scout-ai 1.0.1 → 1.1.1

data/lib/scout/llm/mcp.rb

@@ -6,7 +6,7 @@ module Workflow
     tasks = self.tasks.keys if tasks.empty?
 
     tools = tasks.collect do |task,inputs=nil|
-      tool_definition = LLM.task_tool_definition(self, task, inputs)[:function]
+      tool_definition = LLM.task_tool_definition(self, task, inputs)
       description = tool_definition[:description]
       input_schema = tool_definition[:parameters].slice(:properties, :required)
       annotations = tool_definition.slice(:title)

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

@@ -1,4 +1,7 @@
 module LLM
+  @max_content_length = Scout::Config.get(:max_content_length, :llm_tools, :tools, :llm, :ask, default: 5_000)
+  self.singleton_class.attr_accessor :max_content_length
+
   def self.call_id_name_and_arguments(tool_call)
     tool_call_id = tool_call.dig("call_id") || tool_call.dig("id")
     if tool_call['function']
@@ -15,12 +18,21 @@ module LLM
   end
 
   def self.process_calls(tools, calls, &block)
+    max_content_length = LLM.max_content_length
     IndiferentHash.setup tools
     calls.collect do |tool_call|
       tool_call_id, function_name, function_arguments = call_id_name_and_arguments(tool_call)
 
+      function_arguments = IndiferentHash.setup function_arguments
+
       obj, definition = tools[function_name]
 
+      definition = obj if Hash === obj
+
+      defaults = definition[:parameters][:defaults] if definition && definition[:parameters]
+      function_arguments = function_arguments.merge(defaults) if defaults
+
+      Log.high "Calling #{function_name} (#{Log.fingerprint function_arguments}): "
       function_response = case obj
                           when Proc
                             obj.call function_name, function_arguments
@@ -32,7 +44,7 @@ module LLM
                             if block_given?
                               block.call function_name, function_arguments
                             else
-                              raise "Unkown executor #{Log.fingerprint obj} for function #{function_name}"
+                              ParameterException.new "Tool or function not found '#{function_name}'. Called with parameters #{Log.fingerprint function_arguments}" if obj.nil? && definition.nil?
                             end
                           end
 
@@ -46,8 +58,17 @@ module LLM
                 else
                   function_response.to_json
                 end
+
       content = content.to_s if Numeric === content
 
+      Log.high "Called #{function_name}: " + Log.fingerprint(content)
+
+      if content.length > max_content_length
+        exception_msg = "Function #{function_name} called with parameters #{Log.fingerprint function_arguments} returned #{content.length} characters, which is more than the maximum set of #{max_content_length}."
+        Log.high exception_msg
+        content = {exception: exception_msg, stack: caller}.to_json
+      end
+
       response_message = {
         id: tool_call_id,
         role: "tool",

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

@@ -68,9 +68,9 @@ Returns a list in the format source~target.
           description: "Associations in the form of source~target or target~source"
         },
         fields: {
-          type: "string",
-          enum: select_options,
-          description: "Limit the response to these detail fields fields"
+          type: "array",
+          items: { type: :string },
+          description: "Limit the response to these fields"
         },
       }
     else
@@ -93,22 +93,22 @@ Multiple values may be present and use the charater ';' to separate them.
     else
       properties.delete(:fields)
       description = <<-EOF
-Return the #{field} of association.
+Return the #{fields.first} of association.
 Multiple values may be present and use the charater ';' to separate them.
       EOF
     end
 
     function = {
-        name: database + '_association_details',
-        description: description,
-        parameters: {
-          type: "object",
-          properties: properties,
-          required: ['associations']
-        }
+      name: database.to_s + '_association_details',
+      description: description,
+      parameters: {
+        type: "object",
+        properties: properties,
+        required: ['associations']
+      }
     }
 
-    IndiferentHash.setup function.merge(type: 'function', function: function)
+    IndiferentHash.setup function
   end
 
 
@@ -119,11 +119,12 @@ Multiple values may be present and use the charater ';' to separate them.
       database_description = knowledge_base.description(database)
       undirected = knowledge_base.undirected(database)
       definition = self.database_tool_definition(database, undirected, database_description)
-      tool_definitions.merge(database => [knowledge_base, definition])
+      tool_definitions.merge!(database => [knowledge_base, definition])
       if (fields = knowledge_base.get_database(database).fields).any?
         details_definition = self.database_details_tool_definition(database, undirected, fields)
-        tool_definitions.merge(database + '_association_details' => [knowledge_base, details_definition])
+        tool_definitions.merge!(database.to_s + '_association_details' => [knowledge_base, details_definition])
       end
+      tool_definitions
     }
   end
 

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

@@ -3,6 +3,10 @@ require 'mcp_client'
 
 module LLM
   def self.mcp_tools(url, options = {})
+    timeout = Scout::Config.get :timeout, :mcp, :tools
+
+    options = IndiferentHash.add_defaults options, read_timeout: timeout.to_i if timeout && timeout != ""
+
     if url == 'stdio'
       client = MCPClient.create_client(mcp_server_configs: [options.merge(type: 'stdio')])
     else

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

@@ -2,11 +2,25 @@ require 'scout/workflow'
 module LLM
   def self.task_tool_definition(workflow, task_name, inputs = nil)
     task_info = workflow.task_info(task_name)
+    return nil if task_info.nil?
 
-    inputs = inputs.collect{|i| i.to_sym } if inputs
+    if inputs
+      names = []
+      defaults = {}
+
+      inputs.each do |i|
+        if String === i && i.include?('=')
+          name,_ , value = i.partition("=")
+          defaults[name] = value
+        else
+          names << i.to_sym
+        end
+      end
+
+    end
 
     properties = task_info[:inputs].inject({}) do |acc,input|
-      next acc if inputs and not inputs.include?(input)
+      next acc if names and not names.include?(input)
       type = task_info[:input_types][input]
       description = task_info[:input_descriptions][input]
 
@@ -14,12 +28,17 @@ module LLM
       type = :string if type == :select
       type = :string if type == :path
       type = :number if type == :float
+      type = :array if type.to_s.end_with?('_array')
 
       acc[input] = {
         "type": type,
         "description": description
       }
 
+      if type == :array
+        acc[input]['items'] = {type: :string}
+      end
+
       if input_options = task_info[:input_options][input]
         if select_options = input_options[:select_options]
           select_options = select_options.values if Hash === select_options
@@ -31,7 +50,7 @@ module LLM
     end
 
     required_inputs = task_info[:inputs].select do |input|
-      next if inputs and not inputs.include?(input.to_sym)
+      next if names and not names.include?(input.to_sym)
       task_info[:input_options].include?(input) && task_info[:input_options][input][:required]
     end
 
@@ -41,29 +60,49 @@ module LLM
       parameters: {
         type: "object",
         properties: properties,
-        required: required_inputs
+        required: required_inputs,
       }
     }
 
-    IndiferentHash.setup function.merge(type: 'function', function: function)
+    function[:parameters][:defaults] = defaults if defaults
+
+    #IndiferentHash.setup function.merge(type: 'function', function: function)
+    IndiferentHash.setup function
   end
 
   def self.workflow_tools(workflow, tasks = nil)
-    tasks = workflow.all_exports if tasks.nil?
-    tasks = workflow.all_tasks if tasks.empty?
+    if Array === workflow
+      workflow.inject({}){|tool_definitions,wf| tool_definitions.merge(workflow_tools(wf, tasks)) }
 
-    tasks.inject({}){|tool_definitions,task_name|
-      definition = self.task_tool_definition(workflow, task_name)
-      tool_definitions.merge(task_name => [workflow, definition])
-    }
+    else
+      tasks = workflow.all_exports if tasks.nil?
+      tasks = workflow.all_tasks if tasks.empty?
+
+      tasks.inject({}){|tool_definitions,task_name|
+        definition = self.task_tool_definition(workflow, task_name)
+        next if definition.nil?
+        tool_definitions.merge(task_name => [workflow, definition])
+      }
+    end
   end
 
   def self.call_workflow(workflow, task_name, parameters={})
     jobname = parameters.delete :jobname
-    if workflow.exec_exports.include? task_name.to_sym
-      workflow.job(task_name, jobname, parameters).exec
-    else
-      workflow.job(task_name, jobname, parameters).run
+    begin
+      exec_type = parameters[:exec_type]
+      job = workflow.job(task_name, jobname, parameters)
+      if workflow.exec_exports.include?(task_name.to_sym) || parameters[:exec_type].to_s == 'exec'
+        job.exec
+      else
+        raise ScoutException, 'Potential recursive call' if parameters[:allow_recursive] != 'true' &&
+          (job.running? and job.info[:pid] == Process.pid)
+
+        Workflow.produce(job)
+        job.join
+        job.load
+      end
+    rescue ScoutException
+      return $!
     end
   end
 end

data/lib/scout/llm/tools.rb

@@ -137,4 +137,46 @@ module LLM
       end
     end.flatten
   end
+
+  def self.tool_definitions_to_reponses(tools)
+    tools.values.collect do |obj,definition|
+      definition = obj if Hash === obj
+      definition
+
+      definition = case definition[:function]
+                   when Hash
+                     definition.merge(definition.delete :function)
+                   else
+                     definition
+                   end
+
+      definition = IndiferentHash.add_defaults definition, type: :function
+
+      definition[:parameters].delete :defaults if definition[:parameters]
+
+      definition
+    end
+  end
+
+  class << self
+    alias tool_definitions_to_openai tool_definitions_to_reponses
+  end
+
+  def self.tool_definitions_to_ollama(tools)
+    tools.values.collect do |obj,definition|
+      definition = obj if Hash === obj
+      definition = IndiferentHash.setup definition
+
+      definition = case definition[:function]
+                   when Hash
+                     definition
+                   else
+                     {type: :function, function: definition}
+                   end
+
+      definition = IndiferentHash.add_defaults definition, type: :function
+
+      definition
+    end
+  end
 end

data/lib/scout/llm/utils.rb

@@ -1,21 +1,4 @@
 module LLM
-
-  def self.tag(tag, content, name = nil)
-    if name
-      <<-EOF.strip
-<#{tag} name="#{name}">
-#{content}
-</#{tag}>
-      EOF
-    else
-      <<-EOF.strip
-<#{tag}>
-#{content}
-</#{tag}>
-      EOF
-    end
-  end
-
   def self.get_url_server_tokens(url, prefix=nil)
     return get_url_server_tokens(url).collect{|e| prefix.to_s + "." + e } if prefix
 
@@ -39,4 +22,6 @@ module LLM
     end
     Scout::Config.get(key, *all_tokens, hash)
   end
+
+
 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.0.1 ruby lib
+# stub: scout-ai 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-ai".freeze
-  s.version = "1.0.1".freeze
+  s.version = "1.1.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -49,9 +49,15 @@ Gem::Specification.new do |s|
     "lib/scout/llm/backends/relay.rb",
     "lib/scout/llm/backends/responses.rb",
     "lib/scout/llm/chat.rb",
+    "lib/scout/llm/chat/annotation.rb",
+    "lib/scout/llm/chat/parse.rb",
+    "lib/scout/llm/chat/process.rb",
+    "lib/scout/llm/chat/process/clear.rb",
+    "lib/scout/llm/chat/process/files.rb",
+    "lib/scout/llm/chat/process/options.rb",
+    "lib/scout/llm/chat/process/tools.rb",
     "lib/scout/llm/embed.rb",
     "lib/scout/llm/mcp.rb",
-    "lib/scout/llm/parse.rb",
     "lib/scout/llm/rag.rb",
     "lib/scout/llm/tools.rb",
     "lib/scout/llm/tools/call.rb",
@@ -105,6 +111,8 @@ Gem::Specification.new do |s|
     "test/scout/llm/backends/test_openwebui.rb",
     "test/scout/llm/backends/test_relay.rb",
     "test/scout/llm/backends/test_responses.rb",
+    "test/scout/llm/chat/test_parse.rb",
+    "test/scout/llm/chat/test_process.rb",
     "test/scout/llm/test_agent.rb",
     "test/scout/llm/test_ask.rb",
     "test/scout/llm/test_chat.rb",
@@ -131,13 +139,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-ai".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.7.0.dev".freeze
+  s.rubygems_version = "3.7.2".freeze
   s.summary = "AI gear for scouts".freeze
 
   s.specification_version = 4
 
   s.add_runtime_dependency(%q<scout-rig>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<ruby-openai>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<ollama-ai>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<ruby-mcp-client>.freeze, [">= 0".freeze])
 end
 

data/scout_commands/agent/ask

@@ -41,13 +41,12 @@ agent_name, *question_parts = ARGV
 
 question = question_parts * " "
 
-file, chat, inline, template, dry_run, imports = IndiferentHash.process_options options, :file, :chat, :inline, :template, :dry_run, :imports
+file, chat, inline, template, dry_run, imports, endpoint, model = IndiferentHash.process_options options, :file, :chat, :inline, :template, :dry_run, :imports, :endpoint, :model
 
 file = Path.setup(file) if file
 
 imports = imports.split(/,\s*/) if imports
 
-
 agent_name ||= 'default'
 
 agent_file = Scout.workflows[agent_name]
@@ -71,6 +70,9 @@ else
   #raise ParameterException agent_file
 end
 
+agent.other_options[:endpoint] = endpoint if endpoint
+agent.other_options[:model] = model if model
+
 if template
   if Open.exists?(template)
     template_question = Open.read(template)
@@ -98,24 +100,43 @@ elsif file
 end
 
 if chat
-  conversation = Open.exist?(chat)? LLM.chat(chat) : [] 
+  #conversation = Open.exist?(chat)? LLM.chat(chat) : []
+  #convo_options = LLM.options conversation
+  #conversation = question.empty? ? conversation : conversation +  LLM.chat(question)
+
+  #if dry_run
+  #  ppp LLM.print conversation
+  #  exit 0
+  #end
+
+  #new = agent.ask(conversation, convo_options.merge(options.merge(return_messages: true)))
+  #conversation = Open.read(chat) + LLM.print(new)
+  #Open.write(chat, conversation)
+
+  conversation = Open.exist?(chat)? LLM.chat(chat) : []
   convo_options = LLM.options conversation
-  conversation = question.empty? ? conversation : conversation +  LLM.chat(question)
+  agent.start(Chat.setup(conversation)) if conversation.any?
+  agent.current_chat.concat LLM.chat(question) if question && ! question.empty?
+  imports.each{|import| agent.import import } if imports
 
   if dry_run
     ppp LLM.print conversation
     exit 0
   end
-  new = agent.ask(conversation, convo_options.merge(options.merge(return_messages: true)))
-  conversation = Open.read(chat) + LLM.print(new)
-  Open.write(chat, conversation)
+
+  new = agent.ask(agent.current_chat, convo_options.merge(options.merge(return_messages: true)))
+  conversation += LLM.chat(question) if question
+  conversation += new
+
+  Open.open(chat, mode: 'a'){|f| f.puts LLM.print(new) }
+  puts LLM.purge(new).last[:content]
 elsif inline
 
   file = Open.read inline
 
   new_file = ""
   while true
-    pre, question, post = 
+    pre, question, post =
       file.partition(/^\s*#\s*ask:(?:.*?)(?=^\s*[^\s#])/smu)
 
       break if post.empty?
@@ -124,7 +145,7 @@ elsif inline
     new_file << question
     clean_question = question.gsub('#', '').gsub(/\s+/,' ').sub(/.*ask:\s*/,'').strip
     chat = [
-      {role: :system, content: "Write a succint reply with no commentary and no formatting."}, 
+      {role: :system, content: "Write a succint reply with no commentary and no formatting."},
       {role: :user, content: "Find the following question as a comment in the file give a response to be placed inline: #{question}"},
       LLM.tag('file', file, inline)
     ]
@@ -139,7 +160,10 @@ elsif inline
   new_file << file
   Open.write(inline, new_file)
 else
-  conversation = Chat.setup(LLM.chat question)
-  imports.each{|import| conversation.import import } if imports
-  puts agent.ask(conversation, nil, options)
+  #conversation = Chat.setup(LLM.chat question)
+  #imports.each{|import| conversation.import import } if imports
+  #puts agent.ask(conversation, nil, options)
+  agent.current_chat.concat LLM.chat(question)
+  imports.each{|import| agent.import import } if imports
+  puts agent.chat
 end

data/scout_commands/llm/ask

@@ -21,7 +21,8 @@ characters '???', if they are present.
 -h--help Print this help
 -t--template* Use a template
 -c--chat* Follow a conversation
--i--inline* Ask inline questions about a file
+-i--imports* Chat files to import, separated by comma
+-in--inline* Ask inline questions about a file
 -f--file* Incorporate file at the start
 -m--model* Model to use
 -e--endpoint* Endpoint to use
@@ -39,7 +40,9 @@ end
 
 Log.severity = options.delete(:log).to_i if options.include? :log
 
-file, chat, inline, template, dry_run = IndiferentHash.process_options options, :file, :chat, :inline, :template, :dry_run
+file, chat, inline, imports, template, dry_run = IndiferentHash.process_options options, :file, :chat, :inline, :imports, :template, :dry_run
+
+imports = imports.split(/,\s*/) if imports
 
 question = ARGV * " "
 
@@ -70,7 +73,8 @@ elsif file
 end
 
 if chat
-  conversation = Open.exist?(chat)? LLM.chat(chat) : [] 
+  conversation = Open.exist?(chat)? LLM.chat(chat) : Chat.setup([])
+  imports.each{|import| conversation.import import } if imports
   convo_options = LLM.options conversation
   conversation = question.empty? ? conversation : conversation +  LLM.chat(question)
 
@@ -78,16 +82,17 @@ if chat
     ppp LLM.print conversation
     exit 0
   end
+
   new = LLM.ask(conversation, convo_options.merge(options.merge(return_messages: true)))
-  conversation = Open.read(chat) + LLM.print(new)
-  Open.write(chat, conversation)
+  Open.open(chat, mode: 'a'){|f| f.puts LLM.print(new) }
+  puts LLM.purge(new).last[:content]
 elsif inline
 
   file = Open.read inline
 
   new_file = ""
   while true
-    pre, question, post = 
+    pre, question, post =
       file.partition(/^\s*#\s*ask:(?:.*?)(?=^\s*[^\s#]|\z)/smu)
 
       break if question.empty?
@@ -96,10 +101,15 @@ elsif inline
     new_file << question
     clean_question = question.gsub('#', '').gsub(/\s+/,' ').sub(/.*ask:\s*/,'').strip
     chat = [
-      {role: :system, content: "Write a succint reply with no commentary and no formatting."}, 
+      {role: :system, content: "Write a succint reply with no commentary and no formatting."},
       {role: :user, content: "Find the following question as a comment in the file give a response to be placed inline: #{question}"},
       LLM.tag('file', file, inline)
     ]
+
+    chat = Chat.chat(chat)
+
+    imports.each{|import| chat.import import } if imports
+
     response = LLM.ask(LLM.chat(chat))
     new_file << <<-EOF
 # Response start

data/scout_commands/llm/process

@@ -35,10 +35,10 @@ while true
   files = directory.glob('*.json')
 
   files.each do |file|
+    id = File.basename(file, '.json')
     target = directory.reply[id + '.json']
 
     if ! File.exist?(target)
-      id = File.basename(file, '.json')
       options = IndiferentHash.setup(JSON.parse(Open.read(file)))
       question = options.delete(:question)
       reply = LLM.ask(question, options)

data/test/scout/llm/backends/test_anthropic.rb

@@ -2,7 +2,7 @@ require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
 require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
 
 class TestLLMAnthropic < Test::Unit::TestCase
-  def _test_say_hi
+  def test_say_hi
     prompt =<<-EOF
 user: say hi
     EOF
@@ -121,7 +121,7 @@ What is the weather in London. Should I take my umbrella?
     ppp respose
   end
 
-  def test_json_output
+  def _test_json_output
     prompt =<<-EOF
 user:
 

data/test/scout/llm/backends/test_ollama.rb

@@ -82,7 +82,7 @@ What is the weather in London. Should I take an umbrella?
     ]
 
     sss 0
-    respose = LLM::OLlama.ask prompt, model: 'mistral', tool_choice: 'required', tools: tools do |name,arguments|
+    respose = LLM::OLlama.ask prompt, model: 'gpt-oss', url: 'http://localhost:3330', tool_choice: 'required', tools: tools do |name,arguments|
       "It's raining cats and dogs"
     end
 

data/test/scout/llm/backends/test_responses.rb

@@ -20,7 +20,7 @@ Some text
     assert(Float === emb.first)
   end
 
-  def test_tool_call_output_weather
+  def _test_tool_call_output_weather
     Log.severity = 0
     prompt =<<-EOF
 function_call:
@@ -38,7 +38,7 @@ should i take an umbrella?
     ppp LLM::Responses.ask prompt, model: 'gpt-4.1-nano'
   end
 
-  def test_tool
+  def _test_tool
     prompt =<<-EOF
 user:
 What is the weather in London. Should I take my umbrella?
@@ -75,7 +75,7 @@ What is the weather in London. Should I take my umbrella?
     ppp respose
   end
 
-  def test_news
+  def _test_news
     prompt =<<-EOF
 websearch: true
 
@@ -86,7 +86,7 @@ What was the top new in the US today?
     ppp LLM::Responses.ask prompt
   end
 
-  def test_image
+  def _test_image
     prompt =<<-EOF
 image: #{datafile_test 'cat.jpg'}
 
@@ -98,7 +98,7 @@ What animal is represented in the image?
     ppp LLM::Responses.ask prompt
   end
 
-  def test_json_output
+  def _test_json_output
     prompt =<<-EOF
 system:
 
@@ -112,7 +112,7 @@ What other movies have the protagonists of the original gost busters played on,
     ppp LLM::Responses.ask prompt, format: :json
   end
 
-  def test_json_format
+  def _test_json_format
     prompt =<<-EOF
 user:
 
@@ -130,7 +130,7 @@ Name each actor and the top movie they took part of
     ppp LLM::Responses.ask prompt, format: format
   end
 
-  def test_json_format_list
+  def _test_json_format_list
     prompt =<<-EOF
 user:
 
@@ -148,7 +148,7 @@ Name each actor as keys and the top 3 movies they took part of as values
     ppp LLM::Responses.ask prompt, format: format
   end
 
-  def test_json_format_actor_list
+  def _test_json_format_actor_list
     prompt =<<-EOF
 user:
 
@@ -199,7 +199,7 @@ Name each actor as keys and the top 3 movies they took part of as values
     ppp LLM::Responses.ask prompt, format: schema
   end
 
-  def test_tool_gpt5
+  def _test_tool_gpt5
     prompt =<<-EOF
 user:
 What is the weather in London. Should I take my umbrella?