@vertesia/tools-sdk 0.79.1 → 0.80.0-dev.20251121

package/package.json

@@ -1,39 +1,44 @@
 {
-    "name": "@vertesia/tools-sdk",
-    "version": "0.79.1",
-    "description": "Tools SDK - utilities for building remote tools",
-    "type": "module",
+  "name": "@vertesia/tools-sdk",
+  "version": "0.80.0-dev.20251121",
+  "description": "Tools SDK - utilities for building remote tools",
+  "type": "module",
+  "types": "./lib/types/index.d.ts",
+  "files": [
+    "lib",
+    "src"
+  ],
+  "license": "Apache-2.0",
+  "exports": {
     "types": "./lib/types/index.d.ts",
-    "files": [
-        "lib",
-        "src"
-    ],
-    "license": "Apache-2.0",
-    "scripts": {
-        "test": "vitest run",
-        "build": "pnpm exec tsmod build",
-        "clean": "rimraf ./node_modules ./lib ./tsconfig.tsbuildinfo"
-    },
-    "exports": {
-        "types": "./lib/types/index.d.ts",
-        "import": "./lib/esm/index.js",
-        "require": "./lib/cjs/index.js"
-    },
-    "devDependencies": {
-        "ts-dual-module": "^0.6.3",
-        "typescript": "^5.0.2",
-        "vitest": "^3.0.9"
-    },
-    "ts_dual_module": {
-        "outDir": "lib"
-    },
-    "peerDependencies": {
-        "hono": "^4.0.0"
-    },
-    "dependencies": {
-        "@llumiverse/common": "workspace:*",
-        "@vertesia/client": "workspace:*",
-        "@vertesia/common": "workspace:*",
-        "jose": "^6.0.11"
-    }
-}
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js"
+  },
+  "devDependencies": {
+    "ts-dual-module": "^0.6.3",
+    "typescript": "^5.0.2",
+    "vitest": "^3.0.9"
+  },
+  "ts_dual_module": {
+    "outDir": "lib"
+  },
+  "peerDependencies": {
+    "hono": "^4.9.6"
+  },
+  "dependencies": {
+    "jose": "^6.0.11",
+    "@vertesia/common": "0.80.0-dev.20251121",
+    "@llumiverse/common": "0.23.0-dev.20251121",
+    "@vertesia/client": "0.80.0-dev.20251121"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vertesia/composableai.git",
+    "directory": "packages/tools-sdk"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "build": "pnpm exec tsmod build",
+    "clean": "rimraf ./node_modules ./lib ./tsconfig.tsbuildinfo"
+  }
+}

package/src/InteractionCollection.ts

@@ -0,0 +1,53 @@
+import { InteractionSpec } from "@vertesia/common";
+import { ICollection, CollectionProperties } from "./types.js";
+import { kebabCaseToTitle } from "./utils.js";
+
+export interface InteractionCollectionProps extends CollectionProperties {
+    interactions: InteractionSpec[];
+}
+export class InteractionCollection implements ICollection<InteractionSpec> {
+    interactions: InteractionSpec[];
+    name: string;
+    title?: string;
+    icon?: string;
+    description?: string;
+    constructor({
+        name, title, icon, description, interactions
+    }: InteractionCollectionProps) {
+        this.name = name;
+        this.title = title || kebabCaseToTitle(name);
+        this.icon = icon;
+        this.description = description;
+        this.interactions = interactions;
+    }
+    addInteraction(interaction: any) {
+        this.interactions.push(interaction);
+    }
+
+    getInteractions() {
+        return this.interactions;
+    }
+
+    [Symbol.iterator](): Iterator<InteractionSpec> {
+        let index = 0;
+        const interactions = this.interactions;
+
+        return {
+            next(): IteratorResult<InteractionSpec> {
+                if (index < interactions.length) {
+                    return { value: interactions[index++], done: false };
+                } else {
+                    return { done: true, value: undefined };
+                }
+            }
+        };
+    }
+
+    map<U>(callback: (interaction: InteractionSpec, index: number) => U): U[] {
+        return this.interactions.map(callback);
+    }
+
+    getInteractionByName(name: string): InteractionSpec | undefined {
+        return this.interactions.find(interaction => interaction.name === name);
+    }
+}

package/src/ToolCollection.ts

@@ -2,29 +2,10 @@ import { Context } from "hono";
 import { HTTPException } from "hono/http-exception";
 import { authorize } from "./auth.js";
 import { ToolRegistry } from "./ToolRegistry.js";
-import type { Tool, ToolDefinition, ToolExecutionPayload, ToolExecutionResponse, ToolExecutionResponseError } from "./types.js";
-
-export interface ToolCollectionProperties {
-    /**
-     * A kebab case collection name. Must only contains alphanumeric and dash characters,
-     * The name can be used to generate the path where the collection is exposed.
-     * Example: my-collection
-     */
-    name: string;
-    /**
-     * Optional title for UI display. 
-     * If not provided the pascal case version of the name will be used
-     */
-    title?: string;
-    /**
-     * Optional icon for UI display
-     */
-    icon?: string;
-    /**
-     * A short description 
-     */
-    description: string;
+import type { CollectionProperties, ICollection, Tool, ToolDefinition, ToolExecutionPayload, ToolExecutionResponse, ToolExecutionResponseError } from "./types.js";
+import { kebabCaseToTitle } from "./utils.js";
 
+export interface ToolCollectionProperties extends CollectionProperties {
     /**
      * The tools
      */
@@ -34,7 +15,7 @@ export interface ToolCollectionProperties {
 /**
  * Implements a tools collection endpoint
  */
-export class ToolCollection implements Iterable<Tool<any>> {
+export class ToolCollection implements ICollection<Tool<any>> {
 
     /**
      * A kebab case collection name. Must only contains alphanumeric and dash characters,
@@ -54,7 +35,7 @@ export class ToolCollection implements Iterable<Tool<any>> {
     /**
      * A short description 
      */
-    description: string;
+    description?: string;
     /**
      * The tool registry
      */
@@ -89,7 +70,7 @@ export class ToolCollection implements Iterable<Tool<any>> {
         return this.tools.getTools().map(callback);
     }
 
-    async execute(ctx: Context) {
+    async execute(ctx: Context): Promise<Response> {
         let payload: ToolExecutionPayload<any> | undefined;
         try {
             payload = await readPayload(ctx);
@@ -126,6 +107,3 @@ async function readPayload(ctx: Context) {
     }
 }
 
-function kebabCaseToTitle(name: string) {
-    return name.split('-').map(p => p[0].toUpperCase() + p.substring(1)).join(' ');
-}

package/src/auth.ts

@@ -24,21 +24,22 @@ export async function getJwks(url: string) {
 
 export async function verifyToken(token: string) {
     const decodedJwt = decodeJwt(token);
-    const { studio } = decodeEndpoints(decodedJwt.endpoints as any);
-    if (!studio) {
-        throw new Error("No studio endpoint found in JWT");
+    if (!decodedJwt.iss) {
+        throw new Error("No issuer URL found in JWT");
     }
-    const jwks = await getJwks(`${studio}/.well-known/jwks`);
+    if (!isAllowedIssuer(decodedJwt.iss)) {
+        throw new Error("Issuer is not allowed: " + decodedJwt.iss);
+    }
+    const jwks = await getJwks(`${decodedJwt.iss}/.well-known/jwks`);
     return await jwtVerify<AuthTokenPayload>(token, jwks);
 }
 
 
-
 export async function authorize(ctx: Context) {
     const auth = ctx.req.header('Authorization');
     if (!auth) {
         throw new HTTPException(401, {
-            message: `Missing Authorization header'`
+            message: `Missing Authorization header`
         });
     }
     const [scheme, value] = auth.trim().split(' ');
@@ -84,4 +85,8 @@ export class AuthSession implements ToolExecutionContext {
         }
         return this._client;
     }
-}
+}
+
+function isAllowedIssuer(iss: string) {
+    return iss.endsWith(".vertesia.io") || iss.endsWith(".becomposable.com");
+}

package/src/index.ts

@@ -1,4 +1,5 @@
+export { authorize, AuthSession } from "./auth.js";
+export * from "./InteractionCollection.js";
 export * from "./ToolCollection.js";
 export * from "./ToolRegistry.js";
 export * from "./types.js";
-export { AuthSession, authorize } from "./auth.js";

package/src/types.ts

@@ -2,6 +2,30 @@ import type { ToolDefinition, ToolUse } from "@llumiverse/common";
 import { VertesiaClient } from "@vertesia/client";
 import { AuthTokenPayload, ToolResult, ToolResultContent } from "@vertesia/common";
 
+export type ICollection<T = any> = CollectionProperties & Iterable<T>
+
+export interface CollectionProperties {
+    /**
+     * A kebab case collection name. Must only contains alphanumeric and dash characters,
+     * The name can be used to generate the path where the collection is exposed.
+     * Example: my-collection
+     */
+    name: string;
+    /**
+     * Optional title for UI display. 
+     * If not provided the pascal case version of the name will be used
+     */
+    title?: string;
+    /**
+     * Optional icon for UI display
+     */
+    icon?: string;
+    /**
+     * A short description 
+     */
+    description?: string;
+}
+
 export interface ToolExecutionContext {
     /**
      * The raw JWT token to the tool execution request

package/src/utils.ts

@@ -0,0 +1,3 @@
+export function kebabCaseToTitle(name: string) {
+    return name.split('-').map(p => p[0].toUpperCase() + p.substring(1)).join(' ');
+}