boxcars 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de375ad403bb62fb6af1045aff6a6115cbb598c3747fe48f882fb40483289e0
-  data.tar.gz: 343a3077d72ce21a56d8045701a8a3bd681c5fe91fd8ffbca2cc14270b92f3bb
+  metadata.gz: 34001190ca60f2b9fe68d603267ffccaaef398cae2f8054e34d6d0926fd8bf9d
+  data.tar.gz: 7918d0bad50e6758490a9baa58393e38071e524b0d284c43dd479cf1d091deab
 SHA512:
-  metadata.gz: efc72210fb52599b7c6278502a5b4143d995e671c62c7f6c090cbddf2a8926b231b0d7ab0aa28fa1325324ded1ebac5cac4e10e608ae59077a431a20f9d62f23
-  data.tar.gz: eeb00a993d7bbf64ac5c7461a1e31f241407c58a19a919c0853ade7e4a3bf717ab4f69331c5bc5d8c0049a89c53353d311d41616352131379b7e87b8ec3e491d
+  metadata.gz: dacd721802478a783ac9c50c4ebd959764b7601254c3a4b94546f093177cd94bdb4636d9f635154e6419a7d8505152ac7092c491238baab8ac0e47277323a7af
+  data.tar.gz: 73c638b8486681e3268ff94e390550f565c011891e9c025556f41df4e0e741ae705fa9fdeb6c3d1996919344abbfff84a8f1454e22a5d108dcae6d65e4718403

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boxcars (0.1.8)
+    boxcars (0.2.0)
       google_search_results (~> 2.2)
       ruby-openai (~> 3.0)
 
@@ -140,7 +140,7 @@ GEM
     rubocop-rspec (2.18.1)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-openai (3.3.0)
+    ruby-openai (3.5.0)
       httparty (>= 0.18.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)

data/lib/boxcars/boxcar/calculator.rb

@@ -11,7 +11,6 @@ module Boxcars
     # @param prompt [Boxcars::Prompt] The prompt to use for this boxcar. Defaults to built-in prompt.
     # @param kwargs [Hash] Any other keyword arguments to pass to the parent class.
     def initialize(engine: nil, prompt: nil, **kwargs)
-      # def initialize(engine:, prompt: my_prompt, output_key: :answer, **kwargs)
       the_prompt = prompt || my_prompt
       kwargs[:stop] ||= ["```output"]
       super(name: kwargs[:name] || "Calculator",
@@ -45,7 +44,7 @@ module Boxcars
     TEMPLATE = <<~'IPT'
       You are GPT-3, and you can't do math.
       You can do basic math, and your memorization abilities are impressive, but you can't do any complex calculations that a human could not do in their head. You also have an annoying tendency to just make up highly specific, but wrong, answers.
-      So we hooked you up to a Ruby 3 kernel, and now you can execute ruby code. If anyone gives you a hard math problem, just use this format and we’ll take care of the rest:
+      So we hooked you up to a Ruby 3 kernel, and now you can execute code written in the Ruby programming language. If anyone gives you a hard math problem, just use this format and we’ll take care of the rest:
 
       Question: ${{Question with hard calculation.}}
       ```ruby

data/lib/boxcars/boxcar/sql.rb

@@ -52,8 +52,11 @@ module Boxcars
     def get_embedded_sql_answer(text)
       code = text[/^SQLQuery: (.*)/, 1]
       Boxcars.debug code, :yellow
-      output = connection.exec_query(code).to_a
-      "Answer: #{output}"
+      output = connection.exec_query(code)
+      output = 0 if output.is_a?(Array) && output.empty?
+      output = output.first if output.is_a?(Array) && output.length == 1
+      output = output[output.keys.first] if output.is_a?(Hash) && output.length == 1
+      "Answer: #{output.to_json}"
     end
 
     def get_answer(text)

data/lib/boxcars/boxcar.rb

@@ -111,6 +111,11 @@ module Boxcars
       end
       validate_inputs(inputs: inputs)
     end
+
+    # the default answer is the text passed in
+    def get_answer(text)
+      text
+    end
   end
 end
 

data/lib/boxcars/engine/openai.rb

@@ -9,9 +9,9 @@ module Boxcars
 
     # The default parameters to use when asking the engine.
     DEFAULT_PARAMS = {
-      model: "text-davinci-003",
+      model: "gpt-3.5-turbo",
       temperature: 0.7,
-      max_tokens: 256
+      max_tokens: 512
     }.freeze
 
     # the default name of the engine
@@ -43,7 +43,13 @@ module Boxcars
       organization_id = Boxcars.configuration.organization_id
       clnt = ::OpenAI::Client.new(access_token: access_token, organization_id: organization_id)
       the_params = { prompt: prompt }.merge(open_ai_params).merge(kwargs)
-      clnt.completions(parameters: the_params)
+      if the_params[:model] == "gpt-3.5-turbo"
+        prompt = prompt.first if prompt.is_a?(Array)
+        the_params = { messages: [{ role: "user", content: prompt }] }.merge(open_ai_params).merge(kwargs)
+        clnt.chat(parameters: the_params)
+      else
+        clnt.completions(parameters: the_params)
+      end
     end
 
     # get an answer from the engine for a question.
@@ -51,7 +57,7 @@ module Boxcars
     # @param kwargs [Hash] Additional parameters to pass to the engine if wanted.
     def run(question, **kwargs)
       response = client(prompt: question, **kwargs)
-      answer = response["choices"].map { |c| c["text"] }.join("\n").strip
+      answer = response["choices"].map { |c| c.dig("message", "content") || c["text"] }.join("\n").strip
       puts answer
       answer
     end
@@ -74,7 +80,7 @@ module Boxcars
     def generation_info(sub_choices)
       sub_choices.map do |choice|
         Generation.new(
-          text: choice["text"],
+          text: choice.dig("message", "content") || choice["text"],
           generation_info: {
             finish_reason: choice.fetch("finish_reason", nil),
             logprobs: choice.fetch("logprobs", nil)
@@ -160,7 +166,8 @@ module Boxcars
       'text-babbage-001': 2048,
       'text-ada-001': 2048,
       'code-davinci-002': 8000,
-      'code-cushman-001': 2048
+      'code-cushman-001': 2048,
+      'gpt-3.5-turbo-1': 4096
     }.freeze
     model_lookup[modelname] || 4097
   end

data/lib/boxcars/ruby_repl.rb

@@ -7,12 +7,19 @@ module Boxcars
     # @param code [String] The code to run
     def call(code:)
       Boxcars.debug "RubyREPL: #{code}", :yellow
+
+      # wrap the code in an excption block so we can catch errors
+      code = "begin\n#{code}\nrescue Exception => e\n  puts 'Error: ' + e.message\nend"
       output = ""
       IO.popen("ruby", "r+") do |io|
         io.puts code
         io.close_write
         output = io.read
       end
+      if output =~ /^Error: /
+        Boxcars.error output
+        output
+      end
       Boxcars.debug "Answer: #{output}", :yellow, style: :bold
       output
     end

data/lib/boxcars/train/zero_shot.rb

@@ -19,7 +19,7 @@ module Boxcars
       ... (this Thought/Action/Action Input/Observation sequence can repeat N times)
       Thought: I now know the final answer
       Final Answer: the final answer to the original input question
-      Next Actions: up to three suggested actions for the user to take next
+      Next Actions: If you have them, up to three suggested actions for the user to take after getting this answer.
     FINPUT
 
     # default prompt suffix
@@ -71,13 +71,15 @@ module Boxcars
         answer = engine_output.split(FINAL_ANSWER_ACTION).last.strip
         ['Final Answer', answer]
       else
+        # the thought should be the frist line here if it doesn't start with "Action:"
+        thought = engine_output.split(/\n+/).reject(&:empty?).first
+        Boxcars.debug("Though: #{thought}", :cyan)
         regex = /Action: (?<action>.*)\nAction Input: (?<action_input>.*)/
         match = regex.match(engine_output)
         raise ValueError, "Could not parse engine output: #{engine_output}" unless match
 
         action = match[:action].strip
-        action_input = match[:action_input].strip
-        # [action, action_input.strip(" ").strip('"')]
+        action_input = match[:action_input].strip.delete_prefix('"').delete_suffix('"')
         [action, action_input]
       end
     end

data/lib/boxcars/train.rb

@@ -38,7 +38,7 @@ module Boxcars
     def construct_scratchpad(intermediate_steps)
       thoughts = ""
       intermediate_steps.each do |action, observation|
-        thoughts += action.is_a?(String) ? action : action.log
+        thoughts += action.is_a?(String) ? action : " #{action.log}"
         thoughts += "\n#{observation_prefix}#{observation}\n#{engine_prefix}"
       end
       thoughts
@@ -196,7 +196,7 @@ module Boxcars
             observation = boxcar.run(output.boxcar_input)
             return_direct = boxcar.return_direct
           rescue StandardError => e
-            error "Error in #{boxcar.name} boxcar#call: #{e}", :red
+            Boxcars.error "Error in #{boxcar.name} boxcar#call: #{e}", :red
             observation = "Error - #{e}, correct and try again."
           end
         else

data/lib/boxcars/version.rb

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

data/lib/boxcars.rb

@@ -30,7 +30,7 @@ module Boxcars
     def initialize
       @organization_id = nil
       @logger = Rails.logger if defined?(Rails)
-      @log_prompts = false
+      @log_prompts = ENV.fetch("LOG_PROMPTS", false)
     end
 
     # @return [String] The OpenAI Access Token either from arg or env.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxcars
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Francis Sullivan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug