Merge remote-tracking branch 'origin/master'

webapp/packages/supersonic-fe/config/proxy.ts

@@ -1,7 +1,8 @@
 export default {
   dev: {
     '/api/': {
-      target: 'http://localhost:9080',
+      target: 'http://10.91.217.39:9080',
+      // target: 'http://s2.tmeoa.com',
       changeOrigin: true,
     },
   },

webapp/packages/supersonic-fe/config/routes.ts

@@ -152,10 +152,15 @@ const ROUTES = [
   {
     path: '/database',
     name: 'database',
-    // hideInMenu: true,
     component: './SemanticModel/components/Database/DatabaseTable',
     envEnableList: [ENV_KEY.SEMANTIC],
   },
+  {
+    path: '/llm',
+    name: 'llm',
+    component: './SemanticModel/components/LLM/LlmTable',
+    envEnableList: [ENV_KEY.SEMANTIC],
+  },
   {
     path: '/system',
     name: 'system',

webapp/packages/supersonic-fe/src/locales/zh-CN/menu.ts

@@ -14,6 +14,7 @@ export default {
   'menu.tag': '标签市场',
   'menu.tag.tagDetail': '标签详情页',
   'menu.database': '数据库管理',
+  'menu.llm': '大模型管理',
   'menu.chatSetting': '问答设置',
   'menu.plugin': '插件管理',
   'menu.login': '登录',

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Modal, message, Space, Tooltip, Tabs } from 'antd';
+import { Button, Modal, message, Space, Tooltip, Tabs, Drawer } from 'antd';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { ISemantic } from '../data';
 import CommonEditTable from './CommonEditTable';

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmCreateForm.tsx

@@ -0,0 +1,167 @@
+import { useEffect, forwardRef, useImperativeHandle, useState } from 'react';
+import type { ForwardRefRenderFunction } from 'react';
+import { message, Form, Input, Select, Button, Space, Slider, InputNumber } from 'antd';
+import { saveLlmConfig } from '../../service';
+import { testLLMConn } from '@/services/system';
+import { formLayout } from '@/components/FormHelper/utils';
+import { encryptPassword, decryptPassword } from '@/utils/utils';
+import styles from '../style.less';
+type Props = {
+  llmItem?: any;
+  onSubmit?: (params?: any) => void;
+};
+
+const FormItem = Form.Item;
+const TextArea = Input.TextArea;
+
+const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onSubmit }, ref) => {
+  const [form] = Form.useForm();
+
+  const [formData, setFormData] = useState<any>({
+    config: {
+      timeOut: 60,
+      provider: 'OPEN_AI',
+      temperature: 0,
+    },
+  });
+
+  const [testLoading, setTestLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    form.resetFields();
+    if (llmItem) {
+      form.setFieldsValue({ ...llmItem });
+    }
+  }, [llmItem]);
+
+  const getFormValidateFields = async () => {
+    return await form.validateFields();
+  };
+
+  useImperativeHandle(ref, () => ({
+    getFormValidateFields,
+    saveDatabaseConfig,
+    testDatabaseConnection,
+  }));
+
+  const saveDatabaseConfig = async () => {
+    const values = await form.validateFields();
+    const { code, msg } = await saveLlmConfig({
+      ...(llmItem || {}),
+      ...values,
+    });
+
+    if (code === 200) {
+      message.success('保存成功');
+      onSubmit?.();
+      return;
+    }
+    message.error(msg);
+  };
+  const testDatabaseConnection = async () => {
+    const values = await form.validateFields();
+    setTestLoading(true);
+    const { code, data } = await testLLMConn({
+      ...values.config,
+    });
+    setTestLoading(false);
+    if (code === 200 && data) {
+      message.success('连接测试通过');
+      return;
+    }
+    message.error('连接测试失败');
+  };
+  return (
+    <>
+      <Form
+        {...formLayout}
+        form={form}
+        layout="vertical"
+        className={styles.form}
+        initialValues={formData}
+      >
+        <FormItem
+          name="name"
+          label="连接名称"
+          rules={[{ required: true, message: '请输入连接名称' }]}
+        >
+          <Input placeholder="请输入连接名称" />
+        </FormItem>
+        <FormItem name={['config', 'provider']} label="接口协议">
+          <Select placeholder="">
+            {['OPEN_AI', 'OLLAMA'].map((item) => (
+              <Select.Option key={item} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem name={['config', 'modelName']} label="Model Name">
+          <Input placeholder="请输入语言模型名称" />
+        </FormItem>
+        <FormItem name={['config', 'baseUrl']} label="Base URL">
+          <Input placeholder="请输入Base URL" />
+        </FormItem>
+        <FormItem
+          name={['config', 'apiKey']}
+          label="API Key"
+          hidden={formData?.config?.provider === 'OLLAMA'}
+          getValueFromEvent={(event) => {
+            const value = event.target.value;
+            return encryptPassword(value);
+          }}
+          getValueProps={(value) => {
+            return {
+              value: value ? decryptPassword(value) : '',
+            };
+          }}
+        >
+          <Input.Password placeholder="请输入API Key" visibilityToggle />
+        </FormItem>
+
+        <FormItem name={['config', 'temperature']} label="Temperature">
+          <Slider
+            min={0}
+            max={1}
+            step={0.1}
+            marks={{
+              0: '精准',
+              1: '随机',
+            }}
+          />
+        </FormItem>
+        <FormItem name={['config', 'timeOut']} label="超时时间(秒)">
+          <InputNumber />
+        </FormItem>
+        <FormItem name="description" label="描述">
+          <TextArea placeholder="请输入大模型连接描述" style={{ height: 100 }} />
+        </FormItem>
+
+        <FormItem>
+          <Space>
+            <Button
+              type="primary"
+              loading={testLoading}
+              onClick={() => {
+                testDatabaseConnection();
+              }}
+            >
+              连接测试
+            </Button>
+
+            <Button
+              type="primary"
+              onClick={() => {
+                saveDatabaseConfig();
+              }}
+            >
+              保 存
+            </Button>
+          </Space>
+        </FormItem>
+      </Form>
+    </>
+  );
+};
+
+export default forwardRef(DatabaseCreateForm);

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmSettingModal.tsx

@@ -0,0 +1,73 @@
+import React, { useState, useRef } from 'react';
+import { Button, Modal, Space } from 'antd';
+import LlmCreateForm from './LlmCreateForm';
+import { ISemantic } from '../../data';
+
+export type CreateFormProps = {
+  onCancel: () => void;
+  llmItem?: ISemantic.IDatabaseItem;
+  open: boolean;
+  onSubmit: (values?: any) => void;
+};
+
+const DatabaseSettingModal: React.FC<CreateFormProps> = ({ onCancel, llmItem, open, onSubmit }) => {
+  const [testLoading, setTestLoading] = useState<boolean>(false);
+
+  const createFormRef = useRef<any>({});
+
+  const handleTestConnection = async () => {
+    setTestLoading(true);
+    await createFormRef.current.testDatabaseConnection();
+    setTestLoading(false);
+  };
+
+  const renderFooter = () => {
+    return (
+      <>
+        <Space>
+          <Button
+            type="primary"
+            loading={testLoading}
+            onClick={() => {
+              handleTestConnection();
+            }}
+          >
+            连接测试
+          </Button>
+
+          <Button
+            type="primary"
+            onClick={() => {
+              createFormRef.current.saveDatabaseConfig();
+            }}
+          >
+            保 存
+          </Button>
+        </Space>
+      </>
+    );
+  };
+
+  return (
+    <Modal
+      width={800}
+      destroyOnClose
+      title="大模型设置"
+      style={{ top: 48 }}
+      maskClosable={false}
+      open={open}
+      footer={renderFooter()}
+      onCancel={onCancel}
+    >
+      <LlmCreateForm
+        ref={createFormRef}
+        llmItem={llmItem}
+        onSubmit={() => {
+          onSubmit?.();
+        }}
+      />
+    </Modal>
+  );
+};
+
+export default DatabaseSettingModal;

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmTable.tsx

@@ -0,0 +1,165 @@
+import type { ActionType, ProColumns } from '@ant-design/pro-components';
+import { ProTable } from '@ant-design/pro-components';
+import { message, Button, Space, Popconfirm } from 'antd';
+import React, { useRef, useState, useEffect } from 'react';
+import LlmSettingModal from './LlmSettingModal';
+import { ISemantic } from '../../data';
+import { getLlmList, deleteLlmConfig } from '../../service';
+
+import dayjs from 'dayjs';
+
+type Props = {};
+
+const LlmTable: React.FC<Props> = ({}) => {
+  const [createModalVisible, setCreateModalVisible] = useState<boolean>(false);
+  const [llmItem, setLlmItem] = useState<ISemantic.ILlmItem>();
+  const [dataBaseList, setDataBaseList] = useState<any[]>([]);
+
+  const actionRef = useRef<ActionType>();
+
+  const queryLlmList = async () => {
+    const { code, data, msg } = await getLlmList();
+    if (code === 200) {
+      setDataBaseList(data);
+    } else {
+      message.error(msg);
+    }
+  };
+
+  useEffect(() => {
+    queryLlmList();
+  }, []);
+
+  const columns: ProColumns[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 80,
+    },
+    {
+      dataIndex: 'name',
+      title: '连接名称',
+    },
+    {
+      dataIndex: ['config', 'modelName'],
+      title: '模型名称',
+      search: false,
+    },
+    {
+      dataIndex: ['config', 'provider'],
+      title: '接口协议',
+      search: false,
+    },
+    {
+      dataIndex: 'createdBy',
+      title: '创建人',
+      search: false,
+    },
+
+    {
+      dataIndex: 'description',
+      title: '描述',
+      search: false,
+    },
+
+    {
+      dataIndex: 'updatedAt',
+      title: '更新时间',
+      search: false,
+      render: (value: any) => {
+        return value && value !== '-' ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-';
+      },
+    },
+
+    {
+      title: '操作',
+      dataIndex: 'x',
+      valueType: 'option',
+      width: 100,
+      render: (_, record) => {
+        // if (!record.hasEditPermission) {
+        //   return <></>;
+        // }
+        return (
+          <Space>
+            <a
+              key="dimensionEditBtn"
+              onClick={() => {
+                setLlmItem(record);
+                setCreateModalVisible(true);
+              }}
+            >
+              编辑
+            </a>
+            <Popconfirm
+              title="确认删除？"
+              okText="是"
+              cancelText="否"
+              onConfirm={async () => {
+                const { code, msg } = await deleteLlmConfig(record.id);
+                if (code === 200) {
+                  setLlmItem(undefined);
+                  queryLlmList();
+                } else {
+                  message.error(msg);
+                }
+              }}
+            >
+              <a
+                key="dimensionDeleteEditBtn"
+                onClick={() => {
+                  setLlmItem(record);
+                }}
+              >
+                删除
+              </a>
+            </Popconfirm>
+          </Space>
+        );
+      },
+    },
+  ];
+
+  return (
+    <div style={{ margin: 20 }}>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="id"
+        columns={columns}
+        dataSource={dataBaseList}
+        search={false}
+        tableAlertRender={() => {
+          return false;
+        }}
+        size="small"
+        options={{ reload: false, density: false, fullScreen: false }}
+        toolBarRender={() => [
+          <Button
+            key="create"
+            type="primary"
+            onClick={() => {
+              setLlmItem(undefined);
+              setCreateModalVisible(true);
+            }}
+          >
+            创建大模型连接
+          </Button>,
+        ]}
+      />
+      {createModalVisible && (
+        <LlmSettingModal
+          open={createModalVisible}
+          llmItem={llmItem}
+          onCancel={() => {
+            setCreateModalVisible(false);
+          }}
+          onSubmit={() => {
+            setCreateModalVisible(false);
+            queryLlmList();
+          }}
+        />
+      )}
+    </div>
+  );
+};
+export default LlmTable;

webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts

@@ -780,3 +780,35 @@ export function deleteTerm(data: any): Promise<any> {
     data: { ...data },
   });
 }
+
+export function getLlmList(): Promise<any> {
+  return request(`${process.env.CHAT_API_BASE_URL}model/getModelList`, {
+    method: 'GET',
+  });
+}
+
+export function createLlmConfig(data: any): Promise<any> {
+  return request(`${process.env.CHAT_API_BASE_URL}chat/model`, {
+    method: 'POST',
+    data: { ...data },
+  });
+}
+
+export function saveLlmConfig(data: any): Promise<any> {
+  if (data.id) {
+    return request(`${process.env.CHAT_API_BASE_URL}model`, {
+      method: 'PUT',
+      data,
+    });
+  }
+  return request(`${process.env.CHAT_API_BASE_URL}model`, {
+    method: 'POST',
+    data,
+  });
+}
+
+export function deleteLlmConfig(id: number): Promise<any> {
+  return request(`${process.env.CHAT_API_BASE_URL}model/${id}`, {
+    method: 'DELETE',
+  });
+}

webapp/packages/supersonic-fe/src/services/system.ts

@@ -1,7 +1,7 @@
 import request from 'umi-request';
 
 export function testLLMConn(data: any) {
-  return request('/api/chat/agent/testLLMConn', {
+  return request(`${process.env.CHAT_API_BASE_URL}model/testConnection`, {
     method: 'POST',
     data,
   });