Merge pull request #9231 from GuoLiBin6/feat/glb-to-4.0/src

feat: llm config

Author: GuoLiBin6

containers/Ai/locales/en.json

@@ -334,5 +334,15 @@
   "aice.llm_network_type.hostlocal_default": "Auto schedule - host-local network",
   "aice.llm_network_type.guest": "Specify classic network",
   "aice.llm_network_type.hostlocal": "Specify host-local network",
-  "aice.cpu": "CPU"
+  "aice.cpu": "CPU",
+  "aice.dify_api_image": "Dify API Image",
+  "aice.dify_plugin_image": "Dify Plugin Image",
+  "aice.dify_sandbox_image": "Dify Sandbox Image",
+  "aice.dify_ssr_image": "Dify SSR Image",
+  "aice.dify_weaviate_image": "Dify Weaviate Image",
+  "aice.dify_web_image": "Dify Web Image",
+  "aice.nginx_image": "Nginx Image",
+  "aice.postgres_image": "Postgre Image",
+  "aice.redis_image": "Redis Image",
+  "aice.container_status": "Container Status"
 }

containers/Ai/locales/ja-JP.json

@@ -334,5 +334,15 @@
   "aice.llm_network_type.hostlocal_default": "自動スケジューリング-ホストローカルネットワーク",
   "aice.llm_network_type.guest": "クラシックネットワークを指定",
   "aice.llm_network_type.hostlocal": "ホストローカルネットワークを指定",
-  "aice.cpu": "CPU"
+  "aice.cpu": "CPU",
+  "aice.dify_api_image": "Dify API Image",
+  "aice.dify_plugin_image": "Dify Plugin Image",
+  "aice.dify_sandbox_image": "Dify Sandbox Image",
+  "aice.dify_ssr_image": "Dify SSR Image",
+  "aice.dify_weaviate_image": "Dify Weaviate Image",
+  "aice.dify_web_image": "Dify Web Image",
+  "aice.nginx_image": "Nginx Image",
+  "aice.postgres_image": "Postgre Image",
+  "aice.redis_image": "Redis Image",
+  "aice.container_status": "コンテナ状態"
 }

containers/Ai/locales/zh-CN.json

@@ -336,5 +336,15 @@
   "aice.login_password": "密码",
   "aice.login_extra": "额外信息",
   "aice.login_info": "登录信息",
-  "aice.click_to_show": "点击显示"
+  "aice.click_to_show": "点击显示",
+  "aice.dify_api_image": "Dify API 镜像",
+  "aice.dify_plugin_image": "Dify Plugin 镜像",
+  "aice.dify_sandbox_image": "Dify Sandbox 镜像",
+  "aice.dify_ssr_image": "Dify SSR 镜像",
+  "aice.dify_weaviate_image": "Dify Weaviate 镜像",
+  "aice.dify_web_image": "Dify Web 镜像",
+  "aice.nginx_image": "Nginx 镜像",
+  "aice.postgres_image": "Postgre 镜像",
+  "aice.redis_image": "Redis 镜像",
+  "aice.container_status": "容器状态"
 }

containers/Ai/views/llm-sku/create/Form.vue

@@ -29,7 +29,72 @@
         </a-radio-group>
         <a-label v-else>{{ llmTypeName }}</a-label>
       </a-form-item>
-      <a-form-item :label="$t('aice.llm_image')">
+      <template v-if="form.fd.llm_type === 'dify'">
+        <a-form-item :label="$t('aice.dify_api_image')">
+          <base-select
+            v-decorator="decorators.dify_api_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_api_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_api_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.dify_plugin_image')">
+          <base-select
+            v-decorator="decorators.dify_plugin_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_plugin_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_plugin_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.dify_sandbox_image')">
+          <base-select
+            v-decorator="decorators.dify_sandbox_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_sandbox_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_sandbox_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.dify_ssrf_image')">
+          <base-select
+            v-decorator="decorators.dify_ssrf_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_ssr_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_ssr_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.dify_weaviate_image')">
+          <base-select
+            v-decorator="decorators.dify_weaviate_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_weaviate_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_weaviate_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.dify_web_image')">
+          <base-select
+            v-decorator="decorators.dify_web_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'dify_web_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.dify_web_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.nginx_image')">
+          <base-select
+            v-decorator="decorators.nginx_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'nginx_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.nginx_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.postgres_image')">
+          <base-select
+            v-decorator="decorators.postgres_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'postgres_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.postgres_image')]) }" />
+        </a-form-item>
+        <a-form-item :label="$t('aice.redis_image')">
+          <base-select
+            v-decorator="decorators.redis_image_id"
+            resource="llm_images"
+            :params="{ ...appImageParams, $t: 'redis_image' }"
+            :selectProps="{ placeholder: $t('common.tips.select', [$t('aice.redis_image')]) }" />
+        </a-form-item>
+      </template>
+      <a-form-item v-else :label="$t('aice.llm_image')">
         <base-select
           v-decorator="decorators.llm_image_id"
           resource="llm_images"
