合并所有更改：重命名文件夹、terraform fmt、添加 region 变量、修正地域名、优化文档等

Author: qihou0812

solution/tech-solution/pai-deploys-multi-form-stable-diffusion-webui-services/README.md renamed to solution/tech-solution/use-pai-to-deploy-stable-diffusion-for-AI-painting/README.md

@@ -1,8 +1,7 @@
-<!-- BEGIN_TF_DOCS -->
 ## Introduction
 
 <!-- DOCS_DESCRIPTION_CN -->
-本示例用于实现解决方案[PAI 部署多形态的 Stable Diffusion WebUI 服务部署须知](https://www.aliyun.com/solution/tech-solution-deploy/2509703), 涉及到 PAI、NAS、NAT网关 等资源的创建/添加/挂载/关联/部署。
+本示例用于实现解决方案[PAI 部署多形态的 Stable Diffusion WebUI 服务部署须知](https://www.aliyun.com/solution/tech-solution-deploy/2509703), 涉及到 PAI、NAS、NAT网关 等资源的创建
 <!-- DOCS_DESCRIPTION_CN -->
 
 <!-- DOCS_DESCRIPTION_EN -->

solution/tech-solution/pai-deploys-multi-form-stable-diffusion-webui-services/main.tf renamed to solution/tech-solution/use-pai-to-deploy-stable-diffusion-for-AI-painting/main.tf

@@ -1,4 +1,5 @@
 provider "alicloud" {
+  region = var.region
 }
 
 # 生成随机字符串
@@ -18,10 +19,10 @@ resource "alicloud_vpc" "vpc" {
 
 # VSwitch
 resource "alicloud_vswitch" "vswitch" {
-  vpc_id     = alicloud_vpc.vpc.id
+  vpc_id            = alicloud_vpc.vpc.id
   availability_zone = var.zone_id
-  cidr_block = "192.168.0.0/18"
-  vswitch_name = "vswitch_SDWebUI"
+  cidr_block        = "192.168.0.0/18"
+  vswitch_name      = "vswitch_SDWebUI"
 }
 
 # NAT网关
@@ -33,17 +34,17 @@ resource "alicloud_nat_gateway" "nat_gateway" {
   internet_charge_type = "PayByLcu"
   nat_type             = "Enhanced"
   network_type         = "internet"
-  
+
   tags = {
     WebUI = "SD_WebUI"
   }
 }
 
 # EIP
 resource "alicloud_eip" "eip" {
-  name                  = "eip_SDWebUI"
-  bandwidth             = 200
-  internet_charge_type  = "PayByTraffic"
+  name                 = "eip_SDWebUI"
+  bandwidth            = 200
+  internet_charge_type = "PayByTraffic"
 }
 
 # EIP关联到NAT网关
@@ -55,9 +56,9 @@ resource "alicloud_eip_association" "eip_association" {
 # SNAT条目
 resource "alicloud_snat_entry" "snat_entry" {
   snat_table_id = alicloud_nat_gateway.nat_gateway.snat_table_ids
-  snat_ip        = alicloud_eip.eip.ip_address
-  source_cidr    = "192.168.0.0/18"
-  
+  snat_ip       = alicloud_eip.eip.ip_address
+  source_cidr   = "192.168.0.0/18"
+
   depends_on = [alicloud_eip_association.eip_association]
 }
 
@@ -95,9 +96,9 @@ resource "alicloud_security_group_rule" "allow_https" {
 # NAS文件系统
 resource "alicloud_nas_file_system" "nas" {
   file_system_type = "standard"
-  storage_type   = "Performance"
-  protocol_type  = "NFS"
-  encrypt_type   = 0
+  storage_type     = "Performance"
+  protocol_type    = "NFS"
+  encrypt_type     = 0
 }
 
 # NAS访问组
@@ -119,41 +120,41 @@ resource "alicloud_nas_access_rule" "nas_access_rule" {
 
 # NAS挂载点
 resource "alicloud_nas_mount_target" "nas_mount_target" {
-  vpc_id           = alicloud_vpc.vpc.id
-  vswitch_id       = alicloud_vswitch.vswitch.id
+  vpc_id            = alicloud_vpc.vpc.id
+  vswitch_id        = alicloud_vswitch.vswitch.id
   security_group_id = alicloud_security_group.security_group.id
-  status           = "Active"
-  file_system_id   = alicloud_nas_file_system.nas.id
-  network_type     = "Vpc"
+  status            = "Active"
+  file_system_id    = alicloud_nas_file_system.nas.id
+  network_type      = "Vpc"
   access_group_name = alicloud_nas_access_group.nas_access_group.access_group_name
-  
+
   depends_on = [alicloud_nas_access_rule.nas_access_rule]
 }
 
 # PAI-EAS服务
 resource "alicloud_pai_service" "pai_eas" {
   service_config = jsonencode({
     metadata = {
-      name = "sdwebui_${random_string.random_string.result}"
-      instance = 1
-      type = "SDCluster"
+      name              = "sdwebui_${random_string.random_string.result}"
+      instance          = 1
+      type              = "SDCluster"
       enable_webservice = "true"
     }
     cloud = {
       computing = {
         instance_type = var.instance_type
-        instances = null
+        instances     = null
       }
       networking = {
-        vpc_id = alicloud_vpc.vpc.id
-        vswitch_id = alicloud_vswitch.vswitch.id
+        vpc_id            = alicloud_vpc.vpc.id
+        vswitch_id        = alicloud_vswitch.vswitch.id
         security_group_id = alicloud_security_group.security_group.id
       }
     }
     storage = [
       {
         nfs = {
-          path = "/"
+          path   = "/"
           server = alicloud_nas_mount_target.nas_mount_target.mount_target_domain
         }
         properties = {
@@ -164,9 +165,9 @@ resource "alicloud_pai_service" "pai_eas" {
     ]
     containers = [
       {
-        image = "eas-registry-vpc.ap-southeast-1.cr.aliyuncs.com/pai-eas/stable-diffusion-webui:4.1"
+        image  = "eas-registry-vpc.ap-southeast-1.cr.aliyuncs.com/pai-eas/stable-diffusion-webui:4.1"
         script = "./webui.sh --listen --port 8000 --skip-version-check --no-hashing --no-download-sd-model --skip-install --api --filebrowser --cluster-status --sd-dynamic-cache --data-dir /code/stable-diffusion-webui/data-nas"
-        port = 8000
+        port   = 8000
       }
     ]
     meta = {

solution/tech-solution/pai-deploys-multi-form-stable-diffusion-webui-services/outputs.tf renamed to solution/tech-solution/use-pai-to-deploy-stable-diffusion-for-AI-painting/outputs.tf

@@ -1,3 +1,9 @@
+variable "region" {
+  type        = string
+  description = "地域，由于在新加坡地域开通弹性公网 IP 服务后，访问 Civitai 和Github 的网速高效稳定，此处选择新加坡"
+  default     = "ap-southeast-1"
+}
+
 variable "zone_id" {
   type        = string
   description = "可用区ID"
@@ -8,9 +14,9 @@ variable "instance_type" {
   type        = string
   description = "PAI-EAS实例规格"
   default     = "ecs.gn6i-c16g1.4xlarge"
-  
+
   validation {
-    condition = can(regex("(^ecs.*gn.*)|(^ml.*)|(^ecs.*gu.*)", var.instance_type))
+    condition     = can(regex("(^ecs.*gn.*)|(^ml.*)|(^ecs.*gu.*)", var.instance_type))
     error_message = "实例类型必须匹配模式 (^ecs.*gn.*)|(^ml.*)|(^ecs.*gu.*)"
   }
 }