@eyepop.ai/eyepop 3.22.0 → 3.23.0

package/dist/eyepop.index.mjs

@@ -9311,6 +9311,7 @@ function validateCamera(camera) {
 var PredictionVersion = /* @__PURE__ */ ((PredictionVersion3) => {
   PredictionVersion3[PredictionVersion3["V1"] = 1] = "V1";
   PredictionVersion3[PredictionVersion3["V2"] = 2] = "V2";
+  PredictionVersion3[PredictionVersion3["V3"] = 3] = "V3";
   return PredictionVersion3;
 })(PredictionVersion || {});
 var DEFAULT_PREDICTION_VERSION = 2 /* V2 */;
@@ -9331,8 +9332,17 @@ var ForwardOperatorType = /* @__PURE__ */ ((ForwardOperatorType2) => {
   ForwardOperatorType2["FULL"] = "full";
   ForwardOperatorType2["CROP"] = "crop";
   ForwardOperatorType2["CROP_WITH_FULL_FALLBACK"] = "crop_with_full_fallback";
+  ForwardOperatorType2["SELECT_CROP"] = "select_crop";
+  ForwardOperatorType2["SELECT_FULL"] = "select_full";
   return ForwardOperatorType2;
 })(ForwardOperatorType || {});
+var SelectMode = /* @__PURE__ */ ((SelectMode2) => {
+  SelectMode2["MOST_RELEVANT"] = "most_relevant";
+  return SelectMode2;
+})(SelectMode || {});
+function isSelectOperator(operator) {
+  return operator?.type === "select_crop" /* SELECT_CROP */ || operator?.type === "select_full" /* SELECT_FULL */;
+}
 var InferenceType = /* @__PURE__ */ ((InferenceType2) => {
   InferenceType2["IMAGE_CLASSIFICATION"] = "image_classification";
   InferenceType2["OBJECT_DETECTION"] = "object_detection";
@@ -9369,6 +9379,52 @@ function validatePop(pop) {
   if (pop.defaults?.camera !== void 0) {
     validateCamera(pop.defaults.camera);
   }
+  validateForwards(pop.components);
+}
+function popSelects(pop) {
+  const selects = (components) => (components ?? []).some((component) => isSelectOperator(component.forward?.operator) || selects(component.forward?.targets));
+  return selects(pop?.components);
+}
+function validateForwards(components) {
+  for (const component of components ?? []) {
+    const operator = component.forward?.operator;
+    if (operator !== void 0) {
+      validateSelectOperator(operator);
+    }
+    validateForwards(component.forward?.targets);
+  }
+}
+function validateSelectOperator(operator) {
+  if (!isSelectOperator(operator)) {
+    if (operator.select !== void 0) {
+      throw new Error("select is only valid with the select_crop or select_full operator");
+    }
+    return;
+  }
+  const select = operator.select;
+  if (select === void 0) {
+    throw new Error(`${operator.type} requires a select block`);
+  }
+  if (select.mode !== void 0 && select.mode !== "most_relevant" /* MOST_RELEVANT */) {
+    throw new Error(`select mode ${select.mode} is not supported, the only mode is ${"most_relevant" /* MOST_RELEVANT */}`);
+  }
+  if (select.relevancyModel !== void 0 && select.relevancyModelUuid !== void 0) {
+    throw new Error("select can only have one of relevancyModelUuid or relevancyModel");
+  }
+  if (select.minTrackLengthSeconds !== void 0 && select.minTrackLengthSeconds < 0) {
+    throw new Error("select minTrackLengthSeconds cannot be negative");
+  }
+  if (select.intervalSeconds !== void 0 && select.intervalSeconds <= 0) {
+    throw new Error("select intervalSeconds must be positive");
+  }
+  if (operator.crop !== void 0) {
+    if (operator.type !== "select_crop" /* SELECT_CROP */) {
+      throw new Error(`crop options are only valid with select_crop, not ${operator.type}`);
+    }
+    if (operator.crop.maxItems !== void 0) {
+      throw new Error("select_crop forwards one detection per selection, maxItems does not apply");
+    }
+  }
 }
 
 // worker/webrtc_whip.ts
@@ -9821,8 +9877,8 @@ var UploadJob = class extends AbstractJob {
   get [Symbol.toStringTag]() {
     return "uploadJob";
   }
-  constructor(stream, mimeType, size, videoMode, params, getSession, client, requestLogger, uploadBodyFactory) {
-    super(params, getSession, client, requestLogger);
+  constructor(stream, mimeType, size, videoMode, params, getSession, client, requestLogger, uploadBodyFactory, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     this._uploadStream = stream;
     this._uploadBodyFactory = uploadBodyFactory;
     this._mimeType = mimeType;
@@ -10015,8 +10071,8 @@ var UploadJob = class extends AbstractJob {
   }
 };
 var LoadFromJob = class extends AbstractJob {
-  constructor(location, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
+  constructor(location, params, getSession, client, requestLogger, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     this._location = location;
   }
   get [Symbol.toStringTag]() {
@@ -10062,8 +10118,8 @@ var UploadGroupJob = class extends AbstractJob {
   get [Symbol.toStringTag]() {
     return "uploadGroupJob";
   }
-  constructor(sources, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
+  constructor(sources, params, getSession, client, requestLogger, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     if (sources.length === 0) {
       throw new Error("upload group requires at least one source");
     }
@@ -10124,8 +10180,8 @@ var LoadFromGroupJob = class extends AbstractJob {
   get [Symbol.toStringTag]() {
     return "loadFromGroupJob";
   }
-  constructor(urls, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
+  constructor(urls, params, getSession, client, requestLogger, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     if (urls.length === 0) {
       throw new Error("load from group requires at least one url");
     }
@@ -10170,8 +10226,8 @@ var LoadFromGroupJob = class extends AbstractJob {
   }
 };
 var LoadFromAssetUuidJob = class extends AbstractJob {
-  constructor(assetUuid, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
+  constructor(assetUuid, params, getSession, client, requestLogger, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     this._assetUuid = assetUuid;
   }
   get [Symbol.toStringTag]() {
@@ -10211,8 +10267,8 @@ var LoadFromAssetUuidJob = class extends AbstractJob {
   }
 };
 var LoadMediaStreamJob = class extends AbstractJob {
-  constructor(mediaStream, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
+  constructor(mediaStream, params, getSession, client, requestLogger, version = DEFAULT_PREDICTION_VERSION) {
+    super(params, getSession, client, requestLogger, version);
     this._mediaStream = mediaStream;
   }
   get [Symbol.toStringTag]() {
@@ -10856,6 +10912,14 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     }
     return this.options().pop || null;
   }
+  /**
+   * A select forward's results come only at V3. Only a Pop that selects asks
+   * for it, so a worker too old to know V3 - which also rejects that Pop - is
+   * never sent a version it would not accept.
+   */
+  predictionVersion() {
+    return popSelects(this.pop()) ? 3 /* V3 */ : DEFAULT_PREDICTION_VERSION;
+  }
   async changePop(pop) {
     validatePop(pop);
     if (this.options().popId == "transient" /* Transient */) {
@@ -10984,7 +11048,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return { stream: streamSource.stream, mimeType: streamSource.mimeType };
         })
       );
-      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger);
+      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger, this.predictionVersion());
       return job.start(
         () => {
           this.jobDone(job);
@@ -11016,7 +11080,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
         stream,
         mimeType: mimeTypes?.[i] ?? null
       }));
-      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger);
+      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger, this.predictionVersion());
       return job.start(
         () => {
           this.jobDone(job);
@@ -11041,7 +11105,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     await this._limit.acquire();
     try {
       this.updateState();
-      const job = new LoadFromGroupJob(urls, params, async () => this.session(), this._client, this._requestLogger);
+      const job = new LoadFromGroupJob(urls, params, async () => this.session(), this._client, this._requestLogger, this.predictionVersion());
       return job.start(
         () => {
           this.jobDone(job);
@@ -11073,7 +11137,9 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return this.session();
         },
         this._client,
-        this._requestLogger
+        this._requestLogger,
+        void 0,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -11106,7 +11172,9 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return this.session();
         },
         this._client,
-        this._requestLogger
+        this._requestLogger,
+        void 0,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -11155,7 +11223,8 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
         },
         this._client,
         this._requestLogger,
-        uploadBodyFactory
+        uploadBodyFactory,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -11193,7 +11262,8 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return this.session();
         },
         this._client,
-        this._requestLogger
+        this._requestLogger,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -11223,7 +11293,8 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return this.session();
         },
         this._client,
-        this._requestLogger
+        this._requestLogger,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -11253,7 +11324,8 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return this.session();
         },
         this._client,
-        this._requestLogger
+        this._requestLogger,
+        this.predictionVersion()
       );
       return job.start(
         () => {
@@ -13410,6 +13482,7 @@ export {
   PopComponentType,
   PredictionVersion,
   QUATERNION_TOLERANCE,
+  SelectMode,
   Semaphore,
   Stream,
   TaskMode,
@@ -13436,6 +13509,8 @@ export {
   index_default as default,
   encodeMultipartFormData,
   getBaseUrl,
+  isSelectOperator,
+  popSelects,
   randomMultipartBoundary,
   readableStreamFromString,
   resolveAuth,