@eyepop.ai/eyepop 3.17.2 → 3.18.0

package/README.md

@@ -54,7 +54,6 @@ Create transient sessions with a pop when the worker endpoint is constructed. Th
 
 ```typescript
 import { EyePop } from '@eyepop.ai/eyepop'
-
 ;(async () => {
     const endpoint = await EyePop.workerEndpoint({
         pop: {
@@ -105,10 +104,20 @@ You can also pass the key explicitly from server-side configuration:
 
 ```typescript
 const endpoint = await EyePop.workerEndpoint({
-    auth: { apiKey: process.env.EYEPOP_API_KEY },
+    apiKey: process.env.EYEPOP_API_KEY,
 }).connect()
 ```
 
+`accessToken` is accepted as the same bearer credential shape:
+
+```typescript
+const endpoint = await EyePop.workerEndpoint({
+    accessToken: process.env.EYEPOP_ACCESS_TOKEN,
+}).connect()
+```
+
+The nested `auth` option is still supported but deprecated. Pass `apiKey`, `accessToken`, `session`, or `oAuth2` at the top level for new code.
+
 ### Persistent Sessions
 
 If EyePop has provisioned a persistent worker session for your deployment, set `EYEPOP_SESSION_UUID` in the trusted server environment or pass `sessionUuid` explicitly.
@@ -120,7 +129,6 @@ export EYEPOP_SESSION_UUID=<your_session_uuid>
 
 ```typescript
 import { EyePop } from '@eyepop.ai/eyepop'
