raix 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed80bdf079ec738beb42df145184b5b23b5ad6c2f507233afd9aed47a1ac61f9
-  data.tar.gz: b38006ad88398d9584d29fad763b7361cd22f7d6d6fb3d51e70b6ac80a5c39aa
+  metadata.gz: '0868c4163ea58511e3c0dfc66b2b22a5cb2dbb16a7575746b36cd70af4777137'
+  data.tar.gz: 4e396262603a787dc58817e9fbb536264f25cdb9462bcbe035d675e59cb179ad
 SHA512:
-  metadata.gz: c896ee3e447b7d45e009cc0c18b6d5527f4fc2620773a27a94743c591e9f535be0f1692e4e4d2b1a60b2059b813e66c5c5c32464f7ea194a95d6b31e553fad59
-  data.tar.gz: 822e63a7375693fec475f6056db092c5e1a75398cd513e7650b8bfeec6535fe42c85681b98d4867869bca7e83a156cae5ac8101573c6ebd25f899d86c9b1fe46
+  metadata.gz: 8ae8a80e0e45dfba22290aefe27c39fd914f9046228dac33af1bc631e55a9eff73e38500c12c9eec6ba7bff67a5a16d51438ccf80cbcf423b070125dcd5710c4
+  data.tar.gz: ffb45352168291e28041b787fa8c2bf61c032d5bd5c59fb5a5653a602d6b1bb5ef282475ce7d828722113df797369127a1a4cdeec5da1c53ad887f1665b0385a

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.9.1] - 2025-05-30
+### Added
+- **MCP Type Coercion** - Automatic type conversion for MCP tool arguments based on JSON schema
+  - Supports integer, number, boolean, array, and object types
+  - Handles nested objects and arrays of objects with proper coercion
+  - Gracefully handles invalid JSON and type mismatches
+- **MCP Image Support** - MCP tools can now return image content as structured JSON
+
+### Fixed
+- Fixed handling of nil values in MCP argument coercion
+
 ## [0.9.0] - 2025-05-30
 ### Added
 - **MCP (Model Context Protocol) Support**

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    raix (0.9.0)
+    raix (0.9.1)
       activesupport (>= 6.0)
       faraday-retry (~> 2.0)
       open_router (~> 0.2)

data/lib/mcp/sse_client.rb

@@ -42,7 +42,8 @@ module Raix
         end
       end
 
-      # Executes a tool with given arguments, returns text content.
+      # Executes a tool with given arguments.
+      # Returns text content directly, or JSON-encoded data for other content types.
       def call_tool(name, **arguments)
         request_id = SecureRandom.uuid
         send_json_rpc(request_id, "tools/call", name:, arguments:)
@@ -56,9 +57,18 @@ module Raix
         first_item = content.first
         case first_item
         when Hash
-          if first_item[:type] == "text"
+          case first_item[:type]
+          when "text"
             first_item[:text]
+          when "image"
+            # Return a structured response for images
+            {
+              type: "image",
+              data: first_item[:data],
+              mime_type: first_item[:mimeType] || "image/png"
+            }.to_json
           else
+            # For any other type, return the item as JSON
             first_item.to_json
           end
         else

data/lib/mcp/stdio_client.rb

@@ -21,14 +21,34 @@ module Raix
         end
       end
 
-      # Executes a tool with given arguments, returns text content.
+      # Executes a tool with given arguments.
+      # Returns text content directly, or JSON-encoded data for other content types.
       def call_tool(name, **arguments)
         result = call("tools/call", name:, arguments:)
-        unless result.dig("content", 0, "type") == "text"
-          raise NotImplementedError, "Only text is supported"
-        end
+        content = result["content"]
+        return "" if content.nil? || content.empty?
 
-        result.dig("content", 0, "text")
+        # Handle different content formats
+        first_item = content.first
+        case first_item
+        when Hash
+          case first_item["type"]
+          when "text"
+            first_item["text"]
+          when "image"
+            # Return a structured response for images
+            {
+              type: "image",
+              data: first_item["data"],
+              mime_type: first_item["mimeType"] || "image/png"
+            }.to_json
+          else
+            # For any other type, return the item as JSON
+            first_item.to_json
+          end
+        else
+          first_item.to_s
+        end
       end
 
       # Closes the connection to the server.

data/lib/raix/mcp.rb

@@ -115,11 +115,19 @@ module Raix
           # Required by OpenAI
           latest_definition[:parameters][:properties] ||= {}
 
+          # Store the schema for type coercion
+          tool_schemas = @tool_schemas ||= {}
+          tool_schemas[local_name] = input_schema
+
           # --- define an instance method that proxies to the server
           define_method(local_name) do |arguments, _cache|
             arguments ||= {}
 
-            content_text = client.call_tool(remote_name, **arguments)
+            # Coerce argument types based on the input schema
+            stored_schema = self.class.instance_variable_get(:@tool_schemas)&.dig(local_name)
+            coerced_arguments = coerce_arguments(arguments, stored_schema)
+
+            content_text = client.call_tool(remote_name, **coerced_arguments)
             call_id = SecureRandom.uuid
 
             # Mirror FunctionDispatch transcript behaviour
@@ -157,5 +165,92 @@ module Raix
         @mcp_servers[client.unique_key] = { tools: filtered_tools, client: }
       end
     end
+
+    private
+
+    # Coerce argument types based on the JSON schema
+    def coerce_arguments(arguments, schema)
+      return arguments unless schema.is_a?(Hash) && schema["properties"].is_a?(Hash)
+
+      coerced = {}
+      schema["properties"].each do |key, prop_schema|
+        value = if arguments.key?(key)
+                  arguments[key]
+                elsif arguments.key?(key.to_sym)
+                  arguments[key.to_sym]
+                end
+        next if value.nil?
+
+        coerced[key] = coerce_value(value, prop_schema)
+      end
+
+      # Include any additional arguments not in the schema
+      arguments.each do |key, value|
+        key_str = key.to_s
+        coerced[key_str] = value unless coerced.key?(key_str)
+      end
+
+      coerced.with_indifferent_access
+    end
+
+    # Coerce a single value based on its schema
+    def coerce_value(value, schema)
+      return value unless schema.is_a?(Hash)
+
+      case schema["type"]
+      when "number", "integer"
+        if value.is_a?(String) && value.match?(/\A-?\d+(\.\d+)?\z/)
+          schema["type"] == "integer" ? value.to_i : value.to_f
+        else
+          value
+        end
+      when "boolean"
+        case value
+        when "true", true then true
+        when "false", false then false
+        else value
+        end
+      when "array"
+        array_value = begin
+          value.is_a?(String) ? JSON.parse(value) : value
+        rescue JSON::ParserError
+          value
+        end
+
+        # If there's an items schema, coerce each element
+        if array_value.is_a?(Array) && schema["items"]
+          array_value.map { |item| coerce_value(item, schema["items"]) }
+        else
+          array_value
+        end
+      when "object"
+        object_value = begin
+          value.is_a?(String) ? JSON.parse(value) : value
+        rescue JSON::ParserError
+          value
+        end
+
+        # If there are properties defined, coerce them recursively
+        if object_value.is_a?(Hash) && schema["properties"]
+          coerced_object = {}
+          schema["properties"].each do |prop_key, prop_schema|
+            prop_value = object_value[prop_key] || object_value[prop_key.to_sym]
+            coerced_object[prop_key] = coerce_value(prop_value, prop_schema) unless prop_value.nil?
+          end
+
+          # Include any additional properties not in the schema
+          object_value.each do |obj_key, obj_value|
+            obj_key_str = obj_key.to_s
+            coerced_object[obj_key_str] = obj_value unless coerced_object.key?(obj_key_str)
+          end
+
+          coerced_object
+        else
+          object_value
+        end
+      else
+        value
+      end
+    end
   end
 end

data/lib/raix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raix
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raix
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Obie Fernandez