fix: json format error

Author: da730

packages/vmind/__tests__/performance/performanceTest.ts

@@ -22,7 +22,8 @@ import {
   mockUserInput12,
   mockUserInput13,
   mockUserInput14,
-  mockUserInput16
+  mockUserInput16,
+  mockUserInput17
 } from '../browser/src/constants/mockData';
 const demoDataList: { [key: string]: any } = {
   pie: mockUserInput2,
@@ -44,7 +45,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
@@ -92,7 +94,7 @@ if (gptKey && gptURL) {
   const vmind = new VMind({
     url: gptURL,
     model: Model.GPT3_5,
-    cache: false,
+    cache: true,
     headers: {
       'api-key': gptKey
     }

packages/vmind/src/common/utils.ts

@@ -21,3 +21,10 @@ export const execPipeline = <PipelineContext>(
     const result = pipe(pre, context);
     return result;
   }, src);
+
+export const matchJSONStr = (str: string) => {
+  const first = str.indexOf('{');
+  const last = str.lastIndexOf('}');
+  const result = str.substring(first, last + 1);
+  return result && result.length > 0 ? result : str;
+};

packages/vmind/src/common/vizDataToSpec/pipes.ts

@@ -59,7 +59,7 @@ export const funnelData = (spec: any, context: Context) => {
   // spec.data = [dataset]
   spec.data = {
     id: 'data',
-    values: dataset.sort((a: any, b: any) => b[cell.y] - a[cell.y])
+    values: dataset.sort((a: any, b: any) => b[cell.y as string] - a[cell.y as string])
   };
 
   return spec;

packages/vmind/src/gpt/utils.ts

@@ -2,6 +2,7 @@ import { GPTDataProcessResult, ILLMOptions, LLMResponse } from '../typings';
 import axios from 'axios';
 import JSON5 from 'json5';
 import { omit } from 'lodash';
+import { matchJSONStr } from '../common/utils';
 
 export const requestGPT = async (
   prompt: string,
@@ -77,7 +78,9 @@ export const parseGPTResponse = (GPTRes: LLMResponse) => {
     }
     const choices = GPTRes.choices;
     const content = choices[0].message.content;
-    const resJson: GPTDataProcessResult = parseGPTJson(content, '```');
+    const jsonStr = matchJSONStr(content);
+
+    const resJson: GPTDataProcessResult = parseGPTJson(jsonStr, '```');
     return resJson;
   } catch (err: any) {
     return {

packages/vmind/src/skylark/dataProcess/query/utils.ts

@@ -1,6 +1,7 @@
 import { LLMResponse } from 'src/typings';
 import JSON5 from 'json5';
 import { replaceAll } from '../../../common/dataProcess/utils';
+import { matchJSONStr } from '../../../common/utils';
 
 export const parseJson = (JsonStr: string, prefix?: string) => {
   const parseNoPrefixStr = (str: string) => {
@@ -38,7 +39,8 @@ export const parseSkylarkResponseAsJSON = (skylarkRes: LLMResponse) => {
     }
     const choices = skylarkRes.choices;
     const content = replaceAll(choices[0].message.content, '\n', ' ');
-    const resJson = parseJson(content, '```');
+    const jsonStr = matchJSONStr(content);
+    const resJson = parseJson(jsonStr, '```');
     return resJson;
   } catch (err: any) {
     return {