scout-ai 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95a3c664d483df9e6c5d968822ac358e74215770e7387186f5de12ac72cedeb
-  data.tar.gz: 55e9c02ef0d7794ba797c4fe9c1fdc023c0b08d32178386d53eabcdcb317a0b9
+  metadata.gz: 456939ec51f2ea2c9be5a7fa5eb7992161e893dcfb6618b85eac7e7317af25fa
+  data.tar.gz: 67d22d1cd09f74c73843f143897d543993df4f5d68b9649ab1751a19a944e8fd
 SHA512:
-  metadata.gz: 5252115360b664c8353c05f417b62992bc2970fd04cf1c77281c6eb0ebb185d58ce8b4f3909729b00b7d8b205bf09eb2ccf6ee530044393cf5139b0b44e54f16
-  data.tar.gz: 59358958fdae5ed1aac9edcffde28ffc21bd348ffd589d467be59a005b4dd2c2e942981399f412c710eec630e748a9a2438273cb2a569aa09c17388bc2e25927
+  metadata.gz: 501bf9ff434058cb2ebad6b084a7ffbccf8a392b1a735c9e6e5726afcc23c7331ef471fc4c675130e49920def430332dd01b647b5f9a473c038b8ef0609d55e1
+  data.tar.gz: a267f504d6342a15fe1c0b7f180a47e3b7cd532b71fbd4a5fd3868b4fb7337f3a5c4f5d1ce0aa53276eb268e64ec035806d262b7713dba23d65bb50af2d6c3ab

data/.vimproject

@@ -48,6 +48,8 @@ scout-ai=$PWD filter="*.rb *.rake Rakefile *.rdoc *.R *.sh *.js *.haml *.sass *.
   test_log_resonse
 
   test_prompt.rb
