From f940890f3a25809d6397c3dae49e9710deec485a Mon Sep 17 00:00:00 2001
From: WangHui <1143481437@qq.com>
Date: Tue, 20 Oct 2026 18:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=88=97=E8=A1=A8=E6=8D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/Model.ts                       | 46 ++++++++++++++++++++++++-
 src/components/img/ImgImg.vue           | 12 ++-----
 src/components/img/ReferenceImg.vue     | 12 ++-----
 src/components/img/TextImg.vue          | 11 ++----
 src/components/video/ImgVideo.vue       |  7 ++--
 src/components/video/ReferenceVideo.vue | 28 ++++++---------
 src/components/video/TextVideo.vue      | 10 ++----
 src/types/model.ts                      | 35 ++++++++++++++++++-
 src/views/TextGenerate/TextGenerate.vue | 29 +++++++---------
 9 files changed, 115 insertions(+), 75 deletions(-)

diff --git a/src/apis/Model.ts b/src/apis/Model.ts
index b51a589..ea7b45d 100644
--- a/src/apis/Model.ts
+++ b/src/apis/Model.ts
@@ -1,5 +1,49 @@
 import { get, getApiBaseURL, post } from '../utlis/request'
-import type { TextToTextParams } from '@/types/model'
+import type {
+  AiModelItem,
+  AiModelType,
+  AllModelResponse,
+  Model,
+  TextToTextParams,
+} from '@/types/model'
+
+// 获取可用模型列表原始接口 (model_type: all/t2i/t2v/i2v)
+export const getAiModelsRaw = (params?: { model_type?: AiModelType }): Promise<{ code: number; message: string; data: AiModelItem[] | null }> =>
+  get('/v2/ai/models', params)
+
+/**
+ * 兼容旧 AllModel 返回结构的模型列表获取
+ * - 将新接口 /v2/ai/models 的返回适配为 { status, data: Model[] }
+ * - 现有页面逻辑（input_fields、价格、参数构造）无需改动
+ */
+export const getAiModels = async (modelType: AiModelType): Promise<AllModelResponse> => {
+  const res = await getAiModelsRaw({ model_type: modelType })
+  const list: Model[] = Array.isArray(res?.data)
+    ? res.data.map((item): Model => ({
+        id: String(item.id ?? item.model ?? ''),
+        name: String(item.name ?? item.model ?? ''),
+        model: String(item.model ?? item.name ?? ''),
+        description: String(item.description ?? ''),
+        llmcatelogid: String(item.llmcatelogid ?? modelType),
+        iconid: String(item.iconid ?? ''),
+        upappid: String(item.upappid ?? ''),
+        apiname: String(item.apiname ?? item.model ?? ''),
+        providerid: String(item.providerid ?? ''),
+        ownerid: String(item.ownerid ?? ''),
+        enabled_date: String(item.enabled_date ?? ''),
+        expired_date: String(item.expired_date ?? ''),
+        query_apiname: String(item.query_apiname ?? ''),
+        query_period: Number(item.query_period ?? 0),
+        ppid: String(item.ppid ?? ''),
+        input_fields: Array.isArray(item.input_fields) ? (item.input_fields as Model['input_fields']) : [],
+      }))
+    : []
+
+  return {
+    status: res?.code === 0 ? 'ok' : 'error',
+    data: list,
+  }
+}
 
 // 文生视频
 export const textvideo = <T,D>(data:D):Promise<T> =>post('/llmage/vidu_inference.dspy',data)
diff --git a/src/components/img/ImgImg.vue b/src/components/img/ImgImg.vue
index 1ad8746..4c2e27f 100644
--- a/src/components/img/ImgImg.vue
+++ b/src/components/img/ImgImg.vue
@@ -136,9 +136,8 @@
 </template>
 
 <script setup lang="ts">
-import { AllModel, queryModelPrice, texttoimage } from '@/apis/Model';
+import { getAiModels, queryModelPrice, texttoimage } from '@/apis/Model';
 import type {
-  AllModelResponse,
   InputField,
   Model,
   PriceQueryParams,
@@ -247,15 +246,10 @@ const onModelChange = () => {
 };
 
 const loadImageToImageModels = async () => {
-  interface ModelParams {
-    llmcatelogid: string;
-  }
-
   modelLoading.value = true;
   try {
-    const res = await AllModel<AllModelResponse, ModelParams>({
-      llmcatelogid: 'i2i',
-    });
+    // 图生图在新接口中归入 t2i 类型
+    const res = await getAiModels('t2i');
 
     if (res.status === 'ok' && res.data?.length) {
       models.value = res.data;
diff --git a/src/components/img/ReferenceImg.vue b/src/components/img/ReferenceImg.vue
index be5f13c..7572058 100644
--- a/src/components/img/ReferenceImg.vue
+++ b/src/components/img/ReferenceImg.vue
@@ -148,9 +148,8 @@
 </template>
 
 <script setup lang="ts">
-import { AllModel, queryModelPrice, texttoimage } from '@/apis/Model';
+import { getAiModels, queryModelPrice, texttoimage } from '@/apis/Model';
 import type {
-  AllModelResponse,
   InputField,
   Model,
   PriceQueryParams,
@@ -264,15 +263,10 @@ const onModelChange = () => {
 };
 
 const loadReferenceImageModels = async () => {
-  interface ModelParams {
-    llmcatelogid: string;
-  }
-
   modelLoading.value = true;
   try {
-    const res = await AllModel<AllModelResponse, ModelParams>({
-      llmcatelogid: 'ref2i',
-    });
+    // 参考生图在新接口中归入 t2i 类型
+    const res = await getAiModels('t2i');
 
     if (res.status === 'ok' && res.data?.length) {
       models.value = res.data;
diff --git a/src/components/img/TextImg.vue b/src/components/img/TextImg.vue
index 6a72305..73dbc31 100644
--- a/src/components/img/TextImg.vue
+++ b/src/components/img/TextImg.vue
@@ -116,9 +116,8 @@
 </template>
 
 <script setup lang="ts">
-import { AllModel, queryModelPrice, texttoimage } from '@/apis/Model';
+import { getAiModels, queryModelPrice, texttoimage } from '@/apis/Model';
 import type {
-  AllModelResponse,
   InputField,
   Model,
   PriceQueryParams,
@@ -223,15 +222,9 @@ const isQuantityName = (name: string) => {
 }
 
 const loadTextToImageModels = async () => {
-  interface ModelParams {
-    llmcatelogid: string;
-  }
-
   modelLoading.value = true;
   try {
-    const res = await AllModel<AllModelResponse, ModelParams>({
-      llmcatelogid: 't2i',
-    });
+    const res = await getAiModels('t2i');
 
     if (res.status === 'ok' && res.data?.length) {
       models.value = res.data;
diff --git a/src/components/video/ImgVideo.vue b/src/components/video/ImgVideo.vue
index 268a938..9e68dc5 100644
--- a/src/components/video/ImgVideo.vue
+++ b/src/components/video/ImgVideo.vue
@@ -239,14 +239,12 @@ import { ref, computed, watch, onMounted, onBeforeUnmount } from 'vue';
 import { ElMessage } from 'element-plus';
 import { Delete, Plus, ZoomIn } from '@element-plus/icons-vue';
 import type { UploadFile } from 'element-plus';
-import { imagetovideo, AllModel, queryModelPrice } from '../../apis/Model';
+import { imagetovideo, getAiModels, queryModelPrice } from '../../apis/Model';
 import type {
   Model,
-  AllModelResponse,
   PriceQueryParams,
   PriceQueryResponse,
   TextVideoResponse,
-  ModelParams,
 } from '../../types/model';
 
 // ==================== 组件事件定义 ====================
@@ -582,8 +580,7 @@ const checkRequiredFields = (): boolean => {
 const loadModels = async () => {
   modelLoading.value = true;
   try {
-    const params: ModelParams = { llmcatelogid: 'i2v' };
-    const res = await AllModel<AllModelResponse, ModelParams>(params);
+    const res = await getAiModels('i2v');
     if (res.status === 'ok' && Array.isArray(res.data)) {
       models.value = res.data;
       if (models.value.length > 0) {
diff --git a/src/components/video/ReferenceVideo.vue b/src/components/video/ReferenceVideo.vue
index 330e46c..ef2faed 100644
--- a/src/components/video/ReferenceVideo.vue
+++ b/src/components/video/ReferenceVideo.vue
@@ -325,12 +325,10 @@
 import { ref, computed, watch, onMounted, onBeforeUnmount } from 'vue';
 import { ElMessage } from 'element-plus';
 import { Delete, ZoomIn } from '@element-plus/icons-vue';
-import { referencevideo, AllModel, queryModelPrice } from '../../apis/Model';
+import { referencevideo, getAiModels, queryModelPrice } from '../../apis/Model';
 import type {
-  AllModelResponse,
   InputField,
   Model,
-  ModelParams,
   PriceQueryParams,
   PriceQueryResponse,
   TextVideoResponse,
@@ -700,23 +698,19 @@ const fetchPrice = () => {
   }, 500);
 };
 
-// 加载模型列表：
-// 优先尝试“参考生视频”，如果没有，再兼容回退“图生视频”
+// 加载模型列表
+// 参考生视频在新接口中归入 i2v 类型
 const loadModels = async () => {
-  const candidateTypes: ModelParams['llmcatelogid'][] = ['r2v'];
-
   modelLoading.value = true;
   try {
-    for (const llmcatelogid of candidateTypes) {
-      const res = await AllModel<AllModelResponse, ModelParams>({ llmcatelogid });
-      if (res.status === 'ok' && Array.isArray(res.data) && res.data.length > 0) {
-        models.value = res.data.map(normalizeModel);
-        currentModelId.value = models.value[0].id;
-        currentModel.value = models.value[0];
-        initFormData();
-        fetchPrice();
-        return;
-      }
+    const res = await getAiModels('i2v');
+    if (res.status === 'ok' && Array.isArray(res.data) && res.data.length > 0) {
+      models.value = res.data.map(normalizeModel);
+      currentModelId.value = models.value[0].id;
+      currentModel.value = models.value[0];
+      initFormData();
+      fetchPrice();
+      return;
     }
 
     ElMessage.error('获取模型列表失败');
diff --git a/src/components/video/TextVideo.vue b/src/components/video/TextVideo.vue
index d7b64ef..738157a 100644
--- a/src/components/video/TextVideo.vue
+++ b/src/components/video/TextVideo.vue
@@ -201,15 +201,13 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, onBeforeUnmount, watch } from 'vue';
 import { ElMessage } from 'element-plus';
-import { textvideo, AllModel, queryModelPrice } from '../../apis/Model';
+import { textvideo, getAiModels, queryModelPrice } from '../../apis/Model';
 import type {
   Model,
-  AllModelResponse,
   PriceQueryParams,
   PriceQueryResponse,
   TextVideoParams,
   TextVideoResponse,
-  ModelParams,
 } from '../../types/model';
 
 // ==================== 事件定义 ====================
@@ -478,13 +476,9 @@ const fetchPrice = () => {
   
 // ==================== 模型加载 ====================
 const loadModels = async () => {
-  const Props = {
-    llmcatelogid:'t2v'
-  }
-
   modelLoading.value = true;
   try {
-    const res = await AllModel<AllModelResponse,ModelParams>(Props);
+    const res = await getAiModels('t2v');
     if (res.status === 'ok' && Array.isArray(res.data)) {
       models.value = res.data;
       if (models.value.length > 0) {
diff --git a/src/types/model.ts b/src/types/model.ts
index 679897b..d42a604 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -38,7 +38,7 @@ export interface ModelResult{
 };
 
 export interface Model {
-  type: string;
+  type?: string;
 }
 
 
@@ -307,3 +307,36 @@ export interface HistoryRecordParams {
   pageSize: number;
   llmcatelogid: string;
 }
+
+/**
+ * 可用模型查询类型: all/t2i/t2v/i2v
+ */
+export type AiModelType = 'all' | 't2i' | 't2v' | 'i2v'
+
+/**
+ * 获取可用模型列表请求参数
+ */
+export interface AiModelsParams {
+  model_type?: AiModelType;
+}
+
+/**
+ * 可用模型项（具体字段以后端返回为准）
+ */
+export interface AiModelItem {
+  id?: string;
+  name?: string;
+  model?: string;
+  model_type?: string;
+  description?: string;
+  [key: string]: unknown;
+}
+
+/**
+ * 获取可用模型列表响应
+ */
+export interface AiModelsResponse {
+  code: number;
+  message: string;
+  data: AiModelItem[] | null;
+}
diff --git a/src/views/TextGenerate/TextGenerate.vue b/src/views/TextGenerate/TextGenerate.vue
index e7e1272..59e78b7 100644
--- a/src/views/TextGenerate/TextGenerate.vue
+++ b/src/views/TextGenerate/TextGenerate.vue
@@ -101,10 +101,10 @@
 
 
 <script setup lang="ts">
-import { AllModel, textToTextStream } from '@/apis/Model';
+import { getAiModels, textToTextStream } from '@/apis/Model';
 import LoginPrompt from '@/components/LoginPrompt/LoginPrompt.vue';
 import { useLoginStore } from '@/store/LoginStore';
-import type { AllModelResponse, TextToTextParams } from '@/types/model';
+import type { TextToTextParams } from '@/types/model';
 import { ElMessage } from 'element-plus';
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
@@ -137,22 +137,19 @@ const promptExamples = [
 
 
 // 获取模型
+type AiModelType = 'all' | 't2i' | 't2v' | 'i2v';
 const getModel = async () => {
-  interface ModelParams {
-    llmcatelogid: string;
+  // 文生文在新接口中暂无对应类型，使用 'all' 获取全部模型
+  const modelType: AiModelType = 'all';
+  const res = await getAiModels(modelType);
+  if (res.status === 'ok' && res.data?.length) {
+    modelOptions.value = res.data.map((item) => ({
+      label: item.model || item.name,
+      value: item.model,
+    }));
+    selectedModel.value = modelOptions.value[0]?.value || selectedModel.value;
   }
-  const Props: ModelParams = {
-    llmcatelogid:'t2t'
-   }
-    const res = await AllModel<AllModelResponse, ModelParams>(Props);
-    if(res.status === 'ok' && res.data?.length) {
-      modelOptions.value = res.data.map((item) => ({
-        label: item.model || item.name,
-        value: item.model,
-      }));
-      selectedModel.value = modelOptions.value[0]?.value || selectedModel.value;
-    }
-  } 
+}
 
 onMounted(() => {
   getModel();