Commit 0dc1d8d5 authored by alex yao's avatar alex yao

fix:aibi

parent 0cc7c490
...@@ -291,14 +291,6 @@ public class AiBiServiceImpl implements AiBiService { ...@@ -291,14 +291,6 @@ public class AiBiServiceImpl implements AiBiService {
chartJSONObject.put("question", input); chartJSONObject.put("question", input);
AbstractFunctionResult<ChartData> functionResult = chartDataConvertFunction.doFunction(chartJSONObject.toJSONString(), null, null, null); AbstractFunctionResult<ChartData> functionResult = chartDataConvertFunction.doFunction(chartJSONObject.toJSONString(), null, null, null);
functionRecord = outputChartData(functionResult.getPromptContent(), sseUtil, functionRecord); functionRecord = outputChartData(functionResult.getPromptContent(), sseUtil, functionRecord);
//
// JSONObject echartJSONObject = new JSONObject();
// echartJSONObject.put("sql", dbChainResult.getSql());
// echartJSONObject.put("sql_result", dbChainResult.getSqlResult());
// echartJSONObject.put("question", input);
// AbstractFunctionResult<String> functionResult = eChartGenerateFunction.doFunction(echartJSONObject.toJSONString(), null, null, null);
// String eChartOption = functionResult.getFunctionResult();
// functionRecord = outputECharts(eChartOption, sseUtil, functionRecord);
} }
} else if (StringUtils.isNotBlank(fileUrl)) { } else if (StringUtils.isNotBlank(fileUrl)) {
CSVChainResponse csvChainResponse = new CSVChainResponse(); CSVChainResponse csvChainResponse = new CSVChainResponse();
...@@ -323,14 +315,6 @@ public class AiBiServiceImpl implements AiBiService { ...@@ -323,14 +315,6 @@ public class AiBiServiceImpl implements AiBiService {
chartJSONObject.put("question", input); chartJSONObject.put("question", input);
AbstractFunctionResult<ChartData> functionResult = chartDataConvertFunction.doFunction(chartJSONObject.toJSONString(), null, null, null); AbstractFunctionResult<ChartData> functionResult = chartDataConvertFunction.doFunction(chartJSONObject.toJSONString(), null, null, null);
functionRecord = outputChartData(functionResult.getPromptContent(), sseUtil, functionRecord); functionRecord = outputChartData(functionResult.getPromptContent(), sseUtil, functionRecord);
// JSONObject echartJSONObject = new JSONObject();
// echartJSONObject.put("sql", StringUtils.EMPTY);
// echartJSONObject.put("sql_result", csvChainResult.getResult());
// echartJSONObject.put("question", input);
// AbstractFunctionResult<String> functionResult = eChartGenerateFunction.doFunction(echartJSONObject.toJSONString(), null, null, null);
// String eChartOption = functionResult.getFunctionResult();
// functionRecord = outputECharts(eChartOption, sseUtil, functionRecord);
} }
} }
} }
......
...@@ -108,7 +108,7 @@ public class ChartDataConvertFunction extends AbstractLargeModelFunction { ...@@ -108,7 +108,7 @@ public class ChartDataConvertFunction extends AbstractLargeModelFunction {
} }
ChartData chartData = JsonUtils.deSerialize(message.substring(startEnd, endIndex + 1), ChartData.class); ChartData chartData = JsonUtils.deSerialize(message.substring(startEnd, endIndex + 1), ChartData.class);
result.setFunctionResult(chartData); result.setFunctionResult(chartData);
result.setPromptContent(message); result.setPromptContent(JsonUtils.serialize(chartData));
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment