scout-ai 1.1.0 → 1.1.1

data/test/scout/llm/test_chat.rb

@@ -3,143 +3,9 @@ require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1
 
 class TestMessages < Test::Unit::TestCase
 
-  def test_short
-
-    question =<<-EOF
-Hi
-    EOF
-
-    iii LLM.chat(question)
-  end
-
-  def test_inline
-    question =<<-EOF
-system:
-
-you are a terse assistant that only write in short sentences
-
-assistant:
-
-Here is some stuff
-
-user: feedback
-
-that continues here
-    EOF
-
-    iii LLM.chat(question)
-  end
-
-  def test_messages
-    question =<<-EOF
-system:
-
-you are a terse assistant that only write in short sentences
-
-user:
-
-What is the capital of France
-
-assistant:
-
-Paris
-
-user:
-
-is this the national anthem
-
-[[
-corous: Viva Espagna
-]]
-
-assistant:
-
-no
-
-user:
-
-import: math.system
-
-consider this file
-
-<file name=foo_bar>
-foo: bar
-</file>
-
-how many characters does it hold
-
-assistant:
-
-8
-    EOF
-
-    messages = LLM.messages question
-    refute messages.collect{|i| i[:role] }.include?("corous")
-    assert messages.collect{|i| i[:role] }.include?("import")
-  end
-
-  def test_chat_import
-    file1 =<<-EOF
-system: You are an assistant
-    EOF
-
-    file2 =<<-EOF
-import: header
-user: say something
-    EOF
-
-    TmpFile.with_path do |tmpdir|
-      tmpdir.header.write file1
-      tmpdir.chat.write file2
-
-      chat = LLM.chat tmpdir.chat
-    end
-  end
-
-  def test_clear
-    question =<<-EOF
-system:
-
-you are a terse assistant that only write in short sentences
-
-clear:
-
-user:
-
-What is the capital of France
-    EOF
-
-    TmpFile.with_file question do |file|
-      messages = LLM.chat file
-      refute messages.collect{|m| m[:role] }.include?('system')
-    end
-  end
-
-  def __test_job
-    question =<<-EOF
-system:
-
-you are a terse assistant that only write in short sentences
-
-job: Baking/bake_muffin_tray/Default_08a1812eca3a18dce2232509dabc9b41
-
-How are muffins made
-
-    EOF
-
-    TmpFile.with_file question do |file|
-      messages = LLM.chat file
-      ppp LLM.print messages
-    end
-  end
-
 
   def test_task
     question =<<-EOF
-system:
-
-you are a terse assistant that only write in short sentences
-
 user:
 
 task: Baking bake_muffin_tray blueberries=true title="This is a title" list=one,two,"and three"
@@ -150,26 +16,8 @@ How are muffins made?
 
     TmpFile.with_file question do |file|
       messages = LLM.chat file
-      ppp LLM.print messages
-    end
-  end
-
-  def test_structure
-    require 'scout/llm/ask'
-    sss 0
-    question =<<-EOF
-system:
-
-Respond in json format with a hash of strings as keys and string arrays as values, at most three in length
-
-endpoint: sambanova
-
-What other movies have the protagonists of the original gost busters played on, just the top.
-
-    EOF
-
-    TmpFile.with_file question do |file|
-      ppp LLM.ask file
+      assert_include messages.collect{|m| m[:role] }, 'function_call'
+      assert_include messages.find{|m| m[:role] == 'function_call_output' }[:content], 'Baking'
     end
   end
 
@@ -228,29 +76,5 @@ association: marriages #{datafile_test(:person).marriages} undirected=true sourc
       ppp LLM.ask file
     end
   end
-
-  def test_previous_response
-    require 'scout/llm/ask'
-    sss 0
-    question =<<-EOF
-user:
-
-Say hi
-
-assistant:
-
-Hi
-
-previous_response_id: asdfasdfasdfasdf
-
-Bye
-
-    EOF
-
-    messages = LLM.messages question
-
-    iii messages
-
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-ai
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -37,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ollama-ai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-mcp-client
   requirement: !ruby/object:Gem::Requirement
@@ -89,9 +103,15 @@ files:
 - 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
@@ -145,6 +165,8 @@ files:
 - 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
@@ -186,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.7.2
 specification_version: 4
 summary: AI gear for scouts
 test_files: []

data/lib/scout/llm/parse.rb

@@ -1,91 +0,0 @@
-require 'scout/llm/utils'
-module LLM
-  def self.process_inside(inside)
-    header, content = inside.match(/([^\n]*)\n(.*)/).values_at 1, 2
-    if header.empty?
-      content
-    else
-      action, _sep, rest = header.partition /\s/
-      case action
-      when 'import'
-      when 'cmd'
-        title = rest.strip.empty? ? content : rest
-        tag('file', title, CMD.cmd(content).read)
-      when 'file'
-        file = content
-        title = rest.strip.empty? ? file : rest
-        tag(action, title, Open.read(file))
-      when 'directory'
-        directory = content
-        title = rest.strip.empty? ? directory : rest
-        directory_content = Dir.glob(File.join(directory, '**/*')).collect do |file|
-          file_title = Misc.path_relative_to(directory, file)
-          tag('file', file_title, Open.read(file) )
-        end * "\n"
-        tag(action, title, directory_content )
-      else 
-        tag(action, rest, content)
-      end
-    end
-  end
-
-  def self.parse(question, role = nil)
-    role = :user if role.nil?
-
-    if Array === question
-      question.collect do |q|
-        Hash === q ? q : {role: role, content: q}
-      end
-    else
-      if m = question.match(/(.*?)\[\[(.*?)\]\](.*)/m)
-        pre = m[1]
-        inside = m[2]
-        post = m[3]
-        messages = parse(pre, role)
-
-        messages = [{role: role, content: ''}] if messages.empty?
-        messages.last[:content] += process_inside inside
-
-        last = parse(post, messages.last[:role])
-
-        messages.concat last
-
-        messages
-      elsif m = question.match(/(.*?)(```.*?```)(.*)/m)
-        pre = m[1]
-        inside = m[2]
-        post = m[3]
-        messages = parse(pre, role)
-
-        messages = [{role: role, content: ''}] if messages.empty?
-        messages.last[:content] += inside
-
-        last = parse(post, messages.last[:role])
-
-        if last.first[:role] == messages.last[:role]
-          m = last.shift
-          messages.last[:content] += m[:content]
-        end
-
-        messages.concat last
-
-        messages
-      else
-        chunks = question.scan(/(.*?)^(\w+):(.*?)(?=^\w+:|\z)/m)
-
-        if chunks.any?
-          messages = []
-          messages << {role: role, content: chunks.first.first} if chunks.first and not chunks.first.first.empty?
-          chunks.collect do |pre,role,text|
-            messages << {role: role, content: text.strip}
-          end
-          messages
-        elsif question.strip.empty?
-          []
-        else
-          [{role: role, content: question}]
-        end
-      end
-    end
-  end
-end