raix 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed80bdf079ec738beb42df145184b5b23b5ad6c2f507233afd9aed47a1ac61f9
-  data.tar.gz: b38006ad88398d9584d29fad763b7361cd22f7d6d6fb3d51e70b6ac80a5c39aa
+  metadata.gz: 5464c46a401957877b024ec9a1140b6f2624add3f21c172253663988c74baa49
+  data.tar.gz: a556464db7a06866cf6ecd27530b7ddcbbc372fa8e4f96f7ba84f0c6467de3b1
 SHA512:
-  metadata.gz: c896ee3e447b7d45e009cc0c18b6d5527f4fc2620773a27a94743c591e9f535be0f1692e4e4d2b1a60b2059b813e66c5c5c32464f7ea194a95d6b31e553fad59
-  data.tar.gz: 822e63a7375693fec475f6056db092c5e1a75398cd513e7650b8bfeec6535fe42c85681b98d4867869bca7e83a156cae5ac8101573c6ebd25f899d86c9b1fe46
+  metadata.gz: c99d540f8f8c7c0c35a57628d322ff0eef31803c0bee7244476633bd092320bd7040ceebb4b20126b55529bfe0fb373fee01e4977871a3eedf1e135331e9b4e2
+  data.tar.gz: 53e124ebdf99b0b176fb0c30d15c40e9a3156e210686d705237aa43fc02e2ca0e71a63e5efd75deffaf1f5565a34837ccd6d7f1b1dd6f2cbf6b6d9d5c3f137d2

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [0.9.2] - 2025-06-03
+### Fixed
+- Fixed OpenAI chat completion compatibility
+- Fixed SHA256 hexdigest generation for MCP tool names
+- Added ostruct as explicit dependency to prevent warnings
+- Fixed rubocop lint error for alphabetized gemspec dependencies
+- Updated default OpenRouter model
+
+## [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,10 +1,11 @@
 PATH
   remote: .
   specs:
-    raix (0.9.0)
+    raix (0.9.2)
       activesupport (>= 6.0)
       faraday-retry (~> 2.0)
       open_router (~> 0.2)
+      ostruct
       ruby-openai (~> 7)
 
 GEM
@@ -97,6 +98,7 @@ GEM
       dotenv (>= 2)
       faraday (>= 1)
       faraday-multipart (>= 1)
+    ostruct (0.6.1)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)

data/lib/mcp/sse_client.rb

@@ -3,6 +3,7 @@ require "json"
 require "securerandom"
 require "faraday"
 require "uri"
+require "digest"
 
 module Raix
   module MCP
@@ -42,7 +43,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 +58,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
@@ -74,7 +85,8 @@ module Raix
       end
 
       def unique_key
-        @url.parameterize.underscore.gsub("https_", "")
+        parametrized_url = @url.parameterize.underscore.gsub("https_", "")
+        Digest::SHA256.hexdigest(parametrized_url)[0..2]
       end
 
       private

data/lib/mcp/stdio_client.rb

@@ -1,6 +1,7 @@
 require_relative "tool"
 require "json"
 require "securerandom"
+require "digest"
 
 module Raix
   module MCP
@@ -21,14 +22,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.
@@ -37,7 +58,8 @@ module Raix
       end
 
       def unique_key
-        @args.join(" ").parameterize.underscore
+        parametrized_args = @args.join(" ").parameterize.underscore
+        Digest::SHA256.hexdigest(parametrized_args)[0..2]
       end
 
       private

data/lib/raix/chat_completion.rb

@@ -60,12 +60,12 @@ module Raix
     # @param params [Hash] The parameters for chat completion.
     # @option loop [Boolean] :loop (false) Whether to loop the chat completion after function calls.
     # @option params [Boolean] :json (false) Whether to return the parse the response as a JSON object. Will search for <json> tags in the response first, then fall back to the default JSON parsing of the entire response.
-    # @option params [Boolean] :openai (false) Whether to use OpenAI's API instead of OpenRouter's.
+    # @option params [String] :openai (nil) If non-nil, use OpenAI with the model specified in this param.
     # @option params [Boolean] :raw (false) Whether to return the raw response or dig the text content.
     # @option params [Array] :messages (nil) An array of messages to use instead of the transcript.
     # @option tools [Array|false] :available_tools (nil) Tools to pass to the LLM. Ignored if nil (default). If false, no tools are passed. If an array, only declared tools in the array are passed.
     # @return [String|Hash] The completed chat response.
-    def chat_completion(params: {}, loop: false, json: false, raw: false, openai: false, save_response: true, messages: nil, available_tools: nil)
+    def chat_completion(params: {}, loop: false, json: false, raw: false, openai: nil, save_response: true, messages: nil, available_tools: nil)
       # set params to default values if not provided
       params[:cache_at] ||= cache_at.presence
       params[:frequency_penalty] ||= frequency_penalty.presence

data/lib/raix/configuration.rb

@@ -38,7 +38,7 @@ module Raix
 
     DEFAULT_MAX_TOKENS = 1000
     DEFAULT_MAX_COMPLETION_TOKENS = 16_384
-    DEFAULT_MODEL = "meta-llama/llama-3-8b-instruct:free"
+    DEFAULT_MODEL = "meta-llama/llama-3.3-8b-instruct:free"
     DEFAULT_TEMPERATURE = 0.0
 
     # Initializes a new instance of the Configuration class with default values.

data/lib/raix/mcp.rb

@@ -102,7 +102,7 @@ module Raix
         filtered_tools.each do |tool|
           remote_name = tool.name
           # TODO: Revisit later whether this much context is needed in the function name
-          local_name = "#{client.unique_key}_#{remote_name}".to_sym
+          local_name = "#{remote_name}_#{client.unique_key}".to_sym
 
           description = tool.description
           input_schema = tool.input_schema || {}
@@ -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
@@ -132,7 +140,7 @@ module Raix
                     id: call_id,
                     type: "function",
                     function: {
-                      name: remote_name,
+                      name: local_name.to_s,
                       arguments: arguments.to_json
                     }
                   }
@@ -141,7 +149,7 @@ module Raix
               {
                 role: "tool",
                 tool_call_id: call_id,
-                name: remote_name,
+                name: local_name.to_s,
                 content: content_text
               }
             ]
@@ -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.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raix
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Obie Fernandez
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-openai
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +110,6 @@ files:
 - lib/raix/prompt_declarations.rb
 - lib/raix/response_format.rb
 - lib/raix/version.rb
-- raix.gemspec
 - sig/raix.rbs
 homepage: https://github.com/OlympiaAI/raix
 licenses:

data/raix.gemspec

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/raix/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "raix"
-  spec.version = Raix::VERSION
-  spec.authors = ["Obie Fernandez"]
-  spec.email = ["obiefernandez@gmail.com"]
-
-  spec.summary = "Ruby AI eXtensions"
-  spec.homepage = "https://github.com/OlympiaAI/raix"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.2.2"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/OlympiaAI/raix"
-  spec.metadata["changelog_uri"] = "https://github.com/OlympiaAI/raix/blob/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activesupport", ">= 6.0"
-  spec.add_dependency "faraday-retry", "~> 2.0"
-  spec.add_dependency "open_router", "~> 0.2"
-  spec.add_dependency "ruby-openai", "~> 7"
-end