From 39a85dc4ed7ea0b95d7a33da791dc2dc93b8b09e Mon Sep 17 00:00:00 2001
From: williamhliu <137068196+williamhliu@users.noreply.github.com>
Date: Thu, 30 Nov 2023 21:14:07 +0800
Subject: [PATCH] (feature)(webapp) change agent tool enum value (#454)

---
 .../chat-sdk/src/components/ChatMsg/index.tsx |  2 +-
 .../src/pages/Agent/ToolModal.tsx             |  9 ++--
 .../supersonic-fe/src/pages/Agent/type.ts     | 34 ++++++--------
 .../src/pages/ChatPlugin/DetailModal.tsx      |  4 +-
 .../src/pages/ChatPlugin/constants.ts         |  2 -
 .../src/pages/ChatPlugin/type.ts              | 18 +++----
 webapp/pnpm-lock.yaml                         | 47 +++++++------------
 7 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
index be46f21b7..4c9020b52 100644
--- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
+++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
@@ -146,7 +146,7 @@ const ChatMsg: React.FC<Props> = ({ queryId, data, chartIndex, triggerResize })
     );
   };
 
-  const onLoadData = async (value: any, extraFilter?: any) => {
+  const onLoadData = async (value: any) => {
     setLoading(true);
     const res: any = await queryData({
       ...chatContext,
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
index c415b548b..4d5ba8d59 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
@@ -113,7 +113,8 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
         <FormItem name="name" label="名称">
           <Input placeholder="请输入工具名称" />
         </FormItem>
-        {(toolType === AgentToolTypeEnum.RULE || toolType === AgentToolTypeEnum.LLM_S2SQL) && (
+        {(toolType === AgentToolTypeEnum.NL2SQL_RULE ||
+          toolType === AgentToolTypeEnum.NL2SQL_LLM) && (
           <FormItem name="modelIds" label="主题域">
             <Select
               options={modelList.map((model) => ({ label: model.name, value: model.id }))}
@@ -122,7 +123,7 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
             />
           </FormItem>
         )}
-        {toolType === AgentToolTypeEnum.LLM_S2SQL && (
+        {toolType === AgentToolTypeEnum.NL2SQL_LLM && (
           <FormItem name="exampleQuestions" label="示例问题">
             <div className={styles.paramsSection}>
               {examples.map((example) => {
@@ -158,7 +159,7 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
             </div>
           </FormItem>
         )}
-        {toolType === AgentToolTypeEnum.INTERPRET && (
+        {toolType === AgentToolTypeEnum.ANALYTICS && (
           <>
             <FormItem name="modelId" label="主题域">
               <Select
@@ -240,7 +241,7 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
             />
           </FormItem>
         )}
-        {toolType === AgentToolTypeEnum.RULE && (
+        {toolType === AgentToolTypeEnum.NL2SQL_RULE && (
           <FormItem name="queryTypes" label="查询模式">
             <Select
               placeholder="请选择查询模式"
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
index 9c47831a3..11dbb3cdb 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
@@ -2,48 +2,44 @@ export type MetricOptionType = {
   id: string;
   metricId?: number;
   modelId?: number;
-}
+};
 
 export enum AgentToolTypeEnum {
-  RULE = 'RULE',
-  LLM_S2SQL = 'LLM_S2SQL',
+  NL2SQL_RULE = 'NL2SQL_RULE',
+  NL2SQL_LLM = 'NL2SQL_LLM',
   PLUGIN = 'PLUGIN',
-  INTERPRET = 'INTERPRET'
+  ANALYTICS = 'ANALYTICS',
 }
 
 export const AGENT_TOOL_TYPE_LIST = [
   {
     label: '规则语义解析',
-    value: AgentToolTypeEnum.RULE
+    value: AgentToolTypeEnum.NL2SQL_RULE,
   },
   {
     label: '大模型语义解析',
-    value: AgentToolTypeEnum.LLM_S2SQL
-  },
-  {
-    label: '大模型指标解读',
-    value: AgentToolTypeEnum.INTERPRET
+    value: AgentToolTypeEnum.NL2SQL_LLM,
   },
   {
     label: '第三方插件',
-    value: AgentToolTypeEnum.PLUGIN
+    value: AgentToolTypeEnum.PLUGIN,
   },
-]
+];
 
 export enum QueryModeEnum {
   METRIC = 'METRIC',
-  TAG = 'TAG'
+  TAG = 'TAG',
 }
 
 export const QUERY_MODE_LIST = [
   {
     label: '指标模式',
-    value: QueryModeEnum.METRIC
+    value: QueryModeEnum.METRIC,
   },
   {
     label: '标签模式',
-    value: QueryModeEnum.TAG
-  }
+    value: QueryModeEnum.TAG,
+  },
 ];
 
 export type AgentToolType = {
@@ -55,11 +51,11 @@ export type AgentToolType = {
   metricOptions?: MetricOptionType[];
   exampleQuestions?: string[];
   modelIds?: number[];
-}
+};
 
 export type AgentConfigType = {
   tools: AgentToolType[];
-}
+};
 
 export type AgentType = {
   id?: number;
@@ -73,7 +69,7 @@ export type AgentType = {
   status?: 0 | 1;
   enableSearch?: 0 | 1;
   agentConfig?: AgentConfigType;
-}
+};
 
 export type ModelType = {
   id: number | string;
diff --git a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx
index 70fc54736..3127d05e6 100644
--- a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx
@@ -216,7 +216,7 @@ const DetailModal: React.FC<Props> = ({ detail, onSubmit, onCancel }) => {
             }))}
             onChange={(value) => {
               setPluginType(value);
-              if (value === PluginTypeEnum.LLM_S2SQL) {
+              if (value === PluginTypeEnum.NL2SQL_LLM) {
                 form.setFieldsValue({ parseMode: ParseModeEnum.FUNCTION_CALL });
                 setFunctionParams([
                   {
@@ -243,7 +243,7 @@ const DetailModal: React.FC<Props> = ({ detail, onSubmit, onCancel }) => {
         <FormItem name="pattern" label="函数描述">
           <TextArea placeholder="请输入函数描述，多个描述换行分隔" allowClear />
         </FormItem>
-        {/* <FormItem name="params" label="函数参数" hidden={pluginType === PluginTypeEnum.LLM_S2SQL}>
+        {/* <FormItem name="params" label="函数参数" hidden={pluginType === PluginTypeEnum.NL2SQL_LLM}>
           <div className={styles.paramsSection}>
             {functionParams.map((functionParam: FunctionParamFormItemType) => {
               const { id, name, type, description } = functionParam;
diff --git a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/constants.ts b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/constants.ts
index db835dd25..a62f7f875 100644
--- a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/constants.ts
+++ b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/constants.ts
@@ -1,8 +1,6 @@
 export const PLUGIN_TYPE_MAP = {
   WEB_PAGE: 'Web页面',
   WEB_SERVICE: 'Web服务',
-  // LLM_S2SQL: 'LLM语义解析',
-  // CONTENT_INTERPRET: '内容解读',
 }
 
 export const PARSE_MODE_MAP = {
diff --git a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/type.ts b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/type.ts
index 937acfcda..2cbb18a41 100644
--- a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/type.ts
+++ b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/type.ts
@@ -4,23 +4,23 @@ export type PluginConfigType = {
   paramOptions: any;
   valueParams: any;
   forwardParam: any;
-}
+};
 
 export enum PluginTypeEnum {
   WEB_PAGE = 'WEB_PAGE',
   WEB_SERVICE = 'WEB_SERVICE',
-  LLM_S2SQL = 'LLM_S2SQL'
+  NL2SQL_LLM = 'NL2SQL_LLM',
 }
 
 export enum ParseModeEnum {
   EMBEDDING_RECALL = 'EMBEDDING_RECALL',
-  FUNCTION_CALL = 'FUNCTION_CALL'
+  FUNCTION_CALL = 'FUNCTION_CALL',
 }
 
 export enum ParamTypeEnum {
   CUSTOM = 'CUSTOM',
   SEMANTIC = 'SEMANTIC',
-  FORWARD = 'FORWARD'
+  FORWARD = 'FORWARD',
 }
 
 export type PluginType = {
@@ -32,7 +32,7 @@ export type PluginType = {
   parseModeConfig: string;
   name: string;
   config: PluginConfigType;
-}
+};
 
 export type ModelType = {
   id: number | string;
@@ -49,20 +49,20 @@ export type DimensionType = {
 
 export type FunctionParamType = {
   type: string;
-  properties: Record<string, { type: string, description: string }>;
+  properties: Record<string, { type: string; description: string }>;
   required: string[];
-}
+};
 
 export type FunctionType = {
   name: string;
   description: string;
   parameters: FunctionParamType;
   examples: string[];
-}
+};
 
 export type FunctionParamFormItemType = {
   id: string;
   name?: string;
   type?: string;
   description?: string;
-}
+};
diff --git a/webapp/pnpm-lock.yaml b/webapp/pnpm-lock.yaml
index 21805ba11..6d287e0ce 100644
--- a/webapp/pnpm-lock.yaml
+++ b/webapp/pnpm-lock.yaml
@@ -307,8 +307,8 @@ importers:
         specifier: ^2.0.4
         version: 2.0.4
       '@antv/g6':
-        specifier: ^4.8.14
-        version: 4.8.22
+        specifier: ^4.8.23
+        version: 4.8.23
       '@antv/g6-core':
         specifier: ^0.8.23
         version: 0.8.23
@@ -1152,21 +1152,6 @@ packages:
       lodash: 4.17.21
     dev: false
 
-  /@antv/g6-core@0.8.22:
-    resolution: {integrity: sha512-tH7fO/xCZQnkMqc3N3mkMMpYbOTrcnZChDoSCdDM8ttQ1imK0anObnhdnVkjess7zJ230ySsX8UaE+lzoKFSbg==}
-    dependencies:
-      '@antv/algorithm': 0.1.26
-      '@antv/dom-util': 2.0.4
-      '@antv/event-emitter': 0.1.3
-      '@antv/g-base': 0.5.15
-      '@antv/g-math': 0.1.9
-      '@antv/matrix-util': 3.1.0-beta.3
-      '@antv/path-util': 2.0.15
-      '@antv/util': 2.0.17
-      ml-matrix: 6.10.4
-      tslib: 2.6.2
-    dev: false
-
   /@antv/g6-core@0.8.23:
     resolution: {integrity: sha512-JWdnba5Bx4/hLhbIQeyvdgh68SDYZisveukuBifxLKODCNJNKTopmWf1w6tU+RxAT2k5ByXkTGWQE1IkIL8O+Q==}
     dependencies:
@@ -1182,16 +1167,16 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@antv/g6-element@0.8.22:
-    resolution: {integrity: sha512-rTJgaFDeaiHEF5d+hdJEGbh+Z272bi+Zzu5aTDWCtFFgxtosdeOQGWdyhIEeLCstRvlP3RaaztBIsSZm5BWFsA==}
+  /@antv/g6-element@0.8.23:
+    resolution: {integrity: sha512-KdJOiu4D7UExsYjKOJUcd7YCD/gCfxqHOlS01zkyOqsaindWVLdshBAZWXc2zgzVwHS/fadxwUI+DcllsRkH0g==}
     dependencies:
       '@antv/g-base': 0.5.15
-      '@antv/g6-core': 0.8.22
+      '@antv/g6-core': 0.8.23
       '@antv/util': 2.0.17
     dev: false
 
-  /@antv/g6-pc@0.8.22:
-    resolution: {integrity: sha512-sG17yhA4lXyiLddL/IlCqysbxw3pRspukwaxJ6W5tfDAdM2o04Odf60ppvPekQh/EF6nIZ95qcDl03v3z6NXZw==}
+  /@antv/g6-pc@0.8.23:
+    resolution: {integrity: sha512-8H5n1U8T4pyBcoaEKB8g4TRKycHtONSA+qOeFMq7XIDh1DCn0tUF1uLvwj096Zp+/bUXtAfaRvg+n1KKyCVZ0w==}
     dependencies:
       '@ant-design/colors': 4.0.5
       '@antv/algorithm': 0.1.26
@@ -1202,8 +1187,8 @@ packages:
       '@antv/g-math': 0.1.9
       '@antv/g-svg': 0.5.7
       '@antv/g6-core': 0.8.23
-      '@antv/g6-element': 0.8.22
-      '@antv/g6-plugin': 0.8.22
+      '@antv/g6-element': 0.8.23
+      '@antv/g6-plugin': 0.8.23
       '@antv/hierarchy': 0.6.11
       '@antv/layout': 0.3.23(dagre@0.8.5)
       '@antv/matrix-util': 3.1.0-beta.3
@@ -1216,15 +1201,15 @@ packages:
       ml-matrix: 6.10.4
     dev: false
 
-  /@antv/g6-plugin@0.8.22:
-    resolution: {integrity: sha512-3Z9hnNYwkJ7BAMLRoymWgrgTRXG7EDC2OlDAoRBSUvv/0sLVu7/kvobN3cY3rJF5rNwYmyTYb43ZfbK2UV4GVQ==}
+  /@antv/g6-plugin@0.8.23:
+    resolution: {integrity: sha512-DwhSuUc0a0foIM4nrhXR/+ooZafkVve0IEErldhsygKWLDSz/c9HRLON66OEdzQX7Ed1uE0SMcBUsIDe+wPQrw==}
     dependencies:
       '@antv/dom-util': 2.0.4
       '@antv/g-base': 0.5.15
       '@antv/g-canvas': 0.5.14
       '@antv/g-svg': 0.5.7
-      '@antv/g6-core': 0.8.22
-      '@antv/g6-element': 0.8.22
+      '@antv/g6-core': 0.8.23
+      '@antv/g6-element': 0.8.23
       '@antv/matrix-util': 3.1.0-beta.3
       '@antv/path-util': 2.0.15
       '@antv/scale': 0.3.18
@@ -1232,10 +1217,10 @@ packages:
       insert-css: 2.0.0
     dev: false
 
-  /@antv/g6@4.8.22:
-    resolution: {integrity: sha512-ZbfmaK5H5vULGJUWZLIBJSorF3kSSeSZvvxbOJzzfB72zJ+Pjjtviq2BeiVV+HAZ3Ux7ogvIH6zcwRb1JrIO8g==}
+  /@antv/g6@4.8.23:
+    resolution: {integrity: sha512-tsnJzlZCiOKvwAULGom6ppARutRmoAgV1wZzkOmDRm8ZdokUkpEYfb3faV6802VMs82DLP0zZ0KavapoK1q8hQ==}
     dependencies:
-      '@antv/g6-pc': 0.8.22
+      '@antv/g6-pc': 0.8.23
     dev: false
 
   /@antv/graphlib@1.2.0: