ruby_llm-mcp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0de5a83b2962398c602fe95d3b1c606bf3c0d1b8367209b70f9ef1f41a7f1e2
-  data.tar.gz: 65c1a8c158efc387d9bec8ee67b701432cc605fd276647496d0825d0d83cafb3
+  metadata.gz: 131f358210388bfb593787a010a20459a2fc319f2249ee24594402ee92f78e5d
+  data.tar.gz: dbe0431413c8986bc76987cf748227c8e74bc201cfed23635d487430924d7f0a
 SHA512:
-  metadata.gz: 416161bdd8d22711c144dd7bf3460e27f01cd57f764ebc5d024748bcdcc4fcf279898da28fefcba1ae31546f8b001d48798c7f9e48a0c1bc7b1ad555e2334fcd
-  data.tar.gz: f9a6cbabf0e78aa89268c0cbbdaa2e07e9b33497cf47d1eab7282f60c6bfa161e4d5cbb7a1e6694de93ed18988318c1040ee0e3ffcd363b5d2d761e40158ce1b
+  metadata.gz: f4d4a86d99b955925457348b7a1ec1916b42ed8afda1549c311f1915fa7a0c106f51350819968679970366f9bdeaa393cf42f239b6709c40558065c2f8328484
+  data.tar.gz: a775771f2574f7a77627a1215bc60aaded76a287da65e13bd7504a0bb61a83f81494cddb5280e7cc960f989daef4149180a5e121d30d5da940488a0805183937

data/README.md

@@ -87,6 +87,14 @@ response = chat.ask("Can you help me search for recent files in my project?")
 puts response
 ```
 
+### Support Complex Parameters
+
+If you want to support complex parameters, like an array of objects it currently requires a patch to RubyLLM itself. This is planned to be temporary until the RubyLLM is updated.
+
+```ruby
+RubyLLM::MCP.support_complex_parameters!
+```
+
 ### Streaming Responses with Tool Calls
 
 ```ruby

data/lib/ruby_llm/mcp/client.rb

@@ -4,6 +4,7 @@ module RubyLLM
   module MCP
     class Client
       PROTOCOL_VERSION = "2025-03-26"
+      attr_reader :name, :config, :transport_type, :transport, :request_timeout, :reverse_proxy_url
 
       def initialize(name:, transport_type:, request_timeout: 8000, reverse_proxy_url: nil, config: {})
         @name = name
@@ -13,9 +14,9 @@ module RubyLLM
         # TODO: Add streamable HTTP
         case @transport_type
         when :sse
-          @transport = RubyLLM::MCP::Transport::SSE.new(config[:url])
+          @transport = RubyLLM::MCP::Transport::SSE.new(@config[:url])
         when :stdio
-          @transport = RubyLLM::MCP::Transport::Stdio.new(config[:command], args: config[:args], env: config[:env])
+          @transport = RubyLLM::MCP::Transport::Stdio.new(@config[:command], args: @config[:args], env: @config[:env])
         else
           raise "Invalid transport type: #{transport_type}"
         end

data/lib/ruby_llm/mcp/parameter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module MCP
+    class Parameter < RubyLLM::Parameter
+      attr_accessor :items, :properties
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module MCP
+    module Providers
+      module Anthropic
+        module ComplexParameterSupport
+          def clean_parameters(parameters)
+            parameters.transform_values do |param|
+              format = {
+                type: param.type,
+                description: param.description
+              }.compact
+
+              if param.type == "array"
+                format[:items] = param.items
+              elsif param.type == "object"
+                format[:properties] = clean_parameters(param.properties)
+              end
+
+              format
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+RubyLLM::Providers::Anthropic.extend(RubyLLM::MCP::Providers::Anthropic::ComplexParameterSupport)

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module MCP
+    module Providers
+      module OpenAI
+        module ComplexParameterSupport
+          def param_schema(param)
+            format = {
+              type: param.type,
+              description: param.description
+            }.compact
+
+            if param.type == "array"
+              format[:items] = param.items
+            elsif param.type == "object"
+              format[:properties] = param.properties.transform_values { |value| param_schema(value) }
+            end
+            format
+          end
+        end
+      end
+    end
+  end
+end
+
+RubyLLM::Providers::OpenAI.extend(RubyLLM::MCP::Providers::OpenAI::ComplexParameterSupport)

