@milaboratories/pl-drivers 1.5.12 → 1.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-drivers",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "description": "Drivers and a low-level clients for log streaming, downloading and uploading files from and to pl",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -31,7 +31,7 @@
     "@milaboratories/computable": "^2.3.4",
     "@milaboratories/pl-client": "^2.7.3",
     "@milaboratories/pl-tree": "^1.4.22",
-    "@milaboratories/pl-model-common": "^1.10.4"
+    "@milaboratories/pl-model-common": "^1.10.5"
   },
   "devDependencies": {
     "eslint": "^9.16.0",

package/src/drivers/logs.test.ts

@@ -97,7 +97,7 @@ test('should get last line with a prefix', async () => {
         return;
       }
 
-      return logs.getProgressLog(streamManager, 'PREFIX', ctx);
+      return logs.getProgressLogWithInfo(streamManager, 'PREFIX', ctx);
     });
 
     expect(await c.getValue()).toBeUndefined();
@@ -113,7 +113,10 @@ test('should get last line with a prefix', async () => {
 
       logger.info(`got result: ${JSON.stringify(result)}`);
       if (result.stable) {
-        expect(result.value).toStrictEqual('PREFIX4\n');
+        expect(result.value).toMatchObject({
+          progressLine: 'PREFIX4\n',
+          live: false,
+        });
         return;
       }
     }

package/src/drivers/logs.ts

@@ -75,6 +75,49 @@ export class LogsDriver implements sdk.LogsDriver {
     }
   }
 
+  /** Same as getProgressLog but also returns a liveliness of the log.
+   * The previous getProgressLog couldn't be extended.
+   * Returns a last line that has patternToSearch.
+   * Notifies when a new line appeared or EOF reached. */
+  getProgressLogWithInfo(res: PlTreeEntry, patternToSearch: string): Computable<sdk.ProgressLogWithInfo | undefined>;
+  getProgressLogWithInfo(res: PlTreeEntry, patternToSearch: string, ctx: ComputableCtx): sdk.ProgressLogWithInfo | undefined;
+  getProgressLogWithInfo(
+    res: PlTreeEntry,
+    patternToSearch: string,
+    ctx?: ComputableCtx,
+  ): Computable<sdk.ProgressLogWithInfo | undefined> | sdk.ProgressLogWithInfo | undefined {
+    if (ctx === undefined)
+      return Computable.make((ctx) => this.getProgressLogWithInfo(res, patternToSearch, ctx));
+
+    const stream = streamManagerGetStream(ctx, res);
+    if (stream === undefined) {
+      ctx.markUnstable('no stream in stream manager');
+      return undefined;
+    }
+
+    if (isBlob(stream)) {
+      const log = this.downloadDriver.getProgressLog(stream, patternToSearch, ctx);
+      return {
+        progressLine: log,
+        live: false,
+      }
+    }
+
+    try {
+      const log = this.logsStreamDriver.getProgressLog(stream, patternToSearch, ctx);
+      return {
+        progressLine: log,
+        live: true,
+      }
+    } catch (e: any) {
+      if (e.name == 'RpcError' && e.code == 'NOT_FOUND') {
+        ctx.markUnstable(`NOT_FOUND in logs stream driver while getting a progress log with info: ${e}`);
+        return undefined;
+      }
+      throw e;
+    }
+  }
+
   /** Returns an Id of a smart object, that can read logs directly from
    * the platform. */
   getLogHandle(res: ResourceInfo | PlTreeEntry): Computable<sdk.AnyLogHandle | undefined>;