-
 ;(async () => {
     const endpoint = await EyePop.workerEndpoint({
         sessionUuid: process.env.EYEPOP_SESSION_UUID,
@@ -175,7 +183,7 @@ Dashboard users can run local browser demos with the current browser session:
 ```html
 <script>
     document.addEventListener('DOMContentLoaded', async () => {
-        const endpoint = await EyePop.workerEndpoint({ auth: { oAuth2: true } }).connect()
+        const endpoint = await EyePop.workerEndpoint({ oAuth2: true }).connect()
         try {
             await endpoint.changePop({
                 components: [
@@ -248,10 +256,7 @@ const stream2 = Readable.toWeb(fs.createReadStream('b.jpg'))
 const results = await endpoint.uploadStreamGroup([stream1, stream2], ['image/jpeg', 'image/jpeg'])
 
 // Remote URLs (the server fetches each)
-const results = await endpoint.loadFromGroup([
-    'https://example.com/a.jpg',
-    'https://example.com/b.jpg',
-])
+const results = await endpoint.loadFromGroup(['https://example.com/a.jpg', 'https://example.com/b.jpg'])
 ```
 
 Image order is preserved end-to-end. A group may contain **up to 16 images** (enforced server-side). The pop's ability must be multi-image-capable; a single-image ability handed a group returns an error.

package/dist/eyepop.index.d.mts

@@ -69,6 +69,7 @@ interface Prediction extends StreamTime {
     meshs?: Array<PredictedMesh>;
     keyPoints?: Array<PredictedKeyPoints>;
     embeddings?: Array<PredictedEmbedding>;
+    details?: Array<Map<string, any>>;
     motions?: Array<PredictedMotion>;
 }
 interface PredictedClass {
@@ -114,6 +115,7 @@ interface PredictedObject extends PredictedClass {
     texts?: Array<PredictedText>;
     meshs?: Array<PredictedMesh>;
     keyPoints?: Array<PredictedKeyPoints>;
+    details?: Array<Map<string, any>>;
 }
 interface Point2d {
     x: number;
@@ -933,6 +935,12 @@ interface ApiKeyAuth {
      */
     apiKey: string;
 }
+interface AccessTokenAuth {
+    /**
+     * Bearer token accepted by the compute API.
+     */
+    accessToken: string;
+}
 interface SessionAuth {
     /**
      * Temporary authentication token for client side execution.
@@ -951,7 +959,10 @@ interface LocalAuth {
      */
     isLocal: true;
 }
-type Authentication = undefined | ApiKeyAuth | SessionAuth | OAuth2Auth | LocalAuth;
+type Authentication = undefined | ApiKeyAuth | AccessTokenAuth | SessionAuth | OAuth2Auth | LocalAuth;
+declare function resolveAuth(options: Options): Authentication;
+declare function apiKeyCredential(auth: Authentication): string | undefined;
+declare function accessTokenCredential(auth: Authentication): string | undefined;
 interface HttpClient {
     fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
     close(): Promise<void>;
@@ -962,6 +973,26 @@ interface PlatformSupport {
     resolvePath: (source: PathSource, logger: Logger) => Promise<StreamSource>;
 }
 interface Options {
+    /**
+     * Authentication api key for server side execution.
+     * Defaults to process.env['EYEPOP_API_KEY'].
+     */
+    apiKey?: string | undefined;
+    /**
+     * Bearer token accepted by the compute API.
+     */
+    accessToken?: string | undefined;
+    /**
+     * Temporary authentication token for client side execution.
+     */
+    session?: Session | undefined;
+    /**
+     * For development mode, authenticate with your dashboard.eyepop.ai account
+     */
+    oAuth2?: true | Auth0Options | undefined;
+    /**
+     * @deprecated Pass apiKey, accessToken, session, or oAuth2 at the top level.
+     */
     auth?: Authentication | undefined;
     eyepopUrl?: string | undefined;
     jobQueueLength?: number;
@@ -1467,4 +1498,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { type AbilityAliasEntry, AbstractJob, type AliasResolution, type Annotation, AnnotationInclusionMode, AnnotationType, type ApiKeyAuth, type Area, AreaType, ArtifactType, type Asset, type AssetImport, AssetInclusionMode, AssetStatus, AssetUrlType, type AssetUuidSource, type Auth0Options, type Authentication, type AutoAnnotate, type AutoAnnotateParams, type AutoAnnotatePrompt, AutoAnnotateStatus, AutoAnnotateTask, type AutoPromptConfig, type AutoTask, type BaseArea, type BaseComponent, type BaseTask, type Box, type ChangeEvent, ChangeType, type ClassificationTask, type ComponentFinderComponent, type ComponentParams, type Contour, type ContourArea, type ContourFinderComponent, ContourType, type CreateWorkflow, type CreateWorkflowConfig, DEFAULT_PREDICTION_VERSION, DataApiType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetAutoAnnotate, type DatasetAutoAnnotateCreate, type DatasetAutoAnnotateUpdate, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetParent, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, type DownloadResponse, Endpoint, EndpointState, type EvaluateConfig, type EvaluateFilter, type EvaluateRequest, type EvaluateResponse, type EvaluateRunInfo, EvaluationStatus, ExportedBy, EyePop, EyepopLineDecoder, type FileSource, type ForwardComponent, ForwardOperatorType, type HttpClient, type InferRequest, type InferRunInfo, type InferRuntimeConfig, type InferenceComponent, InferenceType, type ListWorkFlowItem, type ListWorkFlowItemMetadata, type ListWorkflowItemMetadataLabels, LoadFromAssetUuidJob, LoadFromGroupJob, LoadFromJob, LoadMediaStreamJob, type LocalAuth, type Mask, type MediaStreamSource, type Model, type ModelCreate, type ModelExport, ModelExportStatus, ModelFormat, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, ModelTask, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type MotionDetectConfig, MotionModel, type MultipartContent, type MultipartPart, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type PlatformSupport, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedEmbedding, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedMotion, type PredictedObject, type PredictedText, type Prediction, PredictionVersion, type ProcessParams, type ProcessRequest, type QcAiHubExportParams, type RectangleArea, type ResultStream, type Roi, Semaphore, type Session, type SessionAuth, type Source, Stream, type StreamEvent, type StreamSource, type StreamTime, TaskMode, TaskType, type TimeSpan, type TrackingComponent, TranscodeMode, type TransformInto, TransientPopId, UploadGroupJob, UploadJob, type UploadSource, type UrlSource, UserReview, VideoMode, type VlmAbility, type VlmAbilityCreate, type VlmAbilityGroup, type VlmAbilityGroupCreate, type VlmAbilityGroupUpdate, VlmAbilityStatus, type VlmAbilityUpdate, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, type Workflow, WorkflowPhase, EyePop as default, encodeMultipartFormData, getBaseUrl, randomMultipartBoundary, readableStreamFromString };
+export { type AbilityAliasEntry, AbstractJob, type AccessTokenAuth, type AliasResolution, type Annotation, AnnotationInclusionMode, AnnotationType, type ApiKeyAuth, type Area, AreaType, ArtifactType, type Asset, type AssetImport, AssetInclusionMode, AssetStatus, AssetUrlType, type AssetUuidSource, type Auth0Options, type Authentication, type AutoAnnotate, type AutoAnnotateParams, type AutoAnnotatePrompt, AutoAnnotateStatus, AutoAnnotateTask, type AutoPromptConfig, type AutoTask, type BaseArea, type BaseComponent, type BaseTask, type Box, type ChangeEvent, ChangeType, type ClassificationTask, type ComponentFinderComponent, type ComponentParams, type Contour, type ContourArea, type ContourFinderComponent, ContourType, type CreateWorkflow, type CreateWorkflowConfig, DEFAULT_PREDICTION_VERSION, DataApiType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetAutoAnnotate, type DatasetAutoAnnotateCreate, type DatasetAutoAnnotateUpdate, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetParent, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, type DownloadResponse, Endpoint, EndpointState, type EvaluateConfig, type EvaluateFilter, type EvaluateRequest, type EvaluateResponse, type EvaluateRunInfo, EvaluationStatus, ExportedBy, EyePop, EyepopLineDecoder, type FileSource, type ForwardComponent, ForwardOperatorType, type HttpClient, type InferRequest, type InferRunInfo, type InferRuntimeConfig, type InferenceComponent, InferenceType, type ListWorkFlowItem, type ListWorkFlowItemMetadata, type ListWorkflowItemMetadataLabels, LoadFromAssetUuidJob, LoadFromGroupJob, LoadFromJob, LoadMediaStreamJob, type LocalAuth, type Mask, type MediaStreamSource, type Model, type ModelCreate, type ModelExport, ModelExportStatus, ModelFormat, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, ModelTask, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type MotionDetectConfig, MotionModel, type MultipartContent, type MultipartPart, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type PlatformSupport, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedEmbedding, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedMotion, type PredictedObject, type PredictedText, type Prediction, PredictionVersion, type ProcessParams, type ProcessRequest, type QcAiHubExportParams, type RectangleArea, type ResultStream, type Roi, Semaphore, type Session, type SessionAuth, type Source, Stream, type StreamEvent, type StreamSource, type StreamTime, TaskMode, TaskType, type TimeSpan, type TrackingComponent, TranscodeMode, type TransformInto, TransientPopId, UploadGroupJob, UploadJob, type UploadSource, type UrlSource, UserReview, VideoMode, type VlmAbility, type VlmAbilityCreate, type VlmAbilityGroup, type VlmAbilityGroupCreate, type VlmAbilityGroupUpdate, VlmAbilityStatus, type VlmAbilityUpdate, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, type Workflow, WorkflowPhase, accessTokenCredential, apiKeyCredential, EyePop as default, encodeMultipartFormData, getBaseUrl, randomMultipartBoundary, readableStreamFromString, resolveAuth };

package/dist/eyepop.index.d.ts

@@ -69,6 +69,7 @@ interface Prediction extends StreamTime {
     meshs?: Array<PredictedMesh>;
     keyPoints?: Array<PredictedKeyPoints>;
     embeddings?: Array<PredictedEmbedding>;
+    details?: Array<Map<string, any>>;
     motions?: Array<PredictedMotion>;
 }
 interface PredictedClass {
@@ -114,6 +115,7 @@ interface PredictedObject extends PredictedClass {
     texts?: Array<PredictedText>;
     meshs?: Array<PredictedMesh>;
     keyPoints?: Array<PredictedKeyPoints>;
+    details?: Array<Map<string, any>>;
 }
 interface Point2d {
     x: number;
@@ -933,6 +935,12 @@ interface ApiKeyAuth {
      */
     apiKey: string;
 }
+interface AccessTokenAuth {
+    /**
+     * Bearer token accepted by the compute API.
+     */
+    accessToken: string;
+}
 interface SessionAuth {
     /**
      * Temporary authentication token for client side execution.
@@ -951,7 +959,10 @@ interface LocalAuth {
      */
     isLocal: true;
 }
-type Authentication = undefined | ApiKeyAuth | SessionAuth | OAuth2Auth | LocalAuth;
+type Authentication = undefined | ApiKeyAuth | AccessTokenAuth | SessionAuth | OAuth2Auth | LocalAuth;
+declare function resolveAuth(options: Options): Authentication;
+declare function apiKeyCredential(auth: Authentication): string | undefined;
+declare function accessTokenCredential(auth: Authentication): string | undefined;
 interface HttpClient {
     fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
     close(): Promise<void>;
@@ -962,6 +973,26 @@ interface PlatformSupport {
     resolvePath: (source: PathSource, logger: Logger) => Promise<StreamSource>;
 }
 interface Options {
+    /**
+     * Authentication api key for server side execution.
+     * Defaults to process.env['EYEPOP_API_KEY'].
+     */
+    apiKey?: string | undefined;
+    /**
+     * Bearer token accepted by the compute API.
+     */
+    accessToken?: string | undefined;
+    /**
+     * Temporary authentication token for client side execution.
+     */
+    session?: Session | undefined;
+    /**
+     * For development mode, authenticate with your dashboard.eyepop.ai account
+     */
+    oAuth2?: true | Auth0Options | undefined;
+    /**
+     * @deprecated Pass apiKey, accessToken, session, or oAuth2 at the top level.
+     */
     auth?: Authentication | undefined;
     eyepopUrl?: string | undefined;
     jobQueueLength?: number;
@@ -1467,4 +1498,4 @@ declare namespace EyePop {
     function dataEndpoint(opts?: DataOptions): DataEndpoint;
 }
 
-export { type AbilityAliasEntry, AbstractJob, type AliasResolution, type Annotation, AnnotationInclusionMode, AnnotationType, type ApiKeyAuth, type Area, AreaType, ArtifactType, type Asset, type AssetImport, AssetInclusionMode, AssetStatus, AssetUrlType, type AssetUuidSource, type Auth0Options, type Authentication, type AutoAnnotate, type AutoAnnotateParams, type AutoAnnotatePrompt, AutoAnnotateStatus, AutoAnnotateTask, type AutoPromptConfig, type AutoTask, type BaseArea, type BaseComponent, type BaseTask, type Box, type ChangeEvent, ChangeType, type ClassificationTask, type ComponentFinderComponent, type ComponentParams, type Contour, type ContourArea, type ContourFinderComponent, ContourType, type CreateWorkflow, type CreateWorkflowConfig, DEFAULT_PREDICTION_VERSION, DataApiType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetAutoAnnotate, type DatasetAutoAnnotateCreate, type DatasetAutoAnnotateUpdate, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetParent, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, type DownloadResponse, Endpoint, EndpointState, type EvaluateConfig, type EvaluateFilter, type EvaluateRequest, type EvaluateResponse, type EvaluateRunInfo, EvaluationStatus, ExportedBy, EyePop, EyepopLineDecoder, type FileSource, type ForwardComponent, ForwardOperatorType, type HttpClient, type InferRequest, type InferRunInfo, type InferRuntimeConfig, type InferenceComponent, InferenceType, type ListWorkFlowItem, type ListWorkFlowItemMetadata, type ListWorkflowItemMetadataLabels, LoadFromAssetUuidJob, LoadFromGroupJob, LoadFromJob, LoadMediaStreamJob, type LocalAuth, type Mask, type MediaStreamSource, type Model, type ModelCreate, type ModelExport, ModelExportStatus, ModelFormat, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, ModelTask, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type MotionDetectConfig, MotionModel, type MultipartContent, type MultipartPart, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type PlatformSupport, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedEmbedding, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedMotion, type PredictedObject, type PredictedText, type Prediction, PredictionVersion, type ProcessParams, type ProcessRequest, type QcAiHubExportParams, type RectangleArea, type ResultStream, type Roi, Semaphore, type Session, type SessionAuth, type Source, Stream, type StreamEvent, type StreamSource, type StreamTime, TaskMode, TaskType, type TimeSpan, type TrackingComponent, TranscodeMode, type TransformInto, TransientPopId, UploadGroupJob, UploadJob, type UploadSource, type UrlSource, UserReview, VideoMode, type VlmAbility, type VlmAbilityCreate, type VlmAbilityGroup, type VlmAbilityGroupCreate, type VlmAbilityGroupUpdate, VlmAbilityStatus, type VlmAbilityUpdate, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, type Workflow, WorkflowPhase, EyePop as default, encodeMultipartFormData, getBaseUrl, randomMultipartBoundary, readableStreamFromString };
+export { type AbilityAliasEntry, AbstractJob, type AccessTokenAuth, type AliasResolution, type Annotation, AnnotationInclusionMode, AnnotationType, type ApiKeyAuth, type Area, AreaType, ArtifactType, type Asset, type AssetImport, AssetInclusionMode, AssetStatus, AssetUrlType, type AssetUuidSource, type Auth0Options, type Authentication, type AutoAnnotate, type AutoAnnotateParams, type AutoAnnotatePrompt, AutoAnnotateStatus, AutoAnnotateTask, type AutoPromptConfig, type AutoTask, type BaseArea, type BaseComponent, type BaseTask, type Box, type ChangeEvent, ChangeType, type ClassificationTask, type ComponentFinderComponent, type ComponentParams, type Contour, type ContourArea, type ContourFinderComponent, ContourType, type CreateWorkflow, type CreateWorkflowConfig, DEFAULT_PREDICTION_VERSION, DataApiType, DataEndpoint, type DataOptions, type DataSession, type Dataset, type DatasetAutoAnnotate, type DatasetAutoAnnotateCreate, type DatasetAutoAnnotateUpdate, type DatasetCreate, type DatasetHeroAssetUpdate, type DatasetParent, type DatasetUpdate, type DatasetVersion, type DatasetVersionAssetStats, type DownloadResponse, Endpoint, EndpointState, type EvaluateConfig, type EvaluateFilter, type EvaluateRequest, type EvaluateResponse, type EvaluateRunInfo, EvaluationStatus, ExportedBy, EyePop, EyepopLineDecoder, type FileSource, type ForwardComponent, ForwardOperatorType, type HttpClient, type InferRequest, type InferRunInfo, type InferRuntimeConfig, type InferenceComponent, InferenceType, type ListWorkFlowItem, type ListWorkFlowItemMetadata, type ListWorkflowItemMetadataLabels, LoadFromAssetUuidJob, LoadFromGroupJob, LoadFromJob, LoadMediaStreamJob, type LocalAuth, type Mask, type MediaStreamSource, type Model, type ModelCreate, type ModelExport, ModelExportStatus, ModelFormat, type ModelMetrics, ModelPrecisionType, type ModelSample, ModelStatus, ModelTask, type ModelTrainingProgress, ModelTrainingStage, ModelType, type ModelUpdate, type MotionDetectConfig, MotionModel, type MultipartContent, type MultipartPart, type OAuth2Auth, type OnChangeEvent, type Options, type PathSource, type PlatformSupport, type Point2d, type Point3d, type Pop, type PopComponent, PopComponentType, type PopCrop, type PopForward, type PopForwardOperator, type PredictedClass, type PredictedEmbedding, type PredictedKeyPoint, type PredictedKeyPoints, type PredictedMesh, type PredictedMotion, type PredictedObject, type PredictedText, type Prediction, PredictionVersion, type ProcessParams, type ProcessRequest, type QcAiHubExportParams, type RectangleArea, type ResultStream, type Roi, Semaphore, type Session, type SessionAuth, type Source, Stream, type StreamEvent, type StreamSource, type StreamTime, TaskMode, TaskType, type TimeSpan, type TrackingComponent, TranscodeMode, type TransformInto, TransientPopId, UploadGroupJob, UploadJob, type UploadSource, type UrlSource, UserReview, VideoMode, type VlmAbility, type VlmAbilityCreate, type VlmAbilityGroup, type VlmAbilityGroupCreate, type VlmAbilityGroupUpdate, VlmAbilityStatus, type VlmAbilityUpdate, WebrtcBase, WebrtcWhep, WebrtcWhip, WorkerEndpoint, type WorkerOptions, type WorkerSession, type Workflow, WorkflowPhase, accessTokenCredential, apiKeyCredential, EyePop as default, encodeMultipartFormData, getBaseUrl, randomMultipartBoundary, readableStreamFromString, resolveAuth };

package/dist/eyepop.index.js

@@ -8709,14 +8709,51 @@ __export(index_exports, {
   WebrtcWhip: () => WebrtcWhip,
   WorkerEndpoint: () => WorkerEndpoint,
   WorkflowPhase: () => WorkflowPhase,
+  accessTokenCredential: () => accessTokenCredential,
+  apiKeyCredential: () => apiKeyCredential,
   default: () => index_default,
   encodeMultipartFormData: () => encodeMultipartFormData,
   getBaseUrl: () => getBaseUrl,
   randomMultipartBoundary: () => randomMultipartBoundary,
-  readableStreamFromString: () => readableStreamFromString
+  readableStreamFromString: () => readableStreamFromString,
+  resolveAuth: () => resolveAuth
 });
 module.exports = __toCommonJS(index_exports);
 
+// options.ts
+function nonEmptyCredential(value) {
+  return value && value.length > 0 ? value : void 0;
+}
+function resolveAuth(options) {
+  const apiKey = nonEmptyCredential(options.apiKey);
+  if (apiKey !== void 0) {
+    return { apiKey };
+  }
+  const accessToken = nonEmptyCredential(options.accessToken);
+  if (accessToken !== void 0) {
+    return { accessToken };
+  }
+  if (options.session !== void 0) {
+    return { session: options.session };
+  }
+  if (options.oAuth2 !== void 0) {
+    return { oAuth2: options.oAuth2 };
+  }
+  return options.auth;
+}
+function apiKeyCredential(auth) {
+  if (auth === void 0) {
+    return void 0;
+  }
+  return nonEmptyCredential(auth.apiKey);
+}
+function accessTokenCredential(auth) {
+  if (auth === void 0) {
+    return void 0;
+  }
+  return nonEmptyCredential(auth.accessToken);
+}
+
 // compute/compute_session.ts
 var SESSION_DEAD = /* @__PURE__ */ new Set(["error" /* ERROR */, "failed" /* FAILED */, "stopped" /* STOPPED */, "pipeline_error" /* PIPELINE_ERROR */, "unknown" /* UNKNOWN */]);
 var CHECK_FOR_IS_READY_INTERVAL = 250;
@@ -10555,17 +10592,19 @@ var Endpoint = class {
     if (!this._options.eyepopUrl) {
       return Promise.reject("option eyepopUrl or environment variable EYEPOP_URL is required");
     }
-    if (this._options.auth === void 0) {
+    const auth = resolveAuth(this._options);
+    if (auth === void 0) {
       return Promise.reject("cannot connect without defined auth option");
     }
-    if (this._options.auth.session !== void 0) {
-      this._token = this._options.auth.session.accessToken;
-      this._expire_token_time = this._options.auth.session.validUntil / 1e3;
-    } else if (this._options.auth.oAuth2 !== void 0) {
-    } else if (this._options.auth.apiKey !== void 0) {
-    } else if (this._options.auth.isLocal !== void 0) {
+    if (auth.session !== void 0) {
+      this._token = auth.session.accessToken;
+      this._expire_token_time = auth.session.validUntil / 1e3;
+    } else if (auth.oAuth2 !== void 0) {
+    } else if (accessTokenCredential(auth) !== void 0) {
+    } else if (apiKeyCredential(auth) !== void 0) {
+    } else if (auth.isLocal !== void 0) {
     } else {
-      return Promise.reject("option apiKey or environment variable EYEPOP_API_KEY is required");
+      return Promise.reject("option apiKey/accessToken or environment variable EYEPOP_API_KEY is required");
     }
     if (this._options.platformSupport?.createHttpClient !== void 0) {
       this._client = await this._options.platformSupport.createHttpClient(this._requestLogger);
@@ -10639,7 +10678,7 @@ var Endpoint = class {
     throw new Error("reconnect() not implemented");
   }
   async authorizationHeader() {
-    if (this._options.auth.isLocal !== void 0) {
+    if (resolveAuth(this._options)?.isLocal !== void 0) {
       return `Implicit`;
     }
     return `Bearer ${await this.currentAccessToken()}`;
@@ -10649,19 +10688,27 @@ var Endpoint = class {
     if (!this._token || this._expire_token_time < now) {
       this.updateState("Authenticating" /* Authenticating */);
       try {
+        const auth = resolveAuth(this._options);
         if (!this._client) {
           return Promise.reject("endpoint not connected");
-        } else if (this._options.auth.isLocal !== void 0) {
+        } else if (auth?.isLocal !== void 0) {
           this._token = "implicit";
           this._expire_token_time = Number.MAX_VALUE;
-        } else if (this._options.auth.session !== void 0) {
+        } else if (auth?.session !== void 0) {
           return Promise.reject("temporary access token expired");
-        } else if (this._options.auth.oAuth2 !== void 0 && this._options.eyepopUrl) {
-          const session = await authenticateBrowserSession(this._options.auth.oAuth2, this._options);
+        } else if (auth?.oAuth2 !== void 0 && this._options.eyepopUrl) {
+          const session = await authenticateBrowserSession(auth.oAuth2, this._options);
           this._token = session.accessToken;
           this._expire_token_time = session.validUntil / 1e3;
-        } else if (this._options.auth.apiKey !== void 0 && this._options.eyepopUrl) {
-          const headers = { "Authorization": `Bearer ${this._options.auth.apiKey}` };
+        } else if (accessTokenCredential(auth) !== void 0) {
+          this._token = accessTokenCredential(auth);
+          this._expire_token_time = Number.MAX_VALUE;
+        } else if (this._options.eyepopUrl) {
+          const credential = apiKeyCredential(auth);
+          if (credential === void 0) {
+            return Promise.reject("no valid auth option");
+          }
+          const headers = { Authorization: `Bearer ${credential}` };
           const post_url = `${this.eyepopUrl()}/v1/auth/authenticate`;
           const response = await this._client.fetch(post_url, {
             method: "POST",
@@ -10806,7 +10853,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     }
   }
   _authenticationHeaders(session) {
-    return this._options.auth.isLocal !== void 0 ? {} : { Authorization: `Bearer ${session.accessToken}` };
+    return resolveAuth(this._options)?.isLocal !== void 0 ? {} : { Authorization: `Bearer ${session.accessToken}` };
   }
   /**
    * @deprecated Pop ids are only retained for backwards compatibility.
@@ -10877,13 +10924,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);
       return job.start(
         () => {
           this.jobDone(job);
@@ -10914,13 +10955,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);
       return job.start(
         () => {
           this.jobDone(job);
@@ -10944,13 +10979,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);
       return job.start(
         () => {
           this.jobDone(job);
@@ -11453,11 +11482,13 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     return super.authorizationHeader();
   }
   async computeAuthorizationHeader() {
-    if (this.options().auth.isLocal !== void 0) {
+    const auth = resolveAuth(this.options());
+    if (auth?.isLocal !== void 0) {
       return "Implicit";
     }
-    if (this.options().auth.apiKey !== void 0) {
-      return `Bearer ${this.options().auth.apiKey}`;
+    const credential = apiKeyCredential(auth) ?? accessTokenCredential(auth);
+    if (credential !== void 0) {
+      return `Bearer ${credential}`;
     }
     return super.authorizationHeader();
   }
@@ -11908,8 +11939,8 @@ var DataEndpoint = class extends Endpoint {
     this._accountId = options.accountId || null;
     this._account_event_handlers = [];
     this._dataset_uuid_to_event_handlers = /* @__PURE__ */ new Map();
-    const sessionAuth = options.auth;
-    if (sessionAuth.session !== void 0) {
+    const sessionAuth = resolveAuth(options);
+    if (sessionAuth?.session !== void 0) {
       const dataSession = sessionAuth.session;
       if (dataSession.accountId) {
         this._accountId = dataSession.accountId;
@@ -12837,11 +12868,11 @@ var EyePop;
       opts.eyepopUrl = "http://127.0.0.1:8080";
     }
     _fill_default_options(opts);
-    if (opts.auth === void 0) {
+    if (resolveAuth(opts) === void 0) {
       if (opts.isLocalMode) {
         opts.auth = { isLocal: true };
       } else {
-        throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
+        throw new Error("apiKey/accessToken/session/oAuth2 option or EYEPOP_API_KEY environment variable is required");
       }
     }
     if (opts.sessionUuid === void 0) {
@@ -12865,11 +12896,12 @@ var EyePop;
     if (opts.stopJobs === void 0) {
       opts.stopJobs = true;
     }
-    if (opts.auth !== void 0) {
-      if (opts.auth.session !== void 0) {
-        if (opts.auth.session !== void 0) {
-          if (opts.auth.session.popId) {
-            opts.popId = opts.auth.session.popId;
+    const auth = resolveAuth(opts);
+    if (auth !== void 0) {
+      if (auth.session !== void 0) {
+        if (auth.session !== void 0) {
+          if (auth.session.popId) {
+            opts.popId = auth.session.popId;
           }
         }
       }
@@ -12879,16 +12911,17 @@ var EyePop;
   EyePop2.workerEndpoint = workerEndpoint;
   function dataEndpoint(opts = {}) {
     _fill_default_options(opts);
-    if (opts.auth === void 0) {
-      throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
+    const auth = resolveAuth(opts);
+    if (auth === void 0) {
+      throw new Error("apiKey/accessToken/session/oAuth2 option or EYEPOP_API_KEY environment variable is required");
     }
     if (opts.accountId === void 0) {
       opts.accountId = readEnv("EYEPOP_ACCOUNT_ID");
     }
-    if (opts.auth.session !== void 0) {
-      if (opts.auth.session !== void 0) {
-        if (opts.auth.session.accountId) {
-          opts.accountId = opts.auth.session.accountId;
+    if (auth.session !== void 0) {
+      if (auth.session !== void 0) {
+        if (auth.session.accountId) {
+          opts.accountId = auth.session.accountId;
         }
       }
     }
@@ -12896,11 +12929,12 @@ var EyePop;
   }
   EyePop2.dataEndpoint = dataEndpoint;
   function _fill_default_options(opts) {
-    if (!opts.auth) {
-      opts.auth = defaultAuth;
+    if (resolveAuth(opts) === void 0 && defaultAuth) {
+      opts.apiKey = defaultAuth.apiKey;
     }
-    if (!opts.eyepopUrl && opts.auth && opts.auth.session && opts.auth.session.eyepopUrl) {
-      opts.eyepopUrl = opts.auth.session.eyepopUrl;
+    const auth = resolveAuth(opts);
+    if (!opts.eyepopUrl && auth && auth.session && auth.session.eyepopUrl) {
+      opts.eyepopUrl = auth.session.eyepopUrl;
     }
     if (!opts.eyepopUrl) {
       opts.eyepopUrl = readEnv("EYEPOP_URL");
@@ -12908,27 +12942,28 @@ var EyePop;
     if (!opts.eyepopUrl) {
       opts.eyepopUrl = "https://compute.eyepop.ai";
     }
-    if (opts.auth) {
-      if (opts.auth.oAuth2 !== void 0) {
-        if (typeof opts.auth.oAuth2 === "boolean") {
-          if (opts.eyepopUrl && opts.eyepopUrl.match(/https:(.*).staging.eyepop.xyz/i)) {
-            opts.auth = {
-              oAuth2: {
-                domain: "dev-eyepop.us.auth0.com",
-                clientId: "jktx3YO2UnbkNPvr05PQWf26t1kNTJyg",
-                audience: "https://dev-app.eyepop.ai",
-                scope: "admin:clouds access:inference-api access:datasets"
-              }
-            };
+    if (auth) {
+      if (auth.oAuth2 !== void 0) {
+        if (typeof auth.oAuth2 === "boolean") {
+          const oAuth2 = opts.eyepopUrl && opts.eyepopUrl.match(/https:(.*).staging.eyepop.xyz/i) ? {
+            oAuth2: {
+              domain: "dev-eyepop.us.auth0.com",
+              clientId: "jktx3YO2UnbkNPvr05PQWf26t1kNTJyg",
+              audience: "https://dev-app.eyepop.ai",
+              scope: "admin:clouds access:inference-api access:datasets"
+            }
+          } : {
+            oAuth2: {
+              domain: "eyepop.us.auth0.com",
+              clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
+              audience: "https://api.eyepop.ai",
+              scope: "admin:clouds access:inference-api access:datasets"
+            }
+          };
+          if (opts.oAuth2 !== void 0) {
+            opts.oAuth2 = oAuth2.oAuth2;
           } else {
-            opts.auth = {
-              oAuth2: {
-                domain: "eyepop.us.auth0.com",
-                clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
-                audience: "https://api.eyepop.ai",
-                scope: "admin:clouds access:inference-api access:datasets"
-              }
-            };
+            opts.auth = oAuth2;
           }
         }
       }
@@ -12994,10 +13029,13 @@ var index_default = EyePop;
   WebrtcWhip,
   WorkerEndpoint,
   WorkflowPhase,
+  accessTokenCredential,
+  apiKeyCredential,
   encodeMultipartFormData,
   getBaseUrl,
   randomMultipartBoundary,
-  readableStreamFromString
+  readableStreamFromString,
+  resolveAuth
 });
 /*! Bundled license information: