actionmcp 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6794bfeea02de8502aa4b084548a93269149b9376117663d602ecfae54af8014
-  data.tar.gz: 49bca81dc1f59d27fc8d27c1b8978a8def6d3414822f261ce1aee2a4ebfc45b0
+  metadata.gz: e33a00e3a56b0dba226465afd8ce6695158400bb5a26876fa92f72cea65a5418
+  data.tar.gz: 9243f9316686638c66f716d333803db0b8ad0e32d052728b1ca1e1dc5eda21cb
 SHA512:
-  metadata.gz: 3f94f11e49df2549d1e43c4499f7fedfc9f7000279f6b08d2eb3ffb9e32add617a14277869fa3b34a31bde7aa2e6e66674f2e7b49cd57f5606daebbd060097f7
-  data.tar.gz: 9ce4b731e107c76a1e057ea4ce33a90998d1d5700946f8e056eea3763535e12ca941ba875324914c910d375bbac04c12f4c0da25255d2d7cf5e746b9bd1fa19c
+  metadata.gz: d0bdf008e20cbe4bc36d4a295201eb16570fd5e5dc83c24fef759daac1c622c6b58ce16f671db06d326714587e7ecca1b22234829d9c59ea40759b9c78b8e976
+  data.tar.gz: 948bf31356b50d4004093890ca8a336a1e3eb41a85ce95d46e01a41f1a1823f0a2ff20fd849ab2eccda1b7569db9573ab0c84911ea263c2db0b85f2f20c07cdc

data/README.md

@@ -19,7 +19,7 @@ This means an AI (like an LLM) can request information or actions from your appl
 **ActionMCP** is targeted at developers building MCP-enabled applications.
 It simplifies the process of integrating Ruby and Rails apps with the MCP standard by providing a set of base classes and an easy-to-use server interface.
 
-Instead of implementing MCP support from scratch, you can subclass and configure the provided **Prompt**, **Tool**, and **ResourceTemplate** classes to expose your app's functionality to LLMs.
+Instead of implementing MCP support from scratch, you can subclass and configure the provided **Prompt**, **Tool**, and **ResourceTemplate** classes to expose your app's functionality to LLMs. 
 
 ActionMCP handles the underlying MCP message format and routing, so you can adhere to the open standard with minimal effort.
 
@@ -169,6 +169,32 @@ class ProductResourceTemplate < ApplicationMCPResTemplate
     )
   end
 end
+
+# Example of callbacks:
+
+```ruby
+before_resolve do |template|
+  logger.tagged("ProductsTemplate") { logger.info("Starting to resolve product: #{template.product_id}") }
+end
+
+after_resolve do |template|
+  logger.tagged("ProductsTemplate") { logger.info("Finished resolving product resource for product: #{template.product_id}") }
+end
+
+around_resolve do |template, block|
+  start_time = Time.current
+  logger.tagged("ProductsTemplate") { logger.info("Starting resolution for product: #{template.product_id}") }
+
+  resource = block.call
+
+  if resource
+    logger.tagged("ProductsTemplate") { logger.info("Product #{template.product_id} resolved successfully in #{Time.current - start_time}s") }
+  else
+    logger.tagged("ProductsTemplate") { logger.info("Product #{template.product_id} not found") }
+  end
+
+  resource
+end
 ```
 
 Resource templates are automatically registered and used when LLMs request resources matching their patterns.

data/lib/action_mcp/content/resource.rb

@@ -17,7 +17,7 @@ module ActionMCP
       # @param mime_type [String] The MIME type of the resource.
       # @param text [String, nil] The text content of the resource (optional).
       # @param blob [String, nil] The base64-encoded blob of the resource (optional).
-      def initialize(uri, mime_type, text: nil, blob: nil)
+      def initialize(uri, mime_type = "text/plain", text: nil, blob: nil)
         super("resource")
         @uri = uri
         @mime_type = mime_type

data/lib/action_mcp/instrumentation/controller_runtime.rb

@@ -12,22 +12,21 @@ module ActionMCP
       attr_internal :mcp_runtime
 
       def cleanup_view_runtime
-        mcp_rt_before_render = Instrumentation::LogSubscriber.reset_runtime
+        mcp_rt_before_render = LogSubscriber.reset_runtime
         runtime = super
-        mcp_rt_after_render = Instrumentation::LogSubscriber.reset_runtime
+        mcp_rt_after_render = LogSubscriber.reset_runtime
         self.mcp_runtime = mcp_rt_before_render + mcp_rt_after_render
         runtime - mcp_rt_after_render
       end
 
       def append_info_to_payload(payload)
         super
-        payload[:mcp_runtime] = (mcp_runtime || 0) + Instrumentation::LogSubscriber.reset_runtime
+        payload[:mcp_runtime] = (mcp_runtime || 0) + LogSubscriber.reset_runtime
       end
 
       class_methods do
         def log_process_action(payload)
           messages = super
-          binding.irb
           mcp_runtime = payload[:mcp_runtime]
           messages << ("mcp: %.1fms" % mcp_runtime.to_f) if mcp_runtime
           messages

data/lib/action_mcp/log_subscriber.rb

@@ -1,28 +1,29 @@
-# In log_subscriber.rb
 module ActionMCP
   class LogSubscriber < ActiveSupport::LogSubscriber
-    def tool_call(event)
-      # Try both debug and info to ensure output regardless of logger level
-      debug "Tool: #{event.payload[:tool_name]} (#{event.duration.round(2)}ms)"
-      info "Tool: #{event.payload[:tool_name]} (#{event.duration.round(2)}ms)"
+    def self.reset_runtime
+      # Get the combined runtime from both tool and prompt operations
+      tool_rt = Thread.current[:mcp_tool_runtime] || 0
+      prompt_rt = Thread.current[:mcp_prompt_runtime] || 0
+      total_rt = tool_rt + prompt_rt
 
-      # Track total tool time for summary
-      Thread.current[:tool_runtime] ||= 0
-      Thread.current[:tool_runtime] += event.duration
-    end
+      # Reset both counters
+      Thread.current[:mcp_tool_runtime] = 0
+      Thread.current[:mcp_prompt_runtime] = 0
 
-    def prompt_call(event)
-      # Add debug output to confirm method is called
-      puts "LogSubscriber#prompt_call called with: #{event.name}"
+      # Return the total runtime
+      total_rt
+    end
 
-      # Try both debug and info to ensure output regardless of logger level
-      debug "Prompt: #{event.payload[:prompt_name]} (#{event.duration.round(2)}ms)"
-      info "Prompt: #{event.payload[:prompt_name]} (#{event.duration.round(2)}ms)"
+    def tool_call(event)
+      Thread.current[:mcp_tool_runtime] ||= 0
+      Thread.current[:mcp_tool_runtime] += event.duration
+    end
 
-      # Track total prompt time for summary
-      Thread.current[:prompt_runtime] ||= 0
-      Thread.current[:prompt_runtime] += event.duration
+    def prompt_call(event)
+      Thread.current[:mcp_prompt_runtime] ||= 0
+      Thread.current[:mcp_prompt_runtime] += event.duration
     end
+
     attach_to :action_mcp
   end
 end

data/lib/action_mcp/resource_template.rb

@@ -14,7 +14,8 @@ module ActionMCP
     @registered_templates = []
 
     class << self
-      attr_reader :registered_templates, :description, :uri_template, :mime_type, :template_name, :parameters
+      attr_reader :registered_templates, :description, :uri_template,
+                  :mime_type, :template_name, :parameters
 
       def abstract?
         @abstract ||= false
@@ -249,5 +250,11 @@ module ActionMCP
     end
 
     attr_reader :description, :uri_template, :mime_type
+
+    def call
+      run_callbacks :resolve do
+        resolve
+      end
+    end
   end
 end

data/lib/action_mcp/transport/resources.rb

@@ -47,7 +47,7 @@ module ActionMCP
       def send_resource_read(id, params)
         if (template = ResourceTemplatesRegistry.find_template_for_uri(params[:uri]))
           record = template.process(params[:uri])
-          if (resource = record.resolve)
+          if (resource = record.call)
             # if resource is a array or a collection, return each item then it ok
             # else wrap it in a array
             resource = [ resource ] unless resource.respond_to?(:each)

data/lib/action_mcp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 bindir: exe
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -136,7 +136,6 @@ files:
 - lib/action_mcp/gem_version.rb
 - lib/action_mcp/instrumentation/controller_runtime.rb
 - lib/action_mcp/instrumentation/instrumentation.rb
-- lib/action_mcp/instrumentation/log_subscriber.rb
 - lib/action_mcp/instrumentation/resource_instrumentation.rb
 - lib/action_mcp/integer_array.rb
 - lib/action_mcp/json_rpc.rb

data/lib/action_mcp/instrumentation/log_subscriber.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module ActionMCP
-  module Instrumentation
-    # A log subscriber to attach to Elasticsearch related events
-    #
-    # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
-    #
-    class LogSubscriber < ActiveSupport::LogSubscriber
-      def self.runtime=(value)
-        Thread.current["elasticsearch_runtime"] = value
-      end
-
-      def self.runtime
-        Thread.current["elasticsearch_runtime"] ||= 0
-      end
-
-      def self.reset_runtime
-        rt = runtime
-        self.runtime = 0
-        rt
-      end
-
-      # Intercept `search.elasticsearch` events, and display them in the Rails log
-      #
-      def search(event)
-        self.class.runtime += event.duration
-        return unless logger.debug?
-
-        payload = event.payload
-        name    = "#{payload[:klass]} #{payload[:name]} (#{event.duration.round(1)}ms)"
-        search  = payload[:search].inspect.gsub(/:(\w+)=>/, '\1: ')
-
-        debug %(  #{color(name, GREEN, bold: true)} #{colorize_logging ? "\e[2m#{search}\e[0m" : search})
-      end
-    end
-  end
-  Instrumentation::LogSubscriber.attach_to :elasticsearch
-end