@eyepop.ai/eyepop 1.3.0 → 1.4.0

package/dist/eyepop.index.d.mts

@@ -687,11 +687,16 @@ declare class DataEndpoint extends Endpoint<DataEndpoint> {
     private dispatchChangeEvent;
 }
 
+interface StreamEvent {
+    type: string;
+    source_id?: string;
+    message?: string;
+}
 declare class Stream<Prediction> implements AsyncIterable<Prediction> {
     private iterator;
     controller: AbortController;
     constructor(iterator: () => AsyncIterator<Prediction>, controller: AbortController);
-    static iterFromReadableStream<Prediction>(readableStream: Promise<ReadableStream<Uint8Array>>, controller: AbortController): AsyncIterator<Prediction, any, undefined>;
+    static iterFromReadableStream<Prediction>(readableStream: Promise<ReadableStream<Uint8Array>>, controller: AbortController, eventHandler: (event: StreamEvent) => Promise<void>): AsyncIterator<Prediction, any, undefined>;
     /**
      * Generates a Stream from a newline-separated ReadableStream
      * where each item is a JSON value.
@@ -721,6 +726,7 @@ declare class AbstractJob implements ResultStream {
     [Symbol.asyncIterator](): AsyncIterator<Prediction>;
     protected constructor(params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
     protected startJob(): Promise<Response>;
+    protected onEvent(event: StreamEvent): Promise<void>;
     static n: number;
     start(done: () => void, status: (statusCode: number) => void): AbstractJob;
     cancel(): void;
@@ -728,8 +734,10 @@ declare class AbstractJob implements ResultStream {
 declare class UploadJob extends AbstractJob {
     private readonly _uploadStream;
     private readonly _mimeType;
+    private readonly _needsFullDuplex;
     get [Symbol.toStringTag](): string;
     constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected onEvent(event: StreamEvent): Promise<void>;
     protected startJob(): Promise<Response>;
 }
 declare class LoadFromJob extends AbstractJob {
@@ -807,4 +815,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { AbstractJob, type Annotation, AnnotationType, type Asset, type AssetImport, AssetStatus, type Auth0Options, type Authentication, type AutoAnnotateParams, type BaseComponent, type Box, type ChangeEvent, ChangeType, type ComponentFinderComponent, type Contour, type ContourFinderComponent, ContourType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, Endpoint, EndpointState, EyePop, type FileSource, type ForwardComponent, ForwardOperatorType, type InferenceComponent, InferenceType, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedLabel, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type Roi, type SecretKeyAuth, Semaphore, type Session, type SessionAuth, type Source, type SourceParams, type SourcesEntry, Stream, type StreamSource, type StreamTime, type TracingComponent, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };
+export { AbstractJob, type Annotation, AnnotationType, type Asset, type AssetImport, AssetStatus, type Auth0Options, type Authentication, type AutoAnnotateParams, type BaseComponent, type Box, type ChangeEvent, ChangeType, type ComponentFinderComponent, type Contour, type ContourFinderComponent, ContourType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, Endpoint, EndpointState, EyePop, type FileSource, type ForwardComponent, ForwardOperatorType, type InferenceComponent, InferenceType, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedLabel, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type Roi, type SecretKeyAuth, Semaphore, type Session, type SessionAuth, type Source, type SourceParams, type SourcesEntry, Stream, type StreamEvent, type StreamSource, type StreamTime, type TracingComponent, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };

package/dist/eyepop.index.d.ts

@@ -687,11 +687,16 @@ declare class DataEndpoint extends Endpoint<DataEndpoint> {
     private dispatchChangeEvent;
 }
 
+interface StreamEvent {
+    type: string;
+    source_id?: string;
+    message?: string;
+}
 declare class Stream<Prediction> implements AsyncIterable<Prediction> {
     private iterator;
     controller: AbortController;
     constructor(iterator: () => AsyncIterator<Prediction>, controller: AbortController);
-    static iterFromReadableStream<Prediction>(readableStream: Promise<ReadableStream<Uint8Array>>, controller: AbortController): AsyncIterator<Prediction, any, undefined>;
+    static iterFromReadableStream<Prediction>(readableStream: Promise<ReadableStream<Uint8Array>>, controller: AbortController, eventHandler: (event: StreamEvent) => Promise<void>): AsyncIterator<Prediction, any, undefined>;
     /**
      * Generates a Stream from a newline-separated ReadableStream
      * where each item is a JSON value.
@@ -721,6 +726,7 @@ declare class AbstractJob implements ResultStream {
     [Symbol.asyncIterator](): AsyncIterator<Prediction>;
     protected constructor(params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
     protected startJob(): Promise<Response>;
+    protected onEvent(event: StreamEvent): Promise<void>;
     static n: number;
     start(done: () => void, status: (statusCode: number) => void): AbstractJob;
     cancel(): void;
@@ -728,8 +734,10 @@ declare class AbstractJob implements ResultStream {
 declare class UploadJob extends AbstractJob {
     private readonly _uploadStream;
     private readonly _mimeType;
+    private readonly _needsFullDuplex;
     get [Symbol.toStringTag](): string;
     constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected onEvent(event: StreamEvent): Promise<void>;
     protected startJob(): Promise<Response>;
 }
 declare class LoadFromJob extends AbstractJob {
@@ -807,4 +815,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { AbstractJob, type Annotation, AnnotationType, type Asset, type AssetImport, AssetStatus, type Auth0Options, type Authentication, type AutoAnnotateParams, type BaseComponent, type Box, type ChangeEvent, ChangeType, type ComponentFinderComponent, type Contour, type ContourFinderComponent, ContourType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, Endpoint, EndpointState, EyePop, type FileSource, type ForwardComponent, ForwardOperatorType, type InferenceComponent, InferenceType, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedLabel, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type Roi, type SecretKeyAuth, Semaphore, type Session, type SessionAuth, type Source, type SourceParams, type SourcesEntry, Stream, type StreamSource, type StreamTime, type TracingComponent, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };
+export { AbstractJob, type Annotation, AnnotationType, type Asset, type AssetImport, AssetStatus, type Auth0Options, type Authentication, type AutoAnnotateParams, type BaseComponent, type Box, type ChangeEvent, ChangeType, type ComponentFinderComponent, type Contour, type ContourFinderComponent, ContourType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, Endpoint, EndpointState, EyePop, type FileSource, type ForwardComponent, ForwardOperatorType, type InferenceComponent, InferenceType, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedLabel, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type Roi, type SecretKeyAuth, Semaphore, type Session, type SessionAuth, type Source, type SourceParams, type SourcesEntry, Stream, type StreamEvent, type StreamSource, type StreamTime, type TracingComponent, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };

package/dist/eyepop.index.js

@@ -8705,7 +8705,7 @@ var Stream = class _Stream {
     this.iterator = iterator;
     this.controller = controller;
   }
-  static iterFromReadableStream(readableStream, controller) {
+  static iterFromReadableStream(readableStream, controller, eventHandler) {
     let consumed = false;
     async function* iterLines() {
       const lineDecoder = new LineDecoder();
@@ -8728,7 +8728,16 @@ var Stream = class _Stream {
       try {
         for await (const line of iterLines()) {
           if (done) continue;
-          if (line) yield JSON.parse(line);
+          if (line) {
+            const message = JSON.parse(line);
+            const event = message["event"];
+            if (event !== void 0) {
+              eventHandler(event).then(() => {
+              });
+            } else {
+              yield message;
+            }
+          }
         }
         done = true;
       } catch (e) {
@@ -8951,11 +8960,20 @@ var AbstractJob = class {
     if (!this._responseStream) {
       throw Error("logical bug");
     }
-    return Stream.iterFromReadableStream(this._responseStream, this._controller);
+    return Stream.iterFromReadableStream(
+      this._responseStream,
+      this._controller,
+      async (event) => {
+        return await this.onEvent(event);
+      }
+    );
   }
   async startJob() {
     return Promise.reject("abstract class");
   }
+  async onEvent(event) {
+    return Promise.resolve();
+  }
   start(done, status) {
     this._responseStream = new Promise(async (resolve, reject) => {
       try {
@@ -9021,50 +9039,126 @@ var UploadJob = class extends AbstractJob {
     super(params, getSession, client, requestLogger);
     this._uploadStream = stream;
     this._mimeType = mimeType;
+    this._needsFullDuplex = mimeType.startsWith("video/");
+  }
+  async onEvent(event) {
+    if (event.type == "prepared") {
+      if (!event.source_id) {
+        return Promise.reject("did not get a prepared sourceId to simulate full duplex");
+      }
+      const session = await this._getSession();
+      if (!session.baseUrl) {
+        return Promise.reject("session.baseUrl must not ne null");
+      }
+      let request;
+      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=async&sourceId=${event.source_id}`;
+      if (this._params) {
+        this._requestLogger.debug("before POST %s with multipart body because of params", postUrl);
+        const params = JSON.stringify(this._params);
+        const paramBlob = new Blob([params], { type: "application/json" });
+        const formData = new FormData();
+        formData.append("params", paramBlob);
+        formData.append("file", this._uploadStream);
+        const headers = {
+          "Authorization": `Bearer ${session.accessToken}`,
+          "Accept": "application/jsonl"
+        };
+        request = this._client.fetch(postUrl, {
+          headers,
+          method: "POST",
+          body: formData,
+          signal: this._controller.signal,
+          // @ts-ignore
+          duplex: "half"
+        });
+      } else {
+        this._requestLogger.debug("before POST %s with stream as body", postUrl);
+        const headers = {
+          "Authorization": `Bearer ${session.accessToken}`,
+          "Accept": "application/jsonl",
+          "Content-Type": this._mimeType
+        };
+        request = this._client.fetch(postUrl, {
+          headers,
+          method: "POST",
+          body: this._uploadStream,
+          signal: this._controller.signal,
+          // @ts-ignore
+          duplex: "half"
+        });
+      }
+      request.then(async (value) => {
+        if (value.status != 204) {
+          this._requestLogger.debug("unexpected status %d (%s) for POST %s ", value.status, await value.text(), postUrl);
+        }
+      }).catch((reason) => {
+        this._requestLogger.debug("error %v for POST %s ", reason, postUrl);
+      }).finally(() => {
+        this._requestLogger.debug("after POST %s ", postUrl);
+      });
+    }
+    return Promise.resolve();
   }
   async startJob() {
     const session = await this._getSession();
     if (!session.baseUrl) {
       return Promise.reject("session.baseUrl must not ne null");
     }
-    const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=sync`;
     let response;
-    if (this._params) {
-      this._requestLogger.debug("before POST %s with multipart body because of params");
-      const params = JSON.stringify(this._params);
-      const paramBlob = new Blob([params], { type: "application/json" });
-      const formData = new FormData();
-      formData.append("params", paramBlob);
-      formData.append("file", this._uploadStream);
+    if (this._needsFullDuplex) {
+      const prepareUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/prepareSource?timeout=10s`;
       const headers = {
         "Authorization": `Bearer ${session.accessToken}`,
         "Accept": "application/jsonl"
       };
-      response = await this._client.fetch(postUrl, {
+      this._requestLogger.debug("before POST %s to prepare full duplex upload", prepareUrl);
+      response = await this._client.fetch(prepareUrl, {
         headers,
         method: "POST",
-        body: formData,
         signal: this._controller.signal,
         // @ts-ignore
         duplex: "half"
       });
-      this._requestLogger.debug("after POST %s with multipart body because of params");
+      this._requestLogger.debug("after POST %s to prepare full duplex upload", prepareUrl);
     } else {
-      this._requestLogger.debug("before POST %s with stream as body");
-      const headers = {
-        "Authorization": `Bearer ${session.accessToken}`,
-        "Accept": "application/jsonl",
-        "Content-Type": this._mimeType
-      };
-      response = await this._client.fetch(postUrl, {
-        headers,
-        method: "POST",
-        body: this._uploadStream,
-        signal: this._controller.signal,
-        // @ts-ignore
-        duplex: "half"
-      });
-      this._requestLogger.debug("after POST %s with stream as body");
+      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=sync`;
+      if (this._params) {
+        this._requestLogger.debug("before POST %s with multipart body because of params", postUrl);
+        const params = JSON.stringify(this._params);
+        const paramBlob = new Blob([params], { type: "application/json" });
+        const formData = new FormData();
+        formData.append("params", paramBlob);
+        formData.append("file", this._uploadStream);
+        const headers = {
+          "Authorization": `Bearer ${session.accessToken}`,
+          "Accept": "application/jsonl"
+        };
+        response = await this._client.fetch(postUrl, {
+          headers,
+          method: "POST",
+          body: formData,
+          signal: this._controller.signal,
+          // @ts-ignore
+          duplex: "half"
+        });
+        this._requestLogger.debug("after POST %s with multipart body because of params", postUrl);
+      } else {
+        this._requestLogger.debug("before POST %s with stream as body", postUrl);
+        const headers = {
+          "Authorization": `Bearer ${session.accessToken}`,
+          "Accept": "application/jsonl",
+          "Content-Type": this._mimeType
+        };
+        response = await this._client.fetch(postUrl, {
+          headers,
+          method: "POST",
+          body: this._uploadStream,
+          signal: this._controller.signal,
+          // @ts-ignore
+          duplex: "half"
+        });
+        this._requestLogger.debug("after POST %s with stream as body", postUrl);
+      }
     }
     return response;
   }
@@ -9607,18 +9701,39 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     throw new DOMException("resolving a path to a file is not supported in browser");
   };
 } else {
+  let iteratorToStream = function(iterator) {
+    return new ReadableStream({
+      async pull(controller) {
+        const { value, done } = await iterator.next();
+        if (done) {
+          controller.close();
+        } else {
+          controller.enqueue(new Uint8Array(value));
+        }
+      }
+    });
+  };
+  iteratorToStream2 = iteratorToStream;
+  async function* nodeStreamToIterator(stream) {
+    for await (const chunk of stream) {
+      yield chunk;
+    }
+  }
   resolvePath = async (source) => {
     const mime = require_mime_types();
     const filehandle = require("fs/promises");
     const fd = await filehandle.open(source.path, "r");
     const stream = fd.createReadStream();
+    const iterator = nodeStreamToIterator(stream);
+    const webStream = iteratorToStream(iterator);
     const mimeType = mime.lookup(source.path) || "application/octet-stream";
     return {
-      stream,
+      stream: webStream,
       mimeType
     };
   };
 }
+var iteratorToStream2;
 
 // shims/http_client.ts
 var createHttpClient;
@@ -9653,7 +9768,9 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     const undici = require("undici");
     const agent = new undici.Agent({
       keepAliveTimeout: 1e4,
-      connections: 5
+      connections: 5,
+      // two parallel streaming requests to the same host seem to deadlock with pipelining > 0
+      pipelining: 0
     });
     return new HttpClient2(agent);
   };
@@ -11377,7 +11494,7 @@ var EyePop;
     }
     if (typeof opts.auth.oAuth2 != "undefined") {
       if (typeof opts.auth.oAuth2 === "boolean") {
-        if (opts.eyepopUrl.startsWith("https://staging-api.eyepop.ai")) {
+        if (opts.eyepopUrl.startsWith("https://web-api.staging.eyepop.xyz")) {
           opts.auth = {
             oAuth2: {
               domain: "dev-eyepop.us.auth0.com",