boxcars 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b025b4faf290736766df116e4146cdcea5285bfbd54b6b1c8eaae1e3fc220507
-  data.tar.gz: cdc51dd2f92609b3b2d52879de4716fe8a34e20a15c9bc5d9f27c005bd5f760f
+  metadata.gz: a058c8e9111ba8c7b3e29d25c6f9226f87c862c4b10b26c3c05f8a69dbe7659c
+  data.tar.gz: 718546be88153f0f26ba932811e30fa9f8c3a467ac029a76c88d554912640b29
 SHA512:
-  metadata.gz: 4267533089c1c3be564ac59d321a8adb670d4197d0548767be1291835049c1edf86f6994b93186d4b0c5ab49445f17d1bdba35bc3b983eafea150c0b05732775
-  data.tar.gz: 3d37938ea2c431fe3f1b839471421fc5af46e0c60ede688265874d8b1ac93a6e58e440509a66aea4c91375986ed0295a477cca3adca75f68ffc028f33976583a
+  metadata.gz: baf4a36fbb72e064f110576f73945d276794b7f235935d9dc0797460ac3a641439ff29e7e650c93d468e9a70a0f148d0fabde6724cc82b7c3cd05df2020974cd
+  data.tar.gz: 85e40690235ed5e13daa9a326cfef6dae29cd882a18716913a264026fed46cde355ea50c01703aac26da5b77ac3aefc22eaa7eb2583b12485840b32d45f1c94b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boxcars (0.6.8)
+    boxcars (0.6.9)
       anthropic (~> 0.1)
       google_search_results (~> 2.2)
       gpt4all (~> 0.0.4)
@@ -13,13 +13,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.2.2)
-      activesupport (= 7.2.2)
-    activerecord (7.2.2)
-      activemodel (= 7.2.2)
-      activesupport (= 7.2.2)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.2)
+    activesupport (7.2.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -50,41 +50,43 @@ GEM
       protocol-http1 (~> 0.19.0)
       protocol-http2 (~> 0.16.0)
       traces (>= 0.10.0)
-    async-http-faraday (0.14.0)
+    async-http-faraday (0.19.0)
       async-http (~> 0.42)
       faraday
     async-io (1.43.2)
       async
-    async-pool (0.7.0)
+    async-pool (0.10.2)
       async (>= 1.25)
+      traces
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    console (1.27.0)
+    console (1.29.2)
       fiber-annotation
       fiber-local (~> 1.1)
       json
     crack (1.0.0)
       bigdecimal
       rexml
-    debug (1.9.2)
+    date (3.4.1)
+    debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     diff-lcs (1.5.1)
     domain_name (0.6.20240107)
-    dotenv (3.1.4)
+    dotenv (3.1.7)
     drb (2.2.1)
     event_stream_parser (1.0.0)
-    faraday (2.12.1)
+    faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
     faraday-retry (2.2.1)
@@ -92,7 +94,7 @@ GEM
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
-    fiber-storage (0.1.2)
+    fiber-storage (1.0.0)
     github_changelog_generator (1.16.4)
       activesupport
       async (>= 1.25.0)
@@ -107,33 +109,34 @@ GEM
       faraday (~> 2.7)
       os (~> 1.1)
       tty-progressbar (~> 0.18.2)
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     hnswlib (0.9.0)
     http-accept (1.7.0)
-    http-cookie (1.0.6)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.0)
+    io-console (0.8.0)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.9.0)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
-    logger (1.6.2)
-    mime-types (3.5.2)
+    logger (1.6.4)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0702)
+    mime-types-data (3.2024.1203)
     minitest (5.25.4)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
     netrc (0.11.0)
-    nio4r (2.7.3)
-    nokogiri (1.16.8-arm64-darwin)
+    nio4r (2.7.4)
+    nokogiri (1.17.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.8-x86_64-linux)
+    nokogiri (1.17.2-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -145,44 +148,45 @@ GEM
       racc
     pg (1.5.9)
     pgvector (0.2.2)
-    protocol-hpack (1.4.3)
+    protocol-hpack (1.5.1)
     protocol-http (0.26.8)
     protocol-http1 (0.19.1)
       protocol-http (~> 0.22)
     protocol-http2 (0.16.0)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    psych (5.1.2)
+    psych (5.2.2)
+      date
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.7.0)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.3)
-    reline (0.5.9)
+    reline (0.6.0)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.69.1)
+    rspec-support (3.13.2)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -192,11 +196,11 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.36.2)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.2.0)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     ruby-openai (7.3.1)
       event_stream_parser (>= 0.3.0, < 2.0.0)
@@ -206,16 +210,16 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    securerandom (0.4.0)
-    sqlite3 (2.0.4-arm64-darwin)
-    sqlite3 (2.0.4-x86_64-linux-gnu)
-    stringio (3.1.1)
+    securerandom (0.4.1)
+    sqlite3 (2.4.1-arm64-darwin)
+    sqlite3 (2.4.1-x86_64-linux-gnu)
+    stringio (3.1.2)
     strings-ansi (0.2.0)
-    timeout (0.4.2)
+    timeout (0.4.3)
     timers (4.3.5)
-    traces (0.11.1)
+    traces (0.14.1)
     tty-cursor (0.7.1)
-    tty-progressbar (0.18.2)
+    tty-progressbar (0.18.3)
       strings-ansi (~> 0.2)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)

data/lib/boxcars/engine/anthropic.rb

@@ -78,7 +78,7 @@ module Boxcars
       raise Error, "Anthropic: #{response['error']}" if response['error']
 
       answer = response['completion']
-      Boxcars.debug(response, :yellow)
+      Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end
 

data/lib/boxcars/engine/cohere.rb

@@ -78,7 +78,7 @@ module Boxcars
       raise Error, "Cohere: #{response[:error]}" if response[:error]
 
       answer = response[:text]
-      Boxcars.debug(response, :yellow)
+      Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end
 

data/lib/boxcars/engine/gemini_ai.rb

@@ -1,73 +1,66 @@
 # frozen_string_literal: true
 
-# Boxcars - a framework for running a series of tools to get an answer to a question.
+# Boxcars is a framework for running a series of tools to get an answer to a question.
 module Boxcars
-  # A engine that uses Gemini's API.
+  # A engine that uses GeminiAI's API.
   class GeminiAi < Engine
-    attr_reader :prompts, :llm_params, :model_kwargs, :batch_size
+    attr_reader :prompts, :llm_parmas, :model_kwargs, :batch_size
 
     # The default parameters to use when asking the engine.
     DEFAULT_PARAMS = {
-      model: "gemini-1.5-flash-latest"
+      model: "gemini-1.5-flash-latest",
+      temperature: 0.1
     }.freeze
 
     # the default name of the engine
-    DEFAULT_NAME = "Google Gemini AI engine"
+    DEFAULT_NAME = "GeminiAI engine"
     # the default description of the engine
-    DEFAULT_DESCRIPTION = "useful for when you need to use Google Gemini AI to answer questions. " \
+    DEFAULT_DESCRIPTION = "useful for when you need to use AI to answer questions. " \
                           "You should ask targeted questions"
 
-    # A engine is the driver for a single tool to run.
-    # @param name [String] The name of the engine. Defaults to "OpenAI engine".
+    # A engine is a container for a single tool to run.
+    # @param name [String] The name of the engine. Defaults to "GeminiAI engine".
     # @param description [String] A description of the engine. Defaults to:
     #        useful for when you need to use AI to answer questions. You should ask targeted questions".
     # @param prompts [Array<String>] The prompts to use when asking the engine. Defaults to [].
