@eyepop.ai/eyepop 0.22.0 → 0.23.0

package/dist/eyepop.index.d.mts

@@ -321,6 +321,10 @@ interface ModelInstanceDef {
     type: ModelPrecisionType;
 }
 
+interface ModelRef {
+    id: string;
+    folderUrl: string;
+}
 declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     private _baseUrl;
     private _pipelineId;
@@ -337,7 +341,7 @@ declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     popName(): string | null;
     popComp(): string | null;
     postTransform(): string | null;
-    changePopComp(popComp: string): Promise<void>;
+    changePopComp(popComp: string, modelRefs?: ModelRef[]): Promise<void>;
     changePostTransform(postTransform: string | null): Promise<void>;
     popId(): string | null;
     onIngressEvent(handler: (event: IngressEvent) => void): WorkerEndpoint;
@@ -548,6 +552,117 @@ declare class DataEndpoint extends Endpoint<DataEndpoint> {
     private dispatchChangeEvent;
 }
 
+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>;
+    /**
+     * Generates a Stream from a newline-separated ReadableStream
+     * where each item is a JSON value.
+     */
+    static fromReadableStream<Prediction>(readableStream: ReadableStream<Uint8Array>, controller: AbortController): Stream<Prediction>;
+    [Symbol.asyncIterator](): AsyncIterator<Prediction>;
+    /**
+     * Splits the stream into two streams which can be
+     * independently read from at different speeds.
+     */
+    tee(): [Stream<Prediction>, Stream<Prediction>];
+    /**
+     * Converts this stream to a newline-separated ReadableStream of
+     * JSON stringified values in the stream
+     * which can be turned back into a Stream with `Stream.fromReadableStream()`.
+     */
+    toReadableStream(): ReadableStream;
+}
+
+declare class AbstractJob implements ResultStream {
+    protected _getSession: () => Promise<WorkerSession>;
+    protected _params: SourceParams | null;
+    protected _responseStream: Promise<ReadableStream<Uint8Array>> | null;
+    protected _controller: AbortController;
+    protected _client: HttpClient;
+    protected _requestLogger: Logger;
+    [Symbol.asyncIterator](): AsyncIterator<Prediction>;
+    protected constructor(params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected startJob(): Promise<Response>;
+    static n: number;
+    start(done: () => void, status: (statusCode: number) => void): AbstractJob;
+    cancel(): void;
+}
+declare class UploadJob extends AbstractJob {
+    private readonly _uploadStream;
+    private readonly _mimeType;
+    get [Symbol.toStringTag](): string;
+    constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected startJob(): Promise<Response>;
+}
+declare class LoadFromJob extends AbstractJob {
+    private readonly _location;
+    constructor(location: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    get [Symbol.toStringTag](): string;
+    protected startJob(): Promise<Response>;
+}
+declare class LoadLiveIngressJob extends AbstractJob {
+    private readonly _ingressId;
+    constructor(ingressId: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    get [Symbol.toStringTag](): string;
+    protected startJob(): Promise<Response>;
+}
+
+interface OfferData {
+    iceUfrag: string;
+    icePwd: string;
+    medias: string[];
+}
+declare abstract class WebrtcBase {
+    protected readonly _getSession: () => Promise<WorkerSession>;
+    protected readonly _client: HttpClient;
+    protected readonly _requestLogger: Logger;
+    protected readonly _urlPath: string;
+    private readonly _ingressId;
+    private _location;
+    protected _pc: RTCPeerConnection | null;
+    protected _eTag: string;
+    protected _queuedCandidates: RTCIceCandidate[];
+    protected _offerData: OfferData | null;
+    constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
+    close(): Promise<void>;
+    ingressId(): string;
+    protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
+    protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;
+    protected onLocalCandidate(evt: RTCPeerConnectionIceEvent): Promise<WebrtcBase>;
+    static linkToIceServers(links: string | null): RTCIceServer[];
+    protected static editAnswer(answer: string, videoCodec: string, audioCodec: string | undefined, videoBitrate: number, audioBitrate: number | undefined, audioVoice: boolean): string;
+    private static setCodec;
+    private static setVideoBitrate;
+    private static setAudioBitrate;
+    static parseOffer(offer: string): OfferData;
+    static generateSdpFragment(offerData: OfferData, candidates: RTCIceCandidate[]): string;
+    static unquoteCredential(v: string | undefined): string;
+}
+
+declare class WebrtcWhep extends WebrtcBase implements LiveMedia {
+    private _stream;
+    constructor(ingressId: string, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    close(): Promise<void>;
+    stream(): Promise<MediaStream>;
+    start(): Promise<WebrtcWhep>;
+    protected onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    private onIceServers;
+}
+
+declare class WebrtcWhip extends WebrtcBase implements LiveMedia {
+    private _stream;
+    constructor(stream: MediaStream, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    start(): Promise<WebrtcWhip>;
+    stream(): Promise<MediaStream>;
+    protected onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    private onIceServers;
+    close(): Promise<void>;
+}
+
 declare namespace EyePop {
     /**
      * @deprecated use workerEndpoint() instead
@@ -557,4 +672,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { type Annotation, AnnotationType, type Asset, AssetStatus, type Auth0Options, type Authentication, type ChangeEvent, ChangeType, type Contour, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetUpdate, type DatasetVersion, EndpointState, EyePop, type FileSource, type IngressEvent, type LiveMedia, type LiveSource, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, ModelPrecisionType, ModelStatus, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type SecretKeyAuth, type Session, type SessionAuth, type Source, type SourcesEntry, type StreamSource, type StreamTime, TranscodeMode, TransientPopId, type UrlSource, UserReview, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };
+export { AbstractJob, type Annotation, AnnotationType, type Asset, AssetStatus, type Auth0Options, type Authentication, type Box, type ChangeEvent, ChangeType, type Contour, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetUpdate, type DatasetVersion, Endpoint, EndpointState, EyePop, type FileSource, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, ModelPrecisionType, ModelStatus, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, 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, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };

package/dist/eyepop.index.d.ts

@@ -321,6 +321,10 @@ interface ModelInstanceDef {
     type: ModelPrecisionType;
 }
 
+interface ModelRef {
+    id: string;
+    folderUrl: string;
+}
 declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     private _baseUrl;
     private _pipelineId;
@@ -337,7 +341,7 @@ declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     popName(): string | null;
     popComp(): string | null;
     postTransform(): string | null;
-    changePopComp(popComp: string): Promise<void>;
+    changePopComp(popComp: string, modelRefs?: ModelRef[]): Promise<void>;
     changePostTransform(postTransform: string | null): Promise<void>;
     popId(): string | null;
     onIngressEvent(handler: (event: IngressEvent) => void): WorkerEndpoint;
@@ -548,6 +552,117 @@ declare class DataEndpoint extends Endpoint<DataEndpoint> {
     private dispatchChangeEvent;
 }
 
+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>;
+    /**
+     * Generates a Stream from a newline-separated ReadableStream
+     * where each item is a JSON value.
+     */
+    static fromReadableStream<Prediction>(readableStream: ReadableStream<Uint8Array>, controller: AbortController): Stream<Prediction>;
+    [Symbol.asyncIterator](): AsyncIterator<Prediction>;
+    /**
+     * Splits the stream into two streams which can be
+     * independently read from at different speeds.
+     */
+    tee(): [Stream<Prediction>, Stream<Prediction>];
+    /**
+     * Converts this stream to a newline-separated ReadableStream of
+     * JSON stringified values in the stream
+     * which can be turned back into a Stream with `Stream.fromReadableStream()`.
+     */
+    toReadableStream(): ReadableStream;
+}
+
+declare class AbstractJob implements ResultStream {
+    protected _getSession: () => Promise<WorkerSession>;
+    protected _params: SourceParams | null;
+    protected _responseStream: Promise<ReadableStream<Uint8Array>> | null;
+    protected _controller: AbortController;
+    protected _client: HttpClient;
+    protected _requestLogger: Logger;
+    [Symbol.asyncIterator](): AsyncIterator<Prediction>;
+    protected constructor(params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected startJob(): Promise<Response>;
+    static n: number;
+    start(done: () => void, status: (statusCode: number) => void): AbstractJob;
+    cancel(): void;
+}
+declare class UploadJob extends AbstractJob {
+    private readonly _uploadStream;
+    private readonly _mimeType;
+    get [Symbol.toStringTag](): string;
+    constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    protected startJob(): Promise<Response>;
+}
+declare class LoadFromJob extends AbstractJob {
+    private readonly _location;
+    constructor(location: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    get [Symbol.toStringTag](): string;
+    protected startJob(): Promise<Response>;
+}
+declare class LoadLiveIngressJob extends AbstractJob {
+    private readonly _ingressId;
+    constructor(ingressId: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    get [Symbol.toStringTag](): string;
+    protected startJob(): Promise<Response>;
+}
+
+interface OfferData {
+    iceUfrag: string;
+    icePwd: string;
+    medias: string[];
+}
+declare abstract class WebrtcBase {
+    protected readonly _getSession: () => Promise<WorkerSession>;
+    protected readonly _client: HttpClient;
+    protected readonly _requestLogger: Logger;
+    protected readonly _urlPath: string;
+    private readonly _ingressId;
+    private _location;
+    protected _pc: RTCPeerConnection | null;
+    protected _eTag: string;
+    protected _queuedCandidates: RTCIceCandidate[];
+    protected _offerData: OfferData | null;
+    constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
+    close(): Promise<void>;
+    ingressId(): string;
+    protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
+    protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;
+    protected onLocalCandidate(evt: RTCPeerConnectionIceEvent): Promise<WebrtcBase>;
+    static linkToIceServers(links: string | null): RTCIceServer[];
+    protected static editAnswer(answer: string, videoCodec: string, audioCodec: string | undefined, videoBitrate: number, audioBitrate: number | undefined, audioVoice: boolean): string;
+    private static setCodec;
+    private static setVideoBitrate;
+    private static setAudioBitrate;
+    static parseOffer(offer: string): OfferData;
+    static generateSdpFragment(offerData: OfferData, candidates: RTCIceCandidate[]): string;
+    static unquoteCredential(v: string | undefined): string;
+}
+
+declare class WebrtcWhep extends WebrtcBase implements LiveMedia {
+    private _stream;
+    constructor(ingressId: string, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    close(): Promise<void>;
+    stream(): Promise<MediaStream>;
+    start(): Promise<WebrtcWhep>;
+    protected onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    private onIceServers;
+}
+
+declare class WebrtcWhip extends WebrtcBase implements LiveMedia {
+    private _stream;
+    constructor(stream: MediaStream, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    start(): Promise<WebrtcWhip>;
+    stream(): Promise<MediaStream>;
+    protected onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
+    private onIceServers;
+    close(): Promise<void>;
+}
+
 declare namespace EyePop {
     /**
      * @deprecated use workerEndpoint() instead
@@ -557,4 +672,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { type Annotation, AnnotationType, type Asset, AssetStatus, type Auth0Options, type Authentication, type ChangeEvent, ChangeType, type Contour, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetUpdate, type DatasetVersion, EndpointState, EyePop, type FileSource, type IngressEvent, type LiveMedia, type LiveSource, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, ModelPrecisionType, ModelStatus, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, type PredictedClass, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedObject, type Prediction, type ResultStream, type SecretKeyAuth, type Session, type SessionAuth, type Source, type SourcesEntry, type StreamSource, type StreamTime, TranscodeMode, TransientPopId, type UrlSource, UserReview, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };
+export { AbstractJob, type Annotation, AnnotationType, type Asset, AssetStatus, type Auth0Options, type Authentication, type Box, type ChangeEvent, ChangeType, type Contour, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetCreate, type DatasetUpdate, type DatasetVersion, Endpoint, EndpointState, EyePop, type FileSource, type IngressEvent, type LiveMedia, type LiveSource, LoadFromJob, LoadLiveIngressJob, type Mask, type Model, type ModelCreate, ModelFormat, type ModelInstanceDef, ModelPrecisionType, ModelStatus, ModelType, type ModelUpdate, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type Point2d, type Point3d, 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, TranscodeMode, TransientPopId, UploadJob, type UrlSource, UserReview, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, EyePop as default };

package/dist/eyepop.index.js

@@ -8656,19 +8656,29 @@ var require_mime_types = __commonJS({
 // index.ts
 var eyepop_exports = {};
 __export(eyepop_exports, {
+  AbstractJob: () => AbstractJob,
   AnnotationType: () => AnnotationType,
   AssetStatus: () => AssetStatus,
   ChangeType: () => ChangeType,
   DataEndpoint: () => DataEndpoint,
+  Endpoint: () => Endpoint,
   EndpointState: () => EndpointState,
   EyePop: () => EyePop,
+  LoadFromJob: () => LoadFromJob,
+  LoadLiveIngressJob: () => LoadLiveIngressJob,
   ModelFormat: () => ModelFormat,
   ModelPrecisionType: () => ModelPrecisionType,
   ModelStatus: () => ModelStatus,
   ModelType: () => ModelType,
+  Semaphore: () => Semaphore,
+  Stream: () => Stream,
   TranscodeMode: () => TranscodeMode,
   TransientPopId: () => TransientPopId,
+  UploadJob: () => UploadJob,
   UserReview: () => UserReview,
+  WebrtcBase: () => WebrtcBase,
+  WebrtcWhep: () => WebrtcWhep,
+  WebrtcWhip: () => WebrtcWhip,
   WorkerEndpoint: () => WorkerEndpoint,
   default: () => eyepop_default
 });
@@ -10112,14 +10122,15 @@ var WorkerEndpoint = class extends Endpoint {
       return null;
     }
   }
-  async changePopComp(popComp) {
+  async changePopComp(popComp, modelRefs = []) {
     const client = this._client;
     const baseUrl = this._baseUrl;
     if (!baseUrl || !client) {
       return Promise.reject("endpoint not connected, use connect() before changePopComp()");
     }
     const body = {
-      "pipeline": popComp
+      "pipeline": popComp,
+      "modelRefs": modelRefs
     };
     let response = await this.fetchWithRetry(async () => {
       const session = await this.session();
@@ -10136,10 +10147,12 @@ var WorkerEndpoint = class extends Endpoint {
     });
     if (response.status != 204) {
       const message = await response.text();
+      console.error(message);
       return Promise.reject(`Unexpected status ${response.status}: ${message}`);
     }
     if (this._pipeline) {
       this._pipeline.inferPipeline = popComp;
+      this._pipeline.modelRefs = modelRefs;
     }
   }
   async changePostTransform(postTransform) {
@@ -10502,9 +10515,16 @@ var WorkerEndpoint = class extends Endpoint {
     } else {
       postTransform = null;
     }
+    let modelRefs;
+    if (this._pipeline && this._pipeline.modelRefs) {
+      modelRefs = this._pipeline.modelRefs;
+    } else {
+      modelRefs = [];
+    }
     const body = {
       "inferPipelineDef": {
-        "pipeline": pipeline
+        "pipeline": pipeline,
+        "modelRefs": modelRefs
       },
       "postTransformDef": {
         "transform": postTransform
@@ -11345,19 +11365,29 @@ var EyePop;
 var eyepop_default = EyePop;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AbstractJob,
   AnnotationType,
   AssetStatus,
   ChangeType,
   DataEndpoint,
+  Endpoint,
   EndpointState,
   EyePop,
+  LoadFromJob,
+  LoadLiveIngressJob,
   ModelFormat,
   ModelPrecisionType,
   ModelStatus,
   ModelType,
+  Semaphore,
+  Stream,
   TranscodeMode,
   TransientPopId,
+  UploadJob,
   UserReview,
+  WebrtcBase,
+  WebrtcWhep,
+  WebrtcWhip,
   WorkerEndpoint
 });
 /*! Bundled license information: