@vertesia/client 0.76.0 → 0.78.0-dev-9372725

package/package.json

@@ -1,57 +1,62 @@
 {
-  "name": "@vertesia/client",
-  "version": "0.76.0",
-  "type": "module",
-  "types": "./lib/types/index.d.ts",
-  "files": [
-    "lib",
-    "src",
-    "tsconfig.dist.json"
-  ],
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.3",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "@types/node": "^22.13.5",
-    "rollup": "^4.40.2",
-    "rollup-plugin-terser": "^7.0.2",
-    "ts-dual-module": "^0.6.3",
-    "typescript": "^5.0.2",
-    "vitest": "^3.0.9"
-  },
-  "dependencies": {
-    "eventsource": "^3.0.6",
-    "@llumiverse/common": "0.22.0",
-    "@vertesia/common": "0.76.0",
-    "@vertesia/api-fetch-client": "0.76.0"
-  },
-  "ts_dual_module": {
-    "outDir": "lib"
-  },
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "import": "./lib/esm/index.js",
-      "require": "./lib/cjs/index.js"
+    "name": "@vertesia/client",
+    "version": "0.78.0-dev-9372725",
+    "type": "module",
+    "types": "./lib/types/index.d.ts",
+    "files": [
+        "lib",
+        "src",
+        "tsconfig.dist.json"
+    ],
+    "license": "Apache-2.0",
+    "scripts": {
+        "eslint": "eslint './src/**/*.{jsx,js,tsx,ts}'",
+        "build": "pnpm exec tsmod build && pnpm exec rollup -c",
+        "clean": "rimraf ./node_modules ./lib ./tsconfig.tsbuildinfo",
+        "test": "vitest run"
     },
-    "./node": {
-      "types": "./lib/types/nodejs/index.d.ts",
-      "import": "./lib/esm/nodejs/index.js",
-      "require": "./lib/cjs/nodejs/index.js"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "node": [
-        "./lib/types/nodejs/index.d.ts"
-      ]
+    "devDependencies": {
+        "@rollup/plugin-commonjs": "^28.0.3",
+        "@rollup/plugin-node-resolve": "^16.0.1",
+        "@rollup/plugin-typescript": "^12.1.2",
+        "@types/node": "^22.13.5",
+        "rollup": "^4.40.2",
+        "rollup-plugin-terser": "^7.0.2",
+        "ts-dual-module": "^0.6.3",
+        "typescript": "^5.0.2",
+        "vitest": "^3.0.9"
+    },
+    "dependencies": {
+        "@llumiverse/common": "workspace:*",
+        "@vertesia/api-fetch-client": "workspace:*",
+        "@vertesia/common": "workspace:*",
+        "eventsource": "^3.0.6"
+    },
+    "ts_dual_module": {
+        "outDir": "lib"
+    },
+    "exports": {
+        ".": {
+            "types": "./lib/types/index.d.ts",
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "./node": {
+            "types": "./lib/types/nodejs/index.d.ts",
+            "import": "./lib/esm/nodejs/index.js",
+            "require": "./lib/cjs/nodejs/index.js"
+        }
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/vertesia/composableai.git",
+        "directory": "packages/client"
+    },
+    "typesVersions": {
+        "*": {
+            "node": [
+                "./lib/types/nodejs/index.d.ts"
+            ]
+        }
     }
-  },
-  "scripts": {
-    "eslint": "eslint './src/**/*.{jsx,js,tsx,ts}'",
-    "build": "pnpm exec tsmod build && pnpm exec rollup -c",
-    "clean": "rimraf ./node_modules ./lib ./tsconfig.tsbuildinfo",
-    "test": "vitest run"
-  }
-}
+}

package/src/AppsApi.ts

@@ -1,5 +1,5 @@
 import { ApiTopic, ClientBase, ServerError } from "@vertesia/api-fetch-client";
