work in progress

lib/ai_bot/bot.rb

@@ -190,7 +190,7 @@ module DiscourseAi
         update_blk.call("", cancel, build_placeholder(tool.summary, ""))
 
         result =
-          tool.invoke do |progress|
+          tool.invoke(**tool.parameters) do |progress|
             placeholder = build_placeholder(tool.summary, progress)
             update_blk.call("", cancel, placeholder)
           end

lib/ai_bot/personas/persona.rb

@@ -243,14 +243,16 @@ module DiscourseAi
             arguments[name.to_sym] = value if value
           end
 
-          tool_klass.new(
+          instance = tool_klass.new(
-            arguments,
             tool_call_id: function_id || function_name,
             persona_options: options[tool_klass].to_h,
             bot_user: bot_user,
             llm: llm,
             context: context,
           )
+
+          instance.parameters = arguments
+          instance
         end
 
         def strip_quotes(value)

lib/ai_bot/tools/custom.rb

@@ -35,7 +35,8 @@ module DiscourseAi
           super(*args, **kwargs)
         end
 
-        def invoke
+        def invoke(**parameters)
+          @parameters = parameters
           result = runner.invoke
           if runner.custom_raw
             self.custom_raw = runner.custom_raw

lib/ai_bot/tools/dall_e.rb

@@ -4,6 +4,8 @@ module DiscourseAi
   module AiBot
     module Tools
       class DallE < Tool
+        attr_reader :prompts, :aspect_ratio
+
         def self.signature
           {
             name: name,
@@ -32,19 +34,14 @@ module DiscourseAi
           "dall_e"
         end
 
-        def prompts
-          parameters[:prompts]
-        end
-
-        def aspect_ratio
-          parameters[:aspect_ratio]
-        end
-
         def chain_next_response?
           false
         end
 
-        def invoke
+        def invoke(prompts:, aspect_ratio: "square")
+          @prompts = prompts
+          @aspect_ratio = aspect_ratio
+
           # max 4 prompts
           max_prompts = prompts.take(4)
           progress = prompts.first

lib/ai_bot/tools/google.rb

@@ -4,6 +4,8 @@ module DiscourseAi
   module AiBot
     module Tools
       class Google < Tool
+        attr_reader :query
+
         def self.signature
           {
             name: name,
@@ -27,12 +29,9 @@ module DiscourseAi
           [option(:base_query, type: :string)]
         end
 
-        def query
+        def invoke(query:)
-          parameters[:query].to_s.strip
+          query = query.to_s.strip
-        end
+          @query = query
-
-        def invoke
-          query = self.query
 
           yield(query)
 

lib/ai_bot/tools/time.rb

@@ -4,6 +4,8 @@ module DiscourseAi
   module AiBot
     module Tools
       class Time < Tool
+        attr_reader :timezone
+
         def self.signature
           {
             name: name,
@@ -23,11 +25,8 @@ module DiscourseAi
           "time"
         end
 
-        def timezone
+        def invoke(timezone:)
-          parameters[:timezone].to_s
+          @timezone = timezone
-        end
-
-        def invoke
           time =
             begin
               ::Time.now.in_time_zone(timezone)
@@ -37,7 +36,6 @@ module DiscourseAi
           time = ::Time.now if !time
 
           @last_time = time.to_s
-
           { args: { timezone: timezone }, time: time.to_s }
         end
 

lib/ai_bot/tools/tool.rb

@@ -40,18 +40,16 @@ module DiscourseAi
           end
         end
 
-        attr_accessor :custom_raw
+        attr_accessor :custom_raw, :parameters
-        attr_reader :tool_call_id, :persona_options, :bot_user, :llm, :context, :parameters
+        attr_reader :tool_call_id, :persona_options, :bot_user, :llm, :context
 
         def initialize(
-          parameters,
           tool_call_id: "",
           persona_options: {},
           bot_user:,
           llm:,
           context: {}
         )
-          @parameters = parameters
           @tool_call_id = tool_call_id
           @persona_options = persona_options
           @bot_user = bot_user

lib/ai_bot/tools/web_browser.rb

@@ -4,6 +4,8 @@ module DiscourseAi
   module AiBot
     module Tools
       class WebBrowser < Tool
+        attr_reader :url
+
         def self.signature
           {
             name: name,
@@ -24,15 +26,9 @@ module DiscourseAi
           "web_browser"
         end
 
-        def url
+        def invoke(url:)
-          return @url if defined?(@url)
+          url = "https://#{url}" if !url.start_with?("http")
-          @url = parameters[:url]
+          @url = url
-          @url = "https://#{@url}" if !@url.start_with?("http")
-
-          @url
-        end
-
-        def invoke
           send_http_request(url, follow_redirects: true) do |response|
             if response.code == "200"
               html = read_response_body(response)

spec/lib/modules/ai_bot/tools/google_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe DiscourseAi::AiBot::Tools::Google do
   let(:bot_user) { DiscourseAi::AiBot::EntryPoint.find_user_from_model(llm_model.name) }
   let(:llm) { DiscourseAi::Completions::Llm.proxy("custom:#{llm_model.id}") }
   let(:progress_blk) { Proc.new {} }
-  let(:search) { described_class.new({ query: "some search term" }, bot_user: bot_user, llm: llm) }
+  let(:search) { described_class.new(bot_user: bot_user, llm: llm) }
 
   before do
     SiteSetting.ai_bot_enabled = true
@@ -22,7 +22,7 @@ RSpec.describe DiscourseAi::AiBot::Tools::Google do
         "https://www.googleapis.com/customsearch/v1?cx=cx&key=abc&num=10&q=some%20search%20term",
       ).to_return(status: 200, body: json_text, headers: {})
 
-      info = search.invoke(&progress_blk).to_json
+      info = search.invoke(query: "some search term", &progress_blk).to_json
 
       expect(search.results_count).to eq(0)
       expect(info).to_not include("oops")
@@ -33,7 +33,6 @@ RSpec.describe DiscourseAi::AiBot::Tools::Google do
 
       search =
         described_class.new(
-          { query: "some search term" },
           bot_user: bot_user,
           llm: llm,
           persona_options: {
@@ -48,7 +47,7 @@ RSpec.describe DiscourseAi::AiBot::Tools::Google do
         "https://www.googleapis.com/customsearch/v1?cx=cx&key=abc&num=10&q=site:discourse.org%20some%20search%20term",
       ).to_return(status: 200, body: json_text, headers: {})
 
-      search.invoke(&progress_blk)
+      search.invoke(query: "some search term", &progress_blk)
     end
 
     it "can generate correct info" do
@@ -80,7 +79,7 @@ RSpec.describe DiscourseAi::AiBot::Tools::Google do
         "https://www.googleapis.com/customsearch/v1?cx=cx&key=abc&num=10&q=some%20search%20term",
       ).to_return(status: 200, body: json_text, headers: {})
 
-      info = search.invoke(&progress_blk).to_json
+      info = search.invoke(query: "some search term", &progress_blk).to_json
 
       expect(search.results_count).to eq(2)
       expect(info).to include("title1")

spec/lib/modules/ai_bot/tools/web_browser_spec.rb

@@ -19,8 +19,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
           "<html><head><title>Test</title></head><body><p>This is a simplified version of the webpage content.</p></body></html>",
       )
 
-      tool = described_class.new({ url: url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: url)
 
       expect(result).to have_key(:text)
       expect(result[:text]).to eq(processed_text)
@@ -33,8 +33,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
       # Simulating a failed request
       stub_request(:get, url).to_return(status: [500, "Internal Server Error"])
 
-      tool = described_class.new({ url: url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: url)
 
       expect(result).to have_key(:error)
       expect(result[:error]).to include("Failed to retrieve the web page")
@@ -48,8 +48,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
       simple_html = "<html><body><p>Simple content.</p></body></html>"
       stub_request(:get, url).to_return(status: 200, body: simple_html)
 
-      tool = described_class.new({ url: url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: url)
 
       expect(result[:text]).to eq("Simple content.")
     end
@@ -59,8 +59,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
         "<html><head><script>console.log('Ignore me')</script></head><body><style>body { background-color: #000; }</style><p>Only relevant content here.</p></body></html>"
       stub_request(:get, url).to_return(status: 200, body: complex_html)
 
-      tool = described_class.new({ url: url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: url)
 
       expect(result[:text]).to eq("Only relevant content here.")
     end
@@ -70,8 +70,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
         "<html><body><div><section><p>Nested paragraph 1.</p></section><section><p>Nested paragraph 2.</p></section></div></body></html>"
       stub_request(:get, url).to_return(status: 200, body: nested_html)
 
-      tool = described_class.new({ url: url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: url)
 
       expect(result[:text]).to eq("Nested paragraph 1. Nested paragraph 2.")
     end
@@ -86,8 +86,8 @@ RSpec.describe DiscourseAi::AiBot::Tools::WebBrowser do
       stub_request(:get, initial_url).to_return(status: 302, headers: { "Location" => final_url })
       stub_request(:get, final_url).to_return(status: 200, body: redirect_html)
 
-      tool = described_class.new({ url: initial_url }, bot_user: bot_user, llm: llm)
+      tool = described_class.new(bot_user: bot_user, llm: llm)
-      result = tool.invoke
+      result = tool.invoke(url: initial_url)
 
       expect(result[:url]).to eq(final_url)
       expect(result[:text]).to eq("Redirected content.")