npm - @milaboratories/pl-middle-layer - Versions diffs - 1.26.4 → 1.26.6 - Mend

@milaboratories/pl-middle-layer 1.26.4 → 1.26.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/pool/driver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;~~AAuK3D~~,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAoE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;~~IAsBlB~~,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAiCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAkBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}
1	+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAiL3D,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAoE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA6BlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAiCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAkBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.26.4",
+  "version": "1.26.6",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -19,7 +19,8 @@
   "keywords": [],
   "license": "UNLICENSED",
   "dependencies": {
-    "@milaboratories/pframes-node": "2.1.7",
+    "@milaboratories/pframes-node": "2.1.8",
+    "@milaboratories/pframes-rs-node": "1.0.8",
     "canonicalize": "^2.0.0",
     "denque": "^2.1.0",
     "lru-cache": "^11.0.2",
@@ -28,21 +29,21 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.6.1",
     "zod": "~3.23.8",
+    "@milaboratories/pl-http": "^1.0.3",
     "@milaboratories/resolve-helper": "^1.0.2",
+    "@platforma-sdk/block-tools": "^2.5.7",
     "@milaboratories/computable": "^2.3.4",
     "@milaboratories/pl-client": "^2.7.3",
-    "@platforma-sdk/block-tools": "^2.5.7",
-    "@milaboratories/pl-http": "^1.0.3",
-    "@milaboratories/pl-model-middle-layer": "^1.7.1",
-    "@milaboratories/pl-drivers": "^1.5.11",
+    "@milaboratories/pl-drivers": "^1.5.12",
     "@milaboratories/pl-model-common": "^1.10.4",
     "@milaboratories/pl-tree": "^1.4.22",
     "@platforma-sdk/model": "^1.22.2",
-    "@milaboratories/ts-helpers": "^1.1.3",
-    "@milaboratories/pl-model-backend": "^1.0.1",
+    "@milaboratories/pl-model-middle-layer": "^1.7.1",
     "@platforma-sdk/workflow-tengo": "2.9.9",
     "@milaboratories/pl-config": "^1.3.3",
-    "@milaboratories/pl-local": "^1.10.0"
+    "@milaboratories/ts-helpers": "^1.1.3",
+    "@milaboratories/pl-local": "^1.10.0",
+    "@milaboratories/pl-model-backend": "^1.0.1"
   },
   "devDependencies": {
     "semver": "^7.6.3",
@@ -54,8 +55,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "@milaboratories/eslint-config": "^1.0.1",
-    "@milaboratories/platforma-build-configs": "1.0.2"
+    "@milaboratories/platforma-build-configs": "1.0.2",
+    "@milaboratories/eslint-config": "^1.0.1"
   },
   "scripts": {
     "type-check": "tsc --noEmit --composite false",

package/src/debug/index.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 export type MlDebugFlags = {
   logPFrameRequests: boolean;
+  usePFrameRs: boolean;
   logTreeStats?: 'cumulative' | 'per-request';
 };
@@ -7,10 +8,11 @@ let flags: MlDebugFlags | undefined = undefined;
 export function getDebugFlags() {
   if (flags) return flags;
   flags = {
-    logPFrameRequests: process.env.MI_LOG_PFRAMES !== undefined
+    logPFrameRequests: process.env.MI_LOG_PFRAMES !== undefined,
+    usePFrameRs: process.env.MI_USE_PFRAMES_RS !== undefined,
   };
   if (process.env.MI_LOG_TREE_STAT)
-    flags.logTreeStats =
-      process.env.MI_LOG_TREE_STAT === 'cumulative' ? 'cumulative' : 'per-request';
+    flags.logTreeStats
+      = process.env.MI_LOG_TREE_STAT === 'cumulative' ? 'cumulative' : 'per-request';
   return flags;
 }

package/src/pool/driver.ts CHANGED Viewed

@@ -41,6 +41,7 @@ import type { MiLogger } from '@milaboratories/ts-helpers';
 import { assertNever } from '@milaboratories/ts-helpers';
 import canonicalize from 'canonicalize';
 import { PFrame } from '@milaboratories/pframes-node';
+import { PFrame as PFrameRs } from '@milaboratories/pframes-rs-node';
 import * as fsp from 'node:fs/promises';
 import { LRUCache } from 'lru-cache';
 import { ConcurrencyLimitingExecutor } from '@milaboratories/ts-helpers';
@@ -123,29 +124,38 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
     }
     const createSpecPFrame = (): PFrameInternal.PFrameV2 => {
-      const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
-      for (const column of columns) {
-        try {
+      if (getDebugFlags().usePFrameRs) {
+        const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
+        for (const column of columns) {
           pFrame.addColumnSpec(column.id, column.spec);
-        } catch (err: unknown) {
-          throw new Error(
-            `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}.`,
-          );
         }
+        return pFrame;
+      } else {
+        const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
+        for (const column of columns) {
+          try {
+            pFrame.addColumnSpec(column.id, column.spec);
+          } catch (err: unknown) {
+            throw new Error(
+              `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}.`,
+            );
+          }
+        }
+        return pFrame;
       }
-      return pFrame;
     };
     const createDataPFrame = (): PFrameInternal.PFrameV2 => {
-      const pFrame = createSpecPFrame();
+      const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
       pFrame.setDataSource(this);
       for (const column of columns) {
         const dataInfo = mapBlobs(column.data, blobKey);
         try {
+          pFrame.addColumnSpec(column.id, column.spec);
           pFrame.setColumnData(column.id, dataInfo);
         } catch (err: unknown) {
           throw new Error(
-            `Setting column ${column.id} data to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}, DataInfo: ${JSON.stringify(dataInfo)}.`,
+            `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}, DataInfo: ${JSON.stringify(dataInfo)}.`,
           );
         }
       }
@@ -327,7 +337,14 @@ export class PFrameDriver implements SdkPFrameDriver {
       ...request,
       compatibleWith:
         request.compatibleWith.length !== 0
-          ? [{ axesSpec: request.compatibleWith, qualifications: [] }]
+          ? [{
+              axesSpec: [
+                ...new Map(request.compatibleWith.map(
+                  (item) => [canonicalize(item)!, item] as const,
+                )).values(),
+              ],
+              qualifications: [],
+            }]
           : [],
     };
     const responce = await this.concurrencyLimiter.run(