data/lib/ruby_llm/mcp/tool.rb

@@ -5,21 +5,6 @@ module RubyLLM
     class Tool < RubyLLM::Tool
       attr_reader :name, :description, :parameters, :mcp_client, :tool_response
 
-      # @tool_response = {
-      #   name: string;          // Unique identifier for the tool
-      #   description?: string;  // Human-readable description
-      #   inputSchema: {         // JSON Schema for the tool's parameters
-      #     type: "object",
-      #     properties: { ... }  // Tool-specific parameters
-      #   },
-      #   annotations?: {        // Optional hints about tool behavior
-      #     title?: string;      // Human-readable title for the tool
-      #     readOnlyHint?: boolean;    // If true, the tool does not modify its environment
-      #     destructiveHint?: boolean; // If true, the tool may perform destructive updates
-      #     idempotentHint?: boolean;  // If true, repeated calls with same args have no additional effect
-      #     openWorldHint?: boolean;   // If true, tool interacts with external entities
-      #   }
-      # }
       def initialize(mcp_client, tool_response)
         super()
         @mcp_client = mcp_client
@@ -41,13 +26,20 @@ module RubyLLM
       def create_parameters(input_schema)
         params = {}
         input_schema["properties"].each_key do |key|
-          param = RubyLLM::Parameter.new(
+          param = RubyLLM::MCP::Parameter.new(
             key,
             type: input_schema["properties"][key]["type"],
             desc: input_schema["properties"][key]["description"],
             required: input_schema["properties"][key]["required"]
           )
 
+          if param.type == "array"
+            param.items = input_schema["properties"][key]["items"]
+          elsif param.type == "object"
+            properties = create_parameters(input_schema["properties"][key]["properties"])
+            param.properties = properties
+          end
+
           params[key] = param
         end
 

data/lib/ruby_llm/mcp/transport/stdio.rb

@@ -14,10 +14,9 @@ module RubyLLM
         def initialize(command, args: [], env: {})
           @command = command
           @args = args
-          @env = env
+          @env = env || {}
           @client_id = SecureRandom.uuid
 
-          # Initialize state variables
           @id_counter = 0
           @id_mutex = Mutex.new
           @pending_requests = {}
@@ -25,17 +24,14 @@ module RubyLLM
           @running = true
           @reader_thread = nil
 
-          # Start the process
           start_process
         end
 
         def request(body, wait_for_response: true)
-          # Generate a unique request ID
           @id_mutex.synchronize { @id_counter += 1 }
           request_id = @id_counter
           body["id"] = request_id
 
-          # Create a queue for this request's response
           response_queue = Queue.new
           if wait_for_response
             @pending_mutex.synchronize do
@@ -43,7 +39,6 @@ module RubyLLM
             end
           end
 
-          # Send the request to the process
           begin
             @stdin.puts(JSON.generate(body))
             @stdin.flush
@@ -55,7 +50,6 @@ module RubyLLM
 
           return unless wait_for_response
 
-          # Wait for the response with matching ID using a timeout
           begin
             Timeout.timeout(30) do
               response_queue.pop
@@ -69,21 +63,18 @@ module RubyLLM
         def close
           @running = false
 
-          # Close stdin to signal the process to exit
           begin
             @stdin&.close
           rescue StandardError
             nil
           end
 
-          # Wait for process to exit
           begin
             @wait_thread&.join(1)
           rescue StandardError
             nil
           end
 
-          # Close remaining IO streams
           begin
             @stdout&.close
           rescue StandardError
@@ -95,7 +86,6 @@ module RubyLLM
             nil
           end
 
-          # Wait for reader thread to finish
           begin
             @reader_thread&.join(1)
           rescue StandardError
@@ -112,13 +102,14 @@ module RubyLLM
         private
 
         def start_process
-          # Close any existing process
           close if @stdin || @stdout || @stderr || @wait_thread
 
-          # Start a new process
-          @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(@env, @command, *@args)
+          @stdin, @stdout, @stderr, @wait_thread = if @env.empty?
+                                                     Open3.popen3(@command, *@args)
+                                                   else
+                                                     Open3.popen3(environment_string, @command, *@args)
+                                                   end
 
-          # Start a thread to read responses
           start_reader_thread
         end
 
@@ -137,13 +128,9 @@ module RubyLLM
                   next
                 end
 
-                # Read a line from the process
                 line = @stdout.gets
-
-                # Skip empty lines
                 next unless line && !line.strip.empty?
 
-                # Process the response
                 process_response(line.strip)
               rescue IOError, Errno::EPIPE => e
                 puts "Reader error: #{e.message}. Restarting in 1 second..."
@@ -160,7 +147,6 @@ module RubyLLM
         end
 
         def process_response(line)
-          # Try to parse the response as JSON
           response = begin
             JSON.parse(line)
           rescue JSON::ParserError => e
@@ -168,11 +154,8 @@ module RubyLLM
             puts "Raw response: #{line}"
             return
           end
-
-          # Extract the request ID
           request_id = response["id"]&.to_s
 
-          # Find and fulfill the matching request
           @pending_mutex.synchronize do
             if request_id && @pending_requests.key?(request_id)
               response_queue = @pending_requests.delete(request_id)
@@ -180,6 +163,10 @@ module RubyLLM
             end
           end
         end
+
+        def environment_string
+          @env.map { |key, value| "#{key}=#{value}" }.join(" ")
+        end
       end
     end
   end

data/lib/ruby_llm/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module MCP
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/ruby_llm/mcp.rb

@@ -10,8 +10,15 @@ loader.setup
 
 module RubyLLM
   module MCP
-    def self.client(*args, **kwargs)
+    module_function
+
+    def client(*args, **kwargs)
       @client ||= Client.new(*args, **kwargs)
     end
+
+    def support_complex_parameters!
+      require_relative "providers/open_ai/complex_parameter_support"
+      require_relative "providers/anthropic/complex_parameter_support"
+    end
   end
 end

data/lib/ruby_llm/overrides.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module ToolsComplexParametersSupport
+    def param_schema(param)
+      format = {
+        type: param.type,
+        description: param.description
+      }.compact
+
+      if param.type == "array"
+        format[:items] = param.items
+      elsif param.type == "object"
+        format[:properties] = param.properties
+      end
+      format
+    end
+  end
+end
+
+RubyLLM::Providers::OpenAI.extend(RubyLLM::ToolsComplexParametersSupport)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-mcp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Patrick Vice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -110,6 +110,9 @@ files:
 - lib/ruby_llm/mcp.rb
 - lib/ruby_llm/mcp/client.rb
 - lib/ruby_llm/mcp/errors.rb
+- lib/ruby_llm/mcp/parameter.rb
+- lib/ruby_llm/mcp/providers/anthropic/complex_parameter_support.rb
+- lib/ruby_llm/mcp/providers/open_ai/complex_parameter_support.rb
 - lib/ruby_llm/mcp/requests/base.rb
 - lib/ruby_llm/mcp/requests/initialization.rb
 - lib/ruby_llm/mcp/requests/notification.rb
@@ -120,6 +123,7 @@ files:
 - lib/ruby_llm/mcp/transport/stdio.rb
 - lib/ruby_llm/mcp/transport/streamable.rb
 - lib/ruby_llm/mcp/version.rb
+- lib/ruby_llm/overrides.rb
 homepage: https://github.com/patvice/ruby_llm-mcp
 licenses:
 - MIT