stack-service-base 0.0.64 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73b91212d7125c660258defabaa0f09540b66458f31222340109ee1b4e31354
-  data.tar.gz: 296d9f39dd8fac208801c5195141c2a29d134163ae20cc230f3baecc24380c2c
+  metadata.gz: e5364bb7f74a8a5882409f1756051e6157203cf89b148cf3ee69ca60456d5285
+  data.tar.gz: 532831a451ce25cc18a3310b35f0eec5f2d6aa2b69cf2bfa49ec267c22d462e1
 SHA512:
-  metadata.gz: e5f0a35ad58b849f923bd0a9df6a794b1ab52964f51732c60649d3308e29cab3df691c9090e857b0d7d2037ece0cf6068faf1473eb276881fb1db3fbdec0d566
-  data.tar.gz: ea99bd368e07a109da81577522ca6a8071662b67b7cc198a4c78159a74c68ee81a68a11a0c601a46560706ecdc061679a6a512328b64372c8df21119aa334212
+  metadata.gz: d7ee6fb74e36aba27c59632ffaa64dcc208f1af6e03c00a295b238c2e6340abe7a73fdf220863e034574df71204326b13555ec5726ac0fe38c7e8243b3902ed3
+  data.tar.gz: '08deb1846f8eb0f47983ae3d9a1cb7ea7408d9f254d5f8e922ab6c5f319082ba700fba8cb2ae1d42045571a3903f889638f1610c4f38fedec5ac0f483d7fc98c'

data/lib/stack-service-base/examples/mcp_config.ru

@@ -11,25 +11,39 @@ SERVICES = {
   }
 }
 
-require 'stack-service-base/mcp_processor'
-require 'stack-service-base/mcp_tool_registry'
+require 'stack-service-base/mcp/mcp_helper'
+helpers McpHelper
 
-MCP_PROCESSOR = McpProcessor.new
+Tool :search do
+  description 'Search for a term in the database'
+  input query: { type: "string", description: "Term to search for", required: true }
+  call do |inputs|
+    query = inputs[:query]
+    { results: [{id:"doc-1",title:"...",url:"..."}] }
+  end
+end
+
+Tool :fetch do
+  description 'Fetch a resource from the database'
+  input resource_id: { type: "string", description: "Resource ID to fetch", required: true }
+  call do |inputs|
+    id = inputs[:id]
+    { id: "doc-1", title: "...", text: "full text...", url: "https://example.com/doc",  metadata: { source: "vector_store" } }
+  end
+end
 
 Tool :service_status do
   description 'Check current status of a service'
   input service_name: { type: "string", description: "Service name to inspect", required: true }
-  execute do |inputs|
+  call do |inputs|
     service_name = inputs[:service_name]
     service = SERVICES[service_name]
-    rpc_error!(404, "Unknown service #{service_name}") unless service
+    rpc_error!(-32000, "Unknown service #{service_name}") unless service
     {
-      toolResult: {
-        service_name: service_name,
-        status: service[:status],
-        uptime_sec: service[:uptime],
-        last_restart: service[:last_restart].utc.iso8601,
-      }
+      service_name: service_name,
+      status: service[:status],
+      uptime_sec: service[:uptime],
+      last_restart: service[:last_restart].utc.iso8601,
     }
   end
 end
@@ -38,36 +52,21 @@ Tool :restart_service do
   description 'Restart a service'
   input service_name: { type: "string", description: "Service name to restart", required: true },
         force: { type: "boolean", default: false, description: "Force restart if graceful fails" }
-  execute do |inputs|
+  call do |inputs|
     service_name = inputs[:service_name]
     service = SERVICES[service_name]
-    rpc_error!(404, "Unknown service #{service_name}") unless service
+    rpc_error!(-32000, "Unknown service #{service_name}") unless service
 
     service[:status]       = "running"
     service[:last_restart] = Time.now
     service[:uptime]       = 0
-
     {
-      toolResult: {
-        service_name: service_name,
-        status: service[:status],
-        restarted_at: service[:last_restart].utc.iso8601,
-        force: inputs.fetch(:force, false)
-      }
+      service_name: service_name,
+      status: service[:status],
+      restarted_at: service[:last_restart].utc.iso8601,
+      force: inputs.fetch(:force, false)
     }
   end
 end
 
-before { content_type :json }
-error McpProcessor::ParseError do |err|
-  status err.status
-  err.body
-end
-
-get  '/', &MCP_PROCESSOR.method(:root_endpoint)
-post '/' do
-  request.body.rewind
-  MCP_PROCESSOR.rpc_endpoint(request.body.read)
-end
-
 run Sinatra::Application

data/lib/stack-service-base/{mcp_helper.rb → mcp/mcp_helper.rb}

@@ -12,7 +12,7 @@ module McpHelper
         err.body
       end
 
-      get  '/mcp' do
+      get '/mcp' do
         content_type :json
         MCP_PROCESSOR.root_endpoint
       end

data/lib/stack-service-base/{mcp_processor.rb → mcp/mcp_processor.rb}

@@ -115,7 +115,7 @@ class McpProcessor
     name      = params["name"]
     arguments = params["arguments"] || {}
     tool      = ToolRegistry.fetch(name) || rpc_error!(-32601, "Unknown tool #{name}")
-    response = tool.call(arguments)
+    response = tool.call_tool(arguments)
     {
       content: [
         { "type": "text", "text": response.is_a?(String) ? response : response.to_json }

data/lib/stack-service-base/{mcp_tool_registry.rb → mcp/mcp_tool_registry.rb}

@@ -30,10 +30,10 @@ module ToolRegistry
         properties[field] = cfg.transform_keys(&:to_s)
       end
 
-      { type: "object", properties: properties, required: required }
+      { type: 'object', properties: properties, required: required }
     end
 
-    def execute(&block) = @executor = block
+    def call(&block) = @executor = block
 
     def to_h
       {
@@ -43,7 +43,7 @@ module ToolRegistry
       }
     end
 
-    def call(arguments)
+    def call_tool(arguments)
       raise JsonRpcError.new(code: 500, message: "Tool #{name} missing executor") unless @executor
 
       ExecutionContext.new.instance_exec(symbolize_keys(arguments || {}), &@executor)

data/lib/stack-service-base/mcp/rack_test_mcp_protocol.rb

@@ -0,0 +1,52 @@
+require 'json'
+
+module Rack
+  module Test
+    module McpProtocol
+      def rpc_request(payload)
+        post '/mcp', JSON.dump(payload), { 'CONTENT_TYPE' => 'application/json' }
+        expect(last_response.status).to eq(200)
+        parsed_response_body
+      end
+
+      def parsed_response_body
+        body = +''
+        last_response.each { |chunk| body << chunk.to_s }
+        data_lines = body.lines.select { |line| line.start_with?('data:') }
+        payload_line = data_lines.reverse.find { |l| l !~ /ping/i } || data_lines.last
+        payload = (payload_line || body).sub(/\Adata:\s*/, '').sub(/\n\z/, '')
+        JSON.parse(payload, symbolize_names: true)
+      end
+
+      def mcp_list_tools
+        req_id = next_id
+        response = rpc_request(id: req_id, method: 'tools/list', params: {})
+        expect(response[:id]).to eq(req_id)
+        response.dig(:result, :tools)
+      end
+
+      def mcp_call_tool(name:, arguments:)
+        response = mcp_call_tool_raw(name: name, arguments: arguments)
+        tool_results = response.dig(:result, :content)
+        expect(tool_results[0][:type]).to eq('text')
+        JSON.parse(tool_results[0][:text], symbolize_names: true)
+      end
+
+      def mcp_call_tool_raw(name:, arguments:)
+        rpc_request(
+          id: next_id,
+          method: 'tools/call',
+          params: { 'name' => name, 'arguments' => arguments }
+        )
+      end
+
+      private
+
+      def next_id
+        @next_id ||= -1
+        @next_id += 1
+      end
+    end
+  end
+end
+

data/lib/stack-service-base/version.rb

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.64'
+  VERSION = '0.0.66'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.66
 platform: ruby
 authors:
 - Artyom B
@@ -401,9 +401,10 @@ files:
 - lib/stack-service-base/examples/mcp_config.ru
 - lib/stack-service-base/fiber_pool.rb
 - lib/stack-service-base/logging.rb
-- lib/stack-service-base/mcp_helper.rb
-- lib/stack-service-base/mcp_processor.rb
-- lib/stack-service-base/mcp_tool_registry.rb
+- lib/stack-service-base/mcp/mcp_helper.rb
+- lib/stack-service-base/mcp/mcp_processor.rb
+- lib/stack-service-base/mcp/mcp_tool_registry.rb
+- lib/stack-service-base/mcp/rack_test_mcp_protocol.rb
 - lib/stack-service-base/nats_patch_1.rb
 - lib/stack-service-base/nats_service.rb
 - lib/stack-service-base/open_telemetry.rb