@@ -146,10 +211,6 @@
         </a-row>
       </a-form-item>
     </a-form>
-    <div class="form-footer">
-      <a-button type="primary" @click="handleConfirm" :loading="loading">{{ $t('dialog.ok') }}</a-button>
-      <a-button @click="handleCancel">{{ $t('dialog.cancel') }}</a-button>
-    </div>
   </div>
 </template>
 
@@ -214,6 +275,17 @@ export default {
       openclaw: openclawConf = {},
       port_mappings = [],
     } = data
+    const {
+      dify_api_image_id,
+      dify_plugin_image_id,
+      dify_sandbox_image_id,
+      dify_ssrf_image_id,
+      dify_weaviate_image_id,
+      dify_web_image_id,
+      nginx_image_id,
+      postgres_image_id,
+      redis_image_id,
+    } = llmSpec?.dify || {}
     // openclaw 优先来自 llm_spec.openclaw，其次兼容旧的顶层 openclaw 字段
     let openclawConfObj = llmSpec?.openclaw ?? openclawConf
     if (typeof openclawConfObj === 'string') {
@@ -245,7 +317,8 @@ export default {
           },
         }),
         fd: {
-          llm_type: rowLlmType || (LLM_TYPE_OPTIONS[0] && LLM_TYPE_OPTIONS[0].id) || 'openclaw',
+          // 须与 decorators.llm_type.initialValue 一致，否则 currentTypeFields / v-if 与真实选中类型不同步，初始化不展示类型字段
+          llm_type: rowLlmType || defaultLlmType,
         },
       },
       decorators: {
@@ -285,6 +358,42 @@ export default {
             ],
           },
         ],
+        dify_api_image_id: [
+          'dify_api_image_id',
+          {
+            initialValue: dify_api_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_api_image')]) },
+            ],
+          },
+        ],
+        dify_plugin_image_id: [
+          'dify_plugin_image_id',
+          {
+            initialValue: dify_plugin_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_plugin_image')]) },
+            ],
+          },
+        ],
+        dify_sandbox_image_id: [
+          'dify_sandbox_image_id',
+          {
+            initialValue: dify_sandbox_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_sandbox_image')]) },
+            ],
+          },
+        ],
+        dify_ssrf_image_id: [
+          'dify_ssrf_image_id',
+          {
+            initialValue: dify_ssrf_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_ssr_image')]) },
+            ],
+          },
+        ],
         llm_type: [
           'llm_type',
           {
@@ -294,6 +403,51 @@ export default {
             ],
           },
         ],
