@eyepop.ai/eyepop 0.23.0 → 1.0.1

package/dist/eyepop.index.mjs

@@ -10056,40 +10056,30 @@ var WorkerEndpoint = class extends Endpoint {
   popName() {
     return this._popName;
   }
-  popComp() {
+  pop() {
     if (this._pipeline) {
-      return this._pipeline.inferPipeline;
+      return this._pipeline.pop || null;
     } else {
       return null;
     }
   }
-  postTransform() {
-    if (this._pipeline) {
-      return this._pipeline.postTransform;
-    } else {
-      return null;
-    }
-  }
-  async changePopComp(popComp, modelRefs = []) {
+  async changePop(pop) {
     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,
-      "modelRefs": modelRefs
-    };
     let response = await this.fetchWithRetry(async () => {
       const session = await this.session();
       let headers = {
         "Authorization": `Bearer ${session.accessToken}`,
         "Content-Type": "application/json"
       };
-      const patch_url = `${session.baseUrl}/pipelines/${session.pipelineId}/inferencePipeline`;
+      const patch_url = `${session.baseUrl}/pipelines/${session.pipelineId}/pop`;
+      this._requestLogger.debug("before PATCH %s - %s", patch_url, JSON.stringify(pop));
       return client.fetch(patch_url, {
         method: "PATCH",
-        body: JSON.stringify(body),
+        body: JSON.stringify(pop),
         headers
       });
     });
@@ -10098,40 +10088,9 @@ var WorkerEndpoint = class extends Endpoint {
       console.error(message);
       return Promise.reject(`Unexpected status ${response.status}: ${message}`);
     }
+    this._requestLogger.debug("after PATCH pop");
     if (this._pipeline) {
-      this._pipeline.inferPipeline = popComp;
-      this._pipeline.modelRefs = modelRefs;
-    }
-  }
-  async changePostTransform(postTransform) {
-    const client = this._client;
-    const baseUrl = this._baseUrl;
-    if (!baseUrl || !client) {
-      return Promise.reject("endpoint not connected, use connect() before changePopComp()");
-    }
-    postTransform = postTransform ? postTransform : null;
-    const body = {
-      "transform": postTransform
-    };
-    let response = await this.fetchWithRetry(async () => {
-      const session = await this.session();
-      let headers = {
-        "Authorization": `Bearer ${session.accessToken}`,
-        "Content-Type": "application/json"
-      };
-      const patch_url = `${session.baseUrl}/pipelines/${session.pipelineId}/postTransform`;
-      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}`);
-    }
-    if (this._pipeline) {
-      this._pipeline.postTransform = postTransform;
+      this._pipeline.pop = pop;
     }
   }
   popId() {
@@ -10396,7 +10355,7 @@ var WorkerEndpoint = class extends Endpoint {
         }
       }
       if (this.options().popId == "transient" /* Transient */) {
-        this._pipelineId = await this.startPopLessPipeline();
+        this._pipelineId = await this.startTransientPipeline();
         this._popName = this.options().popId || null;
       } else {
         this._pipelineId = config.pipeline_id;
@@ -10444,39 +10403,23 @@ var WorkerEndpoint = class extends Endpoint {
     this.updateState();
     return Promise.resolve(this);
   }
-  async startPopLessPipeline() {
+  async startTransientPipeline() {
     const client = this._client;
     const baseUrl = this._baseUrl;
     const sandboxId = this._sandboxId;
     if (client == null || baseUrl == null) {
       return Promise.reject("endpoint not initialized");
     }
-    let pipeline;
-    if (this._pipeline) {
-      pipeline = this._pipeline.inferPipeline;
-    } else {
-      pipeline = "identity";
-    }
-    let postTransform;
-    if (this._pipeline && this._pipeline.postTransform) {
-      postTransform = this._pipeline.postTransform;
-    } else {
-      postTransform = null;
-    }
-    let modelRefs;
-    if (this._pipeline && this._pipeline.modelRefs) {
-      modelRefs = this._pipeline.modelRefs;
+    let pop;
+    if (this._pipeline && this._pipeline.pop) {
+      pop = this._pipeline.pop;
     } else {
-      modelRefs = [];
+      pop = {
+        components: []
+      };
     }
     const body = {
-      "inferPipelineDef": {
-        "pipeline": pipeline,
-        "modelRefs": modelRefs
-      },
-      "postTransformDef": {
-        "transform": postTransform
-      },
+      "pop": pop,
       "source": {
         "sourceType": "NONE"
       },
@@ -10941,7 +10884,7 @@ var DataEndpoint = class extends Endpoint {
     const client = this._client;
     const baseUrl = this._baseUrl;
     if (!baseUrl || !client) {
-      return Promise.reject("endpoint not connected, use connect() before changePopComp()");
+      return Promise.reject("endpoint not connected");
     }
     let response = await this.fetchWithRetry(async () => {
       const session = await this.session();
@@ -11216,6 +11159,41 @@ var ModelPrecisionType = /* @__PURE__ */ ((ModelPrecisionType2) => {
   ModelPrecisionType2["uint8"] = "uint8";
   return ModelPrecisionType2;
 })(ModelPrecisionType || {});
+var PopComponentType = /* @__PURE__ */ ((PopComponentType2) => {
+  PopComponentType2["FORWARD"] = "forward";
+  PopComponentType2["INFERENCE"] = "inference";
+  PopComponentType2["TRACING"] = "tracing";
+  PopComponentType2["CONTOUR_FINDER"] = "contour_finder";
+  PopComponentType2["COMPONENT_FINDER"] = "component_finder";
+  return PopComponentType2;
+})(PopComponentType || {});
+var ForwardOperatorType = /* @__PURE__ */ ((ForwardOperatorType2) => {
+  ForwardOperatorType2["FULL"] = "full";
+  ForwardOperatorType2["CROP"] = "crop";
+  ForwardOperatorType2["CROP_WITH_FULL_FALLBACK"] = "crop_with_full_fallback";
+  return ForwardOperatorType2;
+})(ForwardOperatorType || {});
+var InferenceType = /* @__PURE__ */ ((InferenceType2) => {
+  InferenceType2["IMAGE_CLASSIFICATION"] = "image_classification";
+  InferenceType2["OBJECT_DETECTION"] = "object_detection";
+  InferenceType2["KEY_POINTS"] = "key_points";
+  InferenceType2["OCR"] = "ocr";
+  InferenceType2["MESH"] = "mesh";
+  InferenceType2["FEATURE_VECTOR"] = "feature_vector";
+  InferenceType2["SEMANTIC_SEGMENTATION"] = "semantic_segmentation";
+  InferenceType2["SEGMENTATION"] = "segmentation";
+  return InferenceType2;
+})(InferenceType || {});
+var ContourType = /* @__PURE__ */ ((ContourType2) => {
+  ContourType2["ALL_PIXELS"] = "all_pixels";
+  ContourType2["POLYGON"] = "polygon";
+  ContourType2["CONVEX_HULL"] = "convex_hull";
+  ContourType2["HOUGH_CIRCLES"] = "hough_circles";
+  ContourType2["CIRCLE"] = "circle";
+  ContourType2["TRIANGLE"] = "triangle";
+  ContourType2["RECTANGLE"] = "rectangle";
+  return ContourType2;
+})(ContourType || {});
 
 // index.ts
 var readEnv = (env) => {
@@ -11316,16 +11294,20 @@ export {
   AnnotationType,
   AssetStatus,
   ChangeType,
+  ContourType,
   DataEndpoint,
   Endpoint,
   EndpointState,
   EyePop,
+  ForwardOperatorType,
+  InferenceType,
   LoadFromJob,
   LoadLiveIngressJob,
   ModelFormat,
   ModelPrecisionType,
   ModelStatus,
   ModelType,
+  PopComponentType,
   Semaphore,
   Stream,
   TranscodeMode,