@eyepop.ai/eyepop 0.17.0 → 0.18.1

package/dist/eyepop.index.d.mts

@@ -152,12 +152,15 @@ interface OAuth2Auth {
     oAuth2: true | Auth0Options;
 }
 type Authentication = undefined | SecretKeyAuth | SessionAuth | OAuth2Auth;
+declare enum TransientPopId {
+    Transient = "transient"
+}
 interface Options {
     auth?: Authentication | undefined;
     /**
      * Defaults to process.env['EYEPOP_POP_ID'].
      */
-    popId?: string | undefined;
+    popId?: string | TransientPopId | undefined;
     /**
      * Override the default base URL for the API, e.g., "https://api.eyepop.ai/"
      *
@@ -177,6 +180,7 @@ declare class Endpoint {
     private _baseUrl;
     private _pipelineId;
     private _popName;
+    private _pipeline;
     private _client;
     private _limit;
     private _state;
@@ -190,6 +194,8 @@ declare class Endpoint {
     state(): EndpointState;
     pendingJobs(): number;
     popName(): string | null;
+    popComp(): string | null;
+    changePopComp(popComp: string): Promise<void>;
     popId(): string | null;
     onStateChanged(handler: (fromState: EndpointState, toState: EndpointState) => void): Endpoint;
     onIngressEvent(handler: (event: IngressEvent) => void): Endpoint;
@@ -208,9 +214,11 @@ declare class Endpoint {
     private jobDone;
     private updateState;
     private jobStatus;
+    private fetchWithRetry;
     private reconnect;
     private authorizationHeader;
     private currentAccessToken;
+    private startPopLessPipeline;
 }
 
 declare namespace EyePop {

package/dist/eyepop.index.d.ts

@@ -152,12 +152,15 @@ interface OAuth2Auth {
     oAuth2: true | Auth0Options;
 }
 type Authentication = undefined | SecretKeyAuth | SessionAuth | OAuth2Auth;
+declare enum TransientPopId {
+    Transient = "transient"
+}
 interface Options {
     auth?: Authentication | undefined;
     /**
      * Defaults to process.env['EYEPOP_POP_ID'].
      */
-    popId?: string | undefined;
+    popId?: string | TransientPopId | undefined;
     /**
      * Override the default base URL for the API, e.g., "https://api.eyepop.ai/"
      *
@@ -177,6 +180,7 @@ declare class Endpoint {
     private _baseUrl;
     private _pipelineId;
     private _popName;
+    private _pipeline;
     private _client;
     private _limit;
     private _state;
@@ -190,6 +194,8 @@ declare class Endpoint {
     state(): EndpointState;
     pendingJobs(): number;
     popName(): string | null;
+    popComp(): string | null;
+    changePopComp(popComp: string): Promise<void>;
     popId(): string | null;
     onStateChanged(handler: (fromState: EndpointState, toState: EndpointState) => void): Endpoint;
     onIngressEvent(handler: (event: IngressEvent) => void): Endpoint;
@@ -208,9 +214,11 @@ declare class Endpoint {
     private jobDone;
     private updateState;
     private jobStatus;
+    private fetchWithRetry;
     private reconnect;
     private authorizationHeader;
     private currentAccessToken;
+    private startPopLessPipeline;
 }
 
 declare namespace EyePop {

package/dist/eyepop.index.js

@@ -9821,6 +9821,7 @@ var Endpoint = class {
     this._expire_token_time = null;
     this._client = null;
     this._state = "Idle" /* Idle */;
+    this._pipeline = null;
     this._stateChangeHandler = null;
     this._ingressEventHandler = null;
     this._ingressEventWs = null;
@@ -9850,6 +9851,44 @@ var Endpoint = class {
   popName() {
     return this._popName;
   }
+  popComp() {
+    if (this._pipeline) {
+      return this._pipeline.inferPipeline;
+    } else {
+      return null;
+    }
+  }
+  async changePopComp(popComp) {
+    const client = this._client;
+    const baseUrl = this._baseUrl;
+    if (!baseUrl || !client) {
+      return Promise.reject("endpoint not connected, use connect() before changePopComp()");
+    }
+    const patch_url = `${this._baseUrl}/pipelines/${this._pipelineId}/inferencePipeline`;
+    const body = {
+      "pipeline": popComp
+    };
+    this._requestLogger.debug("before PATCH %s", patch_url);
+    let response = await this.fetchWithRetry(async () => {
+      let headers = {
+        "Authorization": await this.authorizationHeader(),
+        "Content-Type": "application/json"
+      };
+      return client.fetch(patch_url, {
+        method: "PATCH",
+        body: JSON.stringify(body),
+        headers
+      });
+    });
+    if (response.status != 204) {
+      const message = await response.text();
+      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+    }
+    this._requestLogger.debug("after PATCH %s", patch_url);
+    if (this._pipeline) {
+      this._pipeline.inferPipeline = popComp;
+    }
+  }
   popId() {
     return this._options.popId || null;
   }
@@ -9888,19 +9927,22 @@ var Endpoint = class {
       return Promise.reject("option secretKey or environment variable EYEPOP_SECRET_KEY is required");
     }
     this._client = await createHttpClient();
+    const client = this._client;
     let result = await this.reconnect();
     if (this._baseUrl && this._options.stopJobs) {
       const stop_url = `${this._baseUrl}/pipelines/${this._pipelineId}/source?mode=preempt&processing=sync`;
       const body = { "sourceType": "NONE" };
-      const headers = {
-        "Authorization": await this.authorizationHeader(),
-        "Content-Type": "application/json"
-      };
       this._requestLogger.debug("before PATCH %s", stop_url);
-      let response = await this._client.fetch(stop_url, {
-        method: "PATCH",
-        headers,
-        body: JSON.stringify(body)
+      let response = await this.fetchWithRetry(async () => {
+        const headers = {
+          "Authorization": await this.authorizationHeader(),
+          "Content-Type": "application/json"
+        };
+        return client.fetch(stop_url, {
+          method: "PATCH",
+          headers,
+          body: JSON.stringify(body)
+        });
       });
       if (response.status >= 300) {
         const message = await response.text();
@@ -9981,25 +10023,19 @@ var Endpoint = class {
     }
   }
   async startIngressWs() {
-    if (this._ingressEventWs || !this._baseUrl || !this._client) {
+    const client = this._client;
+    if (this._ingressEventWs || !this._baseUrl || !client) {
       return;
     }
     try {
       const getTokenUrl = `${this._baseUrl}/liveIngress/events/token`;
-      const headers = {
-        "Authorization": await this.authorizationHeader()
-      };
       this._requestLogger.debug("before GET %s", getTokenUrl);
-      let response = await this._client.fetch(getTokenUrl, { headers });
-      if (response.status == 401) {
-        this._requestLogger.debug("after GET %s: 401, about to retry with fresh access token", getTokenUrl);
-        this._token = null;
-        const headers2 = {
+      let response = await this.fetchWithRetry(async () => {
+        const headers = {
           "Authorization": await this.authorizationHeader()
         };
-        this.updateState("FetchConfig" /* FetchConfig */);
-        response = await this._client.fetch(getTokenUrl, { headers: headers2 });
-      }
+        return client.fetch(getTokenUrl, { headers });
+      });
       if (response.status != 200) {
         const message = await response.text();
         return Promise.reject(`Unexpected status ${response.status}: ${message}`);
@@ -10145,11 +10181,49 @@ var Endpoint = class {
       this._expire_token_time = null;
     }
   }
+  async fetchWithRetry(fetcher, retries = 1) {
+    while (true) {
+      try {
+        const response = await fetcher();
+        if (response.status == 401) {
+          this._token = null;
+          this._expire_token_time = null;
+          if (retries--) {
+            this._requestLogger.info("received 401 response, attempt to reauthorize and retry");
+          } else {
+            return Promise.reject(`response ${response.status}: ${response.statusText}`);
+          }
+        } else if (response.status == 404) {
+          this._pipelineId = null;
+          this._baseUrl = null;
+          if (retries--) {
+            this._requestLogger.info("received 404 response, attempt to restart pop and retry");
+          } else {
+            return Promise.reject(`response ${response.status}: ${response.statusText}`);
+          }
+        } else {
+          return response;
+        }
+      } catch (error) {
+        this._pipelineId = null;
+        this._baseUrl = null;
+        if (retries--) {
+          this._requestLogger.info("unknown, attempt to restart pop (as if we received 404)", error);
+          return Promise.reject(error);
+        }
+      }
+    }
+  }
   async reconnect() {
     if (!this._client) {
       return Promise.reject("endpoint not initialized");
     }
-    const config_url = `${this.eyepopUrl()}/pops/${this._options.popId}/config?auto_start=false`;
+    let config_url;
+    if (this._options.popId == "transient" /* Transient */) {
+      config_url = `${this.eyepopUrl()}/workers/config`;
+    } else {
+      config_url = `${this.eyepopUrl()}/pops/${this._options.popId}/config?auto_start=false`;
+    }
     const headers = {
       "Authorization": await this.authorizationHeader()
     };
@@ -10165,7 +10239,6 @@ var Endpoint = class {
       this.updateState("FetchConfig" /* FetchConfig */);
       response = await this._client.fetch(config_url, {
         headers: headers2
-        // @ts-ignore
       });
     }
     if (response.status != 200) {
@@ -10183,7 +10256,6 @@ var Endpoint = class {
         this.updateState("StartingPop" /* StartingPop */);
         response = await this._client.fetch(auto_start_config_url, {
           headers: headers2
-          // @ts-ignore
         });
         if (response.status != 200) {
           this.updateState("Error" /* Error */);
@@ -10194,13 +10266,35 @@ var Endpoint = class {
       }
       const baseUrl = new URL(config.base_url, this.eyepopUrl());
       this._baseUrl = baseUrl.toString();
-      this._pipelineId = config.pipeline_id;
-      this._popName = config.name;
+      if (this._options.popId == "transient" /* Transient */) {
+        this._pipelineId = await this.startPopLessPipeline();
+        this._popName = this._options.popId;
+      } else {
+        this._pipelineId = config.pipeline_id;
+        this._popName = config.name;
+      }
       this._requestLogger.debug("after GET %s: %s / %s", config_url, this._baseUrl, this._pipelineId);
       if (!this._pipelineId || !this._baseUrl) {
         return Promise.reject(`Pop not started`);
       }
       this._baseUrl = this._baseUrl.replace(/\/+$/, "");
+      if (this._baseUrl) {
+        const get_url = `${this._baseUrl}/pipelines/${this._pipelineId}`;
+        const headers2 = {
+          "Authorization": await this.authorizationHeader()
+        };
+        this._requestLogger.debug("before GET %s", get_url);
+        let response2 = await this._client.fetch(get_url, {
+          method: "GET",
+          headers: headers2
+        });
+        if (response2.status > 200) {
+          const message = await response2.text();
+          return Promise.reject(`Unexpected status ${response2.status}: ${message}`);
+        }
+        this._requestLogger.debug("after GET %s", get_url);
+        this._pipeline = await response2.json();
+      }
       this.updateState();
       return Promise.resolve(this);
     }
@@ -10255,6 +10349,60 @@ var Endpoint = class {
     this._logger.debug("using access token, valid for at least %d seconds", this._expire_token_time - now);
     return this._token;
   }
+  async startPopLessPipeline() {
+    if (this._client == null || this._baseUrl == null) {
+      return Promise.reject("endpoint not initialized");
+    }
+    this.updateState("StartingPop" /* StartingPop */);
+    let pipeline;
+    if (this._pipeline) {
+      pipeline = this._pipeline.inferPipeline;
+    } else {
+      pipeline = "identity";
+    }
+    const body = {
+      "inferPipelineDef": {
+        "pipeline": pipeline
+      },
+      "source": {
+        "sourceType": "NONE"
+      },
+      "idleTimeoutSeconds": 30,
+      "logging": ["out_meta"],
+      "videoOutput": "no_output"
+    };
+    const post_url = `${this._baseUrl.replace(/\/+$/, "")}/pipelines`;
+    let headers = {
+      "Content-Type": "application/json",
+      "Authorization": await this.authorizationHeader()
+    };
+    this._requestLogger.debug("before POST %s", post_url);
+    let response = await this._client.fetch(post_url, {
+      method: "POST",
+      headers,
+      body: JSON.stringify(body)
+    });
+    if (response.status == 401) {
+      this._requestLogger.debug("after GET %s: 401, about to retry with fresh access token", post_url);
+      this._token = null;
+      headers = {
+        "Content-Type": "application/json",
+        "Authorization": await this.authorizationHeader()
+      };
+      response = await this._client.fetch(post_url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body)
+      });
+    }
+    if (response.status != 200) {
+      const message = await response.text();
+      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+    }
+    this._requestLogger.debug("after POST %s", post_url);
+    const pipelineId = (await response.json())["id"];
+    return pipelineId;
+  }
 };
 
 // index.ts