Merge pull request #32 from henriquenfaria/hexdigest-unique-key

Use SHA256 hexdigest to uniquely identify MCP tools

Author: obie

lib/mcp/sse_client.rb

@@ -3,6 +3,7 @@
 require "securerandom"
 require "faraday"
 require "uri"
+require "digest"
 
 module Raix
   module MCP
@@ -84,7 +85,8 @@ def close
       end
 
       def unique_key
-        @url.parameterize.underscore.gsub("https_", "")
+        parametrized_url = @url.parameterize.underscore.gsub("https_", "")
+        Digest::SHA256.hexdigest(parametrized_url)[0..2]
       end
 
       private

lib/mcp/stdio_client.rb

@@ -1,6 +1,7 @@
 require_relative "tool"
 require "json"
 require "securerandom"
+require "digest"
 
 module Raix
   module MCP
@@ -57,7 +58,8 @@ def close
       end
 
       def unique_key
-        @args.join(" ").parameterize.underscore
+        parametrized_args = @args.join(" ").parameterize.underscore
+        Digest::SHA256.hexdigest(parametrized_args)[0..2]
       end
 
       private

lib/raix/mcp.rb

@@ -102,7 +102,7 @@ def mcp(client:, only: nil, except: nil)
         filtered_tools.each do |tool|
           remote_name = tool.name
           # TODO: Revisit later whether this much context is needed in the function name
-          local_name = "#{client.unique_key}_#{remote_name}".to_sym
+          local_name = "#{remote_name}_#{client.unique_key}".to_sym
 
           description = tool.description
           input_schema = tool.input_schema || {}
@@ -140,7 +140,7 @@ def mcp(client:, only: nil, except: nil)
                     id: call_id,
                     type: "function",
                     function: {
-                      name: remote_name,
+                      name: local_name.to_s,
                       arguments: arguments.to_json
                     }
                   }
@@ -149,7 +149,7 @@ def mcp(client:, only: nil, except: nil)
               {
                 role: "tool",
                 tool_call_id: call_id,
-                name: remote_name,
+                name: local_name.to_s,
                 content: content_text
               }
             ]

spec/raix/mcp/sse_spec.rb

@@ -55,10 +55,12 @@ def self.functions
 
       # Print available tools for debugging
       tools = LiveMcpConsumer.functions.map { |f| f[:name] }
-      expect(tools).to include(:gitmcp_io_olympiaai_raix_docs_fetch_raix_documentation)
-      expect(tools).to include(:gitmcp_io_olympiaai_raix_docs_search_raix_documentation)
-      expect(tools).to include(:gitmcp_io_olympiaai_raix_docs_search_raix_code)
-      expect(tools).to include(:gitmcp_io_olympiaai_raix_docs_fetch_generic_url_content)
+
+      unique_key_hash = "715"
+      expect(tools).to include(:"fetch_raix_documentation_#{unique_key_hash}")
+      expect(tools).to include(:"search_raix_documentation_#{unique_key_hash}")
+      expect(tools).to include(:"search_raix_code_#{unique_key_hash}")
+      expect(tools).to include(:"fetch_generic_url_content_#{unique_key_hash}")
     end
 
     it "successfully calls a function on the GitMCP server", :novcr do

spec/raix/mcp_spec.rb

@@ -326,3 +326,71 @@ def self.name
     expect(result["bool4"]).to eq(false)
   end
 end
+
+RSpec.describe "MCP function name mapping" do
+  let(:test_class) do
+    Class.new do
+      include Raix::ChatCompletion
+      include Raix::MCP
+
+      attr_accessor :transcript
+
+      def initialize
+        @transcript = []
+      end
+
+      def self.name
+        "TestMcpFunctionNames"
+      end
+
+      def chat_completion_args
+        {}
+      end
+
+      def loop
+        false
+      end
+    end
+  end
+
+  it "uses local_name with prefix in transcript instead of remote_name" do
+    client_key = "client_key"
+    mock_tool = OpenStruct.new(
+      name: "get_data",
+      description: "Gets some data",
+      input_schema: {
+        "properties" => {
+          "id" => { "type" => "integer" }
+        }
+      }
+    )
+    mock_client = double("MCP::StdioClient",
+                         unique_key: client_key,
+                         close: nil,
+                         tools: [mock_tool])
+
+    data_result = "Data for ID 123"
+    allow(mock_client).to receive(:call_tool).with("get_data", id: 123).and_return(data_result)
+    test_class.mcp(client: mock_client)
+    instance = test_class.new
+
+    local_method_name = :get_data_client_key
+    expect(instance).to respond_to(local_method_name)
+
+    result = instance.send(local_method_name, { id: "123" }, nil)
+    expect(result).to eq(data_result)
+
+    expect(instance.transcript.size).to eq(1)
+    messages = instance.transcript[0]
+    expect(messages).to be_an(Array)
+    expect(messages.size).to eq(2)
+
+    assistant_msg = messages[0]
+    expect(assistant_msg[:role]).to eq("assistant")
+    expect(assistant_msg[:tool_calls][0][:function][:name]).to eq("get_data_#{client_key}")
+
+    tool_msg = messages[1]
+    expect(tool_msg[:role]).to eq("tool")
+    expect(tool_msg[:name]).to eq("get_data_#{client_key}")
+  end
+end