-import type { AppInstallation, AppInstallationKind, AppInstallationPayload, AppInstallationWithManifest, AppManifest, AppManifestData, ProjectRef, RequireAtLeastOne } from "@vertesia/common";
+import type { AppInstallation, AppInstallationKind, AppInstallationPayload, AppInstallationWithManifest, AppManifest, AppManifestData, AppToolCollection, ProjectRef, RequireAtLeastOne } from "@vertesia/common";
 
 export interface OrphanedAppInstallation extends Omit<AppInstallation, 'manifest'> {
     manifest: null,
@@ -19,6 +19,15 @@ export default class AppsApi extends ApiTopic {
         return this.put(`/${id}`, { payload: manifest });
     }
 
+    /**
+     * Get the list if tools provided by the given app.
+     * @param appId 
+     * @returns 
+     */
+    listAppInstallationTools(appInstallId: string): Promise<AppToolCollection[]> {
+        return this.get(`/installations/${appInstallId}/tools`)
+    }
+
     /**
      * @param ids - ids to filter by
      * @returns the app manifests but without the agent.tool property which can be big.

package/src/InteractionBase.ts

@@ -2,7 +2,7 @@ import { ExecutionRun, InteractionUpdatePayload, InteractionExecutionPayload } f
 import { VertesiaClient, VertesiaClientProps } from "./client.js";
 import { executeInteraction } from "./execute.js";
 
-export class InteractionBase<P = any, R = any> {
+export class InteractionBase<P = any> {
     client: VertesiaClient;
 
     constructor(public id: string, clientOrOpts: VertesiaClient | VertesiaClientProps) {
@@ -38,7 +38,7 @@ export class InteractionBase<P = any, R = any> {
      * @returns the resolved execution run as Promise<ExecutionRun>
      */
     async execute(payload: InteractionExecutionPayload = {},
-        onChunk?: (chunk: string) => void): Promise<ExecutionRun<P, R>> {
-        return executeInteraction<P, R>(this.client, this.id, payload, onChunk);
+        onChunk?: (chunk: string) => void): Promise<ExecutionRun<P>> {
+        return executeInteraction<P>(this.client, this.id, payload, onChunk);
     }
 }

package/src/InteractionsApi.ts

@@ -1,7 +1,8 @@
 import { ApiTopic, ClientBase, ServerError } from "@vertesia/api-fetch-client";
-import { AsyncExecutionPayload, ComputeInteractionFacetPayload, ExecutionRun, GenerateInteractionPayload, GenerateTestDataPayload, ImprovePromptPayload, Interaction, InteractionCreatePayload, InteractionEndpoint, InteractionEndpointQuery, InteractionExecutionPayload, InteractionExecutionResult, InteractionForkPayload, InteractionPublishPayload, InteractionRef, InteractionRefWithSchema, InteractionSearchPayload, InteractionSearchQuery, InteractionUpdatePayload, InteractionsExportPayload } from "@vertesia/common";
+import { AsyncExecutionPayload, ComputeInteractionFacetPayload, ExecutionRun, GenerateInteractionPayload, GenerateTestDataPayload, ImprovePromptPayload, Interaction, InteractionCreatePayload, InteractionEndpoint, InteractionEndpointQuery, InteractionExecutionPayload, InteractionExecutionResult, InteractionForkPayload, InteractionPublishPayload, InteractionRef, InteractionRefWithSchema, InteractionSearchPayload, InteractionSearchQuery, InteractionUpdatePayload, InteractionsExportPayload, RateLimitRequestPayload, RateLimitRequestResponse } from "@vertesia/common";
+import { CompletionResult } from "@llumiverse/common";
 import { VertesiaClient } from "./client.js";
-import { executeInteraction, executeInteractionAsync, executeInteractionByName } from "./execute.js";
+import { checkRateLimit, executeInteraction, executeInteractionAsync, executeInteractionByName } from "./execute.js";
 
 export interface ComputeInteractionFacetsResponse {
     tags?: { _id: string, count: number }[];
@@ -132,9 +133,9 @@ export default class InteractionsApi extends ApiTopic {
      * @throws 500 if interaction execution fails
      * @throws 500 if interaction execution times out
      **/
-    execute<P = any, R = any>(id: string, payload: InteractionExecutionPayload = {},
-        onChunk?: (chunk: string) => void): Promise<ExecutionRun<P, R>> {
-        return executeInteraction(this.client as VertesiaClient, id, payload, onChunk).catch(err => {
+    execute<P = any>(id: string, payload: InteractionExecutionPayload = {},
+        onChunk?: (chunk: string) => void): Promise<ExecutionRun<P>> {
+        return executeInteraction<P>(this.client as VertesiaClient, id, payload, onChunk).catch(err => {
             if (err instanceof ServerError && err.payload?.id) {
                 throw err.updateDetails({ run_id: err.payload.id });
             } else {
@@ -158,9 +159,9 @@ export default class InteractionsApi extends ApiTopic {
      * @param onChunk
      * @returns
      */
-    executeByName<P = any, R = any>(nameWithTag: string, payload: InteractionExecutionPayload = {},
-        onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P, R>> {
-        return executeInteractionByName(this.client as VertesiaClient, nameWithTag, payload, onChunk).catch(err => {
+    executeByName<P = any>(nameWithTag: string, payload: InteractionExecutionPayload = {},
+        onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P>> {
+        return executeInteractionByName<P>(this.client as VertesiaClient, nameWithTag, payload, onChunk).catch(err => {
             if (err instanceof ServerError && err.payload?.id) {
                 throw err.updateDetails({ run_id: err.payload.id });
             } else {
@@ -214,7 +215,7 @@ export default class InteractionsApi extends ApiTopic {
     /**
      * Suggest Improvement for a prompt
      */
-    suggestImprovements(id: string, payload: ImprovePromptPayload): Promise<{ result: string; }> {
+    suggestImprovements(id: string, payload: ImprovePromptPayload): Promise<{ result: CompletionResult[]; }> {
         return this.post(`${id}/suggest-prompt-improvements`, {
             payload
         });
@@ -238,4 +239,13 @@ export default class InteractionsApi extends ApiTopic {
         return this.get(`/${id}/forks`);
     }
 
+    /**
+     * Request a time slot to execute an interaction with a given environment / model
+     * @param payload RateLimitRequestPayload
+     * @returns RateLimitRequestResponse with delay_ms
+     */
+    requestSlot(payload: RateLimitRequestPayload): Promise<RateLimitRequestResponse> {
+        return checkRateLimit(this.client as VertesiaClient, payload);
+    }
+
 }

package/src/RunsApi.ts

@@ -1,3 +1,4 @@
+import type { ExecutionResponse } from "@llumiverse/common";
 import { ApiTopic, ClientBase } from "@vertesia/api-fetch-client";
 import {
     CheckpointConversationPayload,
@@ -5,6 +6,7 @@ import {
     ExecutionRun,
     ExecutionRunRef,
     FindPayload,
+    PopulatedExecutionRun,
     RunCreatePayload,
     RunListingFilters,
     RunListingQueryOptions,
@@ -13,7 +15,6 @@ import {
     UserMessagePayload,
 } from "@vertesia/common";
 import { VertesiaClient } from "./client.js";
-import type { ExecutionResponse } from "@llumiverse/common";
 
 export interface FilterOption {
     id: string;
@@ -63,10 +64,16 @@ export class RunsApi extends ApiTopic {
      * @param id
      * @returns InteractionResult
      **/
-    retrieve<P = any, R = any>(id: string): Promise<ExecutionRun<P, R>> {
+    retrieve<P = any>(id: string): Promise<ExecutionRun<P>> {
         return this.get("/" + id);
     }
 
+    retrievePopulated<P = any>(id: string): Promise<PopulatedExecutionRun<P>> {
+        return this.get("/" + id, {
+            query: { populate: "true" },
+        });
+    }
+
     /**
      * Get filter options for a field
      * return FilterOption[]

package/src/client.test.ts

@@ -6,6 +6,7 @@ describe('Test Vertesia Client', () => {
         const client = new VertesiaClient({
             serverUrl: 'https://api.vertesia.io',
             storeUrl: 'https://api.vertesia.io',
+            tokenServerUrl: 'https://sts.vertesia.io',
             apikey: '1234',
         });
         expect(client).toBeDefined();
@@ -73,6 +74,7 @@ describe('Test Vertesia Client', () => {
         const client = new VertesiaClient({
             serverUrl: 'http://localhost:8091',
             storeUrl: 'http://localhost:8092',
+            tokenServerUrl: 'http://localhost:8093',
         });
 
         expect(client).toBeDefined();

package/src/client.ts

@@ -35,18 +35,21 @@ export type VertesiaClientProps = {
      * @default api.vertesia.io
      * @since 0.52.0
      */
-    site?: 'api.vertesia.io' | 'api-preview.vertesia.io' | 'api-staging.vertesia.io';
+    site?:
+        | "api.vertesia.io"
+        | "api-preview.vertesia.io"
+        | "api-staging.vertesia.io";
     serverUrl?: string;
     storeUrl?: string;
+    tokenServerUrl?: string;
     apikey?: string;
     projectId?: string;
     sessionTags?: string | string[];
     onRequest?: (request: Request) => void;
     onResponse?: (response: Response) => void;
-}
+};
 
 export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
-
     /**
      * The JWT token linked to the API KEY (sk or pk)
      */
@@ -62,11 +65,15 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
      */
     sessionTags?: string | string[];
 
+    /**
+     * tokenServerUrl
+     */
+    tokenServerUrl: string;
 
     /**
-     * Create a client from the given token. 
+     * Create a client from the given token.
      * If you already have the decoded token you can pass it as the second argument to avoid decodinf it again.
-     * 
+     *
      * @param token the raw JWT token
      * @param payload the decoded JWT token as an AuthTokenPayload - optional
      */
@@ -74,21 +81,21 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
         if (!payload) {
             payload = decodeJWT(token);
         }
-        const endpoints = decodeEndpoints(payload!.endpoints);
+
+        const endpoints = decodeEndpoints(payload.endpoints);
         return await new VertesiaClient({
             serverUrl: endpoints.studio,
-            storeUrl: endpoints.store
+            storeUrl: endpoints.store,
+            tokenServerUrl: payload.iss,
         }).withApiKey(token);
     }
 
-    static decodeEndpoints() {
-
-    }
+    static decodeEndpoints() {}
 
     constructor(
         opts: VertesiaClientProps = {
-            site: 'api.vertesia.io',
-        }
+            site: "api.vertesia.io",
+        },
     ) {
         let studioServerUrl: string;
         let zenoServerUrl: string;
@@ -98,7 +105,9 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
         } else if (opts.site) {
             studioServerUrl = `https://${opts.site}`;
         } else {
-            throw new Error("Parameter 'site' or 'serverUrl' is required for VertesiaClient");
+            throw new Error(
+                "Parameter 'site' or 'serverUrl' is required for VertesiaClient",
+            );
         }
 
         if (opts.storeUrl) {
@@ -106,25 +115,67 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
         } else if (opts.site) {
             zenoServerUrl = `https://${opts.site}`;
         } else {
-            throw new Error("Parameter 'site' or 'storeUrl' is required for VertesiaClient");
+            throw new Error(
+                "Parameter 'site' or 'storeUrl' is required for VertesiaClient",
+            );
         }
 
         super(studioServerUrl);
 
+        if (opts.tokenServerUrl) {
+            this.tokenServerUrl = opts.tokenServerUrl;
+        } else if (opts.site) {
+            this.tokenServerUrl = `https://${opts.site.replace(/^api/, "sts")}`;
+        } else if (opts.serverUrl || opts.storeUrl) {
+            // Determine STS URL based on environment in serverUrl or storeUrl
+            const urlToCheck = opts.serverUrl || opts.storeUrl || "";
+            try {
+                const url = new URL(urlToCheck);
+                // Check for environment patterns
+                if (url.hostname.includes("-production.")) {
+                    // zeno-server-production.api.vertesia.io -> sts.vertesia.io
+                    this.tokenServerUrl = "https://sts.vertesia.io";
+                } else if (url.hostname.includes("-preview.")) {
+                    // zeno-server-preview.api.vertesia.io -> sts-preview.vertesia.io
+                    this.tokenServerUrl = "https://sts-preview.vertesia.io";
+                } else if (url.hostname === "api.vertesia.io") {
+                    // api.vertesia.io -> sts.vertesia.io
+                    this.tokenServerUrl = "https://sts.vertesia.io";
+                } else if (url.hostname === "api-preview.vertesia.io") {
+                    // api-preview.vertesia.io -> sts-preview.vertesia.io
+                    this.tokenServerUrl = "https://sts-preview.vertesia.io";
+                } else if (url.hostname === "api-staging.vertesia.io") {
+                    // api-staging.vertesia.io -> sts-staging.vertesia.io
+                    this.tokenServerUrl = "https://sts-staging.vertesia.io";
+                } else if (url.hostname.startsWith("api")) {
+                    // Generic api.* pattern replacement
+                    url.hostname = url.hostname.replace(/^api/, "sts");
+                    this.tokenServerUrl = url.toString();
+                } else {
+                    // Default to staging for everything else
+                    this.tokenServerUrl = "https://sts-staging.vertesia.io";
+                }
+            } catch (e) {
+                // Default to staging if URL parsing fails
+                this.tokenServerUrl = "https://sts-staging.vertesia.io";
+            }
+        } else {
+            // Default to staging if no URL provided
+            this.tokenServerUrl = "https://sts-staging.vertesia.io";
+        }
+
         this.store = new ZenoClient({
             serverUrl: zenoServerUrl,
+            tokenServerUrl: this.tokenServerUrl,
             apikey: opts.apikey,
             onRequest: opts.onRequest,
-            onResponse: opts.onResponse
+            onResponse: opts.onResponse,
         });
 
         if (opts.apikey) {
             this.withApiKey(opts.apikey);
         }
-        //TODO: this is no more used, remove in next major version
-        if (opts.projectId) {
-            this.headers["x-project-id"] = opts.projectId;
-        }
+
         this.onRequest = opts.onRequest;
         this.onResponse = opts.onResponse;
         this.sessionTags = opts.sessionTags;
@@ -142,25 +193,28 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
 
     async withApiKey(apiKey: string | null) {
         return this.withAuthCallback(
-            apiKey ? async () => {
-                if (!isApiKey(apiKey)) {
-                    return `Bearer ${apiKey}`
-                }
-
-                if (isTokenExpired(this._jwt)) {
-                    const jwt = await this.getAuthToken(apiKey);
-                    this._jwt = jwt.token;
-                }
-                return `Bearer ${this._jwt}`
-            } : undefined
+            apiKey
+                ? async () => {
+                      if (!isApiKey(apiKey)) {
+                          return `Bearer ${apiKey}`;
+                      }
+
+                      if (isTokenExpired(this._jwt)) {
+                          const jwt = await this.getAuthToken(apiKey);
+                          this._jwt = jwt.token;
+                      }
+                      return `Bearer ${this._jwt}`;
+                  }
+                : undefined,
         );
     }
 
     async getRawJWT() {
         if (!this._jwt && this._auth) {
             const auth = await this._auth();
-            if (!this._jwt) { // the _jwt may be set by the auth callback
-                this._jwt = auth.trim().split(' ')[1]; // remove Bearer prefix
+            if (!this._jwt) {
+                // the _jwt may be set by the auth callback
+                this._jwt = auth.trim().split(" ")[1]; // remove Bearer prefix
             }
         }
         return this._jwt || null;
@@ -210,21 +264,36 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
         return this.store.baseUrl;
     }
 
-
     /**
      *
-     * Generate a token for use with other Composable's services
+     * Generate a token for use with other Vertesia's services
      *
-     * @param accountId: selected account to generate the token for
      * @returns AuthTokenResponse
      */
-    async getAuthToken(token?: string, accountId?: string): Promise<AuthTokenResponse> {
-        const query = {
-            accountId,
-            token
-        };
+    async getAuthToken(token?: string): Promise<AuthTokenResponse> {
+        return fetch(`${this.tokenServerUrl}/token/issue`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${token}`,
+            },
+        })
+            .then((response) => response.json())
+            .then((data) => data as AuthTokenResponse)
+            .catch((error) => {
+                console.error(
+                    `Error fetching token from ${this.tokenServerUrl}:`,
+                    { error },
+                );
+                throw error;
+            });
+    }
 
-        return this.get('/auth/token', { query: query, headers: { "authorization": undefined } as any });
+    get initialHeaders() {
+        return {
+            ...super.initialHeaders,
+            'X-Api-Version': '20250925' // YYYYMMDD, client versioning for API endpoints. Increment manually for breaking changes
+        }
     }
 
     projects = new ProjectsApi(this);
@@ -245,7 +314,7 @@ export class VertesiaClient extends AbstractFetchClient<VertesiaClient> {
 }
 
 function isApiKey(apiKey: string) {
-    return (apiKey.startsWith('pk-') || apiKey.startsWith('sk-'));
+    return apiKey.startsWith("pk-") || apiKey.startsWith("sk-");
 }
 
 function isTokenExpired(token: string | null) {
@@ -256,38 +325,45 @@ function isTokenExpired(token: string | null) {
     const decoded = decodeJWT(token);
     const exp = decoded.exp;
     const currentTime = Date.now();
-    return (currentTime <= exp * 1000 - EXPIRATION_THRESHOLD);
+    return currentTime <= exp * 1000 - EXPIRATION_THRESHOLD;
 }
 
 export function decodeJWT(jwt: string): AuthTokenPayload {
-    const payloadBase64 = jwt.split('.')[1];
+    const payloadBase64 = jwt.split(".")[1];
     const decodedJson = base64UrlDecode(payloadBase64);
-    return JSON.parse(decodedJson)
+    return JSON.parse(decodedJson);
 }
 
 function base64UrlDecode(input: string): string {
     // Convert base64url to base64
-    const base64 = input.replace(/-/g, '+').replace(/_/g, '/')
+    const base64 = input
+        .replace(/-/g, "+")
+        .replace(/_/g, "/")
         // Pad with '=' to make length a multiple of 4
-        .padEnd(Math.ceil(input.length / 4) * 4, '=');
+        .padEnd(Math.ceil(input.length / 4) * 4, "=");
 
-    if (typeof Buffer !== 'undefined') {
+    if (typeof Buffer !== "undefined") {
         // Node.js
-        return Buffer.from(base64, 'base64').toString('utf-8');
-    } else if (typeof atob !== 'undefined' && typeof TextDecoder !== 'undefined') {
+        return Buffer.from(base64, "base64").toString("utf-8");
+    } else if (
+        typeof atob !== "undefined" &&
+        typeof TextDecoder !== "undefined"
+    ) {
         // Browser
         const binary = atob(base64);
-        const bytes = Uint8Array.from(binary, c => c.charCodeAt(0));
+        const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
         // decode to utf8
         return new TextDecoder().decode(bytes);
     } else {
-        throw new Error('No base64 decoder available');
+        throw new Error("No base64 decoder available");
     }
 }
 
-export function decodeEndpoints(endpoints: string | Record<string, string> | undefined): Record<string, string> {
+export function decodeEndpoints(
+    endpoints: string | Record<string, string> | undefined,
+): Record<string, string> {
     if (!endpoints) {
-        return getEndpointsFromDomain("api.vertesia.io")
+        return getEndpointsFromDomain("api.vertesia.io");
     }
     if (typeof endpoints === "string") {
         return getEndpointsFromDomain(endpoints);
@@ -301,12 +377,14 @@ function getEndpointsFromDomain(domain: string) {
         return {
             studio: `http://localhost:8091`,
             store: `http://localhost:8092`,
-        }
+            token: process.env.STS_URL ?? "https://sts-staging.vertesia.io",
+        };
     } else {
         const url = `https://${domain}`;
         return {
             studio: url,
             store: url,
-        }
+            token: url.replace("api", "sts"),
+        };
     }
 }

package/src/execute.ts

@@ -1,4 +1,4 @@
-import { AsyncExecutionPayload, ExecutionRunStatus, InteractionExecutionPayload, InteractionExecutionResult, NamedInteractionExecutionPayload } from '@vertesia/common';
+import { AsyncExecutionPayload, ExecutionRunStatus, InteractionExecutionPayload, InteractionExecutionResult, NamedInteractionExecutionPayload, RateLimitRequestPayload, RateLimitRequestResponse } from '@vertesia/common';
 import { VertesiaClient } from './client.js';
 
 export async function EventSourceProvider(): Promise<typeof EventSource> {
@@ -19,10 +19,10 @@ export async function EventSourceProvider(): Promise<typeof EventSource> {
  * @param payload InteractionExecutionPayload
  * @param onChunk callback to be called when the next chunk of the response is available
  */
-export async function executeInteraction<P = any, R = any>(client: VertesiaClient,
+export async function executeInteraction<P = any>(client: VertesiaClient,
     interactionId: string,
     payload: InteractionExecutionPayload = {},
-    onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P, R>> {
+    onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P>> {
     const stream = !!onChunk;
     const response = await client.runs.create({
         ...payload, interaction: interactionId, stream
@@ -52,10 +52,10 @@ export async function executeInteraction<P = any, R = any>(client: VertesiaClien
  * @param onChunk
  * @returns
  */
-export async function executeInteractionByName<P = any, R = any>(client: VertesiaClient,
+export async function executeInteractionByName<P = any>(client: VertesiaClient,
     interaction: string,
     payload: InteractionExecutionPayload = {},
-    onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P, R>> {
+    onChunk?: (chunk: string) => void): Promise<InteractionExecutionResult<P>> {
     const stream = !!onChunk;
     const response = await client.post('/api/v1/execute', {
         payload: {
@@ -117,4 +117,10 @@ export async function executeInteractionAsync(client: VertesiaClient, payload: A
     return await client.post('/api/v1/execute/async', {
         payload,
     });
+}
+
+export async function checkRateLimit(client: VertesiaClient, payload: RateLimitRequestPayload): Promise<RateLimitRequestResponse> {
+    return await client.post('/api/v1/execute/rate-limit/request', {
+        payload
+    });
 }

package/src/store/FilesApi.ts

@@ -120,9 +120,9 @@ export class FilesApi extends ApiTopic {
                 if (res.ok) {
                     return res;
                 } else if (res.status === 404) {
-                    throw new Error(`File ${location} not found`); //TODO: type fetch error better with a fetch error class
+                    throw new Error(`File at ${url} not found`); //TODO: type fetch error better with a fetch error class
                 } else if (res.status === 403) {
-                    throw new Error(`File ${location} is forbidden`);
+                    throw new Error(`File at ${url} is forbidden`);
                 } else {
                     console.log(res);
                     throw new Error(