ruby_llm-mcp 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa780ea2ca1b1ba71c5efa1784b14e9473ad351af94f0dc35d94aab4d6057325
-  data.tar.gz: 1fd76e02e0f6e22087943eff186dbb05cd059e931927442982752cbb9250aa98
+  metadata.gz: 5bec47480f606a8d28f8a79032e392e331dcdcef565cd708e6dcc855f0a31445
+  data.tar.gz: ac65a564ce2bd4d39e4e4fdcff02da19cbd7573186924e938fadb2d9c2f523db
 SHA512:
-  metadata.gz: 5c37a73381c487a02d61bb8365e39b064b37a0d0668bd46eae1bd25ad225982c8f15229867cd4110e89689ec5757e395ce3825795298aabc3f4ed3b8cd49e0e5
-  data.tar.gz: ecb7f5524d9af14c3386abb3ddae91bee454046449ae2e0bba758c95060157c057222a57ce1b9eae5af197e5ec8187e34474fb3801b7cdabb92fdb3cbe14ddd2
+  metadata.gz: 7e9394538e772a3169fe424854cbf57aee643953be4e44f805c82f0f81c61189a06d755e8a14b4e530183e414e9a4b3000912a577d3eca95da236c124b9a54dc
+  data.tar.gz: a6eb704e2aaac9386e54cb178dd136bc19510a2159adc63125d50f5a96c9473de9416e33755059f9578ab609d34fe3fbe8c8d7f8e970900380b93770793376a3

data/lib/ruby_llm/mcp/parameter.rb

@@ -7,6 +7,14 @@ module RubyLLM
     class Parameter < RubyLLM::Parameter
       attr_accessor :items, :properties, :enum, :union_type, :default, :title
 
+      class << self
+        def all_mcp_parameters?(parameters)
+          parameters.is_a?(Hash) &&
+            parameters.any? &&
+            parameters.values.all? { |p| p.is_a?(RubyLLM::MCP::Parameter) }
+        end
+      end
+
       def initialize(name, type: "string", title: nil, desc: nil, required: true, default: nil, union_type: nil) # rubocop:disable Metrics/ParameterLists
         super(name, type: type.to_sym, desc: desc, required: required)
         @title = title

data/lib/ruby_llm/mcp/providers/anthropic/complex_parameter_support.rb

@@ -9,7 +9,7 @@ module RubyLLM
 
           def clean_parameters(parameters)
             parameters.transform_values do |param|
-              build_properties(param).compact
+              mcp_build_properties(param).compact
             end
           end
 
@@ -17,7 +17,7 @@ module RubyLLM
             parameters.select { |_, param| param.required }.keys
           end
 
-          def build_properties(param) # rubocop:disable Metrics/MethodLength
+          def mcp_build_properties(param) # rubocop:disable Metrics/MethodLength
             case param.type
             when :array
               if param.item_type == :object
@@ -46,7 +46,7 @@ module RubyLLM
               }.compact
             when :union
               {
-                param.union_type => param.properties.map { |property| build_properties(property) }
+                param.union_type => param.properties.map { |property| mcp_build_properties(property) }
               }
             else
               {
@@ -63,11 +63,25 @@ module RubyLLM
 end
 
 module RubyLLM::Providers::Anthropic::Tools
-  def self.clean_parameters(parameters)
-    RubyLLM::MCP::Providers::Anthropic::ComplexParameterSupport.clean_parameters(parameters)
+  alias original_clean_parameters clean_parameters
+  alias original_required_parameters required_parameters
+  module_function :original_clean_parameters, :original_required_parameters
+
+  def clean_parameters(parameters)
+    if RubyLLM::MCP::Parameter.all_mcp_parameters?(parameters)
+      return RubyLLM::MCP::Providers::Anthropic::ComplexParameterSupport.clean_parameters(parameters)
+    end
+
+    original_clean_parameters(parameters)
   end
+  module_function :clean_parameters
+
+  def required_parameters(parameters)
+    if RubyLLM::MCP::Parameter.all_mcp_parameters?(parameters)
+      return RubyLLM::MCP::Providers::Anthropic::ComplexParameterSupport.required_parameters(parameters)
+    end
 
-  def self.required_parameters(parameters)
-    RubyLLM::MCP::Providers::Anthropic::ComplexParameterSupport.required_parameters(parameters)
+    original_required_parameters(parameters)
   end
+  module_function :required_parameters
 end

data/lib/ruby_llm/mcp/providers/gemini/complex_parameter_support.rb

@@ -11,12 +11,12 @@ module RubyLLM
           def format_parameters(parameters)
             {
               type: "OBJECT",
-              properties: parameters.transform_values { |param| build_properties(param) },
+              properties: parameters.transform_values { |param| mcp_build_properties(param) },
               required: parameters.select { |_, p| p.required }.keys.map(&:to_s)
             }
           end
 
-          def build_properties(param) # rubocop:disable Metrics/MethodLength
+          def mcp_build_properties(param) # rubocop:disable Metrics/MethodLength
             properties = case param.type
                          when :array
                            if param.item_type == :object
@@ -26,7 +26,7 @@ module RubyLLM
                                description: param.description,
                                items: {
                                  type: param_type_for_gemini(param.item_type),
-                                 properties: param.properties.transform_values { |value| build_properties(value) }
+                                 properties: param.properties.transform_values { |value| mcp_build_properties(value) }
                                }
                              }.compact
                            else
