legion-llm 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b3ae7660acb21a0a098c2154e5046b9349619c33df4725cd9ab0ad183fd5f7
-  data.tar.gz: 5c02100a171c87a11108d8993367359ee0fd46b1fd9212bb43e34e0f6da2ba62
+  metadata.gz: 56b729952a9d16d1b1ab83a669d86d7be4b32b760e3d96e57e19bec1c6158fff
+  data.tar.gz: 85336f8cbe3224d03bdc2c93f923711ae081e15fbea41ff4eee0e45a45a99faf
 SHA512:
-  metadata.gz: a7c118efb871b25592b6787c5c03cd8af3bdb3cdd034f468dcaba51072d014a0bbd2e7ff38532503729765f73086717080c13dd2f02393413317c59f13a50598
-  data.tar.gz: ce2220b0a54853125c1271a9c74d38debf389b0b8f27a380d1c3c872bb6c1860d16ff22b900c4ecf388d955331f7fbef05f487e9f19f63673321c85cf0a5b0fb
+  metadata.gz: 6bfbe51c0ebb5ece47ebe20e17d925051dcd22ce5a084040f20207b9498597fb2b763aa68933a23aeacbd82d5d064365dd71f3dadaca7ddda4dd282e17d12d90
+  data.tar.gz: 7e42e9ee15e04a3ca99d1b00a1355d8c261d3231b006b160e741da581a520787fa3a171afad44b25db28afeec92419fde0aab9508a33a872c9e6a304859ab46e

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.6.6] - 2026-04-01
+
+### Added
+- `McpToolAdapter` — wraps MCP server tool classes as RubyLLM::Tool instances for LLM session injection
+- Pipeline `McpDiscovery` step discovers both server-side (Legion::MCP::Server) and client-side (MCP::Client::Pool) tools
+- Tool name sanitization: dots replaced with underscores for Bedrock compatibility (`[a-zA-Z0-9_-]+`)
+
+### Fixed
+- Skip RubyLLM-based embedding health check for Azure provider since it uses direct HTTP with SNI host injection
+
 ## [0.6.5] - 2026-04-01
 
 ### Fixed

data/lib/legion/llm/embeddings.rb

@@ -316,18 +316,27 @@ module Legion
           raise 'Azure OpenAI embedding not configured (llm.providers.azure.api_base required)' unless api_base
 
           host = URI.parse(api_base).host
-          target = ip || host
+          target_ip = ip
           path = "/openai/deployments/#{model}/embeddings?api-version=2024-02-01"
+          Legion::Logging.info "Azure embed connecting to #{host}:443 (ip_override=#{target_ip.inspect})" if defined?(Legion::Logging)
 
           require 'net/http'
-          http = Net::HTTP.new(target, 443)
+          require 'openssl'
+          http = Net::HTTP.new(host, 443)
           http.use_ssl = true
-          http.open_timeout = 5
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http.open_timeout = 10
           http.read_timeout = 30
 
+          # When an IP override is set, resolve the FQDN to the private endpoint IP
+          # while keeping the FQDN as SNI for TLS handshake
+          if target_ip
+            addr = Addrinfo.tcp(target_ip, 443)
+            http.ipaddr = addr.ip_address
+          end
+
           req = Net::HTTP::Post.new(path)
           req['Content-Type'] = 'application/json'
-          req['Host'] = host
           req['api-key'] = api_key
           body = { input: input }
           body[:dimensions] = dimensions || TARGET_DIMENSION

data/lib/legion/llm/pipeline/executor.rb

@@ -76,6 +76,22 @@ module Legion
 
         private
 
+        def inject_discovered_tools(session)
+          return unless defined?(::Legion::MCP) && ::Legion::MCP.respond_to?(:server)
+
+          server = ::Legion::MCP.server
+          return unless server.respond_to?(:tool_registry)
+
+          server.tool_registry.each do |mcp_tool_class|
+            adapter = McpToolAdapter.new(mcp_tool_class)
+            session.with_tool(adapter)
+          rescue StandardError => e
+            @warnings << "Failed to inject tool: #{e.message}"
+          end
+        rescue StandardError => e
+          @warnings << "Tool injection error: #{e.message}"
+        end
+
         def execute_steps
           executed = 0
           skipped  = 0
@@ -403,7 +419,13 @@ module Legion
             session.with_tool(tool) if tool.is_a?(Class)
           end
 
-          ToolRegistry.tools.each { |t| session.with_tool(t) } if defined?(ToolRegistry)
+          if defined?(ToolRegistry)
+            ToolRegistry.tools.each do |t|
+              Legion::Logging.fatal("Injecting ToolRegistry tool: #{t.class} #{t.respond_to?(:tool_name) ? t.tool_name : t}") if defined?(Legion::Logging)
+              session.with_tool(t)
+            end
+          end
+          inject_discovered_tools(session)
 
           injected_system = EnrichmentInjector.inject(
             system:      @request.system,
@@ -545,6 +567,7 @@ module Legion
 
           (@request.tools || []).each { |tool| session.with_tool(tool) if tool.is_a?(Class) }
           ToolRegistry.tools.each { |t| session.with_tool(t) } if defined?(ToolRegistry)
+          inject_discovered_tools(session)
 
           messages = @request.messages
           prior    = messages.size > 1 ? messages[0..-2] : []

data/lib/legion/llm/pipeline/mcp_tool_adapter.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'ruby_llm'
+
+module Legion
+  module LLM
+    module Pipeline
+      class McpToolAdapter < RubyLLM::Tool
+        def initialize(mcp_tool_class)
+          @mcp_tool_class = mcp_tool_class
+          raw_name = mcp_tool_class.respond_to?(:tool_name) ? mcp_tool_class.tool_name : mcp_tool_class.name.to_s
+          @tool_name = raw_name.tr('.', '_')
+          @tool_desc = mcp_tool_class.respond_to?(:description) ? mcp_tool_class.description.to_s : ''
+          @tool_schema = mcp_tool_class.respond_to?(:input_schema) ? mcp_tool_class.input_schema : nil
+          super()
+        end
+
+        def name
+          @tool_name
+        end
+
+        def description
+          @tool_desc
+        end
+
+        def params_schema
+          return @params_schema if defined?(@params_schema)
+
+          @params_schema = (RubyLLM::Utils.deep_stringify_keys(@tool_schema) if @tool_schema.is_a?(Hash))
+        end
+
+        def execute(**)
+          result = @mcp_tool_class.call(**)
+          if result.is_a?(Hash) && result[:content]
+            result[:content].map { |c| c[:text] || c['text'] }.compact.join("\n")
+          elsif result.is_a?(String)
+            result
+          else
+            result.to_s
+          end
+        rescue StandardError => e
+          "Tool error: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/lib/legion/llm/pipeline/steps/mcp_discovery.rb

@@ -7,35 +7,22 @@ module Legion
         module McpDiscovery
           def step_mcp_discovery
             @discovered_tools ||= []
-
-            unless defined?(::Legion::MCP::Client::Pool)
-              @warnings << 'MCP Client unavailable for tool discovery'
-              record_mcp_timeline(0)
-              return
-            end
-
             start_time = Time.now
-            mcp_tools = ::Legion::MCP::Client::Pool.all_tools
 
-            mcp_tools.each do |tool|
-              @discovered_tools << {
-                name:        tool[:name],
-                description: tool[:description],
-                parameters:  tool[:input_schema],
-                source:      tool[:source]
-              }
-            end
+            discover_server_tools
+            discover_client_tools
 
-            if mcp_tools.any?
-              servers = mcp_tools.map { |t| t.dig(:source, :server) }.uniq
+            total = @discovered_tools.size
+            if total.positive?
+              sources = @discovered_tools.filter_map { |t| t.dig(:source, :server) || t.dig(:source, :type) }.uniq
               @enrichments['mcp:tool_discovery'] = {
-                content:   "#{mcp_tools.length} tools from #{servers.length} servers",
-                data:      { tool_count: mcp_tools.length, servers: servers },
+                content:   "#{total} tools from #{sources.length} sources",
+                data:      { tool_count: total, sources: sources },
                 timestamp: Time.now
               }
             end
 
-            record_mcp_timeline(mcp_tools.length, start_time)
+            record_mcp_timeline(total, start_time)
           rescue StandardError => e
             @warnings << "MCP discovery error: #{e.message}"
             record_mcp_timeline(0)
@@ -43,6 +30,42 @@ module Legion
 
           private
 
+          def discover_server_tools
+            return unless defined?(::Legion::MCP) && ::Legion::MCP.respond_to?(:server)
+
+            server = ::Legion::MCP.server
+            return unless server.respond_to?(:tool_registry)
+
+            server.tool_registry.each do |tool_class|
+              name = tool_class.respond_to?(:tool_name) ? tool_class.tool_name : tool_class.name
+              desc = tool_class.respond_to?(:description) ? tool_class.description : ''
+              schema = tool_class.respond_to?(:input_schema) ? tool_class.input_schema : {}
+              @discovered_tools << {
+                name:        name,
+                description: desc,
+                parameters:  schema,
+                source:      { type: :server, server: 'legion' }
+              }
+            end
+          rescue StandardError => e
+            @warnings << "Server tool discovery error: #{e.message}"
+          end
+
+          def discover_client_tools
+            return unless defined?(::Legion::MCP::Client::Pool)
+
+            ::Legion::MCP::Client::Pool.all_tools.each do |tool|
+              @discovered_tools << {
+                name:        tool[:name],
+                description: tool[:description],
+                parameters:  tool[:input_schema],
+                source:      tool[:source]
+              }
+            end
+          rescue StandardError => e
+            @warnings << "Client tool discovery error: #{e.message}"
+          end
+
           def record_mcp_timeline(count, start_time = nil)
             duration = start_time ? ((Time.now - start_time) * 1000).to_i : 0
             @timeline.record(

data/lib/legion/llm/pipeline.rb

@@ -11,6 +11,7 @@ require_relative 'pipeline/gaia_caller'
 require_relative 'pipeline/tool_dispatcher'
 require_relative 'pipeline/enrichment_injector'
 require_relative 'pipeline/steps'
+require_relative 'pipeline/mcp_tool_adapter'
 require_relative 'pipeline/executor'
 
 module Legion

data/lib/legion/llm/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module LLM
-    VERSION = '0.6.5'
+    VERSION = '0.6.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legion-llm
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Esity
@@ -265,6 +265,7 @@ files:
 - lib/legion/llm/pipeline/enrichment_injector.rb
 - lib/legion/llm/pipeline/executor.rb
 - lib/legion/llm/pipeline/gaia_caller.rb
+- lib/legion/llm/pipeline/mcp_tool_adapter.rb
 - lib/legion/llm/pipeline/profile.rb
 - lib/legion/llm/pipeline/request.rb
 - lib/legion/llm/pipeline/response.rb