-    def initialize(name: DEFAULT_NAME, description: DEFAULT_DESCRIPTION, prompts: [], **kwargs)
-      @llm_params = DEFAULT_PARAMS.merge(kwargs)
+    # @param batch_size [Integer] The number of prompts to send to the engine at once. Defaults to 20.
+    def initialize(name: DEFAULT_NAME, description: DEFAULT_DESCRIPTION, prompts: [], batch_size: 20, **kwargs)
+      @llm_parmas = DEFAULT_PARAMS.merge(kwargs)
       @prompts = prompts
-      @batch_size = 20
+      @batch_size = batch_size
       super(description: description, name: name)
     end
 
-    def conversation_model?(_model)
-      true
+    # Get the OpenAI API client
+    # @param gemini_api_key [String] The access token to use when asking the engine.
+    #   Defaults to Boxcars.configuration.gemini_api_key
+    # @return [OpenAI::Client] The OpenAI API gem client.
+    def self.open_ai_client(gemini_api_key: nil)
+      access_token = Boxcars.configuration.gemini_api_key(gemini_api_key: gemini_api_key)
+      ::OpenAI::Client.new(access_token: access_token, uri_base: "https://generativelanguage.googleapis.com/v1beta/openai/")
     end
 
-    def chat(params, gemini_api_key)
-      raise Boxcars::ConfigurationError('Google AI API key not set') if gemini_api_key.blank?
-
-      model_string = params.delete(:model_string)
-      raise Boxcars::ConfigurationError('Google AI API key not set') if model_string.blank?
-
-      # Define the API endpoint and parameters
-      api_endpoint = "https://generativelanguage.googleapis.com/v1beta/models/#{model_string}:generateContent?key=#{gemini_api_key}"
-
-      connection = Faraday.new(api_endpoint) do |faraday|
-        faraday.request :url_encoded
-        faraday.headers['Content-Type'] = 'application/json'
-      end
-
-      # Make the API call
-      response = connection.post { |req| req.body = params.to_json }
-
-      JSON.parse(response.body, symbolize_names: true)
+    def conversation_model?(_model)
+      true
     end
 
     # Get an answer from the engine.
     # @param prompt [String] The prompt to use when asking the engine.
-    # @param gemini_api_key [String] Optional api key to use when asking the engine.
+    # @param gemini_api_key [String] The access token to use when asking the engine.
     #   Defaults to Boxcars.configuration.gemini_api_key.
     # @param kwargs [Hash] Additional parameters to pass to the engine if wanted.
-    def client(prompt:, inputs: {}, **kwargs)
-      api_key = Boxcars.configuration.gemini_api_key(**kwargs)
-      option_params = llm_params.merge(kwargs)
-      model_string = option_params.delete(:model) || DEFAULT_PARAMS[:model]
-      convo = prompt.as_messages(inputs: inputs)
-      # Convert conversation to Google Gemini format
-      params = to_google_gemini_format(convo[:messages], option_params)
-      params[:model_string] = model_string
-      Boxcars.debug("Prompt after formatting:#{params[:message]}", :cyan) if Boxcars.configuration.log_prompts
-      chat(params, api_key)
+    def client(prompt:, inputs: {}, gemini_api_key: nil, **kwargs)
+      clnt = GeminiAi.open_ai_client(gemini_api_key: gemini_api_key)
+      params = llm_parmas.merge(kwargs)
+      prompt = prompt.first if prompt.is_a?(Array)
+      params = prompt.as_messages(inputs).merge(params)
+      if Boxcars.configuration.log_prompts
+        Boxcars.debug(params[:messages].last(2).map { |p| ">>>>>> Role: #{p[:role]} <<<<<<\n#{p[:content]}" }.join("\n"), :cyan)
+      end
+      clnt.chat(parameters: params)
+    rescue => e
+      Boxcars.error(e, :red)
+      raise
     end
 
     # get an answer from the engine for a question.
@@ -76,13 +69,10 @@ module Boxcars
     def run(question, **kwargs)
       prompt = Prompt.new(template: question)
       response = client(prompt: prompt, **kwargs)
-
       raise Error, "GeminiAI: No response from API" unless response
-      raise Error, "GeminiAI: #{response[:error]}" if response[:error]
 
-      answer = response[:candidates].first[:content][:parts].first[:text]
-      Boxcars.debug(response, :yellow)
-      answer
+      check_response(response)
+      response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
     end
 
     # Get the default parameters for the engine.
@@ -95,13 +85,13 @@ module Boxcars
     # @param must_haves [Array<String>] The keys that must be in the response. Defaults to %w[choices].
     # @raise [KeyError] if there is an issue with the access token.
     # @raise [ValueError] if the response is not valid.
-    def check_response(response, must_haves: %w[completion])
-      if response['error']
+    def check_response(response, must_haves: %w[choices])
+      if response['error'].is_a?(Hash)
         code = response.dig('error', 'code')
         msg = response.dig('error', 'message') || 'unknown error'
-        raise KeyError, "ANTHOPIC_API_KEY not valid" if code == 'invalid_api_key'
+        raise KeyError, "GEMINI_API_TOKEN not valid" if code == 'invalid_api_key'
 
-        raise ValueError, "Gemini error: #{msg}"
+        raise ValueError, "GeminiAI error: #{msg}"
       end
 
       must_haves.each do |key|
@@ -111,13 +101,7 @@ module Boxcars
 
     # the engine type
     def engine_type
-      "claude"
-    end
-
-    # lookup the context size for a model by name
-    # @param modelname [String] The name of the model to lookup.
-    def modelname_to_contextsize(_modelname)
-      100000
+      "gemini_ai"
     end
 
     # Calculate the maximum number of tokens possible to generate for a prompt.
@@ -127,34 +111,8 @@ module Boxcars
       num_tokens = get_num_tokens(prompt_text)
 
       # get max context size for model by name
-      max_size = modelname_to_contextsize(model_name)
+      max_size = 8096
       max_size - num_tokens
     end
-
-    def to_google_gemini_format(convo, option_params)
-      instructions = convo.shift.last if convo.first && convo.first[:role] == :system
-      system_instructions = instructions || "You are a helpful assistant."
-
-      # Convert conversation history to the format expected by Google
-      contents = convo.map { |message| { text: message[:content] } }
-
-      generation_config = {}
-      if option_params.length.positive?
-        generation_config.merge!(option_params)
-        generation_config[:stopSequences] = [generation_config.delete(:stop)] if generation_config[:stop].present?
-      end
-
-      rv = {
-        system_instruction: { parts: { text: system_instructions } }, # System instructions or context
-        contents: { parts: contents } # The chat messages
-      }
-
-      rv[:generationConfig] = generation_config if generation_config.length.positive?
-      rv
-    end
-
-    def default_prefixes
-      { system: "SYSTEM: ", user: "USER: ", assistant: "CHATBOT: ", history: :history }
-    end
   end
 end

data/lib/boxcars/engine/groq.rb

@@ -73,9 +73,7 @@ module Boxcars
       raise Error, "Groq: No response from API" unless response
 
       check_response(response)
-      answer = response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
-      puts answer
-      answer
+      response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
     end
 
     # Get the default parameters for the engine.

data/lib/boxcars/engine/openai.rb

@@ -92,7 +92,7 @@ module Boxcars
       raise Error, "OpenAI: #{response['error']}" if response["error"]
 
       answer = response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
-      puts answer
+      Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end
 

data/lib/boxcars/engine/perplexityai.rb

@@ -78,7 +78,7 @@ module Boxcars
       raise Error, "PerplexityAI: #{response['error']}" if response["error"]
 
       answer = response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
-      puts answer
+      Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end
 

data/lib/boxcars/version.rb

@@ -2,5 +2,5 @@
 
 module Boxcars
   # The current version of the gem.
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxcars
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Francis Sullivan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-07 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anthropic