Merge pull request #49 from VisActor/fix-1.2.5-bugs

Fix 1.2.5 bugs

Author: da730

common/config/rush/pnpm-lock.yaml

@@ -22,8 +22,13 @@ import {
   mockUserInput12,
   mockUserInput13,
   mockUserInput14,
-  mockUserInput16
+  mockUserInput16,
+  mockUserInput17
 } from '../browser/src/constants/mockData';
+
+const TEST_GPT = false;
+const TEST_SKYLARK = true;
+
 const demoDataList: { [key: string]: any } = {
   pie: mockUserInput2,
   'dynamic bar zh_cn': mockUserInput6,
@@ -44,7 +49,8 @@ const demoDataList: { [key: string]: any } = {
   'College entrance examination': acceptRatioData,
   'Shopping Mall Sales Performance': mallSalesData,
   'Global GDP': mockUserInput6Eng,
-  'Sales of different drinkings': mockUserInput3Eng
+  'Sales of different drinkings': mockUserInput3Eng,
+  'Multi measure': mockUserInput17
 };
 const CHART_GENERATION_AVERAGE_TIME = 10000;
 const QPM_LIMIT = 10; //qpm limit of your llm service
@@ -53,7 +59,6 @@ const START_INDEX = 0;
 
 const modelResultMap = {
   [Model.GPT3_5]: { totalCount: 0, successCount: 0, totalTime: 0 },
-  [Model.SKYLARK]: { totalCount: 0, successCount: 0, totalTime: 0 },
   [Model.SKYLARK2]: { totalCount: 0, successCount: 0, totalTime: 0 }
 };
 
@@ -88,48 +93,34 @@ const dataList = Object.keys(demoDataList);
 
 const gptKey = process.env.VITE_GPT_KEY;
 const gptURL = process.env.VITE_GPT_JEST_URL;
-if (gptKey && gptURL) {
+if (gptKey && gptURL && TEST_GPT) {
   const vmind = new VMind({
     url: gptURL,
     model: Model.GPT3_5,
-    cache: false,
+    cache: true,
+    showThoughts: false,
     headers: {
       'api-key': gptKey
     }
   });
   testPerformance(Model.GPT3_5, vmind);
 }
 
-//const skylarkKey = process.env.VITE_SKYLARK_KEY;
-//const skylarkURL = process.env.VITE_SKYLARK_JEST_URL;
-
-//if (skylarkKey && skylarkURL) {
-//  const vmind = new VMind({
-//    url: skylarkURL,
-//    model: Model.SKYLARK,
-//    cache: false,
-//    headers: {
-//      'api-key': skylarkKey
-//    }
-//  });
-//  testPerformance(Model.SKYLARK, vmind);
-//}
-
 const skylark2Key = process.env.VITE_SKYLARK_KEY;
 const skylark2URL = process.env.VITE_SKYLARK_JEST_URL;
 
-//if (skylark2Key && skylark2URL) {
-//  const vmind = new VMind({
-//    url: skylark2URL,
-//    model: Model.SKYLARK2,
-//    cache: false,
-//    showThoughts: false,
-//    headers: {
-//      'api-key': skylark2Key
-//    }
-//  });
-//  testPerformance(Model.SKYLARK2, vmind);
-//}
+if (skylark2Key && skylark2URL && TEST_SKYLARK) {
+  const vmind = new VMind({
+    url: skylark2URL,
+    model: Model.SKYLARK2,
+    cache: true,
+    showThoughts: false,
+    headers: {
+      'api-key': skylark2Key
+    }
+  });
+  testPerformance(Model.SKYLARK2, vmind);
+}
 
 afterAll(() => {
   log('---------------VMind performance test---------------');

packages/vmind/__tests__/performance/performanceTest.ts

@@ -77,7 +77,7 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "6.9.0",
-    "@visactor/vchart": "^1.9.0",
+    "@visactor/vchart": "^1.10.2",
     "@rollup/plugin-dynamic-import-vars": "~2.1.0",
     "@types/lodash": "4.14.182",
     "@types/node": "*",