boxcars 0.4.10 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e9d011a30aa2b478281dca050fec260a09f5e985454beee40405d0ae6991411
-  data.tar.gz: 2bd6e365273101ebd40a35780a1ef9913f4125a29dc24acaab317146a7c19344
+  metadata.gz: 71b72b7d30bda72b5dd0b3150773a233eac72e15ab3efa66d7643d5278770793
+  data.tar.gz: '080addca8e8c89f982db5ae91d9f12e67db15fb37f58d4787857b209848c1006'
 SHA512:
-  metadata.gz: f8937c0f246c0488e0656646bdcd9a02a62edbb068fbd92710e2e275c99c8c7006e4bfec277206b63ae5507833481ec2db9b0a274bb74be743d4739e8bfacc98
-  data.tar.gz: 5c176f8854d058cad2426786707c11a49759781167e1a861b1e376da1f7c9b679e75b7a33645134cc3e8d7298e907c0c831059328979ff8d590262b5804e76d8
+  metadata.gz: 330aa8094b7069084a7e06c7d656b30bd1935f1e12cfefded4788f23d92c62dbbbb92458328e37b95cbf5e446afd73b9170916329f409490e532ae329ac20a79
+  data.tar.gz: 1730d2356b2ddae5e19ee6d0ec0b4b6150eb9a9efb2305863b8e946ccd0184124a3ab22ef6fa37c4cfdacebed7a8fbf520f2d18243f9d05de7f547764d3625ef

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## [v0.5.1](https://github.com/BoxcarsAI/boxcars/tree/v0.5.1) (2024-06-14)
+
+[Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.4.10...v0.5.1)
+
+**Merged pull requests:**
+
+- Fix `Boxcars::SecurityError` error when we have newline [\#192](https://github.com/BoxcarsAI/boxcars/pull/192) ([moustafasallam](https://github.com/moustafasallam))
+- \[infra\] Bump rubocop from 1.64.0 to 1.64.1 [\#190](https://github.com/BoxcarsAI/boxcars/pull/190) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rubocop-rspec from 2.29.1 to 2.30.0 [\#188](https://github.com/BoxcarsAI/boxcars/pull/188) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump webmock from 3.23.0 to 3.23.1 [\#186](https://github.com/BoxcarsAI/boxcars/pull/186) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rubocop from 1.60.2 to 1.64.0 [\#183](https://github.com/BoxcarsAI/boxcars/pull/183) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rexml from 3.2.6 to 3.2.8 [\#182](https://github.com/BoxcarsAI/boxcars/pull/182) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump nokogiri from 1.16.2 to 1.16.5 [\#181](https://github.com/BoxcarsAI/boxcars/pull/181) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump anthropic from 0.1.0 to 0.2.0 [\#180](https://github.com/BoxcarsAI/boxcars/pull/180) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump debug from 1.9.1 to 1.9.2 [\#179](https://github.com/BoxcarsAI/boxcars/pull/179) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump dotenv from 3.1.0 to 3.1.2 [\#177](https://github.com/BoxcarsAI/boxcars/pull/177) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump async from 1.31.0 to 1.32.1 [\#175](https://github.com/BoxcarsAI/boxcars/pull/175) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Update ruby-openai requirement from \>= 4.2, \< 7.0 to \>= 4.2, \< 8.0 [\#174](https://github.com/BoxcarsAI/boxcars/pull/174) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rake from 13.1.0 to 13.2.1 [\#168](https://github.com/BoxcarsAI/boxcars/pull/168) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v0.4.10](https://github.com/BoxcarsAI/boxcars/tree/v0.4.10) (2024-04-19)
+
+[Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.4.9...v0.4.10)
+
+**Merged pull requests:**
+
+- Add llms [\#169](https://github.com/BoxcarsAI/boxcars/pull/169) ([francis](https://github.com/francis))
+- \[infra\] Bump pg from 1.5.5 to 1.5.6 [\#163](https://github.com/BoxcarsAI/boxcars/pull/163) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rubocop-rspec from 2.26.1 to 2.29.1 [\#160](https://github.com/BoxcarsAI/boxcars/pull/160) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rdoc from 6.6.2 to 6.6.3.1 [\#158](https://github.com/BoxcarsAI/boxcars/pull/158) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump dotenv from 3.0.2 to 3.1.0 [\#152](https://github.com/BoxcarsAI/boxcars/pull/152) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump webmock from 3.22.0 to 3.23.0 [\#150](https://github.com/BoxcarsAI/boxcars/pull/150) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump webmock from 3.20.0 to 3.22.0 [\#148](https://github.com/BoxcarsAI/boxcars/pull/148) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump dotenv from 2.8.1 to 3.0.2 [\#146](https://github.com/BoxcarsAI/boxcars/pull/146) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump pg from 1.5.4 to 1.5.5 [\#144](https://github.com/BoxcarsAI/boxcars/pull/144) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump webmock from 3.19.1 to 3.20.0 [\#142](https://github.com/BoxcarsAI/boxcars/pull/142) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump nokogiri from 1.16.0 to 1.16.2 [\#141](https://github.com/BoxcarsAI/boxcars/pull/141) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rspec from 3.12.0 to 3.13.0 [\#140](https://github.com/BoxcarsAI/boxcars/pull/140) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump sqlite3 from 1.7.1 to 1.7.2 [\#139](https://github.com/BoxcarsAI/boxcars/pull/139) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v0.4.9](https://github.com/BoxcarsAI/boxcars/tree/v0.4.9) (2024-01-25)
+
+[Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.4.8...v0.4.9)
+
+**Merged pull requests:**
+
+- use newest models by default from Open AI [\#138](https://github.com/BoxcarsAI/boxcars/pull/138) ([francis](https://github.com/francis))
+- \[infra\] Bump sqlite3 from 1.7.0 to 1.7.1 [\#137](https://github.com/BoxcarsAI/boxcars/pull/137) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rubocop from 1.60.0 to 1.60.2 [\#136](https://github.com/BoxcarsAI/boxcars/pull/136) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[infra\] Bump rubocop from 1.59.0 to 1.60.0 [\#133](https://github.com/BoxcarsAI/boxcars/pull/133) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v0.4.8](https://github.com/BoxcarsAI/boxcars/tree/v0.4.8) (2024-01-08)
 
 [Full Changelog](https://github.com/BoxcarsAI/boxcars/compare/v0.4.7...v0.4.8)
@@ -174,7 +225,7 @@
 
 - Chore/refactored vector stores [\#92](https://github.com/BoxcarsAI/boxcars/pull/92) ([jaigouk](https://github.com/jaigouk))
 - Fix the issue of calling the wrong method in vector\_answer.rb. [\#91](https://github.com/BoxcarsAI/boxcars/pull/91) ([xleotranx](https://github.com/xleotranx))
-- issue\_83 Fix readme 404 [\#87](https://github.com/BoxcarsAI/boxcars/pull/87) ([beouk](https://github.com/beouk))
+- issue\_83 Fix readme 404 [\#87](https://github.com/BoxcarsAI/boxcars/pull/87) ([ntabernacle](https://github.com/ntabernacle))
 
 ## [v0.2.13](https://github.com/BoxcarsAI/boxcars/tree/v0.2.13) (2023-05-24)
 

data/Gemfile

@@ -9,11 +9,11 @@ gem "debug", "~> 1.9"
 
 gem "dotenv", "~> 3.1"
 
-gem "rake", "~> 13.1"
+gem "rake", "~> 13.2"
 
 gem "sqlite3", "~> 1.7"
 
-gem "async", "~>1.31.0"
+gem "async", "~>1.32.1"
 
 gem "activerecord", "~> 7.0"
 
@@ -32,9 +32,9 @@ gem "pgvector", "~> 0.2.2"
 
 group :development, :test do
   gem "rspec", "~> 3.13"
-  gem "rubocop", "~> 1.60"
+  gem "rubocop", "~> 1.64"
   gem "vcr", "~> 6.2.0"
-  gem "webmock", "~> 3.23.0"
+  gem "webmock", "~> 3.23.1"
   gem "rubocop-rake", "~> 0.6.0"
-  gem "rubocop-rspec", "~> 2.29"
+  gem "rubocop-rspec", "~> 3.0"
 end

data/Gemfile.lock

@@ -1,72 +1,83 @@
 PATH
   remote: .
   specs:
-    boxcars (0.4.10)
+    boxcars (0.6.1)
       anthropic (~> 0.1)
       google_search_results (~> 2.2)
       gpt4all (~> 0.0.4)
       hnswlib (~> 0.8)
       nokogiri (~> 1.16)
       pgvector (~> 0.2)
-      ruby-openai (>= 4.2, < 7.0)
+      ruby-openai (>= 4.2, < 8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.1)
-      activesupport (= 7.0.7.1)
-    activerecord (7.0.7.1)
-      activemodel (= 7.0.7.1)
-      activesupport (= 7.0.7.1)
-    activesupport (7.0.7.1)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    anthropic (0.1.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    anthropic (0.3.0)
+      event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ast (2.4.2)
-    async (1.31.0)
+    async (1.32.1)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.61.0)
+    async-http (0.64.2)
       async (>= 1.25)
       async-io (>= 1.28)
       async-pool (>= 0.2)
-      protocol-http (~> 0.25.0)
-      protocol-http1 (~> 0.16.0)
-      protocol-http2 (~> 0.15.0)
+      protocol-http (~> 0.26.0)
+      protocol-http1 (~> 0.19.0)
+      protocol-http2 (~> 0.16.0)
       traces (>= 0.10.0)
-    async-http-faraday (0.12.0)
+    async-http-faraday (0.14.0)
       async-http (~> 0.42)
       faraday
-    async-io (1.35.0)
+    async-io (1.43.2)
       async
-    async-pool (0.4.0)
+    async-pool (0.7.0)
       async (>= 1.25)
-    bigdecimal (3.1.6)
-    concurrent-ruby (1.2.2)
-    console (1.17.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    console (1.27.0)
       fiber-annotation
-      fiber-local
+      fiber-local (~> 1.1)
+      json
     crack (1.0.0)
       bigdecimal
       rexml
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     diff-lcs (1.5.1)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (3.1.0)
+    domain_name (0.6.20240107)
+    dotenv (3.1.2)
+    drb (2.2.1)
     event_stream_parser (1.0.0)
-    faraday (2.9.0)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
-    faraday-http-cache (2.5.0)
+      logger
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
@@ -75,7 +86,9 @@ GEM
     faraday-retry (2.2.1)
       faraday (~> 2.0)
     fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (0.1.2)
     github_changelog_generator (1.16.4)
       activesupport
       async (>= 1.25.0)
@@ -93,104 +106,98 @@ GEM
     hashdiff (1.1.0)
     hnswlib (0.9.0)
     http-accept (1.7.0)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.1)
-    irb (1.11.0)
-      rdoc
-      reline (>= 0.3.8)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    mime-types (3.4.1)
+    logger (1.6.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    minitest (5.20.0)
+    mime-types-data (3.2024.0702)
+    minitest (5.24.1)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
+    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     netrc (0.11.0)
-    nio4r (2.5.9)
-    nokogiri (1.16.2-arm64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     os (1.1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
     pgvector (0.2.2)
-    protocol-hpack (1.4.2)
-    protocol-http (0.25.0)
-    protocol-http1 (0.16.0)
+    protocol-hpack (1.4.3)
+    protocol-http (0.26.8)
+    protocol-http1 (0.19.1)
       protocol-http (~> 0.22)
-    protocol-http2 (0.15.1)
+    protocol-http2 (0.16.0)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rdoc (6.6.3.1)
+    rake (13.2.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.4.1)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
       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.2.6)
+    rexml (3.3.2)
+      strscan
     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-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.60.2)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
-      rubocop (~> 1.40)
-    ruby-openai (6.3.1)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
+    ruby-openai (7.1.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
@@ -198,10 +205,12 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    sqlite3 (1.7.2-arm64-darwin)
-    sqlite3 (1.7.2-x86_64-linux)
-    stringio (3.1.0)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    stringio (3.1.1)
     strings-ansi (0.2.0)
+    strscan (3.1.0)
+    timeout (0.4.1)
     timers (4.3.5)
     traces (0.11.1)
     tty-cursor (0.7.1)
@@ -210,16 +219,13 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       unicode-display_width (>= 1.6, < 3.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uri (0.13.0)
     vcr (6.2.0)
-    webmock (3.23.0)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -232,7 +238,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 7.0)
   activesupport (~> 7.0)
-  async (~> 1.31.0)
+  async (~> 1.32.1)
   boxcars!
   debug (~> 1.9)
   dotenv (~> 3.1)
@@ -241,15 +247,15 @@ DEPENDENCIES
   hnswlib (~> 0.9.0)
   pg (~> 1.5)
   pgvector (~> 0.2.2)
-  rake (~> 13.1)
+  rake (~> 13.2)
   rest-client (~> 2.1)
   rspec (~> 3.13)
-  rubocop (~> 1.60)
+  rubocop (~> 1.64)
   rubocop-rake (~> 0.6.0)
-  rubocop-rspec (~> 2.29)
+  rubocop-rspec (~> 3.0)
   sqlite3 (~> 1.7)
   vcr (~> 6.2.0)
-  webmock (~> 3.23.0)
+  webmock (~> 3.23.1)
 
 BUNDLED WITH
    2.4.16

data/boxcars.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hnswlib", "~> 0.8"
   spec.add_dependency "nokogiri", "~> 1.16"
   spec.add_dependency "pgvector", "~> 0.2"
-  spec.add_dependency "ruby-openai", ">= 4.2", "< 7.0"
+  spec.add_dependency "ruby-openai", ">= 4.2", "< 8.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/boxcars/boxcar/active_record.rb

@@ -99,10 +99,10 @@ module Boxcars
 
     # check for dangerous code that is outside of ActiveRecord
     def safe_to_run?(code)
-      bad_words = %w[commit drop_constraint drop_constraint! drop_extension drop_extension! drop_foreign_key drop_foreign_key! \
-                     drop_index drop_index! drop_join_table drop_join_table! drop_materialized_view drop_materialized_view! \
-                     drop_partition drop_partition! drop_schema drop_schema! drop_table drop_table! drop_trigger drop_trigger! \
-                     drop_view drop_view! eval instance_eval send system execute reset revoke rollback truncate \
+      bad_words = %w[commit drop_constraint drop_constraint! drop_extension drop_extension! drop_foreign_key drop_foreign_key!
+                     drop_index drop_index! drop_join_table drop_join_table! drop_materialized_view drop_materialized_view!
+                     drop_partition drop_partition! drop_schema drop_schema! drop_table drop_table! drop_trigger drop_trigger!
+                     drop_view drop_view! eval instance_eval send system execute reset revoke rollback truncate
                      encrypted_password].freeze
       without_strings = code.gsub(/('([^'\\]*(\\.[^'\\]*)*)'|"([^"\\]*(\\.[^"\\]*)*"))/, 'XX')
 

data/lib/boxcars/boxcar/calculator.rb

@@ -48,7 +48,8 @@ module Boxcars
            "use the following format and we’ll take care of the rest:\n",
            "${{Question with hard calculation.}}\n",
            "reply only with the following format:\n",
-           "```ruby\n${{only Ruby code that prints the answer}}\n```\n",
+           "```ruby\n${{only Ruby code that prints the answer. " \
+           "If you use puts, make sure to wrap the expression in paranthesis}}\n```\n",
            "```output\n${{Output of your code}}\n```\n\n",
            "Otherwise, you should use this simpler format:\n",
            "${{Question without hard calculation}}\n",

data/lib/boxcars/boxcar/json_engine_boxcar.rb

@@ -5,23 +5,27 @@ module Boxcars
   # For Boxcars that use an engine to do their work.
   class JSONEngineBoxcar < EngineBoxcar
     # A JSON Engine Boxcar is a container for a single tool to run.
-    attr_accessor :wanted_data, :data_description
+    attr_accessor :wanted_data, :data_description, :important
 
     # @param prompt [Boxcars::Prompt] The prompt to use for this boxcar with sane defaults.
     # @param wanted_data [String] The data to extract from.
     # @param data_description [String] The description of the data.
+    # @param important [String] Any important instructions you want to give the LLM.
     # @param kwargs [Hash] Additional arguments
-    def initialize(prompt: nil, wanted_data: nil, data_description: nil, **kwargs)
+    def initialize(prompt: nil, wanted_data: nil, data_description: nil, important: nil, **kwargs)
       @wanted_data = wanted_data || "summarize the pertinent facts from the input data"
       @data_description = data_description || "the input data"
+      @important = important
       the_prompt = prompt || default_prompt
+      the_prompt.append("\n\nImportant: #{important}\n") if important.present?
       kwargs[:description] ||= "JSON Engine Boxcar"
       super(prompt: the_prompt, **kwargs)
     end
 
     def default_prompt
       stock_prompt = <<~SYSPR
-        I will provide you with %<data_description>s, and your job is to extract information as described below.
+        I will provide you with %<data_description>s.
+        Your job is to extract information as described below.
 
         Your Output must be valid JSON with no lead in or post answer text in the output format below:
 

data/lib/boxcars/boxcar/ruby_calculator.rb

@@ -13,7 +13,7 @@ module Boxcars
       kwargs[:description] ||= CALCDESC
       kwargs[:parameters] ||= default_params
 
-      super(**kwargs)
+      super
     end
 
     def default_params

data/lib/boxcars/boxcar/sql_active_record.rb

@@ -11,7 +11,7 @@ module Boxcars
     #   :name, :description, :prompt, :top_k, :stop, and :engine
     def initialize(connection: nil, tables: nil, except_tables: nil, **kwargs)
       connection ||= ::ActiveRecord::Base.connection
-      super(connection: connection, tables: tables, except_tables: except_tables, **kwargs)
+      super
     end
 
     private

data/lib/boxcars/boxcar/sql_sequel.rb

@@ -10,7 +10,7 @@ module Boxcars
     # @param kwargs [Hash] Any other keyword arguments to pass to the parent class. This can include
     #   :name, :description, :prompt, :top_k, :stop, and :engine
     def initialize(connection: nil, tables: nil, except_tables: nil, **kwargs)
-      super(connection: connection, tables: tables, except_tables: except_tables, **kwargs)
+      super
     end
 
     private

data/lib/boxcars/boxcar/url_text.rb

@@ -10,7 +10,7 @@ module Boxcars
     # @param name [String] The name of the boxcar. Defaults to classname.
     # @param description [String] A description of the boxcar. Defaults to SERPDESC.
     def initialize(name: "FetchURL", description: DESC)
-      super(name: name, description: description)
+      super
     end
 
     # Get text from a url.

data/lib/boxcars/boxcar/wikipedia_search.rb

@@ -13,7 +13,7 @@ module Boxcars
     # @param description [String] A description of the boxcar. Defaults to SERPDESC.
     # @param serpapi_api_key [String] The API key to use for the SerpAPI. Defaults to Boxcars.configuration.serpapi_api_key.
     def initialize(name: "Wikipedia", description: WDESC)
-      super(name: name, description: description)
+      super
     end
 
     # Get an answer from Google using the SerpAPI.

data/lib/boxcars/boxcar.rb

@@ -165,7 +165,8 @@ module Boxcars
       begin
         output = call(inputs: inputs)
       rescue StandardError => e
-        Boxcars.error "Error in #{name} boxcar#call: #{e}\nbt:#{caller[0..5].join("\n   ")}", :red
+        Boxcars.error "Error in #{name} boxcar#call: #{e}\nbt:#{e.backtrace[0..5].join("\n   ")}", :red
+        Boxcars.error("Response Body: #{e.response[:body]}", :red) if e.respond_to?(:response)
         raise e
       end
       validate_outputs(outputs: output.keys)

data/lib/boxcars/conversation.rb

@@ -20,7 +20,6 @@ module Boxcars
         raise ArgumentError, "Conversation item must be a array" unless ln.is_a?(Array)
         raise ArgumentError, "Conversation item must have 2 items, role and text" unless ln.size == 2
         raise ArgumentError, "Conversation item must have a role #{ln} in (#{PEOPLE})" unless PEOPLE.include? ln[0]
-        raise ArgumentError, "Conversation value must be a string" unless ln[1].is_a?(String)
       end
     end
 
@@ -112,6 +111,24 @@ module Boxcars
       raise KeyError, "Prompt format error: #{first_line}"
     end
 
+    def process_content(content, inputs)
+      # If content is a string, treat it as text
+      if content.is_a?(String)
+        [{ type: "text", text: cformat(content, inputs) }]
+      # If content is an array, assume it's already in the new format
+      elsif content.is_a?(Array)
+        content.map do |item|
+          if item[:type] == "text"
+            { type: "text", text: cformat(item[:text], inputs) }
+          else
+            item # Pass through non-text items (like images) without modification
+          end
+        end
+      else
+        raise ArgumentError, "Invalid content type: #{content.class}"
+      end
+    end
+
     # special format that replaces lone percent signs with double percent signs
     def cformat(*args)
       args[0] = args[0].dup.gsub(/%(?!<)/, '%%') if args.length > 1

data/lib/boxcars/engine/anthropic.rb

@@ -9,9 +9,9 @@ module Boxcars
 
     # The default parameters to use when asking the engine.
     DEFAULT_PARAMS = {
-      model: "claude-2",
-      max_tokens_to_sample: 8096,
-      temperature: 0.2
+      model: "claude-3-5-sonnet-20240620",
+      max_tokens: 4096,
+      temperature: 0.1
     }.freeze
 
     # the default name of the engine
@@ -32,8 +32,8 @@ module Boxcars
       super(description: description, name: name)
     end
 
-    def conversation_model?(_model)
-      false
+    def conversation_model?(model)
+      @conversation_model ||= (extract_model_version(model) > 3.49)
     end
 
     def anthropic_client(anthropic_api_key: nil)
@@ -46,13 +46,27 @@ module Boxcars
     #   Defaults to Boxcars.configuration.anthropic_api_key.
     # @param kwargs [Hash] Additional parameters to pass to the engine if wanted.
     def client(prompt:, inputs: {}, **kwargs)
+      model_params = llm_params.merge(kwargs)
       api_key = Boxcars.configuration.anthropic_api_key(**kwargs)
       aclient = anthropic_client(anthropic_api_key: api_key)
-      params = prompt.as_prompt(inputs: inputs, prefixes: default_prefixes, show_roles: true).merge(llm_params.merge(kwargs))
-      params[:prompt] = "\n\n#{params[:prompt]}" unless params[:prompt].start_with?("\n\n")
-      params[:stop_sequences] = params.delete(:stop) if params.key?(:stop)
-      Boxcars.debug("Prompt after formatting:#{params[:prompt]}", :cyan) if Boxcars.configuration.log_prompts
-      aclient.complete(parameters: params)
+      prompt = prompt.first if prompt.is_a?(Array)
+
+      if conversation_model?(model_params[:model])
+        params = convert_to_anthropic(prompt.as_messages(inputs).merge(model_params))
+        if Boxcars.configuration.log_prompts
+          Boxcars.debug(params[:messages].last(2).map { |p| ">>>>>> Role: #{p[:role]} <<<<<<\n#{p[:content]}" }.join("\n"), :cyan)
+        end
+        response = aclient.messages(parameters: params)
+        response['completion'] = response.dig('content', 0, 'text')
+        response.delete('content')
+        response
+      else
+        params = prompt.as_prompt(inputs: inputs, prefixes: default_prefixes, show_roles: true).merge(model_params)
+        params[:prompt] = "\n\n#{params[:prompt]}" unless params[:prompt].start_with?("\n\n")
+        params[:stop_sequences] = params.delete(:stop) if params.key?(:stop)
+        Boxcars.debug("Prompt after formatting:#{params[:prompt]}", :cyan) if Boxcars.configuration.log_prompts
+        aclient.complete(parameters: params)
+      end
     end
 
     # get an answer from the engine for a question.
@@ -165,6 +179,46 @@ module Boxcars
       max_size - num_tokens
     end
 
+    def extract_model_version(model_string)
+      # Use a regular expression to find the version number
+      match = model_string.match(/claude-(\d+)(?:-(\d+))?/)
+
+      raise ArgumentError, "No version number found in model string: #{model_string}" unless match
+
+      major = match[1].to_i
+      minor = match[2].to_i
+
+      # Combine major and minor versions
+      major + (minor.to_f / 10)
+    end
+
+    # convert generic parameters to Anthopic specific ones
+    def convert_to_anthropic(params)
+      params[:stop_sequences] = params.delete(:stop) if params.key?(:stop)
+      params[:system] = params[:messages].shift[:content] if params.dig(:messages, 0, :role) == :system
+      params[:messages].pop if params[:messages].last[:content].blank?
+      combine_assistant(params)
+    end
+
+    def combine_assistant(params)
+      params[:messages] = combine_assistant_entries(params[:messages])
+      params[:messages].last[:content].rstrip! if params[:messages].last[:role] == :assistant
+      params
+    end
+
+    # if we have multiple assistant entries in a row, we need to combine them
+    def combine_assistant_entries(hashes)
+      combined_hashes = []
+      hashes.each do |hash|
+        if combined_hashes.empty? || combined_hashes.last[:role] != :assistant || hash[:role] != :assistant
+          combined_hashes << hash
+        else
+          combined_hashes.last[:content].concat("\n", hash[:content].rstrip)
+        end
+      end
+      combined_hashes
+    end
+
     def default_prefixes
       { system: "Human: ", user: "Human: ", assistant: "Assistant: ", history: :history }
     end

data/lib/boxcars/engine/openai.rb

@@ -9,7 +9,7 @@ module Boxcars
 
     # The default parameters to use when asking the engine.
     DEFAULT_PARAMS = {
-      model: "gpt-4-turbo-preview",
+      model: "gpt-4o-mini",
       temperature: 0.1,
       max_tokens: 4096
     }.freeze

data/lib/boxcars/prompt.rb

@@ -29,7 +29,7 @@ module Boxcars
     # @param inputs [Hash] The inputs to use for the prompt.
     # @return [Hash] The formatted prompt { prompt: "..."}
     def as_messages(inputs)
-      { messages: [{ role: :assistant, content: format(inputs) }] }
+      { messages: [{ role: :user, content: format(inputs) }] }
     end
 
     # tack on the ongoing conversation if present to the prompt

data/lib/boxcars/vector_store.rb

@@ -59,12 +59,11 @@ module Boxcars
     end
 
     def load_data_files(training_data_path)
-      data = []
       files = Dir.glob(training_data_path)
       raise_error "No files found at #{training_data_path}" if files.empty?
 
-      files.each do |file|
-        data << File.read(file)
+      data = files.map do |file|
+        File.read(file)
       end
       puts "Added #{files.length} files to data. Splitting text into chunks..."
       data

data/lib/boxcars/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxcars
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.6.1
 platform: ruby
 authors:
 - Francis Sullivan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anthropic
@@ -104,7 +104,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 description: You simply set an OpenAI key, give a number of Boxcars to a Train, and
   magic ensues when you run it.
 email: