actionmcp 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a310c4bc57df9c1cd4d0fceb7b80fd9628414609bb6131e5d420584f5605f59c
-  data.tar.gz: 881fb9d39845277adcb24d42e73475dfc9aca5e25afb2b049c5ee55446aca474
+  metadata.gz: f825a63198153189d9970beec66012f8428dd625ec442559043597e4a938113e
+  data.tar.gz: 82891ffd29e22e8a36a80a002d264884756f6b48dfbe373eca963268ba82c4dc
 SHA512:
-  metadata.gz: 7e4caed2e47ffb767e8c6980a07542d093cc5bb7dd1d0438c342e0ec7a9c6af56e0409b108955b229f0fa4147d263a3060ce72a2864f7dc5405aab9f28e66bf6
-  data.tar.gz: ddb5fa89098629fecd125c317d935a0d0f3e4d50d828f4cd5d3b1c4b435be648b973235961af62e566431d1f991d4f3f0e11aeb7812b6423e0e4186cb4785b73
+  metadata.gz: ff8d86f24b9f087f3dc0c81e6bda73045c554ce5f1bb1c90d16faa80411e99a79b4b64e905a552d9e68653759e7ca9380bee202586d52b5a13068626ba34c238
+  data.tar.gz: d872f57c2651d7a0c28db334aa88bb98862f969c5566cc65fc5beefc3fd0b83f46b6de7d9633eb1ba9571dc6e767ed9e4ec501e5858e7ef68b79870582e69e8e

data/lib/action_mcp/prompt.rb

@@ -57,7 +57,7 @@ module ActionMCP
       validates arg_name, presence: true if required
 
       if enum.present?
-        validates arg_name, inclusion: { in: enum }
+        validates arg_name, inclusion: { in: enum }, allow_blank: !required
       end
     end
 
@@ -109,13 +109,13 @@ module ActionMCP
       if valid?
         begin
           perform # Invoke the subclass-specific logic if valid
-        rescue => e
+        rescue
           # Handle exceptions during execution
-          render text: "Error executing prompt: #{e.message}"
+          @response.mark_as_error!(:internal_error, message: "Unhandled Error executing prompt")
         end
       else
         # Handle validation failure
-        render text: "Invalid input: #{errors.full_messages.join(', ')}"
+        @response.mark_as_error!(:invalid_params, message: "Invalid input", data: errors.full_messages)
       end
 
       @response # Return the response with collected messages

data/lib/action_mcp/prompt_response.rb

@@ -2,10 +2,16 @@
 
 module ActionMCP
   class PromptResponse
-    attr_reader :messages, :description
+    include Enumerable
+
+    attr_reader :messages
+
+    # Delegate methods to the underlying messages array
+    delegate :empty?, :size, :each, :find, :map, to: :messages
 
     def initialize
       @messages = []
+      @is_error = false
     end
 
     # Add a message to the response
@@ -20,24 +26,61 @@ 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
-      {
-        messages: @messages
-      }
+      if @is_error
+        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
+      else
+        {
+          messages: @messages
+        }
+      end
     end
 
-    # Alias to_h to as_json for consistency
-    alias_method :to_h, :as_json
+    # Alias as_json to to_h for consistency
+    alias_method :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
+    end
+
+    # Implement eql? for hash key comparison
+    def eql?(other)
+      self == other
+    end
+
+    # Implement hash method for hash key usage
+    def hash
+      [ messages ].hash
+    end
+
     # Pretty print for better debugging
     def inspect
-      "#<#{self.class.name} messages: #{messages.size}"
+      "#<#{self.class.name} messages: #{messages.inspect}>"
     end
   end
 end

data/lib/action_mcp/prompts_registry.rb

@@ -17,20 +17,7 @@ module ActionMCP
       def prompt_call(prompt_name, arguments)
         prompt = find(prompt_name)
         prompt = prompt.new(arguments)
-        prompt.valid?
-        if prompt.valid?
-          {
-            messages: [ {
-              role: "user",
-              content: prompt.call
-            } ]
-          }
-        else
-          {
-            content: prompt.errors.full_messages.map { |msg| Content::Text.new(msg) },
-            isError: true
-          }
-        end
+        prompt.call
       end
 
       def item_klass

data/lib/action_mcp/tool.rb

@@ -134,13 +134,11 @@ module ActionMCP
           perform # Invoke the subclass-specific logic if valid
         rescue => e
           # Handle exceptions during execution
-          @response.mark_as_error!
-          render text: "Error executing tool: #{e.message}"
+          @response.mark_as_error!(:internal_error, message: e.message)
         end
       else
         # Handle validation failure
-        @response.mark_as_error!
-        render text: "Invalid input: #{errors.full_messages.join(', ')}"
+        @response.mark_as_error!(:invalid_request, message: "Invalid input", data: errors.full_messages)
       end
 
       @response # Return the response with collected content

data/lib/action_mcp/tool_response.rb

@@ -4,14 +4,12 @@ module ActionMCP
   # Manages the collection of content objects for tool results
   class ToolResponse
     include Enumerable
-
     attr_reader :contents, :is_error
-
     delegate :empty?, :size, :each, :find, :map, to: :contents
 
-    def initialize(is_error: false)
+    def initialize
       @contents = []
-      @is_error = is_error
+      @is_error = false
     end
 
     # Add content to the response
@@ -21,37 +19,42 @@ module ActionMCP
     end
 
     # Mark response as error
-    def mark_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 as_json(options = nil)
-      {
-        content: @contents.map { |c| c.as_json(options) },
-        isError: @is_error
-      }.compact
+    def to_h
+      if @is_error
+        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
+      else
+        {
+          content: @contents.map { |c| c.to_h },
+        }
+      end
     end
 
-    # Alias to_h to as_json for consistency
-    alias_method :to_h, :as_json
+    # Alias as_json to to_h for consistency
+    alias_method :as_json, :to_h
 
     # Handle to_json directly
     def to_json(options = nil)
-      as_json(options).to_json
+      to_h.to_json(options)
     end
 
-    # Compare with hash for easier testing
-    # This allows assertions like: assert_equal({content: [...], isError: false}, tool_response)
+    # Compare with hash for easier testing.
     def ==(other)
       case other
       when Hash
-        # Compare our hash representation with the other hash
-        # Use deep symbolization to handle both string and symbol keys
-        to_h.deep_symbolize_keys == other.deep_symbolize_keys
+        # 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
-        # Direct comparison with another ToolResponse
         contents == other.contents && is_error == other.is_error
       else
         super

data/lib/action_mcp/tools_registry.rb

@@ -20,9 +20,11 @@ module ActionMCP
         tool = tool_class.new(arguments)
 
         tool.call.to_h
+      rescue RegistryBase::NotFound
+        error_response(:invalid_params, message: "Tool not found: #{tool_name}")
       rescue StandardError => e
         # FIXME, we should maybe not return the error message to the user
-        error_response([ "Tool execution failed: #{e.message}" ])
+        error_response(:invalid_params, message: "Tool execution failed: #{e.message}")
       end
 
       def item_klass
@@ -31,11 +33,9 @@ module ActionMCP
 
       private
 
-      def error_response(messages)
-        {
-          content: messages.map { |msg| Content::Text.new(msg) },
-          isError: true
-        }
+      def error_response(symbol, message: nil, data: nil)
+        response = ToolResponse.new
+        response.mark_as_error!(symbol, message: message, data: data)
       end
     end
   end

data/lib/action_mcp/transport/prompts.rb

@@ -7,12 +7,12 @@ module ActionMCP
       end
 
       def send_prompts_get(request_id, prompt_name, params)
-        send_jsonrpc_response(request_id, result: PromptsRegistry.prompt_call(prompt_name.to_s, params))
-      rescue RegistryBase::NotFound
-        send_jsonrpc_response(request_id, error: JsonRpc::JsonRpcError.new(
-          :method_not_found,
-          message: "Prompt not found: #{prompt_name}"
-        ).as_json)
+        result = PromptsRegistry.prompt_call(prompt_name.to_s, params)
+        if result.is_error
+          send_jsonrpc_response(request_id, error: result)
+        else
+          send_jsonrpc_response(request_id, result:)
+        end
       end
     end
   end

data/lib/action_mcp/transport/tools.rb

@@ -8,12 +8,11 @@ module ActionMCP
 
       def send_tools_call(request_id, tool_name, arguments, _meta = {})
         result = ToolsRegistry.tool_call(tool_name, arguments, _meta)
-        send_jsonrpc_response(request_id, result: result)
-      rescue RegistryBase::NotFound
-        send_jsonrpc_response(request_id, error: JsonRpc::JsonRpcError.new(
-          :method_not_found,
-          message: "Tool not found: #{tool_name}"
-        ).as_json)
+        if result.is_error
+          send_jsonrpc_response(request_id, error: result)
+        else
+          send_jsonrpc_response(request_id, result:)
+        end
       end
     end
   end

data/lib/action_mcp/version.rb

@@ -2,7 +2,7 @@
 
 require_relative "gem_version"
 module ActionMCP
-  VERSION = "0.9.0"
+  VERSION = "0.11.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.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Abdelkader Boudih