@rcrsr/rill-ext-openai 0.9.0 → 0.11.0

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/factory.ts
 import OpenAI from "openai";
 import {
-  RuntimeError as RuntimeError5,
+  RuntimeError as RuntimeError6,
   emitExtensionEvent,
   createVector,
   isDict as isDict2,
@@ -96,6 +96,50 @@ function mapRillType(rillType) {
   }
   return jsonType;
 }
+function buildPropertyFromStructuralType(rillType) {
+  if (rillType.type === "closure" || rillType.type === "tuple") {
+    throw new RuntimeError3("RILL-R004", `unsupported type for JSON Schema: ${rillType.type}`);
+  }
+  if (rillType.type === "any") {
+    return {};
+  }
+  if (rillType.type === "list") {
+    const property = { type: "array" };
+    if (rillType.element !== void 0) {
+      property.items = buildPropertyFromStructuralType(rillType.element);
+    }
+    return property;
+  }
+  if (rillType.type === "dict") {
+    return { type: "object" };
+  }
+  return { type: mapRillType(rillType.type) };
+}
+function buildJsonSchemaFromStructuralType(type, params) {
+  const properties = {};
+  const required = [];
+  if (type.type === "closure") {
+    const closureParams = type.params ?? [];
+    for (let i = 0; i < closureParams.length; i++) {
+      const [paramName, paramType] = closureParams[i];
+      const rillParam = params?.[i];
+      const property = buildPropertyFromStructuralType(paramType);
+      const description = rillParam?.annotations["description"];
+      if (typeof description === "string") {
+        property.description = description;
+      }
+      const enumAnnotation = rillParam?.annotations["enum"];
+      if (Array.isArray(enumAnnotation)) {
+        property.enum = enumAnnotation;
+      }
+      properties[paramName] = property;
+      if (rillParam === void 0 || rillParam.defaultValue === void 0) {
+        required.push(paramName);
+      }
+    }
+  }
+  return { type: "object", properties, required, additionalProperties: false };
+}
 function buildJsonSchema(rillSchema) {
   const properties = {};
   const required = [];
@@ -300,39 +344,15 @@ async function executeToolLoop(messages, tools, maxErrors, callbacks, emitEvent,
     let inputSchema;
     const params = callable.kind === "application" ? callable.params ?? [] : callable.kind === "script" ? callable.params : [];
     if (params.length > 0) {
-      const properties = {};
-      const required = [];
-      for (const param of params) {
-        const property = {};
-        if (param.typeName !== null) {
-          const descriptor = {
-            [param.name]: { type: param.typeName }
-          };
-          const schema = buildJsonSchema(descriptor);
-          const built = schema.properties[param.name];
-          if (built !== void 0) {
-            Object.assign(property, built);
-          }
-        }
-        let paramDesc;
-        if (callable.kind === "script") {
-          const annot = callable.paramAnnotations[param.name];
-          paramDesc = annot?.["description"] ?? "";
-        } else {
-          paramDesc = param.description ?? "";
-        }
-        if (paramDesc) {
-          property["description"] = paramDesc;
-        }
-        properties[param.name] = property;
-        if (param.defaultValue === null) {
-          required.push(param.name);
-        }
-      }
+      const closureType = {
+        type: "closure",
+        params: params.map((p2) => [p2.name, p2.type ?? { type: "any" }])
+      };
+      const builtSchema = buildJsonSchemaFromStructuralType(closureType, [...params]);
       inputSchema = {
         type: "object",
-        properties,
-        required
+        properties: builtSchema.properties,
+        required: builtSchema.required
       };
     } else {
       inputSchema = { type: "object", properties: {}, required: [] };
@@ -452,6 +472,126 @@ async function executeToolLoop(messages, tools, maxErrors, callbacks, emitEvent,
   };
 }
 
+// ../../shared/ext-param/dist/param.js
+import { RuntimeError as RuntimeError5 } from "@rcrsr/rill";
+function validateParamName(name) {
+  if (name === "") {
+    throw new RuntimeError5("RILL-R001", "param name must not be empty");
+  }
+  if (/\s/.test(name)) {
+    throw new RuntimeError5("RILL-R001", "param name must be a valid identifier");
+  }
+}
+function buildAnnotations(desc) {
+  if (desc !== void 0) {
+    return { description: desc };
+  }
+  return {};
+}
+var p = {
+  /**
+   * IR-1: Creates a string parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param desc - Optional description
+   * @returns RillParam with type 'string'
+   */
+  str(name, desc) {
+    validateParamName(name);
+    return {
+      name,
+      type: { type: "string" },
+      defaultValue: void 0,
+      annotations: buildAnnotations(desc)
+    };
+  },
+  /**
+   * IR-2: Creates a number parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param desc - Optional description
+   * @param def - Optional default value
+   * @returns RillParam with type 'number'
+   */
+  num(name, desc, def) {
+    validateParamName(name);
+    return {
+      name,
+      type: { type: "number" },
+      defaultValue: def,
+      annotations: buildAnnotations(desc)
+    };
+  },
+  /**
+   * IR-3: Creates a boolean parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param desc - Optional description
+   * @param def - Optional default value
+   * @returns RillParam with type 'bool'
+   */
+  bool(name, desc, def) {
+    validateParamName(name);
+    return {
+      name,
+      type: { type: "bool" },
+      defaultValue: def,
+      annotations: buildAnnotations(desc)
+    };
+  },
+  /**
+   * IR-4: Creates a dict parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param desc - Optional description
+   * @param def - Optional default value
+   * @returns RillParam with type 'dict'
+   */
+  dict(name, desc, def) {
+    validateParamName(name);
+    return {
+      name,
+      type: { type: "dict" },
+      defaultValue: def,
+      annotations: buildAnnotations(desc)
+    };
+  },
+  /**
+   * IR-5: Creates a list parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param itemType - Optional element type; omitted when not provided
+   * @param desc - Optional description
+   * @returns RillParam with type 'list' (with element if itemType provided)
+   */
+  list(name, itemType, desc) {
+    validateParamName(name);
+    const type = itemType !== void 0 ? { type: "list", element: itemType } : { type: "list" };
+    return {
+      name,
+      type,
+      defaultValue: void 0,
+      annotations: buildAnnotations(desc)
+    };
+  },
+  /**
+   * IR-6: Creates a callable parameter descriptor.
+   *
+   * @param name - Parameter name (must be a valid identifier)
+   * @param desc - Optional description
+   * @returns RillParam with type 'closure'
+   */
+  callable(name, desc) {
+    validateParamName(name);
+    return {
+      name,
+      type: { type: "closure" },
+      defaultValue: void 0,
+      annotations: buildAnnotations(desc)
+    };
+  }
+};
+
 // src/factory.ts
 var DEFAULT_MAX_COMPLETION_TOKENS = 4096;
 var detectOpenAIError = (error) => {
@@ -500,8 +640,8 @@ function createOpenAIExtension(config) {
     // IR-4: openai::message
     message: {
       params: [
-        { name: "text", type: "string" },
-        { name: "options", type: "dict", defaultValue: {} }
+        p.str("text"),
+        p.dict("options", void 0, {})
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
@@ -509,7 +649,7 @@ function createOpenAIExtension(config) {
           const text = args[0];
           const options = args[1] ?? {};
           if (text.trim().length === 0) {
-            throw new RuntimeError5("RILL-R004", "prompt text cannot be empty");
+            throw new RuntimeError6("RILL-R004", "prompt text cannot be empty");
           }
           const system = typeof options["system"] === "string" ? options["system"] : factorySystem;
           const maxTokens = typeof options["max_tokens"] === "number" ? options["max_tokens"] : factoryMaxTokens;
@@ -577,13 +717,13 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Send single message to OpenAI API",
-      returnType: "dict"
+      returnType: { type: "dict" }
     },
     // IR-5: openai::messages
     messages: {
       params: [
-        { name: "messages", type: "list" },
-        { name: "options", type: "dict", defaultValue: {} }
+        p.list("messages"),
+        p.dict("options", void 0, {})
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
@@ -591,7 +731,7 @@ function createOpenAIExtension(config) {
           const messages = args[0];
           const options = args[1] ?? {};
           if (messages.length === 0) {
-            throw new RuntimeError5(
+            throw new RuntimeError6(
               "RILL-R004",
               "messages list cannot be empty"
             );
@@ -608,18 +748,18 @@ function createOpenAIExtension(config) {
           for (let i = 0; i < messages.length; i++) {
             const msg = messages[i];
             if (!msg || typeof msg !== "object" || !("role" in msg)) {
-              throw new RuntimeError5(
+              throw new RuntimeError6(
                 "RILL-R004",
                 "message missing required 'role' field"
               );
             }
             const role = msg["role"];
             if (role !== "user" && role !== "assistant" && role !== "tool") {
-              throw new RuntimeError5("RILL-R004", `invalid role '${role}'`);
+              throw new RuntimeError6("RILL-R004", `invalid role '${role}'`);
             }
             if (role === "user" || role === "tool") {
               if (!("content" in msg) || typeof msg["content"] !== "string") {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   `${role} message requires 'content'`
                 );
@@ -632,7 +772,7 @@ function createOpenAIExtension(config) {
               const hasContent = "content" in msg && msg["content"];
               const hasToolCalls = "tool_calls" in msg && msg["tool_calls"];
               if (!hasContent && !hasToolCalls) {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   "assistant message requires 'content' or 'tool_calls'"
                 );
@@ -703,11 +843,11 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Send multi-turn conversation to OpenAI API",
-      returnType: "dict"
+      returnType: { type: "dict" }
     },
     // IR-6: openai::embed
     embed: {
-      params: [{ name: "text", type: "string" }],
+      params: [p.str("text")],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
@@ -721,7 +861,7 @@ function createOpenAIExtension(config) {
           });
           const embeddingData = response.data[0]?.embedding;
           if (!embeddingData || embeddingData.length === 0) {
-            throw new RuntimeError5(
+            throw new RuntimeError6(
               "RILL-R004",
               "OpenAI: empty embedding returned"
             );
@@ -754,11 +894,11 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Generate embedding vector for text",
-      returnType: "vector"
+      returnType: { type: "vector" }
     },
     // IR-7: openai::embed_batch
     embed_batch: {
-      params: [{ name: "texts", type: "list" }],
+      params: [p.list("texts")],
       fn: async (args, ctx) => {
         const startTime = Date.now();
         try {
@@ -777,7 +917,7 @@ function createOpenAIExtension(config) {
           for (const embeddingItem of response.data) {
             const embeddingData = embeddingItem.embedding;
             if (!embeddingData || embeddingData.length === 0) {
-              throw new RuntimeError5(
+              throw new RuntimeError6(
                 "RILL-R004",
                 "OpenAI: empty embedding returned"
               );
@@ -815,13 +955,13 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Generate embedding vectors for multiple texts",
-      returnType: "list"
+      returnType: { type: "list" }
     },
     // IR-8: openai::tool_loop
     tool_loop: {
       params: [
-        { name: "prompt", type: "string" },
-        { name: "options", type: "dict", defaultValue: {} }
+        p.str("prompt"),
+        p.dict("options", void 0, {})
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
@@ -829,10 +969,10 @@ function createOpenAIExtension(config) {
           const prompt = args[0];
           const options = args[1] ?? {};
           if (prompt.trim().length === 0) {
-            throw new RuntimeError5("RILL-R004", "prompt text cannot be empty");
+            throw new RuntimeError6("RILL-R004", "prompt text cannot be empty");
           }
           if (!("tools" in options) || !isDict2(options["tools"])) {
-            throw new RuntimeError5(
+            throw new RuntimeError6(
               "RILL-R004",
               "tool_loop requires 'tools' option"
             );
@@ -852,17 +992,17 @@ function createOpenAIExtension(config) {
             const prependedMessages = options["messages"];
             for (const msg of prependedMessages) {
               if (!msg || typeof msg !== "object" || !("role" in msg)) {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   "message missing required 'role' field"
                 );
               }
               const role = msg["role"];
               if (role !== "user" && role !== "assistant") {
-                throw new RuntimeError5("RILL-R004", `invalid role '${role}'`);
+                throw new RuntimeError6("RILL-R004", `invalid role '${role}'`);
               }
               if (!("content" in msg) || typeof msg["content"] !== "string") {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   `${role} message requires 'content'`
                 );
@@ -1056,13 +1196,13 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Execute tool-use loop with OpenAI API",
-      returnType: "dict"
+      returnType: { type: "dict" }
     },
     // IR-3: openai::generate
     generate: {
       params: [
-        { name: "prompt", type: "string" },
-        { name: "options", type: "dict" }
+        p.str("prompt"),
+        p.dict("options")
       ],
       fn: async (args, ctx) => {
         const startTime = Date.now();
@@ -1070,7 +1210,7 @@ function createOpenAIExtension(config) {
           const prompt = args[0];
           const options = args[1] ?? {};
           if (!("schema" in options) || options["schema"] === null || options["schema"] === void 0) {
-            throw new RuntimeError5(
+            throw new RuntimeError6(
               "RILL-R004",
               "generate requires 'schema' option"
             );
@@ -1090,17 +1230,17 @@ function createOpenAIExtension(config) {
             const prependedMessages = options["messages"];
             for (const msg of prependedMessages) {
               if (!msg || typeof msg !== "object" || !("role" in msg)) {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   "message missing required 'role' field"
                 );
               }
               const role = msg["role"];
               if (role !== "user" && role !== "assistant") {
-                throw new RuntimeError5("RILL-R004", `invalid role '${role}'`);
+                throw new RuntimeError6("RILL-R004", `invalid role '${role}'`);
               }
               if (!("content" in msg) || typeof msg["content"] !== "string") {
-                throw new RuntimeError5(
+                throw new RuntimeError6(
                   "RILL-R004",
                   `${role} message requires 'content'`
                 );
@@ -1135,7 +1275,7 @@ function createOpenAIExtension(config) {
             data = JSON.parse(raw);
           } catch (parseError) {
             const detail = parseError instanceof Error ? parseError.message : String(parseError);
-            throw new RuntimeError5(
+            throw new RuntimeError6(
               "RILL-R004",
               `generate: failed to parse response JSON: ${detail}`
             );
@@ -1164,7 +1304,7 @@ function createOpenAIExtension(config) {
           return result2;
         } catch (error) {
           const duration = Date.now() - startTime;
-          const rillError = error instanceof RuntimeError5 ? error : mapProviderError("OpenAI", error, detectOpenAIError);
+          const rillError = error instanceof RuntimeError6 ? error : mapProviderError("OpenAI", error, detectOpenAIError);
           emitExtensionEvent(ctx, {
             event: "openai:error",
             subsystem: "extension:openai",
@@ -1175,7 +1315,7 @@ function createOpenAIExtension(config) {
         }
       },
       description: "Generate structured output from OpenAI API",
-      returnType: "dict"
+      returnType: { type: "dict" }
     }
   };
   result.dispose = dispose;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-ext-openai",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "rill extension for OpenAI API integration",
   "license": "MIT",
   "author": "Andre Bremer",
@@ -17,10 +17,10 @@
     "scripting"
   ],
   "peerDependencies": {
-    "@rcrsr/rill": "^0.9.0"
+    "@rcrsr/rill": "^0.11.0"
   },
   "devDependencies": {
-    "@rcrsr/rill": "^0.9.0",
+    "@rcrsr/rill": "^0.11.0",
     "@types/node": "^25.3.0",
     "dts-bundle-generator": "^9.5.1",
     "tsup": "^8.5.1",
@@ -43,7 +43,8 @@
     "access": "public"
   },
   "dependencies": {
-    "openai": "^6.25.0"
+    "openai": "^6.25.0",
+    "@rcrsr/rill-ext-param-shared": "0.0.1"
   },
   "scripts": {
     "build": "tsup && dts-bundle-generator --config dts-bundle-generator.config.cjs",