boxcars 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842e02d2d8d43ea2a989c5a0b5708022443cf532d7616ab4319a063705f808fa
-  data.tar.gz: 0c3349ae1dc50be9984bd440c520a74f2f972151338f1ff23aca5bc47d56837c
+  metadata.gz: 93e000d3596a656454fb5c76becff8c5d5b4bbb33fe75f91598aceb0526c8d48
+  data.tar.gz: 87d3db350a3faa94cb367fbd600749ed584f0868cd8298469b7bef6c9434e93e
 SHA512:
-  metadata.gz: 68c3560e8e67c59f711c6433ba5950b48e5ecc0d955b039280399c81baf26361bb659eae89660f2180064b8a2ec7cf799bf0950b42cb5bc8c28b224fa6eb6c53
-  data.tar.gz: 9f2538a7659b6ab4f236f23fbecb0a594f0ad0778e82b4fc634a2179e355fb40fb5f9ec54f6b9df6cda558a93ca5d2522c950ed8fe454d800cea1db16f5b72ba
+  metadata.gz: d3028c6cbaec10e84597c3a68e2f8f6c88b336b4be50144b04349662afa647d9c266d00debc14c0370bda0bb2150472cf69e347def8fcdc5d3682fc6c2d19512
+  data.tar.gz: 98a10191a8cd96cf85d91f9d5f1f38f07fa29fc7521f55bfd67c500a21fb23b3ef7d4ba7a16df1cc1d35f2a7486fe9ba18f11ab922e288895533ed2197766601

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.8.2](https://github.com/BoxcarsAI/boxcars/tree/v0.8.2) (2025-06-04)
+
+[Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.8.1...v0.8.2)
+
+## [v0.8.1](https://github.com/BoxcarsAI/boxcars/tree/v0.8.1) (2025-06-03)
+
+[Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.8.0...v0.8.1)
+
 ## [v0.8.0](https://github.com/BoxcarsAI/boxcars/tree/v0.8.0) (2025-06-03)
 
 [Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.7.7...v0.8.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boxcars (0.8.2)
+    boxcars (0.8.3)
       faraday-retry (~> 2.0)
       google_search_results (~> 2.2)
       gpt4all (~> 0.0.5)
@@ -56,10 +56,10 @@ GEM
       async (>= 1.25)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.1)
+    bigdecimal (3.2.2)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
-    console (1.30.2)
+    console (1.31.0)
       fiber-annotation
       fiber-local (~> 1.1)
       json
@@ -74,7 +74,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (3.1.8)
     drb (2.2.3)
-    dynamicschema (1.0.0.beta04)
+    dynamicschema (1.0.0)
     erb (5.0.1)
     event_stream_parser (1.0.0)
     faraday (2.13.1)
@@ -132,7 +132,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0527)
+    mime-types-data (3.2025.0603)
     minitest (5.25.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -211,7 +211,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.4)
-    rubocop (1.75.8)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -219,10 +219,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.6.0)

data/lib/boxcars/engine/gemini_ai.rb

@@ -79,12 +79,16 @@ module Boxcars
         )
       end
 
-      _gemini_handle_call_outcome(response_data:)
+      # If there's an error, raise it to maintain backward compatibility with existing tests
+      raise response_data[:error] if response_data[:error]
+
+      response_data
     end
 
     def run(question, **)
       prompt = Prompt.new(template: question)
-      answer = client(prompt:, inputs: {}, **)
+      response_data = client(prompt:, inputs: {}, **)
+      answer = _gemini_handle_call_outcome(response_data:)
       Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end

data/lib/boxcars/engine/groq.rb

@@ -71,12 +71,16 @@ module Boxcars
         )
       end
 
-      _groq_handle_call_outcome(response_data:)
+      # If there's an error, raise it to maintain backward compatibility with existing tests
+      raise response_data[:error] if response_data[:error]
+
+      response_data
     end
 
     def run(question, **)
       prompt = Prompt.new(template: question)
-      answer = client(prompt:, inputs: {}, **)
+      response_data = client(prompt:, inputs: {}, **)
+      answer = _groq_handle_call_outcome(response_data:)
       Boxcars.debug("Answer: #{answer}", :cyan)
       answer
     end

data/lib/boxcars/engine/openai.rb

@@ -128,6 +128,7 @@ module Boxcars
     # Called by Engine#generate to check the response from the client.
     # @param response [Hash] The parsed JSON response from the OpenAI API.
     # @raise [Boxcars::Error] if the response contains an error.
+    # rubocop:disable Naming/PredicateMethod
     def check_response(response)
       if response.is_a?(Hash) && response["error"]
         err_details = response["error"]
@@ -136,6 +137,7 @@ module Boxcars
       end
       true
     end
+    # rubocop:enable Naming/PredicateMethod
 
     def run(question, **)
       prompt = Prompt.new(template: question)

data/lib/boxcars/engine.rb

@@ -57,12 +57,39 @@ module Boxcars
       # Includes prompt, completion, and total tokens used.
       inkeys = %w[completion_tokens prompt_tokens total_tokens].freeze
       prompts.each_slice(batch_size) do |sub_prompts|
-        sub_prompts.each do |sprompts, inputs|
-          response = client(prompt: sprompts, inputs:, **params)
-          check_response(response)
-          choices.concat(response["choices"])
-          usage_keys = inkeys & response["usage"].keys
-          usage_keys.each { |key| token_usage[key] = token_usage[key].to_i + response["usage"][key] }
+        sub_prompts.each do |sprompt, inputs|
+          client_response = client(prompt: sprompt, inputs:, **params)
+
+          # Handle different response formats:
+          # - New format: response_data hash with :parsed_json key (Groq, Gemini)
+          # - Legacy format: direct API response hash (OpenAI, others)
+          api_response_hash = if client_response.is_a?(Hash) && client_response.key?(:parsed_json)
+                                client_response[:parsed_json]
+                              else
+                                client_response
+                              end
+
+          # Ensure we have a hash to work with
+          unless api_response_hash.is_a?(Hash)
+            raise TypeError, "Expected Hash from client method, got #{api_response_hash.class}: #{api_response_hash.inspect}"
+          end
+
+          check_response(api_response_hash)
+
+          current_choices = api_response_hash["choices"]
+          if current_choices.is_a?(Array)
+            choices.concat(current_choices)
+          else
+            Boxcars.logger&.warn "No 'choices' found in API response: #{api_response_hash.inspect}"
+          end
+
+          api_usage = api_response_hash["usage"]
+          if api_usage.is_a?(Hash)
+            usage_keys = inkeys & api_usage.keys
+            usage_keys.each { |key| token_usage[key] = token_usage[key].to_i + api_usage[key] }
+          else
+            Boxcars.logger&.warn "No 'usage' data found in API response: #{api_response_hash.inspect}"
+          end
         end
       end
 

data/lib/boxcars/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxcars
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Francis Sullivan