ai_client 0.4.1 → 0.4.4

data/lib/ai_client/ollama_extensions.rb

@@ -0,0 +1,191 @@
+# lib/ai_client/ollama_extensions.rb
+
+# Ollama Extensions for AiClient
+#
+# This file adds several public instance and class methods to the AiClient class
+# to provide information about AI models and providers.
+#
+# Instance Methods:
+# - model_details: Retrieves details for the current model.
+# - models: Retrieves model names for the current provider.
+#
+# Class Methods:
+# - providers: Retrieves all available providers.
+# - models: Retrieves model names, optionally filtered by provider.
+# - model_details: Retrieves details for a specific model.
+#
+# These methods utilize the AiClient::LLM class and the models.yml file
+# for model information.
+
+# TODO: consider incorporating Ollama AI extensions
+# require 'ollama-ai'
+
+require 'yaml'
+require 'uri'
+require 'json'
+require 'net/http'
+
+class AiClient
+
+  # Retrieves details for the current model.
+  #
+  # @return [Hash, nil] Details of the current model or nil if not found.
+  def model_details
+    id = "#{@provider}/#{@model}"
+    LLM.find(id.downcase)
+  end
+
+  # Retrieves model names for the current provider.
+  #
+  # @return [Array<String>] List of model names for the current provider.
+  def models = LLM.models(@provider)
+
+
+  class << self
+
+    # Retrieves all available providers.
+    #
+    # @return [Array<Symbol>] List of all provider names.
+    def providers = LLM.providers
+
+
+    # Retrieves model names, optionally filtered by provider.
+    #
+    # @param substring [String, nil] Optional substring to filter models by.
+    # @return [Array<String>] List of model names.
+    def models(substring = nil) = LLM.models(substring)
+
+    # Retrieves details for a specific model.
+    #
+    # @param model_id [String] The model ID to retrieve details for,
+    #     in the pattern "provider/model".downcase
+    # @return [AiClient::LLM, nil] Details of the model or nil if not found.
+    def model_details(model_id) = LLM.find(model_id.downcase)
+
+
+    # Resets LLM data with the available ORC models.
+    #
+    # @return [void]
+    #
+    def reset_llm_data
+      # Simply delegate to LLM class if it has the method
+      if LLM.respond_to?(:reset_llm_data)
+        LLM.reset_llm_data
+      end
+    end
+
+
+    # Initializes Ollama extensions for AiClient.
+    #
+    # This sets up the access token and initializes the ORC client.
+    #
+    # @return [void]
+    #
+    def add_ollama_extensions
+      access_token = fetch_access_token
+
+      return unless access_token
+
+      configure_ollama(access_token)
+      initialize_ollama_client
+    end
+
+
+    # Retrieves the ORC client instance.
+    #
+    # @return [Ollama::Client] Instance of the Ollama client.
+    #
+    def ollama_client
+      @ollama_client ||= initialize_ollama_client
+    end
+
+
+    # Retrieves the available models from the Ollama server.
+    #
+    # @param host [String] Optional host URL for the Ollama server.
+    #        Defaults to the configured host or http://localhost:11434 if not specified.
+    # @return [Array<Hash>] List of available models with their details.
+    #
+    def ollama_available_models(host = nil)
+      host ||= ollama_host
+
+      uri = URI("#{host}/api/tags")
+      response = Net::HTTP.get_response(uri)
+
+      if response.is_a?(Net::HTTPSuccess)
+        JSON.parse(response.body)["models"] rescue []
+      else
+        []
+      end
+    end
+
+    # Gets the configured Ollama host URL
+    #
+    # @return [String] The configured Ollama host URL
+    def ollama_host
+      class_config.providers[:ollama]&.dig(:host) || 'http://localhost:11434'
+    end
+
+    # Checks if a specific model exists on the Ollama server.
+    #
+    # @param model_name [String] The name of the model to check.
+    # @param host [String] Optional host URL for the Ollama server.
+    #        Defaults to the configured host or http://localhost:11434 if not specified.
+    # @return [Boolean] True if the model exists, false otherwise.
+    #
+    def ollama_model_exists?(model_name, host = nil)
+      models = ollama_available_models(host)
+      models.any? { |m| m['name'] == model_name }
+    end
+
+
+    private
+
+
+    # Retrieves models from the ORC client.
+    #
+    # @return [Array<Hash>] List of models.
+    #
+    def ollama_models
+      []  # Simply return an empty array since we're not using the actual Ollama gem
+    end
+
+
+    # Fetches the access token from environment variables.
+    #
+    # @return [String, nil] The access token or nil if not found.
+    #
+    def fetch_access_token
+      # Check if the key exists in the configuration
+      return nil unless class_config.envar_api_key_names && 
+                       class_config.envar_api_key_names[:ollama]
+      
+      # Now safely access the array
+      class_config.envar_api_key_names[:ollama]
+                  .map { |key| ENV[key] }
+                  .compact
+                  .first
+    end
+
+    # Configures the Ollama client with the access token.
+    #
+    # @param access_token [String] The access token to configure.
+    # @return [void]
+    #
+    def configure_ollama(access_token)
+      # No-op since we're not using the actual Ollama gem
+    end
+
+    # Initializes the ORC client instance.
+    #
+    # @return [OmniAI::Ollama::Client] Instance of the Ollama client.
+    def initialize_ollama_client
+      # Return a dummy object that won't raise errors
+      Object.new
+    end
+  end
+end
+
+# Don't try to initialize the Ollama extensions at load time
+# because we're not requiring the Ollama gem
+# AiClient.add_ollama_extensions

data/lib/ai_client/retry_middleware.rb

@@ -1,46 +1,23 @@
-# ai_client/retry_middleware.rb
+# lib/ai_client/retry_middleware.rb
 
 class AiClient
-
-  # AiClient.use(
-  #   AiClient::RetryMiddleware.new(
-  #     max_retries:  5,
-  #     base_delay:   2,
-  #     max_delay:    30
-  #   )
-  # )
-  #
   class RetryMiddleware
-
-    # Initializes a new instance of RetryMiddleware.
-    #
-    # @param max_retries [Integer] The maximum number of retries to attempt (default: 3).
-    # @param base_delay [Integer] The base delay in seconds before retrying (default: 2).
-    # @param max_delay [Integer] The maximum delay in seconds between retries (default: 16).
-    #
-    def initialize(max_retries: 3, base_delay: 2, max_delay: 16)
+    def initialize(max_retries: 3, base_delay: 1, max_delay: 16)
       @max_retries  = max_retries
       @base_delay   = base_delay
       @max_delay    = max_delay
     end
 
-    # Calls the next middleware, retrying on specific errors.
-    #
-    # @param client [AiClient] The client instance that invokes the middleware.
-    # @param next_middleware [Proc] The next middleware in the chain to call.
-    # @param args [Array] Any additional arguments to pass to the next middleware.
-    #
-    # @raise [StandardError] Reraise the error if max retries are exceeded.
-    #
     def call(client, next_middleware, *args)
-      retries = 0
+      @retries  = 0
+      @client   = client
+
       begin
         next_middleware.call
       rescue OmniAI::RateLimitError, OmniAI::NetworkError => e
-        if retries < @max_retries
-          retries += 1
-          delay = [@base_delay * (2 ** (retries - 1)), @max_delay].min
-          client.logger.warn("Retrying in #{delay} seconds due to error: #{e.message}")
+        if @retries < @max_retries
+          delay = retry_delay(e)
+          log_retry(delay, e)
           sleep(delay)
           retry
         else
@@ -48,5 +25,16 @@ class AiClient
         end
       end
     end
+    
+    private
+
+    def retry_delay(error)
+      @retries += 1
+      [@base_delay * (2 ** (@retries - 1)), @max_delay].min
+    end
+
+    def log_retry(delay, error)
+      @client.logger.warn("Retrying in #{delay} seconds due to error: #{error.message}")
+    end
   end
 end

data/lib/ai_client/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AiClient
-  VERSION = "0.4.1"
+  VERSION = "0.4.4"
 
   def version       = VERSION
   def self.version  = VERSION

data/lib/ai_client/xai.rb

@@ -0,0 +1,35 @@
+# lib/ai_client/xai.rb
+
+module AiClient
+  module XAI
+    class Client
+      BASE_URI = 'https://api.x.ai/v1' # Replace with actual xAI API endpoint
+
+      def initialize(api_key: ENV['XAI_API_KEY'])
+        @api_key = api_key
+        @connection = OmniAI::HTTP::Connection.new(BASE_URI)
+      end
+
+      def chat(prompt:, model: 'grok3', **options)
+        response = @connection.post(
+          '/chat/completions', # Adjust endpoint based on xAI API docs
+          headers: { 'Authorization' => "Bearer #{@api_key}", 'Content-Type' => 'application/json' },
+          body: {
+            model: model,
+            messages: [{ role: 'user', content: prompt }],
+            temperature: options[:temperature] || 0.7,
+            max_tokens: options[:max_tokens] || 1024
+          }.to_json
+        )
+        parse_response(response)
+      end
+
+      private
+
+      def parse_response(response)
+        json = JSON.parse(response.body)
+        json['choices'][0]['message']['content'] # Adjust based on actual response structure
+      end
+    end
+  end
+end

data/lib/ai_client.rb

@@ -41,6 +41,7 @@ require_relative 'ai_client/open_router_extensions'
 require_relative 'ai_client/llm' # SMELL: must come after the open router stuff
 require_relative 'ai_client/tool'
 require_relative 'ai_client/function'
+require_relative 'ai_client/ollama_extensions' # Added ollama extensions
 
 # Create a generic client instance using only model name
 #   client = AiClient.new('gpt-3.5-turbo')
@@ -288,14 +289,23 @@ class AiClient
       OmniAI::Mistral::Client.new(**client_options)
 
     when :ollama
-      OmniAI::OpenAI::Client.new(host: 'http://localhost:11434', api_key: nil, **client_options)
+      provider_config = @config.providers[:ollama] || {}
+      host = provider_config[:host] || 'http://localhost:11434'
+      OmniAI::OpenAI::Client.new(host: host, api_key: nil, **client_options)
 
     when :localai
-      OmniAI::OpenAI::Client.new(host: 'http://localhost:8080', api_key: nil, **client_options)
+      provider_config = @config.providers[:localai] || {}
+      host = provider_config[:host] || 'http://localhost:8080'
+      OmniAI::OpenAI::Client.new(host: host, api_key: nil, **client_options)
 
     when :open_router
       OmniAI::OpenAI::Client.new(host: 'https://openrouter.ai', api_prefix: 'api', **client_options)
 
+    when :xai
+      # SMELL:  may want to make this an
+      #         extension to OmniAI
+      AiClient::XAI::Client.new
+
     else
       raise ArgumentError, "Unsupported provider: #{@provider}"
     end
@@ -322,6 +332,9 @@ class AiClient
   def determine_provider(model)
     return nil if model.nil? || model.empty?
 
+    # Ollama has many open-source models.
+    # We can use the Ollama API to list the currently installed models.
+    # http://localhost:11434/api/tags
     config.provider_patterns.find { |provider, pattern| model.match?(pattern) }&.first ||
       raise(ArgumentError, "Unsupported model: #{model}")
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ai_client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Dewayne VanHoozer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
@@ -231,12 +230,14 @@ files:
 - lib/ai_client/logger_middleware.rb
 - lib/ai_client/middleware.rb
 - lib/ai_client/models.yml
+- lib/ai_client/ollama_extensions.rb
 - lib/ai_client/open_router_extensions.rb
 - lib/ai_client/retry_middleware.rb
 - lib/ai_client/speak.rb
 - lib/ai_client/tool.rb
 - lib/ai_client/transcribe.rb
 - lib/ai_client/version.rb
+- lib/ai_client/xai.rb
 - sig/ai_client.rbs
 - the_ollama_model_problem.md
 homepage: https://github.com/MadBomber/ai_client
@@ -247,7 +248,6 @@ metadata:
   homepage_uri: https://github.com/MadBomber/ai_client
   source_code_uri: https://github.com/MadBomber/ai_client
   changelog_uri: https://github.com/MadBomber/ai_client/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,8 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A generic AI Client for many providers
 test_files: []