Merge pull request #65 from VisActor/fix-dataAggregation-issues

Fix data aggregation issues
VisActor · Apr 7, 2024 · 26eca9d · 26eca9d
2 parents c697f71 + a72ec5a
commit 26eca9d
Show file tree

Hide file tree

Showing 8 changed files with 382 additions and 35 deletions.
diff --git a/common/changes/@visactor/vmind/fix-dataAggregation-issues_2024-04-03-06-47.json b/common/changes/@visactor/vmind/fix-dataAggregation-issues_2024-04-03-06-47.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vmind",
+      "comment": "replace alasql keywords in sql",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vmind"
+}
diff --git a/docs/assets/changelog/en/release.md b/docs/assets/changelog/en/release.md
@@ -1,17 +1,57 @@
+
 # v1.2.7
 
-2024-03-26
+March 26, 2024
+
+**🆕 New Features**
+
+- **@visactor/vmind**: support data aggregation with skylark
+- **@visactor/vmind**: support rule-based chart generation
+- **@visactor/vmind**: use fold to process the dataset when there are more than 1 y field
+
+**🐛 Bug Fixes**
+
+Fixed several badcases in data aggregation and chart generation.
+
+[For more details, please see v1.2.7](https://github.com/VisActor/VMind/releases/tag/v1.2.7)
+
+# v1.2.4
+
+**Planned Features**
+
+- GIF, video export function supports node environment
+- Further standardize API
+- Remove unrelated dependencies
+- Optimize data aggregation function, fix a large number of badcases
+- Smart Chart Generation fixes badcases
+
+# v1.2.3
+
+**Planned Features**
+
+- Data aggregation function, access to headless bi calculator module, vutils
+- Intelligent data aggregation, generate SQL through LLM, aggregate, filter, and sort data
+
+# v1.2.0
+
+**Planned Features**
+
+1. Data module restructuring, supports direct external transmission of the dataset, bypassing the interpretation of field types by LLM.
+2. Intelligent chart generation accesses skylark pro, skylark2-pro-4k models
+3. Optimize chart generation performance
 
+# v1.1.0
 
-**🆕 New feature**
-
-- **@visactor/vmind**: support data aggregation with skylark`
-- **@visactor/vmind**: support rule-based chart generation`
-- **@visactor/vmind**: use fold to process the dataset when there are more than 1 y field`
+**Planned Features**
 
-**🐛 Bug fix**
-
-fix several badcases in data aggregation and chart generation.
+1. Support new chart types: Dual Axis Chart, Funnel Chart, Waterfall Chart, Box Plot
+2. Refactor the data module, dock with VizSchema
+3. Add a fallback mechanism when the chart generation fails, recommend charts using the chart-advisor module.
 
-[more detail about v1.2.7](https://github.com/VisActor/VMind/releases/tag/v1.2.7)
+# v1.0.6-alpha.5
 
+1. Support new chart types: Sankey Diagram, Radar Chart, Rose Chart.
+2. Fixed dependency errors.
+3. Support for node-side calls.
+4. Support for entering url and request parameters during initialization, customize model request methods: you can customize parameters such as LLM service URL, request headers, request methods, model names, maximum tokens, and temperature, etc.
+5. Removed the ffmpeg dependency, replaced with external input to reduce the package volume and difficulty of installing dependencies.
diff --git a/docs/assets/changelog/zh/release.md b/docs/assets/changelog/zh/release.md
@@ -1,17 +1,57 @@
+
 # v1.2.7
 
 2024-03-26
 
-
 **🆕 新增功能**
-
-- **@visactor/vmind**: support data aggregation with skylark`
-- **@visactor/vmind**: support rule-based chart generation`
-- **@visactor/vmind**: use fold to process the dataset when there are more than 1 y field`
+
+- **@visactor/vmind**：支持 skylark 进行数据聚合
+- **@visactor/vmind**：支持规则型图表生成
+- **@visactor/vmind**：在存在多个y字段时使用fold来处理数据集
 
 **🐛 功能修复**
-
-fix several badcases in data aggregation and chart generation.
+
+修复了在数据聚合和图表生成中的若干问题。
 
 [更多详情请查看 v1.2.7](https://github.com/VisActor/VMind/releases/tag/v1.2.7)
 
+# v1.2.4
+
+**规划功能：**
+
+- GIF、视频导出功能支持node环境
+- 进一步规范API
+- 移除无关依赖
+- 数据聚合功能优化，修复大量badcase
+- 图表智能生成 badcase修复
+
+# v1.2.3
+
+**规划功能：**
+
+- 数据聚合功能，接入headless bi calculator模块、vutils
+- 智能数据聚合，通过大模型生成sql，对数据进行聚合、筛选、排序
+
+# v1.2.0
+
+**规划功能：**
+
+1. 数据模块改造，支持外部直接传dataset，不使用模型进行字段类型解析
+2. 图表智能生成接入skylark pro，skylark2-pro-4k模型
+3. 图表生成性能优化
+
+# v1.1.0
+
+**规划功能：**
+
+1. 新增图表类型支持：双轴图、漏斗图、瀑布图、箱型图
+2. 数据模块重构，对接VizSchema
+3. 增加生成图表失败时的兜底机制，使用chart-advisor模块进行图表推荐
+
+# v1.0.6-alpha.5
+
+1. 新增图表类型支持：桑基图、雷达图、玫瑰图
+2. 修复依赖报错
+3. 支持node端调用
+4. 支持初始化时传入url和请求参数，自定义模型请求方式：可以自定义包括大模型服务URL、请求头、请求方法、模型名称、最大tokens和温度等参数
+5. 移除ffmpeg依赖，改为外部传入，减少了包体积和依赖安装难度
diff --git a/packages/vmind/__tests__/browser/src/constants/mockData.ts b/packages/vmind/__tests__/browser/src/constants/mockData.ts
@@ -3674,3 +3674,58 @@ export const mockUserInput17 = {
 2024-03-07,0.024929771518461413,-1,26.099474885828787,653568,25685979,653568,0.00305250127580487,0.00012037169363684177,-1,0.019630556105233156`,
   input: '使用折线图展示'
 };
+
+export const mockUserInput18 = {
+  csv: `Jira Key,Planned BP,Count
+JIRA-27358,BP1.4.1,1
+JIRA-27356,BP1.4.1,1
+JIRA-27350,BP1.5.0,1
+JIRA-27349,BP1.4.1,1
+JIRA-27348,BP1.4.1,1
+JIRA-27347,BP1.4.1,1
+JIRA-27344,BP1.5.0,1
+JIRA-27343,BP1.4.1,1
+JIRA-27339,BP1.4.1,1
+JIRA-27338,BP1.4.1,1
+JIRA-27336,BP1.4.1,1
+JIRA-27335,BP1.4.1,1
+JIRA-27334,BP1.4.1,1
+JIRA-27333,BP1.5.0,1
+JIRA-27331,BP1.4.1,1
+JIRA-27330,BP1.4.1,1
+JIRA-27322,BP1.4.1,1
+JIRA-27321,BP1.4.1,1
+JIRA-27320,BP1.4.0,1
+JIRA-27319,BP1.4.0,1
+JIRA-27316,BP1.4.0,1
+JIRA-27315,BP1.4.1,1
+JIRA-27314,BP1.5.0,1
+JIRA-27311,BP1.4.1,1
+JIRA-27310,BP1.4.1,1
+JIRA-27309,BP1.4.1,1
+JIRA-27308,BP1.4.1,1
+JIRA-27307,BP1.4.1,1
+JIRA-27306,BP1.4.1,1
+JIRA-27305,BP1.4.1,1
+JIRA-27304,BP1.4.1,1
+JIRA-27303,BP1.4.1,1
+JIRA-27302,BP1.4.1,1
+JIRA-27301,BP1.4.1,1
+JIRA-27300,BP1.4.1,1
+JIRA-27299,BP1.4.1,1
+JIRA-27297,BP1.4.1,1
+JIRA-27296,BP1.4.1,1
+JIRA-27295,BP1.4.1,1
+JIRA-27294,BP1.4.1,1
+JIRA-27293,BP1.4.1,1
+JIRA-27292,BP1.4.1,1
+JIRA-27291,BP1.4.1,1
+JIRA-27290,BP1.5.0,1
+JIRA-27289,BP1.4.1,1
+JIRA-27281,BP1.4.1,1
+JIRA-27279,BP1.4.0,1
+JIRA-27278,BP1.4.1,1
+JIRA-27277,BP1.4.0,1
+JIRA-27276,BP1.4.0,1`,
+  input: '按照bp分类统计count之和，绘制柱状堆叠图'
+};
diff --git a/packages/vmind/__tests__/browser/src/pages/DataInput.tsx b/packages/vmind/__tests__/browser/src/pages/DataInput.tsx
@@ -34,7 +34,8 @@ import {
   mockUserInput13,
   mockUserInput14,
   mockUserInput16,
-  mockUserInput17
+  mockUserInput17,
+  mockUserInput18
 } from '../constants/mockData';
 import VMind from '../../../../src/index';
 import { Model } from '../../../../src/index';
@@ -77,7 +78,8 @@ const demoDataList: { [key: string]: any } = {
   'Shopping Mall Sales Performance': mallSalesData,
   'Global GDP': mockUserInput6Eng,
   'Sales of different drinkings': mockUserInput3Eng,
-  'Multi measure': mockUserInput17
+  'Multi measure': mockUserInput17,
+  DataQuery: mockUserInput18
 };
 
 const globalVariables = (import.meta as any).env;
@@ -104,7 +106,7 @@ export function DataInput(props: IPropsType) {
 
   const [loading, setLoading] = useState<boolean>(false);
 
-  const vmind = useMemo(() => {
+  const vmind: any = useMemo(() => {
     if (!url || !apiKey) {
       Message.error('Please set your LLM URL and API Key!!!');
       return null;