Merge pull request #782 from apecloud/bugfix/model_definition_change

fix: model definition change

Author: sailwebs

frontend/src/api/models/model-service-provider.ts

@@ -26,6 +26,12 @@ export interface ModelServiceProvider {
      * @memberof ModelServiceProvider
      */
     'name'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ModelServiceProvider
+     */
+    'dialect'?: string;
     /**
      * 
      * @type {string}

frontend/src/api/models/supported-model-service-provider.ts

@@ -26,6 +26,12 @@ export interface SupportedModelServiceProvider {
      * @memberof SupportedModelServiceProvider
      */
     'name'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof SupportedModelServiceProvider
+     */
+    'dialect'?: string;
     /**
      * 
      * @type {string}

frontend/src/api/openapi.merged.yaml

@@ -1904,6 +1904,8 @@ components:
       properties:
         name:
           type: string
+        dialect:
+          type: string
         label:
           type: string
         allow_custom_base_url:
@@ -1924,6 +1926,8 @@ components:
       properties:
         name:
           type: string
+        dialect:
+          type: string
         label:
           type: string
         allow_custom_base_url:

frontend/src/constants/index.ts

@@ -62,11 +62,7 @@ export const MODEL_PROVIDER_ICON: {
   deepseek: DeepseekIcon,
   alibabacloud: AlibabaIcon,
   siliconflow: SiliconflowIcon,
-};
 
-export const MODEL_FAMILYS_ICON: {
-  [key in string]: string;
-} = {
   vicuna: VicunaIcon,
   chatglm: ChatglmIcon,
   chatgpt: ChatGPTIcon,
@@ -77,7 +73,6 @@ export const MODEL_FAMILYS_ICON: {
   falcon: FalconIcon,
   gorilla: GorillaIcon,
   qianwen: QianwenIcon,
-  deepseek: DeepseekIcon,
   'glm-4': Glm4Icon,
 };
 

frontend/src/pages/bots/_form/index.tsx

@@ -1,13 +1,14 @@
-import { CollectionStatusEnum, AvailableModel, SupportedModelServiceProvider } from '@/api';
+import {
+  AvailableModel,
+  CollectionStatusEnum,
+  SupportedModelServiceProvider,
+} from '@/api';
 import iconCommon from '@/assets/bots/common.svg';
 import iconKnowledge from '@/assets/bots/knowledge.svg';
 import { CheckCard, RefreshButton } from '@/components';
-import {
-  MODEL_PROVIDER_ICON,
-  UI_COLLECTION_STATUS,
-} from '@/constants';
-import { ApeBot } from '@/types';
+import { MODEL_PROVIDER_ICON, UI_COLLECTION_STATUS } from '@/constants';
 import { api } from '@/services';
+import { ApeBot } from '@/types';
 import {
   Avatar,
   Badge,
@@ -43,7 +44,7 @@ export default ({ form, onSubmit, values, action }: Props) => {
     useModel('collection');
   const [availableModels, setAvailableModels] = useState<AvailableModel[]>();
   const [supportedModelServiceProviders, setSupportedModelServiceProviders] =
-      useState<SupportedModelServiceProvider[]>();
+    useState<SupportedModelServiceProvider[]>();
   const { models, promptTemplates, getPromptTemplates } = useModel('models');
   const { loading, setLoading } = useModel('global');
 
@@ -96,22 +97,22 @@ export default ({ form, onSubmit, values, action }: Props) => {
 
   const getModels = async () => {
     setLoading(true);
-    const [
-      availableModelsRes,
-      supportedModelServiceProvidersRes,
-    ] = await Promise.all([
-      api.availableModelsGet(),
-      api.supportedModelServiceProvidersGet(),
-    ]);
+    const [availableModelsRes, supportedModelServiceProvidersRes] =
+      await Promise.all([
+        api.availableModelsGet(),
+        api.supportedModelServiceProvidersGet(),
+      ]);
     setLoading(false);
     setAvailableModels(availableModelsRes.data.items);
     setSupportedModelServiceProviders(
       supportedModelServiceProvidersRes.data.items,
     );
   };
 
-  const currentModel = useMemo( () => {
-    return models?.find((m) => `${m.model_service_provider}:${m.value}` === botModel)
+  const currentModel = useMemo(() => {
+    return models?.find(
+      (m) => `${m.model_service_provider}:${m.value}` === botModel,
+    );
   }, [botModel, models]);
 
   const currentPromptTemplate = useMemo(() => {
@@ -176,7 +177,10 @@ export default ({ form, onSubmit, values, action }: Props) => {
   useEffect(() => {
     const config = values.config;
     if (_.isEmpty(config?.model)) {
-      form.setFieldValue(['config', 'model'], `${models?.[0]?.model_service_provider}:${models?.[0]?.value}`);
+      form.setFieldValue(
+        ['config', 'model'],
+        `${models?.[0]?.model_service_provider}:${models?.[0]?.value}`,
+      );
     }
   }, [models]);
 
@@ -189,10 +193,9 @@ export default ({ form, onSubmit, values, action }: Props) => {
 
   useEffect(() => {
     if (botModel) {
-      const [model_service_provider, model_name] =
-      botModel.split(':');
-      console.log("model_service_provider", model_service_provider)
-      console.log("model_name", model_name)
+      const [model_service_provider, model_name] = botModel.split(':');
+      console.log('model_service_provider', model_service_provider);
+      console.log('model_name', model_name);
       form.setFieldValue(
         ['config', 'model_service_provider'],
         model_service_provider,
@@ -299,7 +302,6 @@ export default ({ form, onSubmit, values, action }: Props) => {
                 }}
               />
             </Form.Item>
-
           </Col>
           <Col
             {...{

frontend/src/pages/bots/index.tsx

@@ -1,5 +1,5 @@
 import { PageContainer, PageHeader, RefreshButton } from '@/components';
-import { MODEL_FAMILYS_ICON } from '@/constants';
+import { MODEL_PROVIDER_ICON } from '@/constants';
 import { PlusOutlined, SearchOutlined } from '@ant-design/icons';
 import {
   Avatar,
@@ -130,9 +130,11 @@ export default () => {
         <Row gutter={[24, 24]}>
           {_bots?.map((bot) => {
             const config = bot.config;
-            const model = models?.find((item) => item.value === config?.model);
-            const modelIcon = model?.family_name
-              ? MODEL_FAMILYS_ICON[model.family_name]
+            const model = models?.find(
+              (item) => item.value === config?.model_name,
+            );
+            const modelIcon = model?.model_service_provider
+              ? MODEL_PROVIDER_ICON[model.model_service_provider]
               : undefined;
             return (
               <Col key={bot.id} xs={24} sm={12} md={8} lg={6} xl={6} xxl={6}>