feat: error handler

Author: da730

packages/vmind/__tests__/browser/src/pages/DataInput.tsx

@@ -39,6 +39,7 @@ import VMind from '../../../../src/index';
 import { Model } from '../../../../src/index';
 import { queryDataset } from '../../../../src/gpt/dataProcess';
 import { isArray } from 'lodash';
+//import { mockDataset } from './mockData'
 
 const TextArea = Input.TextArea;
 const Option = Select.Option;
@@ -122,7 +123,9 @@ export function DataInput(props: IPropsType) {
     //setLoading(true);
     const { fieldInfo, dataset } = vmind.parseCSVData(csv);
     //const { fieldInfo: fieldInfoQuery, dataset: datasetQuery } = await vmind?.dataQuery(describe, fieldInfo, dataset);
-    //const { fieldInfo, dataset } = await vmind.parseCSVDataWithLLM(csv, describe);
+    //const { fieldInfo, dataset, usage } = await vmind.parseCSVDataWithLLM(csv, describe);
+    //const dataset = mockDataset
+    //const fieldInfo = vmind?.getFieldInfo(dataset)
     const startTime = new Date().getTime();
     const chartGenerationRes = await vmind.generateChart(describe, fieldInfo, dataset);
     const endTime = new Date().getTime();

packages/vmind/src/gpt/chart-generation/NLToChart.ts

@@ -40,8 +40,8 @@ export const generateChartWithGPT = async (
       queryDatasetUsage = usage;
     }
   } catch (err) {
-    console.warn('data query error!');
-    console.warn(err);
+    console.error('data query error!');
+    console.error(err);
   }
 
   const schema = getSchemaFromFieldInfo(fieldInfo);
@@ -111,7 +111,7 @@ export const chartAdvisorGPT = async (
   const advisorResJson: GPTChartAdvisorResult = parseGPTResponse(advisorRes) as unknown as GPTChartAdvisorResult;
 
   if (advisorResJson.error) {
-    throw Error('Network Error!');
+    throw Error((advisorResJson as any).message);
   }
   if (!SUPPORTED_CHART_LIST.includes(advisorResJson['CHART_TYPE'])) {
     throw Error('Unsupported Chart Type. Please Change User Input');

packages/vmind/src/gpt/utils.ts

@@ -34,7 +34,7 @@ export const requestGPT = async (
         stream: false
         //response_format: { type: 'json_object' } //Only models after gpt-3.5-turbo-1106 support this parameter.
       }
-    }).then(response => response.data);
+    }).then((response: any) => response.data);
 
     return res;
   } catch (err: any) {
@@ -68,16 +68,23 @@ export const parseGPTJson = (JsonStr: string, prefix?: string) => {
 };
 
 export const parseGPTResponse = (GPTRes: LLMResponse) => {
-  if (GPTRes.error) {
+  try {
+    if (GPTRes.error) {
+      return {
+        error: true,
+        ...GPTRes.error
+      };
+    }
+    const choices = GPTRes.choices;
+    const content = choices[0].message.content;
+    const resJson: GPTDataProcessResult = parseGPTJson(content, '```');
+    return resJson;
+  } catch (err: any) {
     return {
       error: true,
-      ...GPTRes.error
+      message: err.message
     };
   }
-  const choices = GPTRes.choices;
-  const content = choices[0].message.content;
-  const resJson: GPTDataProcessResult = parseGPTJson(content, '```');
-  return resJson;
 };
 
 export const replaceAll = (originStr: string, replaceStr: string, newStr: string) => {

packages/vmind/src/skylark/chart-generation/NLToChart.ts

@@ -85,7 +85,7 @@ export const chartAdvisorSkylark = async (
   const chartRecommendRes = await requestSkyLark(chartRecommendPrompt, userMessage, options);
   const chartRecommendResJSON = parseSkylarkResponse(chartRecommendRes);
   if (chartRecommendResJSON.error) {
-    throw Error('Network Error!');
+    throw Error(chartRecommendResJSON.message);
   }
   if (!SUPPORTED_CHART_LIST.includes(chartRecommendResJSON['charttype'])) {
     throw Error('Unsupported Chart Type. Please Change User Input');

packages/vmind/src/skylark/utils.ts

@@ -47,8 +47,8 @@ export const parseSkylarkResponse = (larkResponse: LLMResponse): Record<string,
     resJson.usage = usage;
     //replace all the keys to lower case.
     return Object.keys(resJson).reduce((prev, cur) => ({ ...prev, [cur.toLocaleLowerCase()]: resJson[cur] }), {});
-  } catch (err) {
+  } catch (err: any) {
     console.error(err);
-    return { error: true };
+    return { error: true, message: err.message };
   }
 };