@rcrsr/rill-ext-openai 0.18.1 → 0.18.3

package/dist/index.js

@@ -117,94 +117,67 @@ function buildPropertyFromStructuralType(rillType) {
     return property;
   }
   if (rillType.kind === "dict") {
+    const dictType = rillType;
+    if (dictType.fields && Object.keys(dictType.fields).length > 0) {
+      const nested = buildDictSchema(dictType);
+      return {
+        type: "object",
+        properties: nested.properties,
+        required: nested.required,
+        additionalProperties: false
+      };
+    }
     return { type: "object" };
   }
   return { type: mapRillType(rillType.kind) };
 }
-function buildJsonSchemaFromStructuralType(type, params) {
+function buildDictSchema(dictType) {
   const properties = {};
   const required = [];
-  if (type.kind === "closure") {
-    const closureParams = type.params ?? [];
-    for (let i = 0; i < closureParams.length; 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"];
-      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);
-      }
+  const fields = dictType.fields ?? {};
+  for (const [name, fieldDef] of Object.entries(fields)) {
+    const property = buildPropertyFromStructuralType(fieldDef.type);
+    const description = fieldDef.annotations?.["description"];
+    if (typeof description === "string") {
+      property.description = description;
     }
-  }
-  return { type: "object", properties, required, additionalProperties: false };
-}
-function buildJsonSchema(rillSchema) {
-  const properties = {};
-  const required = [];
-  for (const [key, value] of Object.entries(rillSchema)) {
-    if (typeof value === "string") {
-      properties[key] = buildProperty(value);
-    } else if (typeof value === "object" && value !== null) {
-      properties[key] = buildProperty(value);
-    } else {
-      throw new RuntimeError3("RILL-R004", `unsupported type: ${String(value)}`);
+    properties[name] = property;
+    if (fieldDef.defaultValue === void 0) {
+      required.push(name);
     }
-    required.push(key);
   }
   return { type: "object", properties, required, additionalProperties: false };
 }
-function buildProperty(descriptor) {
-  if (typeof descriptor === "string") {
-    const jsonType2 = mapRillType(descriptor);
-    return { type: jsonType2 };
-  }
-  const rillType = descriptor["type"];
-  if (typeof rillType !== "string") {
-    throw new RuntimeError3("RILL-R004", `unsupported type: ${String(rillType)}`);
+function buildJsonSchemaFromStructuralType(type, params) {
+  if (type.kind === "dict") {
+    return buildDictSchema(type);
   }
-  const jsonType = mapRillType(rillType);
-  const property = { type: jsonType };
-  const description = descriptor["description"];
-  if (typeof description === "string") {
-    property.description = description;
+  if (type.kind !== "closure") {
+    throw new RuntimeError3("RILL-R004", `unsupported schema kind: ${type.kind} (expected dict or closure)`);
   }
-  if ("enum" in descriptor) {
-    if (rillType !== "string") {
-      throw new RuntimeError3("RILL-R004", "enum is only valid for string type");
-    }
-    const enumValues = descriptor["enum"];
-    if (Array.isArray(enumValues)) {
-      property.enum = enumValues;
+  const properties = {};
+  const required = [];
+  const closureParams = type.params ?? [];
+  for (let i = 0; i < closureParams.length; 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"];
+    if (typeof description === "string") {
+      property.description = description;
     }
-  }
-  if (rillType === "list" && "items" in descriptor) {
-    const items = descriptor["items"];
-    if (typeof items === "string") {
-      property.items = buildProperty(items);
-    } else if (typeof items === "object" && items !== null) {
-      property.items = buildProperty(items);
+    const enumAnnotation = rillParam?.annotations["enum"];
+    if (Array.isArray(enumAnnotation)) {
+      property.enum = enumAnnotation;
     }
-  }
-  if (rillType === "dict" && "properties" in descriptor) {
-    const nestedProps = descriptor["properties"];
-    if (typeof nestedProps === "object" && nestedProps !== null) {
-      const subSchema = buildJsonSchema(nestedProps);
-      property.properties = subSchema.properties;
-      property.required = subSchema.required;
-      property.additionalProperties = false;
+    properties[paramName] = property;
+    if (rillParam === void 0 || rillParam.defaultValue === void 0) {
+      required.push(paramName);
     }
   }
-  return property;
+  return { type: "object", properties, required, additionalProperties: false };
 }
 
 // ../../shared/ext-llm/dist/tool-loop.js
@@ -1249,7 +1222,19 @@ function createOpenAIExtension(config) {
             if (!choice || typeof choice !== "object" || !("message" in choice)) {
               return null;
             }
-            return choice.message;
+            const msg = choice.message;
+            if (!msg || typeof msg !== "object") {
+              return null;
+            }
+            const m = msg;
+            const clean = {
+              role: m["role"],
+              content: m["content"]
+            };
+            if (m["tool_calls"]) {
+              clean["tool_calls"] = m["tool_calls"];
+            }
+            return clean;
           },
           // Format tool results into OpenAI message format
           formatToolResult: (toolResults) => {
@@ -1387,8 +1372,8 @@ function createOpenAIExtension(config) {
     generate: {
       params: [
         p.str("prompt"),
+        { name: "schema", type: { kind: "type" }, defaultValue: void 0, annotations: { description: "Type expression for structured output schema" } },
         p.dict("options", void 0, {}, {
-          schema: { type: { kind: "dict" } },
           system: { type: { kind: "string" }, defaultValue: "" },
           max_tokens: { type: { kind: "number" }, defaultValue: 0 },
           messages: { type: { kind: "list", element: { kind: "dict", fields: { role: { type: { kind: "string" } }, content: { type: { kind: "string" } } } } }, defaultValue: [] }
@@ -1398,15 +1383,21 @@ function createOpenAIExtension(config) {
         const startTime = Date.now();
         try {
           const prompt = args["prompt"];
+          const schemaArg = args["schema"];
           const options = args["options"] ?? {};
-          if (!("schema" in options) || options["schema"] === null || options["schema"] === void 0) {
+          if (!schemaArg || !schemaArg.__rill_type || !schemaArg.structure) {
+            throw new RuntimeError6(
+              "RILL-R004",
+              "generate requires a type expression as schema"
+            );
+          }
+          if (schemaArg.structure.kind !== "dict") {
             throw new RuntimeError6(
               "RILL-R004",
-              "generate requires 'schema' option"
+              `generate requires a dict type as schema, got ${schemaArg.structure.kind}`
             );
           }
-          const rillSchema = options["schema"];
-          const jsonSchema = buildJsonSchema(rillSchema);
+          const jsonSchema = buildJsonSchemaFromStructuralType(schemaArg.structure);
           const system = typeof options["system"] === "string" ? options["system"] : factorySystem;
           const maxTokens = typeof options["max_tokens"] === "number" && options["max_tokens"] > 0 ? options["max_tokens"] : factoryMaxTokens;
           const apiMessages = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-ext-openai",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "rill extension for OpenAI API integration",
   "license": "MIT",
   "author": "Andre Bremer",
@@ -25,8 +25,8 @@
     "dts-bundle-generator": "^9.5.1",
     "tsup": "^8.5.1",
     "undici-types": "^7.22.0",
-    "@rcrsr/rill-ext-llm-shared": "^0.18.1",
-    "@rcrsr/rill-ext-param-shared": "0.18.1"
+    "@rcrsr/rill-ext-param-shared": "0.18.1",
+    "@rcrsr/rill-ext-llm-shared": "^0.18.3"
   },
   "files": [
     "dist"