@milaboratories/pl-middle-layer 1.37.76 → 1.37.77

package/dist/pool/driver.d.ts

@@ -19,11 +19,13 @@ export interface InternalPFrameDriver extends SdkPFrameDriver {
     /** Create a new PFrame */
     createPFrame(def: PFrameDef<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>, ctx: ComputableCtx): PFrameHandle;
     /** Create a new PTable */
-    createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx, signal?: AbortSignal): PTableHandle;
+    createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx): PTableHandle;
     /** Calculates data for the table and returns complete data representation of it */
     calculateTableData(handle: PFrameHandle, request: CalculateTableDataRequest<PObjectId>, range: TableRange | undefined, signal?: AbortSignal): Promise<CalculateTableDataResponse>;
     /** Calculate set of unique values for a specific axis for the filtered set of records */
     getUniqueValues(handle: PFrameHandle, request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;
+    /** Unified table shape */
+    getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape>;
     /**
      * Retrieve the data from the table. To retrieve only data required, it can be
      * sliced both horizontally ({@link columnIndices}) and vertically
@@ -40,20 +42,20 @@ export declare class PFrameDriver implements InternalPFrameDriver {
     private readonly spillPath;
     private readonly pFrames;
     private readonly pTables;
-    private readonly concurrencyLimiter;
-    private readonly getDataLimiter;
+    private readonly frameConcurrencyLimiter;
+    private readonly tableConcurrencyLimiter;
     pprofDump(): Promise<Uint8Array>;
     static init(blobDriver: DownloadDriver, logger: MiLogger, spillPath: string): Promise<PFrameDriver>;
     private constructor();
     createPFrame(def: PFrameDef<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>, ctx: ComputableCtx): PFrameHandle;
-    createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx, signal?: AbortSignal): PTableHandle;
+    createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx): PTableHandle;
     findColumns(handle: PFrameHandle, request: FindColumnsRequest): Promise<FindColumnsResponse>;
     getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec>;
     listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]>;
     calculateTableData(handle: PFrameHandle, request: CalculateTableDataRequest<PObjectId>, range: TableRange | undefined, signal?: AbortSignal): Promise<CalculateTableDataResponse>;
     getUniqueValues(handle: PFrameHandle, request: UniqueValuesRequest, signal?: AbortSignal): Promise<UniqueValuesResponse>;
-    getShape(handle: PTableHandle): Promise<PTableShape>;
     getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]>;
+    getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape>;
     getData(handle: PTableHandle, columnIndices: number[], range: TableRange | undefined, signal?: AbortSignal): Promise<PTableVector[]>;
 }
 //# sourceMappingURL=driver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.37.76",
+  "version": "1.37.77",
   "description": "Pl Middle Layer",
   "engines": {
     "node": ">=20.16.0"
@@ -22,7 +22,7 @@
   "keywords": [],
   "license": "UNLICENSED",
   "dependencies": {
-    "@milaboratories/pframes-rs-node": "1.0.43",
+    "@milaboratories/pframes-rs-node": "1.0.44",
     "canonicalize": "~2.1.0",
     "denque": "^2.1.0",
     "lru-cache": "^11.1.0",
@@ -33,14 +33,14 @@
     "zod": "~3.23.8",
     "remeda": "^2.22.6",
     "@milaboratories/pl-http": "^1.1.3",
+    "@milaboratories/computable": "^2.5.0",
     "@milaboratories/resolve-helper": "^1.1.0",
-    "@milaboratories/pl-model-middle-layer": "^1.7.38",
-    "@platforma-sdk/block-tools": "^2.5.56",
     "@milaboratories/pl-client": "^2.11.0",
     "@milaboratories/pl-drivers": "^1.5.68",
-    "@milaboratories/computable": "^2.5.0",
-    "@milaboratories/pl-model-backend": "^1.1.0",
+    "@platforma-sdk/block-tools": "^2.5.57",
     "@milaboratories/pl-model-common": "^1.15.5",
+    "@milaboratories/pl-model-backend": "^1.1.0",
+    "@milaboratories/pl-model-middle-layer": "^1.7.39",
     "@milaboratories/pl-tree": "^1.6.9",
     "@platforma-sdk/model": "^1.34.10",
     "@milaboratories/ts-helpers": "^1.4.0",

package/src/pool/driver.ts

@@ -84,7 +84,7 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordFilter[] {
 const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
 
 class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
-  public readonly pFrame: PFrameInternal.PFrameV6;
+  public readonly pFrame: PFrameInternal.PFrameV7;
   private readonly abortController = new AbortController();
   private readonly blobIdToResource = new Map<string, ResourceInfo>();
   private readonly blobHandleComputables = new Map<
@@ -179,7 +179,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
 
 class PTableHolder implements Disposable {
   constructor(
-    public readonly table: Promise<PFrameInternal.PTableV4>,
+    public readonly pTable: PFrameInternal.PTableV5,
     private readonly abortController: AbortController,
   ) {}
 
@@ -189,15 +189,13 @@ class PTableHolder implements Disposable {
 
   [Symbol.dispose](): void {
     this.abortController.abort();
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.table.then((table) => table.dispose());
+    this.pTable.dispose();
   }
 }
 
 type FullPTableDef = {
   pFrameHandle: PFrameHandle;
   def: PTableDef<PObjectId>;
-  signal?: AbortSignal;
 };
 
 /**
@@ -224,7 +222,6 @@ export interface InternalPFrameDriver extends SdkPFrameDriver {
   createPTable(
     def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
     ctx: ComputableCtx,
-    signal?: AbortSignal,
   ): PTableHandle;
 
   /** Calculates data for the table and returns complete data representation of it */
@@ -242,6 +239,12 @@ export interface InternalPFrameDriver extends SdkPFrameDriver {
     signal?: AbortSignal
   ): Promise<UniqueValuesResponse>;
 
+  /** Unified table shape */
+  getShape(
+    handle: PTableHandle,
+    signal?: AbortSignal,
+  ): Promise<PTableShape>;
+
   /**
    * Retrieve the data from the table. To retrieve only data required, it can be
    * sliced both horizontally ({@link columnIndices}) and vertically
@@ -261,8 +264,8 @@ export interface InternalPFrameDriver extends SdkPFrameDriver {
 export class PFrameDriver implements InternalPFrameDriver {
   private readonly pFrames: RefCountResourcePool<InternalPFrameData, PFrameHolder>;
   private readonly pTables: RefCountResourcePool<FullPTableDef, PTableHolder>;
-  private readonly concurrencyLimiter: ConcurrencyLimitingExecutor;
-  private readonly getDataLimiter: ConcurrencyLimitingExecutor;
+  private readonly frameConcurrencyLimiter: ConcurrencyLimitingExecutor;
+  private readonly tableConcurrencyLimiter: ConcurrencyLimitingExecutor;
 
   public async pprofDump(): Promise<Uint8Array> {
     return await PFrame.pprofDump();
@@ -284,8 +287,8 @@ export class PFrameDriver implements InternalPFrameDriver {
     private readonly spillPath: string,
   ) {
     const concurrencyLimiter = new ConcurrencyLimitingExecutor(1);
-    this.concurrencyLimiter = concurrencyLimiter;
-    this.getDataLimiter = new ConcurrencyLimitingExecutor(1);
+    this.frameConcurrencyLimiter = concurrencyLimiter;
+    this.tableConcurrencyLimiter = new ConcurrencyLimitingExecutor(1);
 
     this.pFrames = new (class extends RefCountResourcePool<InternalPFrameData, PFrameHolder> {
       constructor(
@@ -329,28 +332,22 @@ export class PFrameDriver implements InternalPFrameDriver {
 
         const pFrameHolder = this.pFrames.getByKey(handle);
         const abortController = new AbortController();
-        const combinedSignal = AbortSignal.any(
-          [params.signal, abortController.signal, pFrameHolder.disposeSignal].filter((s) => !!s),
-        );
-
-        const tablePromise = concurrencyLimiter.run(async () => {
-          const table = await pFrameHolder.pFrame.createTable({
-            src: joinEntryToInternal(params.def.src),
-            filters: migrateFilters(params.def.filters),
-          }, combinedSignal);
-
-          let sortedTable = table;
-          if (params.def.sorting.length > 0) {
-            try {
-              sortedTable = await table.sort(params.def.sorting, combinedSignal);
-            } finally {
-              table.dispose();
-            }
-          }
 
-          return sortedTable;
+        const table = pFrameHolder.pFrame.createTable({
+          src: joinEntryToInternal(params.def.src),
+          filters: migrateFilters(params.def.filters),
         });
-        return new PTableHolder(tablePromise, abortController);
+
+        let sortedTable = table;
+        if (params.def.sorting.length > 0) {
+          try {
+            sortedTable = table.sort(params.def.sorting);
+          } finally {
+            table.dispose();
+          }
+        }
+
+        return new PTableHolder(sortedTable, abortController);
       }
 
       protected calculateParamsKey(params: FullPTableDef): string {
@@ -386,11 +383,10 @@ export class PFrameDriver implements InternalPFrameDriver {
   public createPTable(
     def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
     ctx: ComputableCtx,
-    signal?: AbortSignal,
   ): PTableHandle {
     const pFrameHandle = this.createPFrame(extractAllColumns(def.src), ctx);
     const defIds = mapPTableDef(def, (c) => c.id);
-    const res = this.pTables.acquire({ def: defIds, pFrameHandle, signal });
+    const res = this.pTables.acquire({ def: defIds, pFrameHandle });
     if (getDebugFlags().logPFrameRequests)
       this.logger.info(
         `Create PTable call (pFrameHandle = ${pFrameHandle}; pTableHandle = ${JSON.stringify(res)}): ${JSON.stringify(
@@ -455,18 +451,18 @@ export class PFrameDriver implements InternalPFrameDriver {
         `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
       );
     }
-    return await this.concurrencyLimiter.run(async () => {
+    return await this.frameConcurrencyLimiter.run(async () => {
       const pFrameHolder = this.pFrames.getByKey(handle);
       const combinedSignal = AbortSignal.any([signal, pFrameHolder.disposeSignal].filter((s) => !!s));
-      const table = await pFrameHolder.pFrame.createTable({
+      const table = pFrameHolder.pFrame.createTable({
         src: joinEntryToInternal(request.src),
         filters: migrateFilters(request.filters),
-      }, combinedSignal);
+      });
 
       let sortedTable = table;
       if (request.sorting.length > 0) {
         try {
-          sortedTable = await table.sort(request.sorting, combinedSignal);
+          sortedTable = table.sort(request.sorting);
         } finally {
           table.dispose();
         }
@@ -474,7 +470,10 @@ export class PFrameDriver implements InternalPFrameDriver {
 
       try {
         const spec = sortedTable.getSpec();
-        const data = await sortedTable.getData([...spec.keys()], range, combinedSignal);
+        const data = await sortedTable.getData([...spec.keys()], {
+          range,
+          signal: combinedSignal,
+        });
         return spec.map((spec, i) => ({
           spec: spec,
           data: data[i],
@@ -495,13 +494,15 @@ export class PFrameDriver implements InternalPFrameDriver {
         `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
       );
     }
-    return await this.concurrencyLimiter.run(async () => {
+    return await this.frameConcurrencyLimiter.run(async () => {
       const pFrameHolder = this.pFrames.getByKey(handle);
       const combinedSignal = AbortSignal.any([signal, pFrameHolder.disposeSignal].filter((s) => !!s));
       return await pFrameHolder.pFrame.getUniqueValues({
         ...request,
         filters: migrateFilters(request.filters),
-      }, combinedSignal);
+      }, {
+        signal: combinedSignal,
+      });
     });
   }
 
@@ -509,14 +510,18 @@ export class PFrameDriver implements InternalPFrameDriver {
   // PTable istance methods
   //
 
-  public async getShape(handle: PTableHandle): Promise<PTableShape> {
-    const pTable = await this.pTables.getByKey(handle).table;
-    return pTable.getShape();
+  public getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {
+    const pTable = this.pTables.getByKey(handle).pTable;
+    return Promise.resolve(pTable.getSpec());
   }
 
-  public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {
-    const pTable = await this.pTables.getByKey(handle).table;
-    return pTable.getSpec();
+  public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {
+    return await this.tableConcurrencyLimiter.run(async () => {
+      const pTable = this.pTables.getByKey(handle).pTable;
+      return await pTable.getShape({
+        signal,
+      });
+    });
   }
 
   public async getData(
@@ -525,11 +530,13 @@ export class PFrameDriver implements InternalPFrameDriver {
     range: TableRange | undefined,
     signal?: AbortSignal,
   ): Promise<PTableVector[]> {
-    return await this.getDataLimiter.run(async () => {
+    return await this.tableConcurrencyLimiter.run(async () => {
       const pTableHolder = this.pTables.getByKey(handle);
-      const pTable = await pTableHolder.table;
       const combinedSignal = AbortSignal.any([signal, pTableHolder.disposeSignal].filter((s) => !!s));
-      return await pTable.getData(columnIndices, range, combinedSignal);
+      return await pTableHolder.pTable.getData(columnIndices, {
+        range,
+        signal: combinedSignal,
+      });
     });
   }
 }