@rcrsr/rill-ext-openai 0.11.0 → 0.16.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 // Generated by dts-bundle-generator v9.5.1
 
-import { ExtensionConfigSchema, ExtensionResult } from '@rcrsr/rill';
+import { ExtensionConfigSchema, ExtensionManifest, ExtensionResult } from '@rcrsr/rill';
 
 /**
  * Base configuration for LLM extensions
@@ -73,8 +73,9 @@ export type OpenAIExtensionConfig = LLMProviderConfig;
  * ```
  */
 export declare function createOpenAIExtension(config: OpenAIExtensionConfig): ExtensionResult;
-export declare const VERSION = "0.0.1";
+export declare const VERSION: string;
 export declare const configSchema: ExtensionConfigSchema;
+export declare const extensionManifest: ExtensionManifest;
 
 export {
 	LLMProviderConfig as LLMExtensionConfig,

package/dist/index.js

@@ -1,3 +1,6 @@
+// src/index.ts
+import { createRequire } from "module";
+
 // src/factory.ts
 import OpenAI from "openai";
 import {
@@ -5,7 +8,8 @@ import {
   emitExtensionEvent,
   createVector,
   isDict as isDict2,
-  isVector
+  isVector,
+  rillTypeToTypeValue
 } from "@rcrsr/rill";
 
 // ../../shared/ext-llm/dist/validation.js
@@ -121,7 +125,9 @@ function buildJsonSchemaFromStructuralType(type, params) {
   if (type.type === "closure") {
     const closureParams = type.params ?? [];
     for (let i = 0; i < closureParams.length; i++) {
-      const [paramName, paramType] = closureParams[i];
+      const fieldDef = closureParams[i];
+      const paramName = fieldDef.name ?? `param${i}`;
+      const paramType = fieldDef.type;
       const rillParam = params?.[i];
       const property = buildPropertyFromStructuralType(paramType);
       const description = rillParam?.annotations["description"];
@@ -220,21 +226,20 @@ async function executeToolCall(toolName, toolInput, tools, context) {
     throw new RuntimeError4("RILL-R004", `Invalid tool input for ${toolName}: tool must be application, runtime, or script callable`);
   }
   try {
-    let args;
-    if ((callable.kind === "application" || callable.kind === "script") && callable.params && callable.params.length > 0) {
-      const params = callable.params;
-      const inputDict = toolInput;
-      args = params.map((param) => {
-        const value = inputDict[param.name];
-        return value !== void 0 ? value : void 0;
-      });
-    } else {
-      args = [toolInput];
-    }
+    const inputDict = toolInput;
     if (callable.kind === "script") {
       if (!context) {
         throw new RuntimeError4("RILL-R004", `Invalid tool input for ${toolName}: script callable requires a runtime context`);
       }
+      let args;
+      if (callable.params && callable.params.length > 0) {
+        args = callable.params.map((param) => {
+          const value = inputDict[param.name];
+          return value !== void 0 ? value : void 0;
+        });
+      } else {
+        args = [inputDict];
+      }
       return await invokeCallable(callable, args, context);
     }
     const ctx = context ?? {
@@ -242,7 +247,7 @@ async function executeToolCall(toolName, toolInput, tools, context) {
       variables: /* @__PURE__ */ new Map(),
       pipeValue: null
     };
-    const result = callable.fn(args, ctx);
+    const result = callable.fn(inputDict, ctx);
     return result instanceof Promise ? await result : result;
   } catch (error) {
     if (error instanceof RuntimeError4) {
@@ -335,18 +340,13 @@ async function executeToolLoop(messages, tools, maxErrors, callbacks, emitEvent,
       throw new RuntimeError4("RILL-R004", `tool_loop: tool "${name}" is not a callable`);
     }
     const callable = fnValue;
-    let description;
-    if (callable.kind === "script") {
-      description = callable.annotations["description"] ?? "";
-    } else {
-      description = callable.description ?? "";
-    }
+    const description = callable.annotations?.["description"] ?? "";
     let inputSchema;
     const params = callable.kind === "application" ? callable.params ?? [] : callable.kind === "script" ? callable.params : [];
     if (params.length > 0) {
       const closureType = {
         type: "closure",
-        params: params.map((p2) => [p2.name, p2.type ?? { type: "any" }])
+        params: params.map((p2) => ({ name: p2.name, type: p2.type ?? { type: "any" } }))
       };
       const builtSchema = buildJsonSchemaFromStructuralType(closureType, [...params]);
       inputSchema = {
@@ -545,13 +545,15 @@ var p = {
    * @param name - Parameter name (must be a valid identifier)
    * @param desc - Optional description
    * @param def - Optional default value
-   * @returns RillParam with type 'dict'
+   * @param fields - Optional structural field definitions (RillFieldDef with type and optional defaultValue)
+   * @returns RillParam with type 'dict' (with fields if provided)
    */
-  dict(name, desc, def) {
+  dict(name, desc, def, fields) {
     validateParamName(name);
+    const type = fields !== void 0 ? { type: "dict", fields } : { type: "dict" };
     return {
       name,
-      type: { type: "dict" },
+      type,
       defaultValue: def,
       annotations: buildAnnotations(desc)
     };
@@ -641,13 +643,16 @@ function createOpenAIExtension(config) {
     message: {
       params: [
         p.str("text"),
-        p.dict("options", void 0, {})
+        p.dict("options", void 0, {}, {
+          system: { type: { type: "string" }, defaultValue: "" },
+          max_tokens: { type: { type: "number" }, defaultValue: 0 }
+        })
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const text = args[0];
-          const options = args[1] ?? {};
+          const text = args["text"];
+          const options = args["options"] ?? {};
           if (text.trim().length === 0) {
             throw new RuntimeError6("RILL-R004", "prompt text cannot be empty");
           }
@@ -716,20 +721,33 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Send single message to OpenAI API",
-      returnType: { type: "dict" }
+      annotations: { description: "Send single message to OpenAI API" },
+      returnType: rillTypeToTypeValue({
+        type: "dict",
+        fields: {
+          content: { type: { type: "string" } },
+          model: { type: { type: "string" } },
+          usage: { type: { type: "dict", fields: { input: { type: { type: "number" } }, output: { type: { type: "number" } } } } },
+          stop_reason: { type: { type: "string" } },
+          id: { type: { type: "string" } },
+          messages: { type: { type: "list", element: { type: "dict" } } }
+        }
+      })
     },
     // IR-5: openai::messages
     messages: {
       params: [
-        p.list("messages"),
-        p.dict("options", void 0, {})
+        p.list("messages", { type: "dict", fields: { role: { type: { type: "string" } }, content: { type: { type: "string" } } } }),
+        p.dict("options", void 0, {}, {
+          system: { type: { type: "string" }, defaultValue: "" },
+          max_tokens: { type: { type: "number" }, defaultValue: 0 }
+        })
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const messages = args[0];
-          const options = args[1] ?? {};
+          const messages = args["messages"];
+          const options = args["options"] ?? {};
           if (messages.length === 0) {
             throw new RuntimeError6(
               "RILL-R004",
@@ -842,8 +860,18 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Send multi-turn conversation to OpenAI API",
-      returnType: { type: "dict" }
+      annotations: { description: "Send multi-turn conversation to OpenAI API" },
+      returnType: rillTypeToTypeValue({
+        type: "dict",
+        fields: {
+          content: { type: { type: "string" } },
+          model: { type: { type: "string" } },
+          usage: { type: { type: "dict", fields: { input: { type: { type: "number" } }, output: { type: { type: "number" } } } } },
+          stop_reason: { type: { type: "string" } },
+          id: { type: { type: "string" } },
+          messages: { type: { type: "list", element: { type: "dict" } } }
+        }
+      })
     },
     // IR-6: openai::embed
     embed: {
@@ -851,7 +879,7 @@ function createOpenAIExtension(config) {
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const text = args[0];
+          const text = args["text"];
           validateEmbedText(text.trim());
           validateEmbedModel(factoryEmbedModel);
           const response = await client.embeddings.create({
@@ -893,8 +921,8 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Generate embedding vector for text",
-      returnType: { type: "vector" }
+      annotations: { description: "Generate embedding vector for text" },
+      returnType: rillTypeToTypeValue({ type: "vector" })
     },
     // IR-7: openai::embed_batch
     embed_batch: {
@@ -902,7 +930,7 @@ function createOpenAIExtension(config) {
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const texts = args[0];
+          const texts = args["texts"];
           if (texts.length === 0) {
             return [];
           }
@@ -954,20 +982,27 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Generate embedding vectors for multiple texts",
-      returnType: { type: "list" }
+      annotations: { description: "Generate embedding vectors for multiple texts" },
+      returnType: rillTypeToTypeValue({ type: "list", element: { type: "vector" } })
     },
     // IR-8: openai::tool_loop
     tool_loop: {
       params: [
         p.str("prompt"),
-        p.dict("options", void 0, {})
+        p.dict("options", void 0, {}, {
+          tools: { type: { type: "dict" } },
+          system: { type: { type: "string" }, defaultValue: "" },
+          max_tokens: { type: { type: "number" }, defaultValue: 0 },
+          max_errors: { type: { type: "number" }, defaultValue: 3 },
+          max_turns: { type: { type: "number" }, defaultValue: 10 },
+          messages: { type: { type: "list", element: { type: "dict", fields: { role: { type: { type: "string" } }, content: { type: { type: "string" } } } } }, defaultValue: [] }
+        })
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const prompt = args[0];
-          const options = args[1] ?? {};
+          const prompt = args["prompt"];
+          const options = args["options"] ?? {};
           if (prompt.trim().length === 0) {
             throw new RuntimeError6("RILL-R004", "prompt text cannot be empty");
           }
@@ -1195,20 +1230,35 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Execute tool-use loop with OpenAI API",
-      returnType: { type: "dict" }
+      annotations: { description: "Execute tool-use loop with OpenAI API" },
+      returnType: rillTypeToTypeValue({
+        type: "dict",
+        fields: {
+          content: { type: { type: "string" } },
+          model: { type: { type: "string" } },
+          usage: { type: { type: "dict", fields: { input: { type: { type: "number" } }, output: { type: { type: "number" } } } } },
+          stop_reason: { type: { type: "string" } },
+          turns: { type: { type: "number" } },
+          messages: { type: { type: "list", element: { type: "dict" } } }
+        }
+      })
     },
     // IR-3: openai::generate
     generate: {
       params: [
         p.str("prompt"),
-        p.dict("options")
+        p.dict("options", void 0, {}, {
+          schema: { type: { type: "dict" } },
+          system: { type: { type: "string" }, defaultValue: "" },
+          max_tokens: { type: { type: "number" }, defaultValue: 0 },
+          messages: { type: { type: "list", element: { type: "dict", fields: { role: { type: { type: "string" } }, content: { type: { type: "string" } } } } }, defaultValue: [] }
+        })
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
-          const prompt = args[0];
-          const options = args[1] ?? {};
+          const prompt = args["prompt"];
+          const options = args["options"] ?? {};
           if (!("schema" in options) || options["schema"] === null || options["schema"] === void 0) {
             throw new RuntimeError6(
               "RILL-R004",
@@ -1314,8 +1364,18 @@ function createOpenAIExtension(config) {
           throw rillError;
         }
       },
-      description: "Generate structured output from OpenAI API",
-      returnType: { type: "dict" }
+      annotations: { description: "Generate structured output from OpenAI API" },
+      returnType: rillTypeToTypeValue({
+        type: "dict",
+        fields: {
+          data: { type: { type: "any" } },
+          raw: { type: { type: "string" } },
+          model: { type: { type: "string" } },
+          usage: { type: { type: "dict", fields: { input: { type: { type: "number" } }, output: { type: { type: "number" } } } } },
+          stop_reason: { type: { type: "string" } },
+          id: { type: { type: "string" } }
+        }
+      })
     }
   };
   result.dispose = dispose;
@@ -1323,7 +1383,9 @@ function createOpenAIExtension(config) {
 }
 
 // src/index.ts
-var VERSION = "0.0.1";
+var _require = createRequire(import.meta.url);
+var _pkg = _require("../package.json");
+var VERSION = _pkg.version;
 var configSchema = {
   api_key: { type: "string", required: true, secret: true },
   model: { type: "string", required: true },
@@ -1335,8 +1397,14 @@ var configSchema = {
   system: { type: "string" },
   embed_model: { type: "string" }
 };
+var extensionManifest = {
+  factory: createOpenAIExtension,
+  configSchema,
+  version: VERSION
+};
 export {
   VERSION,
   configSchema,
-  createOpenAIExtension
+  createOpenAIExtension,
+  extensionManifest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-ext-openai",
-  "version": "0.11.0",
+  "version": "0.16.0",
   "description": "rill extension for OpenAI API integration",
   "license": "MIT",
   "author": "Andre Bremer",
@@ -17,10 +17,10 @@
     "scripting"
   ],
   "peerDependencies": {
-    "@rcrsr/rill": "^0.11.0"
+    "@rcrsr/rill": "~0.16.0"
   },
   "devDependencies": {
-    "@rcrsr/rill": "^0.11.0",
+    "@rcrsr/rill": "~0.16.0",
     "@types/node": "^25.3.0",
     "dts-bundle-generator": "^9.5.1",
     "tsup": "^8.5.1",