@@ -43,12 +43,12 @@ module RubyLLM
                              type: param_type_for_gemini(param.type),
                              title: param.title,
                              description: param.description,
-                             properties: param.properties.transform_values { |value| build_properties(value) },
+                             properties: param.properties.transform_values { |value| mcp_build_properties(value) },
                              required: param.properties.select { |_, p| p.required }.keys
                            }.compact
                          when :union
                            {
-                             param.union_type => param.properties.map { |properties| build_properties(properties) }
+                             param.union_type => param.properties.map { |properties| mcp_build_properties(properties) }
                            }
                          else
                            {
@@ -60,10 +60,27 @@ module RubyLLM
 
             properties.compact
           end
+
+          def param_type_for_gemini(type)
+            RubyLLM::Providers::Gemini::Tools.param_type_for_gemini(type)
+          end
         end
       end
     end
   end
 end
 
-RubyLLM::Providers::Gemini.extend(RubyLLM::MCP::Providers::Gemini::ComplexParameterSupport)
+module RubyLLM::Providers::Gemini::Tools
+  alias original_format_parameters format_parameters
+  module_function :original_format_parameters
+  module_function :param_type_for_gemini
+
+  def format_parameters(parameters)
+    if RubyLLM::MCP::Parameter.all_mcp_parameters?(parameters)
+      return RubyLLM::MCP::Providers::Gemini::ComplexParameterSupport.format_parameters(parameters)
+    end
+
+    original_format_parameters(parameters)
+  end
+  module_function :format_parameters
+end

data/lib/ruby_llm/mcp/providers/openai/complex_parameter_support.rb

@@ -57,4 +57,16 @@ module RubyLLM
   end
 end
 
-RubyLLM::Providers::OpenAI.extend(RubyLLM::MCP::Providers::OpenAI::ComplexParameterSupport)
+module RubyLLM::Providers::OpenAI::Tools
+  alias original_param_schema param_schema
+  module_function :original_param_schema
+
+  def param_schema(param)
+    if param.is_a?(RubyLLM::MCP::Parameter)
+      return RubyLLM::MCP::Providers::OpenAI::ComplexParameterSupport.param_schema(param)
+    end
+
+    original_param_schema(param)
+  end
+  module_function :param_schema
+end

data/lib/ruby_llm/mcp/transports/streamable_http.rb

@@ -496,6 +496,11 @@ module RubyLLM
               # Server doesn't support SSE - this is acceptable
               RubyLLM::MCP.logger.info "Server does not support SSE streaming"
               nil
+            when 409
+              # Conflict - SSE connection already exists for this session
+              # This is expected when reusing sessions and is acceptable
+              RubyLLM::MCP.logger.debug "SSE stream already exists for this session"
+              nil
             else
               reason_phrase = response.respond_to?(:reason_phrase) ? response.reason_phrase : nil
               raise Errors::TransportError.new(

data/lib/ruby_llm/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module MCP
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-mcp
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Patrick Vice