llm-fillin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1167e6d823abb66aaa8e4cfd2f0a5ba2cb969dfe2ebc88f5a9931e5cf641b846
-  data.tar.gz: 1419c96c1c60df093cf8175cb1fa0e4098460f5528e3ed43097effd7426f4b1a
+  metadata.gz: a9a7ff0f7be64aaca2b9a33a7f0b025efee102564c99ccad04fa461e73c9bc01
+  data.tar.gz: c2c4010ba0ce661098f5ce6295d910b7b50910428434c6e01898116bfc16c41a
 SHA512:
-  metadata.gz: cd888ae3ec1245f5201c5509b3d08ce234927c5b91e61a46b10fd52739d4bfb314657a289da336b4d01fedebdeb3166ec4c036e75fb67d48e7b40be21f336e92
-  data.tar.gz: 4cdb05933e2f97aae0bf296f44f11abf2ac77612a57d8784c959fe184e8038caae4348c009d4ca1979c2294c2bffba9c0909333a0e345518be955049ebc5e425
+  metadata.gz: ae37c8a7f116ae48b31fc657e7f043568c6c3a94e3dac92a245fccbd52f0045507604bc8ce0fb837bfe41c8ffb5d86ca2e9a1fcdb7614fa50e2d0bdb6dec8510
+  data.tar.gz: 5344056f92d113505b1d26847ddccf5d40ffb02a264540efbfe133659756150b75888662013310e3e5e8dc376a92a4a6f833dc6a140f93600cc7a6ec40bcb664

data/README.md

@@ -3,6 +3,8 @@
 **LLM-powered slot filling + tool orchestration for Ruby.**  
 Register JSON-schema tools, let an LLM ask for missing fields, then call your handlers safely.
 
+---
+
 ## Install
 ```bash
 bundle install
@@ -19,14 +21,40 @@ export OPENAI_API_KEY=sk-...
 ruby examples/run_create_toy.rb
 ```
 
