improve progress

Author: SamSaffron

config/locales/server.en.yml

@@ -457,9 +457,12 @@ en:
           other: "Found %{count} <a href='%{url}'>results</a> for '%{query}'"
         setting_context: "Reading context for: %{setting_name}"
         schema: "%{tables}"
+        researcher_dry_run:
+          one: "Proposed research: %{goals}\n\nFound %{count} result for '%{filter}'"
+          other: "Proposed research: %{goals}\n\nFound %{count} result for '%{filter}'"
         researcher:
-          one: "Found %{count} result for '%{filter}'"
-          other: "Found %{count} results for '%{filter}'"
+          one: "Researching: %{goals}\n\nFound %{count} result for '%{filter}'"
+          other: "Researching: %{goals}\n\nFound %{count} result for '%{filter}'"
         search_settings:
           one: "Found %{count} result for '%{query}'"
           other: "Found %{count} results for '%{query}'"

lib/personas/tools/researcher.rb

@@ -4,7 +4,7 @@ module DiscourseAi
   module Personas
     module Tools
       class Researcher < Tool
-        attr_reader :last_filter, :result_count
+        attr_reader :filter, :result_count, :goals, :dry_run
 
         class << self
           def signature
@@ -51,25 +51,41 @@ def accepted_options
         end
 
         def invoke(&blk)
-          @last_filter = parameters[:filter] || ""
+          @filter = parameters[:filter] || ""
+          @goals = parameters[:goals] || ""
+          @dry_run = parameters[:dry_run].nil? ? false : parameters[:dry_run]
+
           post = Post.find_by(id: context.post_id)
           goals = parameters[:goals] || ""
           dry_run = parameters[:dry_run].nil? ? false : parameters[:dry_run]
 
           return { error: "No goals provided" } if goals.blank?
-          return { error: "No filter provided" } if @last_filter.blank?
-
-          filter = DiscourseAi::Utils::Research::Filter.new(@last_filter)
+          return { error: "No filter provided" } if @filter.blank?
 
+          filter = DiscourseAi::Utils::Research::Filter.new(@filter)
           @result_count = filter.search.count
 
+          blk.call details
+
           if dry_run
-            { dry_run: true, goals: goals, filter: @last_filter, number_of_results: @result_count }
+            { dry_run: true, goals: goals, filter: @filter, number_of_results: @result_count }
           else
             process_filter(filter, goals, post, &blk)
           end
         end
 
+        def details
+          if @dry_run
+            I18n.t("discourse_ai.ai_bot.tool_description.researcher_dry_run", description_args)
+          else
+            I18n.t("discourse_ai.ai_bot.tool_description.researcher", description_args)
+          end
+        end
+
+        def description_args
+          { count: @result_count || 0, filter: @filter || "", goals: @goals || "" }
+        end
+
         protected
 
         MIN_TOKENS_FOR_RESEARCH = 8000
@@ -88,7 +104,7 @@ def process_filter(filter, goals, post, &blk)
           results = []
 
           formatter.each_chunk { |chunk| results << run_inference(chunk[:text], goals, post, &blk) }
-          { dry_run: false, goals: goals, filter: @last_filter, results: results }
+          { dry_run: false, goals: goals, filter: @filter, results: results }
         end
 
         def run_inference(chunk_text, goals, post, &blk)
@@ -111,7 +127,9 @@ def run_inference(chunk_text, goals, post, &blk)
             cancel_manager: context.cancel_manager,
           ) { |partial| results << partial }
 
-          blk.call(".")
+          @progress_dots ||= 0
+          @progress_dots += 1
+          blk.call(details + "\n\n#{"." * @progress_dots}")
           results.join
         end
 
@@ -135,37 +153,6 @@ def goal_user_prompt(goals, chunk_text)
             Your goal is: #{goals}
            TEXT
         end
-
-        def description_args
-          { count: @result_count || 0, filter: @last_filter || "" }
-        end
-
-        private
-
-        def simulate_count(filter_components)
-          # In a real implementation, this would query the database to get a count
-          # For now, return a simulated count
-          rand(10..100)
-        end
-
-        def perform_research(filter_components, goals, max_results)
-          # This would perform the actual research based on the filter and goal
-          # For now, return a simplified result structure
-          format_results([], %w[content url author date])
-        end
-
-        def calculate_max_results(llm)
-          max_results = options[:max_results].to_i
-          return [max_results, 100].min if max_results > 0
-
-          if llm.max_prompt_tokens > 30_000
-            50
-          elsif llm.max_prompt_tokens > 10_000
-            30
-          else
-            15
-          end
-        end
       end
     end
   end

spec/lib/personas/tools/researcher_spec.rb

@@ -89,11 +89,17 @@
       responses = 10.times.map { |i| ["Found: Relevant content #{i + 1}"] }
       results = nil
 
+      last_progress = nil
+      progress_blk = Proc.new { |response| last_progress = response }
+
       DiscourseAi::Completions::Llm.with_prepared_responses(responses) do
         researcher.llm = llm_model.to_llm
         results = researcher.invoke(&progress_blk)
       end
 
+      expect(last_progress).to include("find relevant content")
+      expect(last_progress).to include("category:research-category")
+
       expect(results[:dry_run]).to eq(false)
       expect(results[:goals]).to eq("find relevant content")
       expect(results[:filter]).to eq("category:research-category @#{user.username}")