actionmcp 0.20.0 → 0.22.0

data/lib/action_mcp/server/sampling_request.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    class SamplingRequest
+      class << self
+        attr_reader :default_messages, :default_system_prompt, :default_context,
+                    :default_model_hints, :default_intelligence_priority,
+                    :default_max_tokens, :default_temperature
+
+        def configure
+          yield self
+        end
+
+        def messages(messages = nil)
+          if messages
+            @default_messages = messages.map do |msg|
+              mutate_content(msg)
+            end
+          end
+          @messages ||= []
+        end
+
+        def system_prompt(prompt = nil)
+          @default_system_prompt = prompt if prompt
+          @default_system_prompt
+        end
+
+        def include_context(context = nil)
+          @default_context = context if context
+          @default_context
+        end
+
+        def model_hints(hints = nil)
+          @default_model_hints = hints if hints
+          @model_hints ||= []
+        end
+
+        def intelligence_priority(priority = nil)
+          @default_intelligence_priority = priority if priority
+          @intelligence_priority ||= 0.9
+        end
+
+        def max_tokens(tokens = nil)
+          @default_max_tokens = tokens if tokens
+          @max_tokens ||= 500
+        end
+
+        def temperature(temp = nil)
+          @default_temperature = temp if temp
+          @temperature ||= 0.7
+        end
+
+        private
+
+        def mutate_content(msg)
+          content = msg[:content]
+          if content.is_a?(ActionMCP::Content) || (content.respond_to?(:to_h) && !content.is_a?(Hash))
+            { role: msg[:role], content: content.to_h }
+          else
+            msg
+          end
+        end
+      end
+
+      attr_accessor :system_prompt, :model_hints, :intelligence_priority, :max_tokens, :temperature
+      attr_reader :messages, :context
+
+      def initialize
+        @messages = self.class.default_messages.dup
+        @system_prompt = self.class.default_system_prompt
+        @context = self.class.default_context
+        @model_hints = self.class.default_model_hints.dup
+        @intelligence_priority = self.class.default_intelligence_priority
+        @max_tokens = self.class.default_max_tokens
+        @temperature = self.class.default_temperature
+
+        yield self if block_given?
+      end
+
+      def messages=(value)
+        @messages = value.map do |msg|
+          self.class.send(:mutate_content, msg)
+        end
+      end
+
+      def include_context=(value)
+        @context = value
+      end
+
+      def add_message(content, role: "user")
+        if content.is_a?(Content::Base) || (content.respond_to?(:to_h) && !content.is_a?(Hash))
+          @messages << { role: role, content: content.to_h }
+        else
+          content = Content::Text.new(content).to_h if content.is_a?(String)
+          @messages << { role: role, content: content }
+        end
+      end
+
+      def to_h
+        {
+          messages: messages.map { |msg| { role: msg[:role], content: msg[:content] } },
+          systemPrompt: system_prompt,
+          includeContext: context,
+          modelPreferences: {
+            hints: model_hints.map { |name| { name: name } },
+            intelligencePriority: intelligence_priority
+          },
+          maxTokens: max_tokens,
+          temperature: temperature
+        }.compact
+      end
+    end
+  end
+end

data/lib/action_mcp/{transport → server}/tools.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Tools
       def send_tools_list(request_id)
         tools = format_registry_items(ToolsRegistry.non_abstract)

data/lib/action_mcp/server/transport_handler.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    class TransportHandler
+      attr_reader :session
+
+      delegate :initialize!, :initialized?, to: :session
+      delegate :read, :write, to: :session
+      include Logging
+
+      include  Messaging
+      include  Capabilities
+      include  Tools
+      include  Prompts
+      include  Resources
+      include  Notifications
+      include  Sampling
+      include  Roots
+
+      # @param [ActionMCP::Session] session
+      def initialize(session)
+        @session = session
+      end
+
+      def send_pong(request_id)
+        send_jsonrpc_response(request_id, result: {})
+      end
+
+      private
+
+      def write_message(data)
+        session.write(data)
+      end
+
+      def format_registry_items(registry)
+        registry.map { |item| item.klass.to_h }
+      end
+    end
+  end
+end

data/lib/action_mcp/uri_ambiguity_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionMCP
   module UriAmbiguityChecker
     extend ActiveSupport::Concern
@@ -17,9 +19,7 @@ module ActionMCP
         segments2 = pattern2.split("/")
 
         # If different number of segments, they can't be ambiguous
-        if segments1.size != segments2.size
-          return false
-        end
+        return false if segments1.size != segments2.size
 
         # Extract literals (non-parameters) from each pattern
         literals1 = []
@@ -34,14 +34,12 @@ module ActionMCP
         end
 
         # Check each segment for direct literal mismatches
-        segments1.zip(segments2).each_with_index do |(seg1, seg2), index|
+        segments1.zip(segments2).each_with_index do |(seg1, seg2), _index|
           param1 = parameter?(seg1)
           param2 = parameter?(seg2)
 
           # When both segments are literals, they must match exactly
-          if !param1 && !param2 && seg1 != seg2
-            return false
-          end
+          return false if !param1 && !param2 && seg1 != seg2
         end
 
         # Check for structural incompatibility in the literals
@@ -60,9 +58,7 @@ module ActionMCP
             common_literal_indices2 = common_literals.map { |lit| lit_values2.index(lit) }
 
             # If the relative ordering is different, patterns are not ambiguous
-            if common_literal_indices1 != common_literal_indices2
-              return false
-            end
+            return false if common_literal_indices1 != common_literal_indices2
           end
         end
 

data/lib/action_mcp/version.rb

@@ -2,7 +2,7 @@
 
 require_relative "gem_version"
 module ActionMCP
-  VERSION = "0.20.0"
+  VERSION = "0.22.0"
 
   class << self
     alias version gem_version

data/lib/action_mcp.rb

@@ -30,6 +30,7 @@ end.setup
 
 module ActionMCP
   require_relative "action_mcp/version"
+  require_relative "action_mcp/client"
   include Logging
   PROTOCOL_VERSION = "2024-11-05"
 
@@ -86,6 +87,6 @@ module ActionMCP
   ActiveModel::Type.register(:integer_array, IntegerArray)
 end
 
-ActiveSupport.on_load(:action_mcp) do
+ActiveSupport.on_load(:action_mcp, run_once: true) do
   self.logger = ::Rails.logger
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.1
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -122,12 +108,25 @@ files:
 - db/migrate/20250316005649_create_action_mcp_session_resources.rb
 - exe/actionmcp_cli
 - lib/action_mcp.rb
-- lib/action_mcp/base_json_rpc_handler.rb
 - lib/action_mcp/base_response.rb
 - lib/action_mcp/callbacks.rb
 - lib/action_mcp/capability.rb
 - lib/action_mcp/client.rb
-- lib/action_mcp/client_json_rpc_handler.rb
+- lib/action_mcp/client/base.rb
+- lib/action_mcp/client/blueprint.rb
+- lib/action_mcp/client/catalog.rb
+- lib/action_mcp/client/json_rpc_handler.rb
+- lib/action_mcp/client/logging.rb
+- lib/action_mcp/client/messaging.rb
+- lib/action_mcp/client/prompt_book.rb
+- lib/action_mcp/client/prompts.rb
+- lib/action_mcp/client/resources.rb
+- lib/action_mcp/client/roots.rb
+- lib/action_mcp/client/server.rb
+- lib/action_mcp/client/sse_client.rb
+- lib/action_mcp/client/stdio_client.rb
+- lib/action_mcp/client/toolbox.rb
+- lib/action_mcp/client/tools.rb
 - lib/action_mcp/configuration.rb
 - lib/action_mcp/content.rb
 - lib/action_mcp/content/audio.rb
@@ -145,7 +144,7 @@ files:
 - lib/action_mcp/json_rpc/notification.rb
 - lib/action_mcp/json_rpc/request.rb
 - lib/action_mcp/json_rpc/response.rb
-- lib/action_mcp/json_rpc_handler.rb
+- lib/action_mcp/json_rpc_handler_base.rb
 - lib/action_mcp/log_subscriber.rb
 - lib/action_mcp/logging.rb
 - lib/action_mcp/prompt.rb
@@ -157,27 +156,24 @@ files:
 - lib/action_mcp/resource_callbacks.rb
 - lib/action_mcp/resource_template.rb
 - lib/action_mcp/resource_templates_registry.rb
-- lib/action_mcp/sampling_request.rb
 - lib/action_mcp/server.rb
-- lib/action_mcp/server_json_rpc_handler.rb
+- lib/action_mcp/server/capabilities.rb
+- lib/action_mcp/server/json_rpc_handler.rb
+- lib/action_mcp/server/messaging.rb
+- lib/action_mcp/server/notifications.rb
+- lib/action_mcp/server/prompts.rb
+- lib/action_mcp/server/resources.rb
+- lib/action_mcp/server/roots.rb
+- lib/action_mcp/server/sampling.rb
+- lib/action_mcp/server/sampling_request.rb
+- lib/action_mcp/server/tools.rb
+- lib/action_mcp/server/transport_handler.rb
 - lib/action_mcp/string_array.rb
 - lib/action_mcp/test_helper.rb
 - lib/action_mcp/tool.rb
 - lib/action_mcp/tool_response.rb
 - lib/action_mcp/tools_registry.rb
 - lib/action_mcp/transport.rb
-- lib/action_mcp/transport/capabilities.rb
-- lib/action_mcp/transport/messaging.rb
-- lib/action_mcp/transport/notifications.rb
-- lib/action_mcp/transport/prompts.rb
-- lib/action_mcp/transport/resources.rb
-- lib/action_mcp/transport/roots.rb
-- lib/action_mcp/transport/sampling.rb
-- lib/action_mcp/transport/sse_client.rb
-- lib/action_mcp/transport/stdio_client.rb
-- lib/action_mcp/transport/tools.rb
-- lib/action_mcp/transport/transport_base.rb
-- lib/action_mcp/transport_handler.rb
 - lib/action_mcp/uri_ambiguity_checker.rb
 - lib/action_mcp/version.rb
 - lib/actionmcp.rb

