ruby_llm_swarm-mcp 0.8.0 → 0.8.1

data/lib/ruby_llm/mcp/transports/support/http_client.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "httpx"
+
+module RubyLLM
+  module MCP
+    module Transports
+      module Support
+        class HTTPClient
+          CONNECTION_KEY = :ruby_llm_mcp_client_connection
+
+          def self.connection
+            Thread.current[CONNECTION_KEY] ||= build_connection
+          end
+
+          def self.build_connection
+            HTTPX.with(
+              pool_options: {
+                max_connections: RubyLLM::MCP.config.max_connections,
+                pool_timeout: RubyLLM::MCP.config.pool_timeout
+              }
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/mcp/transports/support/rate_limit.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module MCP
+    module Transports
+      module Support
+        class RateLimit
+          def initialize(limit: 10, interval: 1000)
+            @limit = limit
+            @interval = interval
+            @timestamps = []
+            @mutex = Mutex.new
+          end
+
+          def exceeded?
+            now = current_time
+
+            @mutex.synchronize do
+              purge_old(now)
+              @timestamps.size >= @limit
+            end
+          end
+
+          def add
+            now = current_time
+
+            @mutex.synchronize do
+              purge_old(now)
+              @timestamps << now
+            end
+          end
+
+          private
+
+          def current_time
+            Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          end
+
+          def purge_old(now)
+            cutoff = now - @interval
+            @timestamps.reject! { |t| t < cutoff }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/mcp/transports/support/timeout.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module MCP
+    module Transports
+      module Support
+        module Timeout
+          def with_timeout(seconds, request_id: nil)
+            result = nil
+            exception = nil
+
+            worker = Thread.new do
+              result = yield
+            rescue StandardError => e
+              exception = e
+            end
+
+            if worker.join(seconds)
+              raise exception if exception
+
+              result
+            else
+              worker.kill # stop the thread (can still have some risk if shared resources)
+              raise RubyLLM::MCP::Errors::TimeoutError.new(
+                message: "Request timed out after #{seconds} seconds",
+                request_id: request_id
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module MCP
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

data/lib/ruby_llm/mcp.rb

@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Standard Libraries
-require "cgi"
-require "erb"
-require "json"
-require "logger"
-require "open3"
-require "rbconfig"
-require "securerandom"
-require "socket"
-require "timeout"
-require "uri"
-require "yaml"
-
-# Gems
-require "httpx"
-require "json-schema"
 require "ruby_llm"
+require "json-schema"
 require "zeitwerk"
-
 require_relative "chat"
 
 module RubyLLM
@@ -100,26 +84,19 @@ module RubyLLM
   end
 end
 
-loader = Zeitwerk::Loader.for_gem_extension(RubyLLM)
-
-loader.ignore("#{__dir__}/mcp/railtie.rb")
+require_relative "mcp/railtie" if defined?(Rails::Railtie)
 
+loader = Zeitwerk::Loader.for_gem_extension(RubyLLM)
 loader.inflector.inflect("mcp" => "MCP")
 loader.inflector.inflect("sse" => "SSE")
 loader.inflector.inflect("openai" => "OpenAI")
 loader.inflector.inflect("streamable_http" => "StreamableHTTP")
 loader.inflector.inflect("http_client" => "HTTPClient")
-loader.inflector.inflect("http_server" => "HttpServer")
-
-loader.inflector.inflect("ruby_llm_adapter" => "RubyLLMAdapter")
-loader.inflector.inflect("mcp_sdk_adapter" => "MCPSdkAdapter")
-loader.inflector.inflect("mcp_transports" => "MCPTransports")
-
 loader.inflector.inflect("oauth_provider" => "OAuthProvider")
+loader.inflector.inflect("browser_oauth" => "BrowserOAuth")
 loader.inflector.inflect("browser_oauth_provider" => "BrowserOAuthProvider")
+loader.inflector.inflect("http_server" => "HttpServer")
+loader.inflector.inflect("callback_handler" => "CallbackHandler")
+loader.inflector.inflect("callback_server" => "CallbackServer")
 
 loader.setup
-
-if defined?(Rails::Railtie)
-  require_relative "mcp/railtie"
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm_swarm-mcp
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Patrick Vice
@@ -53,8 +53,7 @@ dependencies:
         version: '2'
 description: |
   A Ruby client for the Model Context Protocol (MCP) that seamlessly integrates with RubyLLM.
-  Supports both native full-featured implementation and the official mcp-sdk gem.
-  Connect to MCP servers via SSE, stdio, or HTTP transports, automatically convert MCP tools into
+  Connect to MCP servers via SSE or stdio transports, automatically convert MCP tools into
   RubyLLM-compatible tools, and enable AI models to interact with external data sources and
   services. Makes using MCP with RubyLLM as easy as possible.
 email:
@@ -83,13 +82,6 @@ files:
 - lib/generators/ruby_llm/mcp/oauth/templates/views/show.html.erb
 - lib/ruby_llm/chat.rb
 - lib/ruby_llm/mcp.rb
-- lib/ruby_llm/mcp/adapters/base_adapter.rb
-- lib/ruby_llm/mcp/adapters/mcp_sdk_adapter.rb
-- lib/ruby_llm/mcp/adapters/mcp_transports/coordinator_stub.rb
-- lib/ruby_llm/mcp/adapters/mcp_transports/sse.rb
-- lib/ruby_llm/mcp/adapters/mcp_transports/stdio.rb
-- lib/ruby_llm/mcp/adapters/mcp_transports/streamable_http.rb
-- lib/ruby_llm/mcp/adapters/ruby_llm_adapter.rb
 - lib/ruby_llm/mcp/attachment.rb
 - lib/ruby_llm/mcp/auth.rb
 - lib/ruby_llm/mcp/auth/browser/callback_handler.rb
@@ -111,46 +103,59 @@ files:
 - lib/ruby_llm/mcp/auth/security.rb
 - lib/ruby_llm/mcp/auth/session_manager.rb
 - lib/ruby_llm/mcp/auth/token_manager.rb
-- lib/ruby_llm/mcp/auth/transport_oauth_helper.rb
 - lib/ruby_llm/mcp/auth/url_builder.rb
 - lib/ruby_llm/mcp/client.rb
 - lib/ruby_llm/mcp/completion.rb
 - lib/ruby_llm/mcp/configuration.rb
 - lib/ruby_llm/mcp/content.rb
+- lib/ruby_llm/mcp/coordinator.rb
 - lib/ruby_llm/mcp/elicitation.rb
 - lib/ruby_llm/mcp/error.rb
 - lib/ruby_llm/mcp/errors.rb
 - lib/ruby_llm/mcp/logging.rb
-- lib/ruby_llm/mcp/native.rb
-- lib/ruby_llm/mcp/native/cancellable_operation.rb
-- lib/ruby_llm/mcp/native/client.rb
-- lib/ruby_llm/mcp/native/json_rpc.rb
-- lib/ruby_llm/mcp/native/messages.rb
-- lib/ruby_llm/mcp/native/messages/helpers.rb
-- lib/ruby_llm/mcp/native/messages/notifications.rb
-- lib/ruby_llm/mcp/native/messages/requests.rb
-- lib/ruby_llm/mcp/native/messages/responses.rb
-- lib/ruby_llm/mcp/native/notification.rb
-- lib/ruby_llm/mcp/native/protocol.rb
-- lib/ruby_llm/mcp/native/response_handler.rb
-- lib/ruby_llm/mcp/native/transport.rb
-- lib/ruby_llm/mcp/native/transports/sse.rb
-- lib/ruby_llm/mcp/native/transports/stdio.rb
-- lib/ruby_llm/mcp/native/transports/streamable_http.rb
-- lib/ruby_llm/mcp/native/transports/support/http_client.rb
-- lib/ruby_llm/mcp/native/transports/support/rate_limit.rb
-- lib/ruby_llm/mcp/native/transports/support/timeout.rb
 - lib/ruby_llm/mcp/notification_handler.rb
+- lib/ruby_llm/mcp/notifications/cancelled.rb
+- lib/ruby_llm/mcp/notifications/initialize.rb
+- lib/ruby_llm/mcp/notifications/roots_list_change.rb
 - lib/ruby_llm/mcp/progress.rb
 - lib/ruby_llm/mcp/prompt.rb
+- lib/ruby_llm/mcp/protocol.rb
 - lib/ruby_llm/mcp/railtie.rb
+- lib/ruby_llm/mcp/requests/completion_prompt.rb
+- lib/ruby_llm/mcp/requests/completion_resource.rb
+- lib/ruby_llm/mcp/requests/initialization.rb
+- lib/ruby_llm/mcp/requests/logging_set_level.rb
+- lib/ruby_llm/mcp/requests/ping.rb
+- lib/ruby_llm/mcp/requests/prompt_call.rb
+- lib/ruby_llm/mcp/requests/prompt_list.rb
+- lib/ruby_llm/mcp/requests/resource_list.rb
+- lib/ruby_llm/mcp/requests/resource_read.rb
+- lib/ruby_llm/mcp/requests/resource_template_list.rb
+- lib/ruby_llm/mcp/requests/resources_subscribe.rb
+- lib/ruby_llm/mcp/requests/shared/meta.rb
+- lib/ruby_llm/mcp/requests/shared/pagination.rb
+- lib/ruby_llm/mcp/requests/tool_call.rb
+- lib/ruby_llm/mcp/requests/tool_list.rb
 - lib/ruby_llm/mcp/resource.rb
 - lib/ruby_llm/mcp/resource_template.rb
+- lib/ruby_llm/mcp/response_handler.rb
+- lib/ruby_llm/mcp/responses/elicitation.rb
+- lib/ruby_llm/mcp/responses/error.rb
+- lib/ruby_llm/mcp/responses/ping.rb
+- lib/ruby_llm/mcp/responses/roots_list.rb
+- lib/ruby_llm/mcp/responses/sampling_create_message.rb
 - lib/ruby_llm/mcp/result.rb
 - lib/ruby_llm/mcp/roots.rb
 - lib/ruby_llm/mcp/sample.rb
 - lib/ruby_llm/mcp/server_capabilities.rb
 - lib/ruby_llm/mcp/tool.rb
+- lib/ruby_llm/mcp/transport.rb
+- lib/ruby_llm/mcp/transports/sse.rb
+- lib/ruby_llm/mcp/transports/stdio.rb
+- lib/ruby_llm/mcp/transports/streamable_http.rb
+- lib/ruby_llm/mcp/transports/support/http_client.rb
+- lib/ruby_llm/mcp/transports/support/rate_limit.rb
+- lib/ruby_llm/mcp/transports/support/timeout.rb
 - lib/ruby_llm/mcp/version.rb
 - lib/tasks/release.rake
 homepage: https://www.rubyllm-mcp.com
@@ -158,10 +163,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.rubyllm-mcp.com
-  source_code_uri: https://github.com/parruda/ruby_llm-mcp
-  changelog_uri: https://github.com/parruda/ruby_llm-mcp/commits/main
+  source_code_uri: https://github.com/patvice/ruby_llm-mcp
+  changelog_uri: https://github.com/patvice/ruby_llm-mcp/commits/main
   documentation_uri: https://www.rubyllm-mcp.com/guides/
-  bug_tracker_uri: https://github.com/parruda/ruby_llm-mcp/issues
+  bug_tracker_uri: https://github.com/patvice/ruby_llm-mcp/issues
   rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
 rdoc_options: []

data/lib/ruby_llm/mcp/adapters/base_adapter.rb

@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-module RubyLLM
-  module MCP
-    module Adapters
-      class BaseAdapter
-        class << self
-          def supported_features
-            @supported_features ||= {}
-          end
-
-          def supports(*features)
-            features.each { |f| supported_features[f] = true }
-          end
-
-          def support?(feature)
-            supported_features[feature] || false
-          end
-
-          def supported_transports
-            @supported_transports ||= []
-          end
-
-          def supports_transport(*transports)
-            @supported_transports = transports
-          end
-
-          def transport_supported?(transport)
-            supported_transports.include?(transport.to_sym)
-          end
-        end
-
-        attr_reader :client
-
-        def initialize(client, transport_type:, config: {})
-          @client = client
-          @transport_type = transport_type
-          @config = config
-        end
-
-        def supports?(feature)
-          self.class.support?(feature)
-        end
-
-        def validate_transport!(transport_type)
-          unless self.class.transport_supported?(transport_type)
-            raise Errors::UnsupportedTransport.new(
-              message: <<~MSG.strip
-                Transport '#{transport_type}' is not supported by #{self.class.name}.
-                Supported transports: #{self.class.supported_transports.join(', ')}
-              MSG
-            )
-          end
-        end
-
-        def start
-          raise NotImplementedError, "#{self.class.name} must implement #start"
-        end
-
-        def stop
-          raise NotImplementedError, "#{self.class.name} must implement #stop"
-        end
-
-        def restart!
-          raise NotImplementedError, "#{self.class.name} must implement #restart!"
-        end
-
-        def alive?
-          raise NotImplementedError, "#{self.class.name} must implement #alive?"
-        end
-
-        def ping
-          raise NotImplementedError, "#{self.class.name} must implement #ping"
-        end
-
-        def capabilities
-          raise NotImplementedError, "#{self.class.name} must implement #capabilities"
-        end
-
-        def client_capabilities
-          raise NotImplementedError, "#{self.class.name} must implement #client_capabilities"
-        end
-
-        def tool_list(cursor: nil)
-          raise NotImplementedError, "#{self.class.name} must implement #tool_list"
-        end
-
-        def execute_tool(name:, parameters:)
-          raise NotImplementedError, "#{self.class.name} must implement #execute_tool"
-        end
-
-        def resource_list(cursor: nil)
-          raise NotImplementedError, "#{self.class.name} must implement #resource_list"
-        end
-
-        def resource_read(uri:)
-          raise NotImplementedError, "#{self.class.name} must implement #resource_read"
-        end
-
-        def prompt_list(cursor: nil)
-          raise NotImplementedError, "#{self.class.name} must implement #prompt_list"
-        end
-
-        def execute_prompt(name:, arguments:)
-          raise NotImplementedError, "#{self.class.name} must implement #execute_prompt"
-        end
-
-        def resource_template_list(cursor: nil) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:resource_templates)
-        end
-
-        def completion_resource(uri:, argument:, value:, context: nil) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:completions)
-        end
-
-        def completion_prompt(name:, argument:, value:, context: nil) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:completions)
-        end
-
-        def set_logging(level:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:logging)
-        end
-
-        def resources_subscribe(uri:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:subscriptions)
-        end
-
-        def initialize_notification
-          raise_unsupported_feature(:notifications)
-        end
-
-        def cancelled_notification(reason:, request_id:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:notifications)
-        end
-
-        def roots_list_change_notification
-          raise_unsupported_feature(:notifications)
-        end
-
-        def ping_response(id:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:responses)
-        end
-
-        def roots_list_response(id:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:responses)
-        end
-
-        def sampling_create_message_response(id:, model:, message:, **_options) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:sampling)
-        end
-
-        def error_response(id:, message:, code: -32_000) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:responses)
-        end
-
-        def elicitation_response(id:, elicitation:) # rubocop:disable Lint/UnusedMethodArgument
-          raise_unsupported_feature(:elicitation)
-        end
-
-        def register_resource(_resource)
-          raise_unsupported_feature(:resource_registration)
-        end
-
-        private
-
-        def raise_unsupported_feature(feature)
-          raise Errors::UnsupportedFeature.new(
-            message: <<~MSG.strip
-              Feature '#{feature}' is not supported by #{self.class.name}.
-
-              This feature requires the :ruby_llm adapter.
-              Change your configuration to use adapter: :ruby_llm
-            MSG
-          )
-        end
-      end
-    end
-  end
-end