+
+  openclaw
  }
  lib=lib {
   scout-ai.rb

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/scout/llm/agent/delegate.rb

@@ -1,89 +1,48 @@
 module LLM
   class Agent
 
-    AGENTS = {}
-
-    def delegate(agent, name, description, &block)
-      @other_options[:tools] ||= {}
-      task_name = "hand_off_to_#{name}"
-
-      block ||= Proc.new do |name, parameters|
-        message = parameters[:message]
-        new_conversation = parameters[:new_conversation]
-        Log.medium "Delegated to #{agent}: " + Log.fingerprint(message)
-        if new_conversation
-          agent.start
-        else
-          agent.purge
-        end
-        agent.user message
-        agent.chat
-      end
-
-      properties = {
-        message: {
-          "type": :string,
-          "description": "Message to pass to the agent"
-        },
-        new_conversation: {
-          "type": :boolean,
-          "description": "Erase conversation history and start a new conversation with this message",
-          "default": false
-        }
-      }
-
-      required_inputs = [:message]
-
-      function = {
-        name: task_name,
-        description: description,
-        parameters: {
-          type: "object",
-          properties: properties,
-          required: required_inputs
-        }
-      }
-
-      definition = IndiferentHash.setup function.merge(type: 'function', function: function)
+    attr_accessor :society, :chats
 
+    def load_agent(agent_name, options)
+      raise ParameterException, 
+        "Agent name must be a single word optionally including a few puntuation characters" unless agent_name =~ /^[a-z_.-]*$/i
+      @society ||= {}
+      @society[agent_name] ||= LLM.load_agent agent_name, options.merge(self.other_options)
+    end
 
-      @other_options[:tools][task_name] = [block, definition]
+    def load_chat(agent_name, options, chat)
+      @chats ||= {}
+      @chats[chat] ||= load_agent(agent_name, options).clone
     end
 
     def socialize(options = {})
       @other_options[:tools] ||= {}
+      @society ||= {}
 
-      task_name = "ask"
+      task_name = :ask
       block ||= Proc.new do |name, parameters|
         agent_name, prompt, chat_id = IndiferentHash.process_options parameters.dup, 
           :agent, :prompt, :chat, 
           chat: 'current'
 
         begin
-          raise ParameterException, "Agent name must be a single word optionally including a few puntuation characters" unless agent_name =~ /^[a-z_.-]*$/i
-
-
           options = options.dup
 
-          #options[:endpoint] ||= Scout::Config.get(:endpoint, name, :Agent, :agent_ask, :delegate)
-          #options[:model] ||= Scout::Config.get(:model, name, :Agent, :agent_ask, :delegate)
-
           res = case chat_id
                 when 'current'
-                  agent = LLM.load_agent agent_name, options
+                  agent = load_chat agent_name, options, 'current'
                   chat = self.current_chat - self.start_chat
                   agent.concat chat
                   agent.user prompt
                   agent.chat 
                 when 'none', nil, 'false'
-                  agent = LLM.load_agent agent_name, options
+                  agent = load_agent agent_name, options
                   agent.prompt prompt
                 else
-                  agent = LLM::Agent::AGENTS[[chat_id,agent_name]] ||= LLM.load_agent agent_name, options
+                  agent = load_chat agent_name, options, chat_id
                   agent.user prompt
                   agent.chat
                 end
-          iii res
           res
         rescue ScoutException
           next $!
@@ -134,4 +93,51 @@ prompt.
       @other_options[:tools][task_name] = [block, definition]
     end
   end
+    def delegate(agent, name, description, &block)
+      @other_options[:tools] ||= {}
+      task_name = "hand_off_to_#{name}".to_sym
+
+      block ||= Proc.new do |name, parameters|
+        message = parameters[:message]
+        new_conversation = parameters[:new_conversation]
+        Log.medium "Delegated to #{agent}: " + Log.fingerprint(message)
+        if new_conversation
+          agent.start
+        else
+          agent.purge
+        end
+        agent.user message
+        agent.chat
+      end
+
+      properties = {
+        message: {
+          "type": :string,
+          "description": "Message to pass to the agent"
+        },
+        new_conversation: {
+          "type": :boolean,
+          "description": "Erase conversation history and start a new conversation with this message",
+          "default": false
+        }
+      }
+
+      required_inputs = [:message]
+
+      function = {
+        name: task_name,
+        description: description,
+        parameters: {
+          type: "object",
+          properties: properties,
+          required: required_inputs
+        }
+      }
+
+      definition = IndiferentHash.setup function.merge(type: 'function', function: function)
+
+
+      @other_options[:tools][task_name] = [block, definition]
+    end
+
 end

data/lib/scout/llm/ask.rb

@@ -32,7 +32,7 @@ module LLM
 
     options[:meta] = Chat.meta messages
 
-    Log.high Log.color :green, "Asking #{endpoint || 'client'}: #{options[:previous_response_id]}\n" + LLM.print(messages)
+    Log.high Log.color :green, "Asking #{endpoint || 'client'}: #{options[:previous_response_id]}\n" + Chat.print_brief(messages)
     tools = options[:tools]
     Log.high "Tools: #{Log.fingerprint tools.keys}" if tools
     Log.debug "#{Log.fingerprint tools}}" if tools
@@ -71,7 +71,9 @@ module LLM
       end
     end
 
-    Log.high Log.color :blue, "Response:\n" + LLM.print(res) 
+    Chat.setup res if Array === res
+
+    Log.high Log.color :blue, "Response:\n" + Chat.print_brief(res, %w(meta assistant)) 
 
     res
   end

data/lib/scout/llm/backends/default.rb

@@ -409,8 +409,8 @@ module LLM
         pattern = {
           'pt+': [['usage','prompt_tokens']],
           'ct+': [['usage','completion_tokens']],
-          't+': [['usage','total_tokens']],
-          'r': [['choices', 0, 'message', 'reasoning_content']],
+          'tt+': [['usage','total_tokens']],
+          'reas': [['choices', 0, 'message', 'reasoning_content']],
         }
 
         meta = {}

data/lib/scout/llm/chat/annotation.rb

@@ -134,6 +134,12 @@ module Chat
     self.replace new
   end
 
+  def remove_role(role=:clear)
+    messages = self.select{|m| m[:role].to_s == role.to_s }
+    self.reject!{|m| m[:role].to_s == role.to_s }
+    messages
+  end
+
   def json(...)
     self.format :json
     output = ask(...)

data/lib/scout/llm/chat/parse.rb

@@ -139,4 +139,30 @@ module Chat
       end
     end * "\n\n"
   end
+
+  def self.print_brief(chat, expand = [])
+    return chat if String  === chat
+    expand = expand.collect{|role| role.to_s }
+
+    "\n" + chat.collect do |message|
+      message = IndiferentHash.setup message
+      role, content = message.values_at :role, :content
+      role = role.to_s
+
+      str = case message[:content]
+            when Hash, Array
+              message[:content].to_json
+            when nil, ''
+              ''
+            else
+              message[:content].to_s
+            end
+
+      next role, "\n\n" + str if expand.include?(role)
+
+      [role, Log.fingerprint(str)[1..-2]]
+    end.compact.collect do |role,str|
+      "#{role}: #{str}"
+    end * "\n\n"
+  end
 end

data/lib/scout/llm/chat/process/meta.rb

@@ -1,6 +1,13 @@
 module Chat
   def self.serialize_meta(meta) 
-    meta.collect{|p| p * "="} * " "  
+    keys = meta.keys
+
+    keys = keys.sort_by do |k|
+      v = meta[k]
+      String === v ? v.length : 0
+    end
+
+    keys.collect{|k| [k,meta[k]] * "="} * " "  
   end  
 
   def self.parse_meta(str) 
@@ -29,6 +36,7 @@ module Chat
 
       key = next_key
     end 
+
     meta
   end  
 

data/lib/scout/llm/chat/process/tools.rb

@@ -150,6 +150,10 @@ module Chat
         next
       elsif message[:role] == 'introduce'
         workflow_name = message[:content]
+        workflow = begin
+                     Kernel.const_get workflow_name
+                   rescue
+                   end
         if Open.remote? workflow_name
           require 'rbbt'
           require 'scout/offsite/ssh'
@@ -157,7 +161,7 @@ module Chat
           workflow = RemoteWorkflow.new workflow_name
         else
           workflow = Workflow.require_workflow workflow_name
-        end
+        end unless workflow
 
         raise "Workflow not found #{workflow_name}" if workflow.nil?
 

data/lib/scout/llm/tools/call.rb

@@ -92,6 +92,7 @@ module LLM
 
     tool_call_content.collect do |function_name,function_arguments,tool_call_id,tool_call,content|
       if Step === content
+        step = content
         if content.done?
           content = content.load.to_json if content.done?
         elsif content.error? && content.exception
@@ -103,10 +104,13 @@ module LLM
             content = {exception: $!.message, stack: $!.backtrace }.to_json
           end
         end
+      else
+        step = nil
       end
 
       if (String === content) && content.length > max_content_length
         exception_msg = "Function #{function_name} #{tool_call_id} (#{Log.fingerprint function_arguments}) returned #{content.length} characters, which is more than the maximum of #{max_content_length}. To protect the model context window this result was not returned."
+        exception_msg += " The results is made available at '#{step.path}'." if step
         Log.high exception_msg
         content = {exception: exception_msg, stack: caller}.to_json
       end

data/scout-ai.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-ai 1.2.0 ruby lib
+# stub: scout-ai 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-ai".freeze
-  s.version = "1.2.0".freeze
+  s.version = "1.2.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-ai
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Miguel Vazquez