data/lib/action_mcp/base_json_rpc_handler.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-module ActionMCP
-  # Base handler for common functionality
-  class BaseJsonRpcHandler
-    delegate :initialize!, :initialized?, to: :transport
-    delegate :write, :read, to: :transport
-    attr_reader :transport
-
-    # @param transport [ActionMCP::TransportHandler]
-    def initialize(transport)
-      @transport = transport
-    end
-
-    # Process a single line of input.
-    # @param line [String, Hash]
-    def call(line)
-      request = parse_request(line)
-      return unless request
-
-      process_request(request)
-    end
-
-    protected
-
-    def parse_request(line)
-      if line.is_a?(String)
-        line.strip!
-        return if line.empty?
-
-        begin
-          MultiJson.load(line)
-        rescue MultiJson::ParseError => e
-          Rails.logger.error("Failed to parse JSON: #{e.message}")
-          nil
-        end
-      else
-        line
-      end
-    end
-
-    # @param request [Hash]
-    def process_request(request)
-      unless request["jsonrpc"] == "2.0"
-        puts "Invalid request: #{request}"
-        return
-      end
-      read(request)
-      return if request["error"]
-      return if request["result"] == {} # Probably a pong
-
-      rpc_method = request["method"]
-      id = request["id"]
-      params = request["params"]
-
-      # Common methods (both directions)
-      case rpc_method
-      when "ping"                      # [BOTH] Ping message
-        transport.send_pong(id)
-      when "initialize"                # [BOTH] Initialization
-        handle_initialize(id, params)
-      when %r{^notifications/}
-        process_common_notifications(rpc_method, params)
-      else
-        handle_specific_method(rpc_method, id, params)
-      end
-    end
-
-    # Override in subclasses
-    def handle_initialize(id, params)
-      raise NotImplementedError, "Subclasses must implement #handle_initialize"
-    end
-
-    # Override in subclasses
-    def handle_specific_method(rpc_method, id, params)
-      raise NotImplementedError, "Subclasses must implement #handle_specific_method"
-    end
-
-    def process_common_notifications(rpc_method, params)
-      case rpc_method
-      when "notifications/initialized"            # [BOTH] Initialization complete
-        puts "Initialized"
-        transport.initialize!
-      when "notifications/cancelled"              # [BOTH] Request cancellation
-        puts "Request #{params['requestId']} cancelled: #{params['reason']}"
-        # Handle cancellation
-      else
-        handle_specific_notification(rpc_method, params)
-      end
-    end
-
-    # Override in subclasses
-    def handle_specific_notification(rpc_method, params)
-      raise NotImplementedError, "Subclasses must implement #handle_specific_notification"
-    end
-  end
-end

data/lib/action_mcp/client_json_rpc_handler.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module ActionMCP
-  # Handler for client-side requests (server -> client)
-  class ClientJsonRpcHandler < BaseJsonRpcHandler
-    def handle_initialize(id, params)
-      # Client-specific initialization
-      transport.send_client_capabilities(id, params)
-    end
-
-    def handle_specific_method(rpc_method, id, params)
-      case rpc_method
-      when "client/setLoggingLevel" # [CLIENT] Server configuring client logging
-        transport.set_client_logging_level(id, params["level"])
-      when %r{^roots/}                 # [CLIENT] Roots management
-        process_roots(rpc_method, id, params)
-      when %r{^sampling/}              # [CLIENT] Sampling requests
-        process_sampling(rpc_method, id, params)
-      else
-        Rails.logger.warn("Unknown client method: #{rpc_method}")
-      end
-    end
-
-    def handle_specific_notification(rpc_method, params)
-      case rpc_method
-      when "notifications/resources/updated" # [CLIENT] Resource update notification
-        puts "Resource #{params['uri']} was updated"
-        # Handle resource update notification
-      when "notifications/tools/list_changed" # [CLIENT] Tool list change notification
-        puts "Tool list has changed"
-        # Handle tool list change notification
-      when "notifications/prompts/list_changed" # [CLIENT] Prompt list change notification
-        puts "Prompt list has changed"
-        # Handle prompt list change notification
-      when "notifications/resources/list_changed" # [CLIENT] Resource list change notification
-        puts "Resource list has changed"
-        # Handle resource list change notification
-      else
-        Rails.logger.warn("Unknown client notification: #{rpc_method}")
-      end
-    end
-
-    private
-
-    # @param rpc_method [String]
-    # @param id [String]
-    # @param params [Hash]
-    def process_roots(rpc_method, id, params)
-      case rpc_method
-      when "roots/list"               # [CLIENT] List available roots
-        transport.send_roots_list(id)
-      else
-        Rails.logger.warn("Unknown roots method: #{rpc_method}")
-      end
-    end
-
-    # @param rpc_method [String]
-    # @param id [String]
-    # @param params [Hash]
-    def process_sampling(rpc_method, id, params)
-      case rpc_method
-      when "sampling/createMessage" # [CLIENT] Create a message using AI
-        transport.send_sampling_create_message(id, params)
-      else
-        Rails.logger.warn("Unknown sampling method: #{rpc_method}")
-      end
-    end
-  end
-end