actionmcp 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb964a85c5ae8f64c05730e054c3e252c22e8fe3eeea6230496929948ea51f68
-  data.tar.gz: a7cfd82678922926ef8beb28cc0346ebb583f826d1cc9ff9d8d54f55cecd08d7
+  metadata.gz: 86bd5d34d17ae66d5fcae2cf75c8231f78d6c08f88199f4835e42faed93e9589
+  data.tar.gz: 239b2fc880942da6f7b4c1b6bf1b498ab12a7866d1bfb34e719bb7f46e206985
 SHA512:
-  metadata.gz: f6c12f6088da3ca4e642fe9aac72d7caeacd9630619c61a1d2c93006e87ab2da7d35eb25467e086d6ecb5e3109546f0f61285e6f9c175183fb8b1365f7cbae96
-  data.tar.gz: 70cbe6bcbf594afcc7558f3c178771c5b2d9c06d00f7474288bfbe59d9da694ccef578c68a0c5cf9a6a571f4ef51f317ed2fa34d57600321364beffb5ba7fe77
+  metadata.gz: ded4b3ae254173fa102465c03e665606ebd1f8acea443e117a2190c1d1115ee53b30401e94c9b9842d469493002213b32a21e58612f74f46a4e0956885f8f4b6
+  data.tar.gz: 730190f2a425916ea1c719cbdbdcd427ff606a0539b66e88226225f638d242f61c2663c9dcd0b38201ebe0856a4aa44ed3527f26399885e9658ee4319407c22d

data/lib/action_mcp/base_response.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  class BaseResponse
+    include Enumerable
+    attr_reader :is_error
+
+    def initialize
+      @is_error = false
+    end
+
+    # Mark response as error
+    def mark_as_error!(symbol = :invalid_request, message: nil, data: nil)
+      @is_error = true
+      @symbol = symbol
+      @error_message = message
+      @error_data = data
+      self
+    end
+
+    # Convert to hash format expected by MCP protocol
+    def to_h
+      if @is_error
+        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
+      else
+        build_success_hash
+      end
+    end
+
+    # Method to be implemented by subclasses
+    def build_success_hash
+      raise NotImplementedError, "Subclasses must implement #build_success_hash"
+    end
+
+    # Alias as_json to to_h for consistency
+    alias as_json to_h
+
+    # Handle to_json directly
+    def to_json(options = nil)
+      to_h.to_json(options)
+    end
+
+    # Compare with hash for easier testing
+    def ==(other)
+      case other
+      when Hash
+        # Convert both to normalized format for comparison
+        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
+        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
+        hash_self == hash_other
+      when self.class
+        compare_with_same_class(other)
+      else
+        super
+      end
+    end
+
+    # Method to be implemented by subclasses for comparison
+    def compare_with_same_class(other)
+      raise NotImplementedError, "Subclasses must implement #compare_with_same_class"
+    end
+
+    # Implement eql? for hash key comparison
+    def eql?(other)
+      self == other
+    end
+
+    # Method to be implemented by subclasses for hash generation
+    def hash_components
+      raise NotImplementedError, "Subclasses must implement #hash_components"
+    end
+
+    # Implement hash method for hash key usage
+    def hash
+      hash_components.hash
+    end
+
+    def success?
+      !is_error
+    end
+
+    def error?
+      is_error
+    end
+  end
+end

data/lib/action_mcp/prompt.rb

@@ -46,8 +46,9 @@ module ActionMCP
     # @param required [Boolean] Whether the argument is required.
     # @param default [Object] The default value of the argument.
     # @param enum [Array<String>] The list of allowed values for the argument.
+    # @param type [Symbol] The type of the argument (e.g., :string, :integer, :boolean). Defaults to :string.
     # @return [void]
-    def self.argument(arg_name, description: "", required: false, default: nil, enum: nil)
+    def self.argument(arg_name, description: "", required: false, default: nil, enum: nil, type: :string)
       arg_def = {
         name: arg_name.to_s,
         description: description,
@@ -58,7 +59,7 @@ module ActionMCP
       self._argument_definitions += [ arg_def ]
 
       # Register the attribute so it's recognized by ActiveModel
-      attribute arg_name, :string, default: default
+      attribute arg_name, type, default: default
       validates arg_name, presence: true if required
 
       return unless enum.present?
@@ -81,7 +82,7 @@ module ActionMCP
       {
         name: prompt_name,
         description: description.presence,
-        arguments: arguments.map { |arg| arg.slice(:name, :description, :required) }
+        arguments: arguments.map { |arg| arg.slice(:name, :description, :required, :type) }
       }.compact
     end
 

data/lib/action_mcp/prompt_response.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  class PromptResponse
-    include Enumerable
-    attr_reader :messages, :is_error
+  class PromptResponse < BaseResponse
+    attr_reader :messages
 
     # Delegate methods to the underlying messages array
     delegate :empty?, :size, :each, :find, :map, to: :messages
 
     def initialize
+      super
       @messages = []
-      @is_error = false
     end
 
     # Add a message to the response
@@ -25,56 +24,21 @@ module ActionMCP
       self
     end
 
-    def mark_as_error!(symbol = :invalid_request, message: nil, data: nil)
-      @is_error = true
-      @symbol = symbol
-      @error_message = message
-      @error_data = data
-      self
-    end
-
-    # Convert to hash format expected by MCP protocol
-    def to_h
-      if @is_error
-        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
-      else
-        {
-          messages: @messages
-        }
-      end
-    end
-
-    # Alias as_json to to_h for consistency
-    alias as_json to_h
-
-    # Handle to_json directly
-    def to_json(options = nil)
-      to_h.to_json(options)
-    end
-
-    # Compare with hash for easier testing
-    def ==(other)
-      case other
-      when Hash
-        # Convert both to normalized format for comparison
-        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
-        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
-        hash_self == hash_other
-      when PromptResponse
-        messages == other.messages
-      else
-        super
-      end
+    # Implementation of build_success_hash for PromptResponse
+    def build_success_hash
+      {
+        messages: @messages
+      }
     end
 
-    # Implement eql? for hash key comparison
-    def eql?(other)
-      self == other
+    # Implementation of compare_with_same_class for PromptResponse
+    def compare_with_same_class(other)
+      messages == other.messages
     end
 
-    # Implement hash method for hash key usage
-    def hash
-      [ messages ].hash
+    # Implementation of hash_components for PromptResponse
+    def hash_components
+      [ messages ]
     end
 
     # Pretty print for better debugging

data/lib/action_mcp/tool_response.rb

@@ -2,15 +2,14 @@
 
 module ActionMCP
   # Manages the collection of content objects for tool results
-  class ToolResponse
-    include Enumerable
-    attr_reader :contents, :is_error
+  class ToolResponse < BaseResponse
+    attr_reader :contents
 
     delegate :empty?, :size, :each, :find, :map, to: :contents
 
     def initialize
+      super
       @contents = []
-      @is_error = false
     end
 
     # Add content to the response
@@ -19,65 +18,21 @@ module ActionMCP
       content # Return the content for chaining
     end
 
-    # Mark response as error
-    def mark_as_error!(symbol = :invalid_request, message: nil, data: nil)
-      @is_error = true
-      @symbol = symbol
-      @error_message = message
-      @error_data = data
-      self
+    # Implementation of build_success_hash for ToolResponse
+    def build_success_hash
+      {
+        content: @contents.map(&:to_h)
+      }
     end
 
-    # Convert to hash format expected by MCP protocol
-    def to_h
-      if @is_error
-        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
-      else
-        {
-          content: @contents.map(&:to_h)
-        }
-      end
+    # Implementation of compare_with_same_class for ToolResponse
+    def compare_with_same_class(other)
+      contents == other.contents && is_error == other.is_error
     end
 
-    # Alias as_json to to_h for consistency
-    alias as_json to_h
-
-    # Handle to_json directly
-    def to_json(options = nil)
-      to_h.to_json(options)
-    end
-
-    # Compare with hash for easier testing.
-    def ==(other)
-      case other
-      when Hash
-        # Convert both to normalized format for comparison
-        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
-        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
-        hash_self == hash_other
-      when ToolResponse
-        contents == other.contents && is_error == other.is_error
-      else
-        super
-      end
-    end
-
-    # Implement eql? for hash key comparison
-    def eql?(other)
-      self == other
-    end
-
-    # Implement hash method for hash key usage
-    def hash
-      [ contents, is_error ].hash
-    end
-
-    def success?
-      !is_error
-    end
-
-    def error?
-      is_error
+    # Implementation of hash_components for ToolResponse
+    def hash_components
+      [ contents, is_error ]
     end
 
     # Pretty print for better debugging

data/lib/action_mcp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -123,6 +123,7 @@ files:
 - 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