@eyepop.ai/eyepop 3.7.2 → 3.8.1

package/dist/eyepop.index.js

@@ -8661,13 +8661,16 @@ __export(index_exports, {
   ArtifactType: () => ArtifactType,
   AssetStatus: () => AssetStatus,
   AssetUrlType: () => AssetUrlType,
+  AutoAnnotateStatus: () => AutoAnnotateStatus,
   AutoAnnotateTask: () => AutoAnnotateTask,
   ChangeType: () => ChangeType,
   ContourType: () => ContourType,
   DEFAULT_PREDICTION_VERSION: () => DEFAULT_PREDICTION_VERSION,
+  DataApiType: () => DataApiType,
   DataEndpoint: () => DataEndpoint,
   Endpoint: () => Endpoint,
   EndpointState: () => EndpointState,
+  EvaluationStatus: () => EvaluationStatus,
   ExportedBy: () => ExportedBy,
   EyePop: () => EyePop,
   EyepopLineDecoder: () => EyepopLineDecoder,
@@ -8700,6 +8703,7 @@ __export(index_exports, {
   WorkerEndpoint: () => WorkerEndpoint,
   WorkflowPhase: () => WorkflowPhase,
   default: () => index_default,
+  getBaseUrl: () => getBaseUrl,
   readableStreamFromString: () => readableStreamFromString
 });
 module.exports = __toCommonJS(index_exports);
@@ -10708,6 +10712,28 @@ function urlJoin() {
 }
 
 // data/data_types.ts
+var DataApiType = /* @__PURE__ */ ((DataApiType2) => {
+  DataApiType2["dataset"] = "dataset";
+  DataApiType2["vlm"] = "vlm";
+  return DataApiType2;
+})(DataApiType || {});
+function getBaseUrl(session, dataApiType) {
+  switch (dataApiType) {
+    case "dataset" /* dataset */:
+      return session.datasetApiUrl ?? "";
+    case "vlm" /* vlm */:
+      return session.vlmApiUrl ?? "";
+    default:
+      throw new Error(`unsupported type ${dataApiType}`);
+  }
+}
+var AutoAnnotateStatus = /* @__PURE__ */ ((AutoAnnotateStatus2) => {
+  AutoAnnotateStatus2["error"] = "error";
+  AutoAnnotateStatus2["requested"] = "requested";
+  AutoAnnotateStatus2["in_progress"] = "in_progress";
+  AutoAnnotateStatus2["completed"] = "completed";
+  return AutoAnnotateStatus2;
+})(AutoAnnotateStatus || {});
 var AssetStatus = /* @__PURE__ */ ((AssetStatus2) => {
   AssetStatus2["rejected"] = "rejected";
   AssetStatus2["upload_in_progress"] = "upload_in_progress";
@@ -10846,6 +10872,156 @@ var AssetUrlType = /* @__PURE__ */ ((AssetUrlType3) => {
   AssetUrlType3["https_signed"] = "https_signed";
   return AssetUrlType3;
 })(AssetUrlType || {});
+var EvaluationStatus = /* @__PURE__ */ ((EvaluationStatus2) => {
+  EvaluationStatus2["success"] = "success";
+  EvaluationStatus2["failed"] = "failed";
+  return EvaluationStatus2;
+})(EvaluationStatus || {});
+
+// data/jobs.ts
+var InferAssetJob = class {
+  constructor(assetUrl, inferRequest, vlmFetch, requestLogger) {
+    this._response = null;
+    this._runInfo = null;
+    this._controller = new AbortController();
+    this._vlmFetch = vlmFetch;
+    this._assetUrl = assetUrl;
+    this._inferRequest = inferRequest;
+    this._requestLogger = requestLogger;
+  }
+  [Symbol.asyncIterator]() {
+    if (!this._response) {
+      throw Error("logical bug");
+    }
+    let consumed = false;
+    const response_promise = this._response;
+    const controller = this._controller;
+    async function* iterator() {
+      if (consumed) {
+        throw new Error("Cannot iterate over a consumed stream, use `.tee()` to split the stream.");
+      }
+      consumed = true;
+      let done = false;
+      try {
+        const predictions = await response_promise;
+        if (predictions) {
+          for (let prediction of predictions) {
+            yield prediction;
+          }
+        }
+        done = true;
+      } catch (e) {
+        if (e instanceof Error && e.name === "AbortError") return;
+        throw e;
+      } finally {
+        if (!done) controller.abort();
+      }
+    }
+    return iterator();
+  }
+  start(done) {
+    this._response = new Promise(async (resolve, reject) => {
+      try {
+        let requestId = null;
+        while (true) {
+          let response = null;
+          if (requestId) {
+            response = await this._vlmFetch(`/api/v1/requests/${requestId}?timeout=20`, {
+              method: "POST"
+            });
+          } else {
+            const infer_request = new Map(Object.entries(this._inferRequest));
+            infer_request.set("url", this._assetUrl);
+            const body = new FormData();
+            body.append("infer_request", JSON.stringify(Object.fromEntries(infer_request)));
+            response = await this._vlmFetch(`/api/v1/infer?timeout=20`, {
+              method: "POST",
+              body
+            });
+          }
+          const predictions = response["predictions"];
+          const runInfo = response["run_info"];
+          if (predictions) {
+            this._runInfo = runInfo;
+            resolve(predictions);
+            break;
+          } else {
+            requestId = response["request_id"];
+            if (!requestId) {
+              reject(`missing request_id in response: ${JSON.stringify(response)}`);
+              break;
+            }
+          }
+        }
+      } catch (reason) {
+        reject(reason);
+      } finally {
+        done();
+      }
+    });
+    return this;
+  }
+  cancel() {
+    this._controller.abort("cancelled");
+  }
+};
+var EvaluateDatasetJob = class {
+  constructor(evaluateRequest, workerRelease, vlmFetch, requestLogger) {
+    this._response = null;
+    this._controller = new AbortController();
+    this._vlmFetch = vlmFetch;
+    this._evaluateRequest = evaluateRequest;
+    this._workerRelease = workerRelease;
+    this._requestLogger = requestLogger;
+  }
+  async response() {
+    if (!this._response) {
+      throw Error("logical bug");
+    }
+    return await this._response;
+  }
+  start(done) {
+    this._response = new Promise(async (resolve, reject) => {
+      try {
+        let requestId = null;
+        while (true) {
+          let response = null;
+          if (requestId) {
+            response = await this._vlmFetch(`/api/v1/evaluations/${requestId}?timeout=20`, {
+              method: "GET"
+            });
+          } else {
+            const workerReleaseQuery = this._workerRelease ? `&worker_release=${this._workerRelease}` : "";
+            response = await this._vlmFetch(`/api/v1/evaluations?timeout=20${workerReleaseQuery}`, {
+              method: "POST",
+              body: JSON.stringify(this._evaluateRequest),
+              headers: { "Content-Type": "application/json" }
+            });
+          }
+          const runInfo = response["run_info"];
+          if (runInfo) {
+            resolve(response);
+            break;
+          } else {
+            requestId = response["request_id"];
+            if (!requestId) {
+              reject(`missing request_id in response: ${JSON.stringify(response)}`);
+              break;
+            }
+          }
+        }
+      } catch (reason) {
+        reject(reason);
+      } finally {
+        done();
+      }
+    });
+    return this;
+  }
+  cancel() {
+    this._controller.abort("cancelled");
+  }
+};
 
 // data/data_endpoint.ts
 var WS_INITIAL_RECONNECT_DELAY = 1e3;
@@ -10853,7 +11029,8 @@ var WS_MAX_RECONNECT_DELAY = 6e4;
 var DataEndpoint = class extends Endpoint {
   constructor(options) {
     super(options);
-    this._baseUrl = null;
+    this.datasetApiUrl = null;
+    this.vlmApiUrl = null;
     this._ws = null;
     this._ws_current_reconnect_delay = null;
     this._accountId = options.accountId || null;
@@ -10874,11 +11051,13 @@ var DataEndpoint = class extends Endpoint {
       accessToken: session.accessToken,
       validUntil: session.validUntil,
       accountId: this.options().accountId,
-      baseUrl: this._baseUrl
+      datasetApiUrl: this.datasetApiUrl,
+      vlmApiUrl: this.vlmApiUrl
     };
   }
   async disconnect(wait = true) {
-    this._baseUrl = null;
+    this.datasetApiUrl = null;
+    this.vlmApiUrl = null;
     if (this._ws) {
       try {
         this._ws.close();
@@ -10893,7 +11072,9 @@ var DataEndpoint = class extends Endpoint {
     if (!this._client) {
       return Promise.reject("endpoint not initialized");
     }
-    const config_url = `${this.eyepopUrl()}/data/config?account_uuid=${this._accountId}`;
+    this._logger.warn("AAA", this.vlmApiUrl);
+    const accountUuidQuery = this._accountId ? `?account_uuid=${this._accountId}` : "";
+    const config_url = `${this.eyepopUrl()}/configs${accountUuidQuery}`;
     let headers = {
       Authorization: await this.authorizationHeader()
     };
@@ -10913,11 +11094,13 @@ var DataEndpoint = class extends Endpoint {
     if (response.status != 200) {
       this.updateState("Error" /* Error */);
       const message = await response.text();
-      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+      return Promise.reject(`Unexpected status ${response.status} for ${config_url}: ${message}`);
     }
     let config = await response.json();
-    const baseUrl = new URL(config.base_url, this.eyepopUrl());
-    this._baseUrl = baseUrl.toString();
+    const datasetApiUrl = new URL(config.dataset_api_url, this.eyepopUrl());
+    this.datasetApiUrl = datasetApiUrl.toString();
+    const vlmApiUrl = new URL(config.vlm_api_url, this.eyepopUrl());
+    this.vlmApiUrl = vlmApiUrl.toString();
     if (this.options().disableWs) {
       this._logger.info("disabled ws connection");
     } else {
@@ -10925,7 +11108,7 @@ var DataEndpoint = class extends Endpoint {
     }
     if (this.options().useCookie) {
       const client = this._client;
-      const url = urlJoin(this._baseUrl, "security", "check?set_cookie=true");
+      const url = urlJoin(this.datasetApiUrl, "security", "check?set_cookie=true");
       const headers2 = {
         Authorization: await this.authorizationHeader()
       };
@@ -10946,7 +11129,7 @@ var DataEndpoint = class extends Endpoint {
       this._ws.close();
       this._ws = null;
     }
-    const baseUrl = this._baseUrl?.replace("https://", "wss://").replace("http://", "ws://");
+    const baseUrl = this.datasetApiUrl?.replace("https://", "wss://").replace("http://", "ws://");
     if (!baseUrl) {
       return;
     }
@@ -11004,16 +11187,15 @@ var DataEndpoint = class extends Endpoint {
   options() {
     return this._options;
   }
-  async request(path2, options = {}, disableAuth = false) {
+  async request(path2, options = {}, disableAuth = false, dataApiType = "dataset" /* dataset */) {
     const client = this._client;
-    const baseUrl = this._baseUrl;
-    if (!baseUrl || !client) {
+    if (!client) {
       return Promise.reject("endpoint not connected");
     }
     let response = await this.fetchWithRetry(async () => {
       const session = await this.session();
+      const baseUrl = getBaseUrl(session, dataApiType);
       const headers = {
-        "Content-Type": "application/json",
         ...disableAuth ? {} : { Authorization: `Bearer ${session.accessToken}` },
         ...options.headers || {}
       };
@@ -11025,8 +11207,8 @@ var DataEndpoint = class extends Endpoint {
         method: options.method || "GET",
         body: options.body
       };
-      this._requestLogger.debug("Request - " + ri.method + path2 + " BODY: " + (ri.body ? ri.body : ""));
-      return await client.fetch(urlJoin(session.baseUrl ?? "", path2), ri);
+      this._requestLogger.debug("Request - " + ri.method + " " + path2 + " BODY: " + (ri.body ? ri.body : ""));
+      return await client.fetch(urlJoin(baseUrl ?? "", path2), ri);
     });
     if (response.status === 204) {
       return null;
@@ -11054,7 +11236,8 @@ var DataEndpoint = class extends Endpoint {
   async createDataset(data) {
     return this.request(`/datasets?account_uuid=${this._accountId}`, {
       method: "POST",
-      body: JSON.stringify(data)
+      body: JSON.stringify(data),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async getDataset(dataset_uuid, include_stats = true, dataset_version, modifiable_version_only) {
@@ -11067,13 +11250,15 @@ var DataEndpoint = class extends Endpoint {
   async updateDataset(dataset_uuid, data, start_auto_annotate = true) {
     return this.request(`/datasets/${dataset_uuid}?start_auto_annotate=${start_auto_annotate}`, {
       method: "PATCH",
-      body: JSON.stringify(data)
+      body: JSON.stringify(data),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async updateDatasetHeroAsset(dataset_uuid, update) {
     return this.request(`/datasets/${dataset_uuid}/hero_asset`, {
       method: "PATCH",
-      body: JSON.stringify(update)
+      body: JSON.stringify(update),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async deleteDataset(dataset_uuid) {
@@ -11114,6 +11299,30 @@ var DataEndpoint = class extends Endpoint {
       method: "DELETE"
     });
   }
+  async createDatasetAutoAnnotate(create, dataset_uuid, dataset_version) {
+    const versionQuery = dataset_version ? `dataset_version=${dataset_version}&` : "";
+    return this.request(`/datasets/${dataset_uuid}/auto_annotates?${versionQuery}`, {
+      method: "POST",
+      body: JSON.stringify(create),
+      headers: { "Content-Type": "application/json" }
+    });
+  }
+  async updateDatasetAutoAnnotate(update, dataset_uuid, auto_annotate, source, dataset_version) {
+    const versionQuery = dataset_version ? `dataset_version=${dataset_version}&` : "";
+    return this.request(`/datasets/${dataset_uuid}/auto_annotates?auto_annotate=${auto_annotate}&source=${encodeURIComponent(source)}&${versionQuery}`, {
+      method: "PATCH",
+      body: JSON.stringify(update),
+      headers: { "Content-Type": "application/json" }
+    });
+  }
+  async listDatasetAutoAnnotates(dataset_uuid, auto_annotate, source, dataset_version) {
+    const versionQuery = dataset_version ? `dataset_version=${dataset_version}&` : "";
+    const autoAnnotateQuery = auto_annotate ? `auto_annotate=${auto_annotate}&` : "";
+    const sourceQuery = source ? `source=${source}&` : "";
+    return this.request(`/datasets/${dataset_uuid}/auto_annotates?${versionQuery}&${autoAnnotateQuery}&${sourceQuery}`, {
+      method: "GET"
+    });
+  }
   // Asset methods
   async uploadAsset(dataset_uuid, dataset_version, blob, external_id = void 0) {
     const versionQuery = dataset_version ? `&dataset_version=${dataset_version}` : "";
@@ -11182,7 +11391,8 @@ var DataEndpoint = class extends Endpoint {
     const datasetQuery = dataset_uuid ? `&dataset_uuid=${dataset_uuid}` : "";
     return this.request(`/assets/${asset_uuid}/ground_truth?${datasetQuery}${versionQuery}`, {
       method: "PATCH",
-      body: JSON.stringify(predictions)
+      body: JSON.stringify(predictions),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async deleteAssetGroundTruth(asset_uuid, dataset_uuid, dataset_version) {
@@ -11202,23 +11412,45 @@ var DataEndpoint = class extends Endpoint {
       method: "PATCH"
     });
   }
+  async addAssetAnnotation(asset_uuid, dataset_uuid, dataset_version, predictions, auto_annotate, source, user_review, approved_threshold) {
+    const datasetQuery = dataset_uuid ? `dataset_uuid=${dataset_uuid}&` : "";
+    const versionQuery = dataset_version ? `&dataset_version=${dataset_version}&` : "";
+    const autoAnnotateQuery = auto_annotate ? `&auto_annotate=${auto_annotate}&` : "";
+    const sourceQuery = source ? `&source=${encodeURIComponent(source)}&` : "";
+    const userReviewQuery = user_review ? `&user_review=${user_review}&` : "";
+    const approvedThresholdQuery = typeof approved_threshold !== "undefined" ? `&approved_threshold=${approved_threshold}&` : "";
+    return this.request(`/assets/${asset_uuid}/annotations?${datasetQuery}${versionQuery}${autoAnnotateQuery}${sourceQuery}${userReviewQuery}${approvedThresholdQuery}`, {
+      method: "POST",
+      body: JSON.stringify(predictions),
+      headers: { "Content-Type": "application/json" }
+    });
+  }
+  async updateAssetAnnotationApproval(asset_uuid, dataset_uuid, dataset_version, auto_annotate, source, user_review, approved_threshold) {
+    const datasetQuery = dataset_uuid ? `dataset_uuid=${dataset_uuid}&` : "";
+    const versionQuery = dataset_version ? `&dataset_version=${dataset_version}&` : "";
+    const autoAnnotateQuery = auto_annotate ? `&auto_annotate=${auto_annotate}&` : "";
+    const sourceQuery = source ? `&source=${encodeURIComponent(source)}&` : "";
+    const userReviewQuery = user_review ? `&user_review=${user_review}&` : "";
+    const approvedThresholdQuery = approved_threshold ? `&approved_threshold=${approved_threshold}&` : "";
+    return this.request(`/assets/${asset_uuid}/annotations?${datasetQuery}${versionQuery}${autoAnnotateQuery}${sourceQuery}${userReviewQuery}${approvedThresholdQuery}`, {
+      method: "PATCH"
+    });
+  }
   async downloadAsset(asset_uuid, dataset_uuid, dataset_version, transcode_mode = "original" /* original */, start_timestamp, end_timestamp, url_type) {
     const versionQuery = dataset_version ? `&dataset_version=${dataset_version}` : "";
     const datasetQuery = dataset_uuid ? `&dataset_uuid=${dataset_uuid}` : "";
     const startTimestampQuery = start_timestamp ? `&start_timestamp=${start_timestamp}` : "";
     const endTimestampQuery = end_timestamp ? `&end_timestamp=${end_timestamp}` : "";
     const urlTypeQuery = url_type ? `&url_type=${url_type}` : "";
-    return this.request(
-      `/assets/${asset_uuid}/download?transcode_mode=${transcode_mode}${datasetQuery}${versionQuery}${startTimestampQuery}${endTimestampQuery}${urlTypeQuery}`,
-      {
-        method: "GET"
-      }
-    );
+    return this.request(`/assets/${asset_uuid}/download?transcode_mode=${transcode_mode}${datasetQuery}${versionQuery}${startTimestampQuery}${endTimestampQuery}${urlTypeQuery}`, {
+      method: "GET"
+    });
   }
   async previewAutoAnnotateAsset(asset_uuid, auto_annotate, auto_annotate_params) {
     return this.request(`/assets/${asset_uuid}/preview_auto_annotate?auto_annotate=${auto_annotate}`, {
       method: "POST",
-      body: auto_annotate_params ? JSON.stringify(auto_annotate_params) : null
+      body: auto_annotate_params ? JSON.stringify(auto_annotate_params) : null,
+      headers: auto_annotate_params ? { "Content-Type": "application/json" } : {}
     });
   }
   // Model methods
@@ -11235,7 +11467,8 @@ var DataEndpoint = class extends Endpoint {
   async createModel(dataset_uuid, dataset_version, data, start_training = true) {
     return this.request(`/models?dataset_uuid=${dataset_uuid}&dataset_version=${dataset_version}&start_training=${start_training}`, {
       method: "POST",
-      body: JSON.stringify(data)
+      body: JSON.stringify(data),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async getModel(model_uuid) {
@@ -11251,7 +11484,8 @@ var DataEndpoint = class extends Endpoint {
   async updateModel(model_uuid, data) {
     return this.request(`/models/${model_uuid}`, {
       method: "PATCH",
-      body: JSON.stringify(data)
+      body: JSON.stringify(data),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async deleteModel(model_uuid) {
@@ -11275,7 +11509,8 @@ var DataEndpoint = class extends Endpoint {
     }
     await this.request(`/models/${model_uuid}/exports/qc_ai_hub`, {
       method: "POST",
-      body: JSON.stringify(params)
+      body: JSON.stringify(params),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async downloadModelArtifacts(model_uuid, model_formats, device_name, artifact_type) {
@@ -11347,7 +11582,8 @@ var DataEndpoint = class extends Endpoint {
   async startWorkflow(account_uuid, template_name, workflow) {
     return this.request(`/workflows?account_uuid=${account_uuid}&template_name=${template_name}`, {
       method: "POST",
-      body: JSON.stringify(workflow)
+      body: JSON.stringify(workflow),
+      headers: { "Content-Type": "application/json" }
     });
   }
   async getWorkflow(workflow_id, account_uuid) {
@@ -11364,6 +11600,61 @@ var DataEndpoint = class extends Endpoint {
       method: "GET"
     });
   }
+  async inferAsset(asset_uuid, infer_request, dataset_uuid, dataset_version, transcode_mode, start_timestamp, end_timestamp) {
+    const datasetQuery = dataset_uuid ? `dataset_uuid=${dataset_uuid}&` : "";
+    const versionQuery = dataset_version ? `dataset_version=${dataset_version}&` : "";
+    const transcodeModeQuery = transcode_mode ? `transcode_mode=${transcode_mode}&` : "";
+    const startTimestampQuery = start_timestamp ? `start_timestamp=${start_timestamp}&` : "";
+    const endTimestampQuery = end_timestamp ? `end_timestamp=${end_timestamp}&` : "";
+    const assetUrl = `ai.eyepop://data/assets/${asset_uuid}?${transcodeModeQuery}${datasetQuery}${versionQuery}${startTimestampQuery}${endTimestampQuery}`;
+    if (!this.vlmApiUrl || !this._client || !this._limit) {
+      throw new Error("endpoint not connected, use connect()");
+    }
+    await this._limit.acquire();
+    try {
+      this.updateState();
+      const job = new InferAssetJob(
+        assetUrl,
+        infer_request,
+        async (path2, options) => {
+          return await this.request(path2, options, false, "vlm" /* vlm */);
+        },
+        this._requestLogger
+      );
+      return job.start(() => {
+        this.jobDone(job);
+      });
+    } catch (e) {
+      this._limit.release();
+      throw e;
+    }
+  }
+  async evaluateDataset(evaluate_request, worker_release) {
+    if (!this.vlmApiUrl || !this._client || !this._limit) {
+      throw new Error("endpoint not connected, use connect()");
+    }
+    await this._limit.acquire();
+    try {
+      this.updateState();
+      const job = new EvaluateDatasetJob(
+        evaluate_request,
+        worker_release ?? null,
+        async (path2, options) => {
+          return await this.request(path2, options, false, "vlm" /* vlm */);
+        },
+        this._requestLogger
+      );
+      return job.start(() => {
+        this.jobDone(job);
+      });
+    } catch (e) {
+      this._limit.release();
+      throw e;
+    }
+  }
+  jobDone(job) {
+    this._limit?.release();
+  }
   async dispatchChangeEvent(change_event) {
     switch (change_event.change_type) {
       // account event types
@@ -11607,13 +11898,16 @@ var index_default = EyePop;
   ArtifactType,
   AssetStatus,
   AssetUrlType,
+  AutoAnnotateStatus,
   AutoAnnotateTask,
   ChangeType,
   ContourType,
   DEFAULT_PREDICTION_VERSION,
+  DataApiType,
   DataEndpoint,
   Endpoint,
   EndpointState,
+  EvaluationStatus,
   ExportedBy,
   EyePop,
   EyepopLineDecoder,
@@ -11645,6 +11939,7 @@ var index_default = EyePop;
   WebrtcWhip,
   WorkerEndpoint,
   WorkflowPhase,
+  getBaseUrl,
   readableStreamFromString
 });
 /*! Bundled license information: