Merge pull request #47 from meta-d/develop

Fix: langgraph version bug
meta-d · Aug 17, 2024 · 3965902 · 3965902
2 parents de934fb + 6865b62
commit 3965902
Show file tree

Hide file tree

Showing 21 changed files with 7,449 additions and 57,118 deletions.
diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile
@@ -37,7 +37,7 @@ COPY --chown=node:node packages/adapter/package.json ./packages/adapter/
 COPY --chown=node:node packages/analytics/package.json ./packages/analytics/
 
 COPY --chown=node:node .deploy/api/package.json ./
-COPY --chown=node:node ./package-lock.json ./
+COPY --chown=node:node yarn.lock ./
 
 RUN npm install --legacy-peer-deps
 

diff --git a/.deploy/api/package-prod.json b/.deploy/api/package-prod.json
@@ -13,14 +13,13 @@
     "@langchain/community": "0.2.20",
     "@langchain/core": "0.2.18",
     "@langchain/langgraph": "0.0.31",
-    "@langchain/ollama": "^0.0.2",
-		"@langchain/openai": "0.2.4",
+    "@langchain/ollama": "0.0.4",
+    "@langchain/openai": "0.2.4",
     "@nestjs/common": "^8.0.0",
     "@nestjs/core": "^8.0.0",
     "@nestjs/platform-express": "^8.0.0",
     "@swc/helpers": "~0.5.0",
     "idb-keyval": "^6.0.2",
-    "immer": "^10.0.1",
     "langchain": "0.2.10",
     "money-clip": "^3.0.5",
     "reflect-metadata": "^0.1.13",
@@ -31,5 +30,8 @@
   },
   "workspaces": [
     "packages/*"
-  ]
+  ],
+  "resolutions": {
+    "@langchain/core": "0.2.18"
+  }
 }
diff --git a/.deploy/api/package.json b/.deploy/api/package.json
@@ -13,14 +13,13 @@
     "@langchain/community": "0.2.20",
     "@langchain/core": "0.2.18",
     "@langchain/langgraph": "0.0.31",
-    "@langchain/ollama": "^0.0.2",
-		"@langchain/openai": "0.2.4",
+    "@langchain/ollama": "0.0.4",
+    "@langchain/openai": "0.2.4",
     "@nestjs/common": "^8.0.0",
     "@nestjs/core": "^8.0.0",
     "@nestjs/platform-express": "^8.0.0",
     "@swc/helpers": "~0.5.0",
     "idb-keyval": "^6.0.2",
-    "immer": "^10.0.1",
     "langchain": "0.2.10",
     "money-clip": "^3.0.5",
     "reflect-metadata": "^0.1.13",
@@ -57,5 +56,8 @@
   "workspaces": [
     "apps/*",
     "packages/*"
-  ]
+  ],
+  "resolutions": {
+    "@langchain/core": "0.2.18"
+  }
 }
diff --git a/.deploy/webapp/package.json b/.deploy/webapp/package.json
@@ -48,7 +48,7 @@
     "@langchain/community": "0.2.20",
     "@langchain/core": "0.2.18",
     "@langchain/langgraph": "0.0.31",
-    "@langchain/ollama": "^0.0.2",
+    "@langchain/ollama": "0.0.4",
     "@langchain/openai": "0.2.4",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@ng-matero/extensions": "^13.1.0",
@@ -193,6 +193,9 @@
     "libs/*",
     "packages/*"
   ],
+  "resolutions": {
+    "@langchain/core": "0.2.18"
+  },
   "nx": {
     "includedScripts": []
   }

diff --git a/apps/cloud/src/app/features/project/indicators/register/register.component.ts b/apps/cloud/src/app/features/project/indicators/register/register.component.ts
@@ -32,7 +32,8 @@ import {
   IFilter,
   isEqual,
   negate,
-  TimeRangeType
+  TimeRangeType,
+  Indicator as OCAPIndicator, 
 } from '@metad/ocap-core'
 import { withProps } from '@ngneat/elf'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
@@ -104,7 +105,7 @@ export class IndicatorRegisterComponent extends TranslationBaseComponent impleme
   readonly dirtyCheckResult = dirtyCheckWith(this.store, this.pristineStore, { comparator: negate(isEqual) })
   readonly dirty = this.dirtyCheckResult.dirty
 
-  readonly indicator = toSignal(this.store.pipe(distinctUntilChanged(isEqual)))
+  readonly indicator = toSignal<Indicator>(this.store.pipe(distinctUntilChanged(isEqual)))
 
   readonly loading = signal(false)
   readonly projectSignal = this.projectService.project
@@ -132,7 +133,7 @@ export class IndicatorRegisterComponent extends TranslationBaseComponent impleme
     //   } as undefined as DataSettings & { error?: string }
     // }
     const { dimension, hierarchy, level } = getIndicatorEntityCalendar(
-      indicator,
+      indicator as OCAPIndicator,
       entityType,
       timeGranularity
     )