ai_client 0.3.1 → 0.4.0

data/lib/ai_client/open_router_extensions.rb

@@ -81,7 +81,6 @@ class AiClient
     end
 
 
-    private
 
     # Retrieves the ORC client instance.
     #
@@ -91,6 +90,10 @@ class AiClient
       @orc_client ||= add_open_router_extensions || raise("OpenRouter extensions are not available")
     end
 
+
+    private
+
+
     # Retrieves models from the ORC client.
     #
     # @return [Array<Hash>] List of models.

data/lib/ai_client/version.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
 class AiClient
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
+
+  def version       = VERSION
+  def self.version  = VERSION
 end

data/lib/ai_client.rb

@@ -85,10 +85,12 @@ class AiClient
   attr_reader :client,        # OmniAI's client instance
               :provider,      # [Symbol]
               :model,         # [String]
-              :logger, 
+              :logger,
+              :last_message,
               :last_response,
               :timeout,
-              :config         # Instance configuration
+              :config,        # Instance configuration
+              :context        # chat-bot context
 
   # Initializes a new AiClient instance.
   #
@@ -114,35 +116,16 @@ class AiClient
   #   - :timeout [Integer] Timeout value for requests.
   # @yield [config] An optional block to configure the instance.
   #
-  def initialize(model, **options, &block)
-    # Assign the instance variable @config from the class variable @@config
-    @config = self.class.class_config.dup  
-    
-    # Yield the @config to a block if given
-    yield(@config) if block_given?
-
-    # Merge in an instance-specific YAML file
-    if options.has_key?(:config)
-      @config.merge! Config.load(options[:config])
-      options.delete(:config) # Lconfig not supported by OmniAI
-    end
-
-    @model            = model
-    explicit_provider = options.fetch(:provider, config.provider)
-
-    @provider   = validate_provider(explicit_provider) || determine_provider(model)
-
-    provider_config = @config.providers[@provider] || {}
-
-    @logger   = options[:logger]    || @config.logger
-    @timeout  = options[:timeout]   || @config.timeout
-    @base_url = options[:base_url]  || provider_config[:base_url]
-    @options  = options.merge(provider_config)
+  def initialize(model = nil, **options, &block)
+    @context        = [] # An Array of String or response objects
+    @last_messages  = nil
+    @last_response  = nil
 
-    # @client is an instance of an OmniAI::* class
-    @client         = create_client
+    setup_config(options, &block)
+    set_provider_and_model(model, options[:provider])
+    setup_instance_variables(options)
 
-    @last_response  = nil
+    @client = create_client
   end
 
   
@@ -174,13 +157,13 @@ class AiClient
   # @return [String] The extracted content.
   # @raise [NotImplementedError] If content extraction is not implemented for the provider.
   #
-  def content
+  def content(response=last_response)
     case @provider
     when :localai, :mistral, :ollama, :open_router, :openai
-      last_response.data.tunnel 'content'
+      response.data.tunnel 'content'
       
     when :anthropic, :google
-      last_response.data.tunnel 'text'
+      response.data.tunnel 'text'
 
     else
       raise NotImplementedError, "Content extraction not implemented for provider: #{@provider}"
@@ -219,6 +202,47 @@ class AiClient
   ##############################################
   private
 
+  def setup_config(options, &block)
+    @config = self.class.class_config.dup  
+
+    yield(@config) if block_given?
+
+    if options.key?(:config)
+      @config.merge!(Config.load(options[:config]))
+      options.delete(:config) # config not supported by OmniAI
+    end
+  end
+
+
+  def set_provider_and_model(my_model, my_provider)
+    if my_model.nil?
+      if my_provider.nil?
+        @provider = @config.default_provider.to_sym
+      else
+        @provider = validate_provider(my_provider)
+      end
+      @model    = @config.default_model[@provider]
+    else
+      @model = my_model
+      if my_provider.nil?
+        @provider = determine_provider(my_model)
+      else
+        @provider = validate_provider(my_provider)
+      end
+    end
+  end
+
+
+  def setup_instance_variables(options)
+    provider_config = @config.providers[@provider] || {}
+
+    @logger   = options[:logger] || @config.logger
+    @timeout  = options[:timeout] || @config.timeout
+    @base_url = options[:base_url] || provider_config[:base_url]
+    @options  = options.merge(provider_config)
+  end
+
+
   # Validates the specified provider.
   #
   # @param provider [Symbol] The provider to validate.
@@ -296,6 +320,8 @@ class AiClient
   # @raise [ArgumentError] If the model is unsupported.
   #
   def determine_provider(model)
+    return nil if model.nil? || model.empty?
+
     config.provider_patterns.find { |provider, pattern| model.match?(pattern) }&.first ||
       raise(ArgumentError, "Unsupported model: #{model}")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ai_client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Dewayne VanHoozer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-20 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash