diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 860dab66..8c75ab64 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: macOS-12 + runs-on: macOS-13 permissions: contents: write diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml index 2eb9643b..ed7a20c1 100644 --- a/.github/workflows/release-changelog.yml +++ b/.github/workflows/release-changelog.yml @@ -7,7 +7,7 @@ on: jobs: update-changelog-after-publish-a-release: name: GitHub Actions Test - runs-on: macOS-12 + runs-on: macOS-13 strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 026a88dc..470e3a66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: macOS-12 + runs-on: macOS-13 permissions: contents: write pull-requests: write diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index 94584cf4..b55a92f5 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -11,7 +11,7 @@ jobs: if_merged: if: github.event.pull_request.merged == true - runs-on: macOS-12 + runs-on: macOS-13 permissions: contents: write diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fb6b1cb9..560cc091 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: macOS-12 + runs-on: macOS-13 strategy: matrix: diff --git a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-06-03-08-17.json b/common/changes/@visactor/vmind/docs-demo-openai-header_2024-06-03-08-17.json deleted file mode 100644 index 9f9d6260..00000000 --- a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-06-03-08-17.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vmind", - "comment": "send authorization header when use openai models", - "type": "none" - } - ], - "packageName": "@visactor/vmind" -} \ No newline at end of file diff --git a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-02-55.json b/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-02-55.json deleted file mode 100644 index 0945a5c3..00000000 --- a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-02-55.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vmind", - "comment": "set all headers in all cases", - "type": "none" - } - ], - "packageName": "@visactor/vmind" -} \ No newline at end of file diff --git a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-03-05.json b/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-03-05.json deleted file mode 100644 index 3ef3b3d9..00000000 --- a/common/changes/@visactor/vmind/docs-demo-openai-header_2024-07-03-03-05.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vmind", - "comment": "add bearer header in smart insight page", - "type": "none" - } - ], - "packageName": "@visactor/vmind" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index dfb91fe0..a534b8ec 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -148,8 +148,8 @@ importers: '@types/react-dom': ^18.0.0 '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 - '@visactor/calculator': workspace:* - '@visactor/chart-advisor': workspace:1.2.13 + '@visactor/calculator': workspace:2.0.1 + '@visactor/chart-advisor': workspace:2.0.1 '@visactor/vchart': ^1.12.4 '@visactor/vchart-theme': ^1.11.2 '@visactor/vdataset': ~0.17.4 @@ -1999,7 +1999,7 @@ packages: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3_canvas@2.11.2 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_canvas@2.11.2 jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -2039,7 +2039,7 @@ packages: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3_ts-node@10.9.0 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_ts-node@10.9.0 jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -2217,7 +2217,7 @@ packages: graceful-fs: 4.2.11 jest-haste-map: 26.6.2 jest-runner: 26.6.3_canvas@2.11.2 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_canvas@2.11.2 transitivePeerDependencies: - bufferutil - canvas @@ -2234,7 +2234,7 @@ packages: graceful-fs: 4.2.11 jest-haste-map: 26.6.2 jest-runner: 26.6.3_ts-node@10.9.0 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_ts-node@10.9.0 transitivePeerDependencies: - bufferutil - canvas @@ -10665,7 +10665,7 @@ packages: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_canvas@2.11.2 jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -10697,7 +10697,7 @@ packages: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3 + jest-runtime: 26.6.3_ts-node@10.9.0 jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -10762,7 +10762,7 @@ packages: exit: 0.1.2 glob: 7.2.3 graceful-fs: 4.2.11 - jest-config: 26.6.3_ts-node@10.9.0 + jest-config: 26.6.3 jest-haste-map: 26.6.2 jest-message-util: 26.6.2 jest-mock: 26.6.2 @@ -10775,7 +10775,11 @@ packages: strip-bom: 4.0.0 yargs: 15.4.1 transitivePeerDependencies: + - bufferutil + - canvas - supports-color + - ts-node + - utf-8-validate dev: true /jest-runtime/26.6.3_canvas@2.11.2: diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index f62502da..e3b3144c 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -2,7 +2,7 @@ { "definitionName": "lockStepVersion", "policyName": "vmindMin", - "version": "1.2.13", + "version": "1.2.14", "mainProject": "@visactor/vmind", "nextBump": "patch" } diff --git a/packages/calculator/package.json b/packages/calculator/package.json index 23b8a9a3..c894cdfb 100644 --- a/packages/calculator/package.json +++ b/packages/calculator/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/calculator", - "version": "1.2.13", + "version": "2.0.1", "description": "SQL-like query executor with DSL", "main": "lib", "module": "es", diff --git a/packages/chart-advisor/package.json b/packages/chart-advisor/package.json index 1dcd088f..802f4b24 100644 --- a/packages/chart-advisor/package.json +++ b/packages/chart-advisor/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/chart-advisor", - "version": "1.2.13", + "version": "2.0.1", "description": "图表推荐模块", "main": "lib", "module": "es", diff --git a/packages/vmind/CHANGELOG.json b/packages/vmind/CHANGELOG.json index df3d4451..e5ad7dec 100644 --- a/packages/vmind/CHANGELOG.json +++ b/packages/vmind/CHANGELOG.json @@ -1,6 +1,30 @@ { "name": "@visactor/vmind", "entries": [ + { + "version": "2.0.1", + "tag": "@visactor/vmind_v2.0.1", + "date": "Fri, 21 Feb 2025 07:38:30 GMT", + "comments": { + "none": [ + { + "comment": "Overall architecture upgrade" + }, + { + "comment": "Support DeepSeek and other custom model with api-key" + }, + { + "comment": "12 new chart types added for chart generation" + }, + { + "comment": "Add Text2Chart capability" + }, + { + "comment": "Add Chart Insight capability" + } + ] + } + }, { "version": "1.2.13", "tag": "@visactor/vmind_v1.2.13", @@ -128,4 +152,4 @@ "comments": {} } ] -} +} \ No newline at end of file diff --git a/packages/vmind/CHANGELOG.md b/packages/vmind/CHANGELOG.md index 80eb755e..3f8947fa 100644 --- a/packages/vmind/CHANGELOG.md +++ b/packages/vmind/CHANGELOG.md @@ -1,6 +1,28 @@ # Change Log - @visactor/vmind -This log was last generated on Thu, 11 Jul 2024 08:20:22 GMT and should not be manually modified. +This log was last generated on Fri, 21 Feb 2025 07:38:30 GMT and should not be manually modified. + +## 2.0.1 +Fri, 21 Feb 2025 07:38:30 GMT + +### Updates + +- Overall architecture upgrade +- Support DeepSeek and other custom model with api-key +- 12 new chart types added for chart generation + - [Range Bar Chart](https://www.visactor.io/vchart/demo/range-column-chart/range-bar) + - [Liquid Chart](https://www.visactor.io/vchart/demo/liquid-chart/liquid-chart) + - [Linear Progress Bar](https://www.visactor.io/vchart/demo/progress/linear-progress) + - [Circular Progress Bar](https://www.visactor.io/vchart/demo/progress/circular-progress) + - [Circle Packing Chart](https://www.visactor.io/vchart/demo/circle-packing-chart/basic-circle-packing) + - [Sunburst Chart](https://www.visactor.io/vchart/demo/sunburst-chart/basic-sunburst) + - [Gauge Chart](https://www.visactor.io/vchart/demo/gauge-chart/basic-gauge) + - [Treemap Chart](https://www.visactor.io/vchart/demo/treemap-chart/basic-treemap) + - [Heatmap Chart](https://www.visactor.io/vchart/demo/heatmap-chart/basic-heatmap) + - [Venn Chart](https://www.visactor.io/vchart/demo/venn-chart/venn-chart) + - [Map](https://www.visactor.io/vchart/demo/map-chart/basic-map) +- Add Text2Chart capability +- Add Chart Insight capability ## 1.2.13 Thu, 11 Jul 2024 08:20:22 GMT diff --git a/packages/vmind/package.json b/packages/vmind/package.json index 2189d019..ba8ae8c5 100644 --- a/packages/vmind/package.json +++ b/packages/vmind/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vmind", - "version": "2.0.1-alpha.1", + "version": "2.0.1", "main": "cjs/index.js", "module": "esm/index.js", "types": "esm/index.d.ts", @@ -93,14 +93,14 @@ }, "dependencies": { "chroma-js": "^3.1.1", - "@visactor/chart-advisor": "workspace:1.2.13", + "@visactor/chart-advisor": "workspace:2.0.1", "@visactor/vdataset": "~0.17.4", "@visactor/vutils": "~0.17.4", "axios": "^1.4.0", "json5": "~2.2.3", "dayjs": "~1.11.10", "js-yaml": "~4.1.0", - "@visactor/calculator": "workspace:*", + "@visactor/calculator": "workspace:2.0.1", "alasql": "~4.3.2", "@visactor/vchart-theme": "^1.11.2", "jstat": "~1.9.6", diff --git a/packages/vmind/src/atom/chartGenerator/index.ts b/packages/vmind/src/atom/chartGenerator/index.ts index 6db394f7..48f06f39 100644 --- a/packages/vmind/src/atom/chartGenerator/index.ts +++ b/packages/vmind/src/atom/chartGenerator/index.ts @@ -146,12 +146,13 @@ export class ChartGeneratorAtom extends BaseAtom { for (const key in oldUsage) { if (Object.prototype.hasOwnProperty.call(oldUsage, key)) { const curKey = key as keyof Usage; - result[curKey] = (oldUsage[curKey] || 0) + (newUsage[curKey] || 0); + result[curKey] = (oldUsage[curKey] || 0) + (newUsage?.[curKey] || 0); } }