-Try:
-```
-I want a red race car toy for $12
+---
+
+## Example Conversation
+
+```text
+AI: Got it! You want a red race car toy for $12. Could you please provide a name for this toy?
+YOU: Supra
+AI: You want a red race car toy named "Supra" for $12. Just to confirm, is the category of the toy "car"?
+YOU: what other category are there?
+AI: The toy categories available are plush, puzzle, doll, car, lego, and other. Would you like to proceed with the "car" category for the red race car toy named Supra?
+YOU: make it lego
+AI: You want a red Lego race car toy priced at $12. Just to confirm, is the toy name "Supra"?
+YOU: yes
+✅ Toy created: Supra (lego, red) - $12.0 | ID TOY-6A99ED
 ```
 
-The assistant will ask for any missing fields (like category) and then “create” the toy.
+---
+
+## How it works
+1. You type a natural request (`"I want a red race car toy for $12"`).
+2. The LLM recognizes intent (`create_toy_v1`) and extracts what it can:
+   - name = missing
+   - category = inferred, but asks for confirmation
+   - price = 1200 minor units
+   - color = red
+3. The assistant asks follow-up questions until all required fields are filled.
+4. When ready, the tool handler runs and returns a structured object with the toy’s details.
+
+---
 
 ## Use in your app
-- Register tools (schemas + handlers)
-- Call the Orchestrator with your message list
-- Validate server-side; enforce tenant/RBAC; generate idempotency for creates
+- Register your own tools in the `Registry` (e.g. `create_invoice`, `create_user`, `lookup_balance`).
+- Pass messages into the `Orchestrator`.
+- The orchestrator ensures:
+  - JSON schema validation
+  - tenant/actor context passed into handlers
+  - idempotency keys for safe “create” operations

data/lib/llm/fillin/adapters/openai_adapter.rb

@@ -6,27 +6,42 @@ module LLM
   module Fillin
     class OpenAIAdapter
       def initialize(api_key:, model:, temperature: 0)
-        @client = OpenAI::Client.new(access_token: api_key)
-        @model = model
+        # Official OpenAI SDK (openai ~> 0.21.x)
+        @client = OpenAI::Client.new(api_key: api_key)
+        @model = model.to_sym         # e.g. :"gpt-4o-mini"
         @temperature = temperature
       end
 
       def step(system_prompt:, messages:, tools:, tool_results: [])
-        resp = @client.chat(parameters: {
-          model: @model,
+        response = @client.chat.completions.create(
+          model: @model,                       # e.g. :"gpt-4o-mini" or "gpt-4o-mini"
           temperature: @temperature,
-          tools: tools,
-          tool_choice: "auto",
-          messages: [{ role: "system", content: system_prompt }] +
-                    messages +
-                    tool_results
-        })
-        msg = resp.dig("choices", 0, "message")
-        { tool_calls: msg["tool_calls"], content: msg["content"] }
+          messages: [{ role: "system", content: system_prompt }] + messages + tool_results,
+          tools: tools,                        # [{ type: "function", function: {...} }, ...]
+          tool_choice: "auto"
+        )
+
+        # In openai ~> 0.21, response is an object:
+        # OpenAI::Models::Chat::ChatCompletion
+        choice = response.choices.first
+        msg    = choice.message               # OpenAI::Models::Chat::ChatCompletionMessage
+
+        # Accessors vary by presence; guard with respond_to?
+        tool_calls    = msg.respond_to?(:tool_calls)    ? msg.tool_calls    : nil
+        function_call = msg.respond_to?(:function_call) ? msg.function_call : nil
+        content       = msg.respond_to?(:content)       ? msg.content       : nil
+
+        {
+          tool_calls: tool_calls,             # Array or nil
+          function_call: function_call,       # Hash-like or nil
+          content: content                    # String or nil
+        }
       end
 
+      # Feed tool results back using role "tool" (tool calls) OR "function" (legacy).
+      # We'll always emit the modern "tool" message; orchestrator can adapt.
       def tool_result_message(tool_call_id:, name:, content:)
-        { role: "tool", tool_call_id:, name:, content: content.to_json }
+        { role: "tool", tool_call_id: tool_call_id, name: name, content: content.to_json }
       end
     end
   end

data/lib/llm/fillin/orchestrator.rb

@@ -17,6 +17,7 @@ module LLM
       # messages: [{role:"user", content:"..."}]
       def step(thread_id:, tenant_id:, actor_id:, messages:)
         prior_tool_msgs = @store.fetch_tool_messages(thread_id)
+
         res = @adapter.step(
           system_prompt: POLICY,
           messages: messages,
@@ -24,28 +25,60 @@ module LLM
           tool_results: prior_tool_msgs
         )
 
+        # --- New-style tools (preferred) ---
         if (calls = res[:tool_calls]).is_a?(Array) && calls.any?
           call = calls.first
-          name, version = call.dig("function", "name").split(/_v/i)
-          args = JSON.parse(call.dig("function", "arguments") || "{}")
+          # In openai 0.21.x these are typed objects:
+          # call => OpenAI::Models::Chat::ChatCompletionMessageFunctionToolCall
+          # call.function => OpenAI::Models::Chat::ChatCompletionMessageFunctionCall
+
+          fn   = call.respond_to?(:function) ? call.function : nil
+          name = fn&.respond_to?(:name) ? fn.name : nil                       # e.g., "create_toy_v1"
+          args_json = fn&.respond_to?(:arguments) ? fn.arguments.to_s : "{}"
+          args = args_json.empty? ? {} : JSON.parse(args_json)
 
-          tool = @registry.tool(name, version: "v1")
+          tool_name, version = (name || "").split(/_v/i)
+          version ||= "v1"
+
+          tool = @registry.tool(tool_name, version: "v1")
           Validators.validate!(tool.schema, args)
 
-          ctx = { tenant_id:, actor_id:, thread_id: }
+          ctx = { tenant_id: tenant_id, actor_id: actor_id, thread_id: thread_id }
           result = tool.handler.call(args, ctx)
 
           tool_msg = @adapter.tool_result_message(
-            tool_call_id: call["id"],
-            name: "#{name}_v1",
+            tool_call_id: call.respond_to?(:id) ? call.id : nil,
+            name: "#{tool_name}_v1",
             content: result
           )
           @store.push_tool_message(thread_id, tool_msg)
 
-          { type: :tool_ran, tool_name: name, result: result }
-        else
-          { type: :assistant, text: res[:content].to_s }
+          return { type: :tool_ran, tool_name: tool_name, result: result }
         end
+
+        # --- Legacy single function_call (fallback) ---
+        if (fc = res[:function_call])
+          name_with_version = fc["name"]
+          args_json = fc["arguments"].to_s
+          args = args_json.empty? ? {} : JSON.parse(args_json)
+
+          tool_name, version = name_with_version.split(/_v/i)
+          version ||= "v1"
+
+          tool = @registry.tool(tool_name, version: "v1")
+          Validators.validate!(tool.schema, args)
+
+          ctx = { tenant_id: tenant_id, actor_id: actor_id, thread_id: thread_id }
+          result = tool.handler.call(args, ctx)
+
+          # Legacy role is "function"; we already store tool messages in memory,
+          # not required for a single-step demo, but safe to omit or adapt if needed.
+
+          return { type: :tool_ran, tool_name: tool_name, result: result }
+        end
+
+        # No tool call -> just assistant text (likely a clarifying question)
+        { type: :assistant, text: res[:content].to_s }
       end
     end
   end

data/lib/llm/fillin/version.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
+# lib/llm/fillin/version.rb
 module LLM
   module Fillin
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm-fillin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Phia Vang