ai_client 0.4.0 → 0.4.3

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.0"
+  VERSION = "0.4.3"
 
   def version       = VERSION
   def self.version  = VERSION

data/lib/ai_client.rb

@@ -288,9 +288,11 @@ class AiClient
       OmniAI::Mistral::Client.new(**client_options)
 
     when :ollama
+      # SMELL: what if ollama is not running on localhost?
       OmniAI::OpenAI::Client.new(host: 'http://localhost:11434', api_key: nil, **client_options)
 
     when :localai
+      # SMELL: what if localai is not running on localhost?
       OmniAI::OpenAI::Client.new(host: 'http://localhost:8080', api_key: nil, **client_options)
 
     when :open_router
@@ -322,6 +324,11 @@ class AiClient
   def determine_provider(model)
     return nil if model.nil? || model.empty?
 
+    # SMELL:  ollama has many open-source models.  Its hard to keep
+    #         the patterns updated; hgwever, ollama has an 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.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Dewayne VanHoozer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
@@ -247,7 +246,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 +260,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.3
 specification_version: 4
 summary: A generic AI Client for many providers
 test_files: []