+        dify_weaviate_image_id: [
+          'dify_weaviate_image_id',
+          {
+            initialValue: dify_weaviate_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_weaviate_image')]) },
+            ],
+          },
+        ],
+        dify_web_image_id: [
+          'dify_web_image_id',
+          {
+            initialValue: dify_web_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.dify_web_image')]) },
+            ],
+          },
+        ],
+        nginx_image_id: [
+          'nginx_image_id',
+          {
+            initialValue: nginx_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.nginx_image')]) },
+            ],
+          },
+        ],
+        postgres_image_id: [
+          'postgres_image_id',
+          {
+            initialValue: postgres_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.postgres_image')]) },
+            ],
+          },
+        ],
+        redis_image_id: [
+          'redis_image_id',
+          {
+            initialValue: redis_image_id,
+            rules: [
+              { required: true, message: this.$t('common.tips.select', [this.$t('aice.redis_image')]) },
+            ],
+          },
+        ],
         openclaw_agents_md: [
           'openclaw_agents_md',
           {
@@ -375,7 +529,7 @@ export default {
         device: [
           'device',
           {
-            initialValue: devices && devices[0]?.model,
+            initialValue: devices && devices.length > 0 ? devices.map(v => v.model) : [],
             rules: [
               { required: true, message: this.$t('common.tips.select', [this.$t('aice.devices')]) },
             ],
@@ -406,8 +560,8 @@ export default {
         },
       },
       formItemLayout: {
-        wrapperCol: { span: 18 },
-        labelCol: { span: 5 },
+        wrapperCol: { span: 20 },
+        labelCol: { span: 4 },
       },
       envVars,
       projectName: (project_domain != null && tenant != null) ? `${project_domain}/${tenant}` : '',
@@ -519,6 +673,15 @@ export default {
           phone_image,
           request_sync_image,
           llm_image_id,
+          dify_api_image_id,
+          dify_plugin_image_id,
+          dify_sandbox_image_id,
+          dify_ssrf_image_id,
+          dify_weaviate_image_id,
+          dify_web_image_id,
+          nginx_image_id,
+          postgres_image_id,
+          redis_image_id,
           cpu,
           memory,
           volume_size,
@@ -577,7 +740,7 @@ export default {
           const v = pickTypeValues[key]
           if (v === undefined) return
           if (key === 'device') {
-            data.devices = [{ model: v }]
+            data.devices = v.map(k => ({ model: k }))
           } else {
             data[key] = v
           }
@@ -594,6 +757,22 @@ export default {
             data.llm_spec = { openclaw: { workspace_templates } }
           }
         }
+        if (effectiveLlmType === 'dify') {
+          data.llm_spec = {
+            dify: {
+              dify_api_image_id: dify_api_image_id,
+              dify_plugin_image_id: dify_plugin_image_id,
+              dify_sandbox_image_id: dify_sandbox_image_id,
+              dify_ssrf_image_id: dify_ssrf_image_id,
+              dify_weaviate_image_id: dify_weaviate_image_id,
+              dify_web_image_id: dify_web_image_id,
+              nginx_image_id: nginx_image_id,
+              postgres_image_id: postgres_image_id,
+              redis_image_id: redis_image_id,
+            },
+          }
+          delete data.llm_image_id
+        }
         if (this.mode === 'edit' && this.onManager && this.editData) {
           if (request_sync_image) data.request_sync_image = true
           await this.onManager('update', {

containers/Ai/views/llm-sku/create/index.vue

@@ -3,10 +3,18 @@
     <page-header :title="headerTitle" />
     <page-body needMarginBottom>
       <llm-sku-create-form
+        ref="createForm"
         mode="create"
+        hide-footer
         @success="onFormSuccess"
         @cancel="onFormCancel" />
     </page-body>
+    <page-footer>
+      <template v-slot:right>
+        <a-button type="primary" :loading="submitLoading" @click="handleConfirm">{{ $t('common.create') }}</a-button>
+        <a-button @click="handleCancel">{{ $t('common.cancel') }}</a-button>
+      </template>
+    </page-footer>
   </div>
 </template>
 
@@ -18,6 +26,11 @@ export default {
   components: {
     LlmSkuCreateForm,
   },
+  data () {
+    return {
+      submitLoading: false,
+    }
+  },
   computed: {
     isApplyType () {
       return this.$route.path.includes('app-llm')
@@ -27,8 +40,22 @@ export default {
     },
   },
   methods: {
+    async handleConfirm () {
+      const form = this.$refs.createForm
+      if (!form) return
+      this.submitLoading = true
+      try {
+        await form.handleConfirm()
+      } catch (e) {
+        // 校验失败等由表单处理
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    handleCancel () {
+      this.$refs.createForm && this.$refs.createForm.handleCancel()
+    },
     onFormSuccess () {
-      this.$message.success(this.$t('common.success'))
       this.$router.push(this.isApplyType ? '/app-llm-sku' : '/llm-sku')
     },
     onFormCancel () {