aia 0.8.6 → 0.9.0

data/lib/extensions/ruby_llm/chat.rb

@@ -0,0 +1,197 @@
+# lib/extensions/ruby_llm/chat.rb
+
+module RubyLLM
+  class Chat
+    class << self
+      # Sets up Model Control Protocol (MCP) tools
+      #
+      # @param client [instance object] MCP client instance to use
+      # @param call_tool_method [Symbol] Method name to use for tool execution
+      # @param tools [Array<Hash>] Array of MCP tool definitions
+      #
+      # @return [self] Returns self for method chaining
+      #
+      def with_mcp(client:, call_tool_method:, tools:)
+        # Validate all required parameters are present
+        if client.nil?
+          RubyLLM.logger.error "MCP setup failed: client must be provided"
+          return clear_mcp_state
+        end
+
+        if call_tool_method.nil?
+          RubyLLM.logger.error "MCP setup failed: call_tool_method must be provided"
+          return clear_mcp_state
+        end
+
+        if tools.nil?
+          RubyLLM.logger.error "MCP setup failed: tools must be provided"
+          return clear_mcp_state
+        end
+
+        # Validate call_tool_method type
+        unless call_tool_method.is_a?(Symbol) || call_tool_method.is_a?(String)
+          RubyLLM.logger.error "MCP setup failed: call_tool_method must be a Symbol or String, got #{call_tool_method.class}"
+          return clear_mcp_state
+        end
+
+        # Validate client responds to the method
+        unless client.respond_to?(call_tool_method)
+          RubyLLM.logger.error "MCP setup failed: client instance does not respond to call_tool_method #{call_tool_method}"
+          return clear_mcp_state
+        end
+
+        # Set MCP configuration
+        @mcp_client    = client
+        @mcp_call_tool = call_tool_method.to_sym
+        @mcp_tools     = tools
+
+        self
+      end
+
+      # Get the MCP client instance if configured
+      # @return [MCPClient::Client, nil] The MCP client instance or nil if not configured
+      def mcp_client
+        @mcp_client
+      end
+
+      # Get the method name to use for tool execution if configured
+      # @return [Symbol, nil] The method name or nil if not configured
+      def mcp_call_tool
+        @mcp_call_tool
+      end
+
+      # Get the MCP tool definitions if configured
+      # @return [Array<Hash>] The MCP tool definitions or empty array if not configured
+      def mcp_tools
+        @mcp_tools || []
+      end
+
+      private
+
+      # Clear all MCP state and return self
+      # @return [self]
+      def clear_mcp_state
+        @mcp_client    = nil
+        @mcp_call_tool = nil
+        @mcp_tools     = []
+        self
+      end
+    end
+
+    # Prepend a module to add MCP tool support
+    module MCPSupport
+      def initialize(...)
+        super
+        add_mcp_tools
+      end
+
+      private
+
+      def add_mcp_tools
+        self.class.mcp_tools.each do |tool_def|
+          debug_me{[ :tool_def ]}
+          tool_name = tool_def.dig(:function, :name).to_sym
+          next if @tools.key?(tool_name) # Skip if local or MCP tool exists with same name
+
+          @tools[tool_name] = MCPToolWrapper.new(tool_def)
+        end
+      end
+    end
+
+    # Add MCP support to the Chat class
+    prepend MCPSupport
+  end
+
+  # Wraps an MCP tool definition to match the RubyLLM::Tool interface
+  class MCPToolWrapper
+    def initialize(mcp_tool)
+      @mcp_tool = mcp_tool
+    end
+
+    def name
+      @mcp_tool.dig(:function, :name)
+    end
+
+    def description
+      @mcp_tool.dig(:function, :description)
+    end
+
+    # Simple parameter class that implements the interface expected by RubyLLM::Providers::OpenAI::Tools#param_schema
+    class Parameter
+      attr_reader :type, :description, :required
+      
+      def initialize(type, description, required)
+        @type = type || 'string'
+        @description = description
+        @required = required
+      end
+    end
+    
+    def parameters
+      @parameters ||= begin
+        props = @mcp_tool.dig(:function, :parameters, "properties") || {}
+        required_params = @mcp_tool.dig(:function, :parameters, "required") || []
+        
+        # Create Parameter objects with the expected interface
+        # The parameter name is the key in the properties hash
+        result = {}
+        props.each do |param_name, param_def|
+          result[param_name.to_sym] = Parameter.new(
+            param_def["type"],
+            param_def["description"],
+            required_params.include?(param_name)
+          )
+        end
+        result
+      end
+    end
+
+    def call(args)
+      # Log the tool call with arguments
+      RubyLLM.logger.debug "Tool #{name} called with: #{args.inspect}"
+
+      # Verify MCP client is configured properly
+      unless Chat.mcp_client && Chat.mcp_call_tool
+        error = { error: "MCP client not properly configured" }
+        RubyLLM.logger.error error[:error]
+        return error
+      end
+
+      # Handle tool calls that require non-string parameters
+      normalized_args = {}
+      args.each do |key, value|
+        # Convert string numbers to actual numbers when needed
+        if value.is_a?(String) && value.match?(/\A-?\d+(\.\d+)?\z/)
+          param_type = @mcp_tool.dig(:function, :parameters, "properties", key.to_s, "type")
+          if param_type == "number" || param_type == "integer"
+            normalized_args[key] = value.include?('.') ? value.to_f : value.to_i
+            next
+          end
+        end
+        normalized_args[key] = value
+      end
+      
+      # Execute the tool via the MCP client with a timeout
+      timeout = 10 # seconds
+      result = nil
+      
+      begin
+        Timeout.timeout(timeout) do
+          result = Chat.mcp_client.send(Chat.mcp_call_tool, name, normalized_args)
+        end
+      rescue Timeout::Error
+        error = { error: "MCP tool execution timed out after #{timeout} seconds" }
+        RubyLLM.logger.error error[:error]
+        return error
+      rescue StandardError => e
+        error = { error: "MCP tool execution failed: #{e.message}" }
+        RubyLLM.logger.error error[:error]
+        return error
+      end
+
+      # Log the result
+      RubyLLM.logger.debug "Tool #{name} returned: #{result.inspect}"
+      result
+    end
+  end
+end

data/mcp_servers/README.md

@@ -0,0 +1,90 @@
+# MCP Servers
+
+The Model Context Protocol (MCP) enables tools from different server implementations to be defined in a common consistent way, allowing LLMs that support callback functions (aka tools) to access data that enhances the context of a prompt.
+
+You can find additional MCP servers at https://mcpindex.net
+
+## Overview
+
+This directory contains configuration files for various MCP servers that provide different capabilities to LLMs:
+
+| Server | Purpose | Configuration File |
+|--------|---------|--------------------|
+| Filesystem | Provides access to the local filesystem | `filesystem.json` |
+| iMCP | macOS-specific MCP server for system integration | `imcp.json` |
+| Playwright | Enables web automation and scraping capabilities | `playwright_server_definition.json` |
+
+## Configuration Details
+
+### Filesystem Server
+
+The filesystem server allows LLMs to read and interact with the local filesystem:
+
+TODO: fix this JSON file to use a generic directory; maybe $HOME
+
+```json
+{
+  "type": "stdio",
+  "command": [
+    "npx",
+    "-y",
+    "@modelcontextprotocol/server-filesystem",
+    "/Users/dewayne/sandbox/git_repos/madbomber/aia/develop"
+  ]
+}
+```
+
+The server is configured to access files within the project's development directory.
+
+### iMCP Server
+
+See: https://github.com/loopwork-ai/iMCP
+
+The iMCP server provides macOS-specific functionality:
+
+```json
+{
+  "mcpServers" : {
+    "iMCP" : {
+      "command" : "/Applications/iMCP.app/Contents/MacOS/imcp-server"
+    }
+  }
+}
+```
+
+### Playwright Server
+
+The Playwright server enables web automation and browser interaction capabilities:
+
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "url": "http://localhost:8931/sse",
+      "headers": {},
+      "comment": "Local Playwright MCP Server running on port 8931"
+    }
+  }
+}
+```
+
+## Usage
+
+These MCP servers can be utilized by LLM applications to extend their capabilities beyond text generation. The configuration files in this directory are used to define how to connect to each server and what capabilities they provide.
+
+## Getting Started
+
+Use the --mcp option with aia to specify which MCP servers to use. You may use the --mcp option multiple times to select more than one server. For example:
+
+```bash
+aia prompt_id --mcp filesystem.json --mcp imcp.json --mcp playwright_server_definition.json
+# or
+aia --chat --mcp filesystem.json --mcp imcp.json --mcp playwright_server_definition.json
+# or
+aia prompt_id --chat --mcp filesystem.json --mcp imcp.json --mcp playwright_server_definition.json
+```
+
+## Additional Resources
+
+- [Model Context Protocol Documentation](https://github.com/anthropics/anthropic-cookbook/tree/main/model_context_protocol)
+- [MCP Server Implementation Guidelines](https://modelcontextprotocol.github.io/)

data/mcp_servers/filesystem.json

@@ -0,0 +1,9 @@
+{
+  "type": "stdio",
+  "command": [
+    "npx",
+    "-y",
+    "@modelcontextprotocol/server-filesystem",
+    "/Users/dewayne/sandbox/git_repos/madbomber/aia/develop"
+  ]
+}

data/mcp_servers/imcp.json

@@ -0,0 +1,7 @@
+{
+  "mcpServers" : {
+    "iMCP" : {
+      "command" : "/Applications/iMCP.app/Contents/MacOS/imcp-server"
+    }
+  }
+}

data/mcp_servers/launcher.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "launcher": {
+      "command": "npx",
+      "args": [
+        "y",
+        "@joshuarileydev/mac-apps-launcher-mcp-server"
+      ]
+    }
+  }
+}

data/mcp_servers/playwright_server_definition.json

@@ -0,0 +1,9 @@
+{
+  "mcpServers": {
+    "playwright": {
+      "url": "http://localhost:8931/sse",
+      "headers": {},
+      "comment": "Local Playwright MCP Server running on port 8931"
+    }
+  }
+}

data/mcp_servers/timeserver.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "timeserver": {
+      "command": "python",
+      "args": ["-m", "mcp_simple_timeserver"]
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aia
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Dewayne VanHoozer
@@ -10,7 +10,7 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ai_client
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: amazing_print
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,47 +52,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
+  name: prompt_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: prompt_manager
+  name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: ruby_llm
+  name: ruby-mcp-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - ".envrc"
 - ".version"
 - CHANGELOG.md
+- COMMITS.md
 - LICENSE
 - README.md
 - Rakefile
@@ -303,7 +304,6 @@ files:
 - examples/headlines
 - justfile
 - lib/aia.rb
-- lib/aia/ai_client_adapter.rb
 - lib/aia/aia_completion.bash
 - lib/aia/aia_completion.fish
 - lib/aia/aia_completion.zsh
@@ -321,7 +321,14 @@ files:
 - lib/aia/utility.rb
 - lib/aia/version.rb
 - lib/extensions/openstruct_merge.rb
+- lib/extensions/ruby_llm/chat.rb
 - main.just
+- mcp_servers/README.md
+- mcp_servers/filesystem.json
+- mcp_servers/imcp.json
+- mcp_servers/launcher.json
+- mcp_servers/playwright_server_definition.json
+- mcp_servers/timeserver.json
 homepage: https://github.com/MadBomber/aia
 licenses:
 - MIT

data/lib/aia/ai_client_adapter.rb

@@ -1,210 +0,0 @@
-# lib/aia/ai_client_adapter.rb
-#
-
-
-require 'ai_client'
-require 'tty-spinner'
-
-
-module AIA
-  class AIClientAdapter
-    def initialize
-      @model  = AIA.config.model
-
-      model_info = extract_model_parts(@model)
-      @client = AiClient.new(
-        model_info[:model],
-        provider: model_info[:provider]
-      )
-    end
-
-
-    def chat(prompt)
-      if @model.downcase.include?('dall-e') || @model.downcase.include?('image-generation')
-        text_to_image(prompt)
-      elsif @model.downcase.include?('vision') || @model.downcase.include?('image')
-        image_to_text(prompt)
-      elsif @model.downcase.include?('tts') || @model.downcase.include?('speech')
-        text_to_audio(prompt)
-      elsif @model.downcase.include?('whisper') || @model.downcase.include?('transcription')
-        audio_to_text(prompt)
-      else
-        text_to_text(prompt)
-      end
-    end
-
-
-
-    def transcribe(audio_file)
-      @client.transcribe(audio_file)
-    end
-
-
-
-    def speak(text)
-      output_file = "#{Time.now.to_i}.mp3"
-
-      begin
-        # Try with options
-        @client.speak(text, output_file, {
-          model: AIA.config.speech_model,
-          voice: AIA.config.voice
-        })
-      rescue ArgumentError
-        @client.speak(text)
-      end
-
-      system("#{AIA.config.speak_command} #{output_file}") if File.exist?(output_file) && system("which #{AIA.config.speak_command} > /dev/null 2>&1")
-    end
-
-    def method_missing(method, *args, &block)
-      if @client.respond_to?(method)
-        @client.public_send(method, *args, &block)
-      else
-        super
-      end
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      @client.respond_to?(method) || super
-    end
-
-    private
-
-
-
-    def extract_model_parts(model_string)
-      parts = model_string.split('/')
-      parts.map!(&:strip)
-
-      if parts.length > 1
-        provider = parts[0]
-        model = parts[1]
-      else
-        provider = nil # AiClient will figure it out from the model name
-        model = parts[0]
-      end
-
-
-
-      { provider: provider, model: model }
-    end
-
-
-
-    def extract_text_prompt(prompt)
-
-      if prompt.is_a?(String)
-        prompt
-      elsif prompt.is_a?(Hash) && prompt[:text]
-        prompt[:text]
-      elsif prompt.is_a?(Hash) && prompt[:content]
-        prompt[:content]
-      else
-        prompt.to_s
-      end
-    end
-
-
-
-    def text_to_text(prompt)
-      text_prompt = extract_text_prompt(prompt)
-      @client.chat(text_prompt)
-    end
-
-
-
-    def text_to_image(prompt)
-      text_prompt = extract_text_prompt(prompt)
-
-
-      output_file = "#{Time.now.to_i}.png"
-
-      begin
-        begin
-          @client.generate_image(text_prompt, output_file, {
-            size:    AIA.config.image_size,
-            quality: AIA.config.image_quality,
-            style:   AIA.config.image_style
-          })
-        rescue ArgumentError
-          @client.generate_image(text_prompt)
-        end
-
-        "Image generated and saved to: #{output_file}"
-      rescue => e
-        "Error generating image: #{e.message}"
-      end
-    end
-
-
-
-    def image_to_text(prompt)
-      image_path = extract_image_path(prompt)
-      text_prompt = extract_text_prompt(prompt)
-
-      if image_path && File.exist?(image_path)
-        begin
-          @client.chat("#{text_prompt}\n[Analyzing image: #{image_path}]")
-        rescue => e
-          "Error analyzing image: #{e.message}"
-        end
-      else
-        text_to_text(prompt)
-      end
-    end
-
-
-
-    def text_to_audio(prompt)
-      text_prompt = extract_text_prompt(prompt)
-
-      output_file = "#{Time.now.to_i}.mp3"
-
-      begin
-        begin
-          @client.speak(text_prompt, output_file, {
-            model: AIA.config.speech_model,
-            voice: AIA.config.voice
-          })
-        rescue ArgumentError
-          @client.speak(text_prompt)
-        end
-
-        system("#{AIA.config.speak_command} #{output_file}") if File.exist?(output_file) && system("which #{AIA.config.speak_command} > /dev/null 2>&1")
-
-        "Audio generated and saved to: #{output_file}"
-      rescue => e
-        "Error generating audio: #{e.message}"
-      end
-    end
-
-
-
-    def audio_to_text(prompt)
-      if prompt.is_a?(String) && File.exist?(prompt) &&
-         prompt.downcase.end_with?('.mp3', '.wav', '.m4a', '.flac')
-        begin
-          @client.transcribe(prompt)
-        rescue => e
-          "Error transcribing audio: #{e.message}"
-        end
-      else
-        # Fall back to regular chat if no valid audio file is found
-        text_to_text(prompt)
-      end
-    end
-
-
-
-    def extract_image_path(prompt)
-      if prompt.is_a?(String)
-        prompt.scan(/\b[\w\/\.\-]+\.(jpg|jpeg|png|gif|webp)\b/i).first&.first
-      elsif prompt.is_a?(Hash)
-        prompt[:image] || prompt[:image_path]
-      else
-        nil
-      end
-    end
-  end
-end