luogu 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a148eff2b580b1fc02bf9a71ffbef28bcfbe54752bc73c877ea17ed19cf301c4
-  data.tar.gz: edeb9d2d566292180ad9cc29c172a2e7545c1656dd3791258780adf8a0587571
+  metadata.gz: 0e121e0329cf0f92c56754426facf7c5142941bdb859a19b3125cc9a53e30221
+  data.tar.gz: 0a8d2f4ae3b4599bbe60960dfaf6d5cfc8c6d21c5e9e69bd7e7432d30ec9c36f
 SHA512:
-  metadata.gz: 3fd79fb77f48a73cd6e64194cd2826e23ad27c18d7904c0a737c0b2340bc080a33e65271f005f91a6182eed36f77ccb08c15efd4f93c43588b3ac6800af2e48c
-  data.tar.gz: 4f3fbb7674ae5dd9ddf3df8979ccbea102552527eba4090309cf6a0265d4022701e1338d91fa8dba4283acc9bede24398365ad8dddc4e4efe606e0b28e9b3e9f
+  metadata.gz: 22d8dd554b0620536b9ac858ad6e5009da3bf5eb3bba502b10710f4f783ca0b8f392895805cb9ad6db3c2f567d7c95891dc2c26149e1be76f9493622427bf74e
+  data.tar.gz: 89be4a1d4d4525885fcdb77889c07365b1dd22f223f2de225c79ebb99b80126bd110cec51721c03110321ce239a0bbef4e262011f9b8822c0135383c27256a81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luogu (0.2.2)
+    luogu (0.2.5)
       dotenv (~> 2.8, >= 2.8.1)
       dry-cli (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)

data/lib/luogu/agent_runner.rb

@@ -67,15 +67,24 @@ module Luogu
       @request_params.messages = messages
       response = provider.request.call(@request_params.to_h)
       unless response.code == 200
-        logger.error response.body
-        raise RequestError
+        logger.error response.body.to_s
+        raise RequestError, response.body.to_s
       end
-      content = provider.parse.call(response)
+
+      begin
+        content = Luogu.wrap_array(provider.parse.call(response))
+      rescue => error
+        logger.error error.message
+        return "error! #{error.message}"
+      end
+
+
       logger.debug content
+
       if (answer = self.find_and_save_final_answer(content))
         logger.info "final answer: #{answer}"
         answer
-      elsif content.is_a?(Array)
+      else
         run_agents(content, messages, run_agent_retries: run_agent_retries)
       end
     end

data/lib/luogu/init.rb

@@ -9,6 +9,7 @@ require 'benchmark'
 require 'erb'
 require 'logger'
 require 'securerandom'
+require 'shellwords'
 
 require "dry/cli"
 require 'dry-configurable'
@@ -31,6 +32,7 @@ require_relative 'openai'
 require_relative 'terminal'
 
 require_relative 'aiui'
+require_relative 'utils'
 
 class String
   def cover_chinese

data/lib/luogu/openai.rb

@@ -49,6 +49,8 @@ module Luogu::OpenAI
     else
       result_json
     end
+  rescue => e
+    raise e, "Input must be JSON and contain action and action_input."
   end
 
   def chat_response_handle(response)
@@ -80,7 +82,7 @@ module Luogu::OpenAI
       @system = {}
     end
 
-    def system(text: nil, file_: nil)
+    def system(text: nil, file: nil)
       data = text || File.read(file)
       @system = {role: "system", content: data}
       self

data/lib/luogu/templates/agent_input.md.erb

@@ -12,14 +12,14 @@ RESPONSE FORMAT INSTRUCTIONS
 When responding to me please, please output a response in one of two formats:
 
 **Option 1:**
-Use this if you want humans to use the tools.
+Use this if you want the human to use a tool.
 Markdown code snippet formatted in the following schema:
 
 ```json
-[{
+{
   "action": string \ The action to take. Must be one of <%= @agents.map do |a| a.name end.join(', ') %>
   "action_input": string \ The input to the action
-}]
+}
 ```
 
 **Option #2:**

data/lib/luogu/utils.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Luogu
+  def println(message)
+    if system("which glow > /dev/null 2>&1")
+      system("echo #{Shellwords.escape(message)} | glow -")
+    else
+      puts message
+    end
+  end
+
+  def wrap_array(obj)
+    if obj.is_a?(Array)
+      obj
+    else
+      [obj]
+    end
+  end
+
+  module_function :println, :wrap_array
+end

data/lib/luogu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luogu
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luogu
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -131,6 +131,7 @@ files:
 - lib/luogu/templates/agent_system.md.erb
 - lib/luogu/templates/agent_tool_input.md.erb
 - lib/luogu/terminal.rb
+- lib/luogu/utils.rb
 - lib/luogu/version.rb
 - luogu.gemspec
 - prompt.md