fixing specs

Author: SamSaffron

config/locales/server.en.yml

@@ -330,6 +330,13 @@ en:
       summarizing: "Summarizing topic"
       searching: "Searching for: '%{query}'"
       tool_options:
+        researcher:
+          max_results:
+            name: "Maximum number of results"
+            description: "Maximum number of results to include in a filter"
+          include_private:
+            name: "Include private"
+            description: "Include private topics in the filters"
         create_artifact:
           creator_llm:
             name: "LLM"

lib/completions/cancel_manager.rb

@@ -66,6 +66,7 @@ def stop_monitor
             Rails.logger.warn("DiscourseAI: CancelManager monitor thread did not stop in time")
             monitor_thread.kill if monitor_thread.alive?
           end
+          @monitor_thread = nil
         end
       end
 
@@ -83,6 +84,15 @@ def remove_callback(cb)
 
       def cancel!
         @cancelled = true
+        monitor_thread = @monitor_thread
+        if monitor_thread && monitor_thread != Thread.current
+          monitor_thread.wakeup
+          monitor_thread.join(2)
+          if monitor_thread.alive?
+            Rails.logger.warn("DiscourseAI: CancelManager monitor thread did not stop in time")
+            monitor_thread.kill if monitor_thread.alive?
+          end
+        end
         @callbacks.each do |cb|
           begin
             cb.call

spec/lib/modules/ai_bot/playground_spec.rb

@@ -1159,8 +1159,8 @@
 
       last_post = third_post.topic.posts.order(:id).last
 
-      # not Hello123, we cancelled at 1 which means we may get 2 and then be done
-      expect(last_post.raw).to eq("Hello12")
+      # not Hello123, we cancelled at 1
+      expect(last_post.raw).to eq("Hello1")
     end
   end
 

spec/lib/personas/persona_spec.rb

@@ -223,6 +223,7 @@ def system_prompt
           DiscourseAi::Personas::Artist,
           DiscourseAi::Personas::Creative,
           DiscourseAi::Personas::DiscourseHelper,
+          DiscourseAi::Personas::ForumResearcher,
           DiscourseAi::Personas::GithubHelper,
           DiscourseAi::Personas::Researcher,
           DiscourseAi::Personas::SettingsExplorer,
@@ -237,6 +238,7 @@ def system_prompt
           DiscourseAi::Personas::Artist,
           DiscourseAi::Personas::Creative,
           DiscourseAi::Personas::DiscourseHelper,
+          DiscourseAi::Personas::ForumResearcher,
           DiscourseAi::Personas::GithubHelper,
           DiscourseAi::Personas::Researcher,
           DiscourseAi::Personas::SettingsExplorer,
@@ -256,6 +258,7 @@ def system_prompt
         DiscourseAi::Personas::SettingsExplorer,
         DiscourseAi::Personas::Creative,
         DiscourseAi::Personas::DiscourseHelper,
+        DiscourseAi::Personas::ForumResearcher,
         DiscourseAi::Personas::GithubHelper,
       )
 
@@ -268,6 +271,7 @@ def system_prompt
         DiscourseAi::Personas::SettingsExplorer,
         DiscourseAi::Personas::Creative,
         DiscourseAi::Personas::DiscourseHelper,
+        DiscourseAi::Personas::ForumResearcher,
         DiscourseAi::Personas::GithubHelper,
       )
     end