Clean up and organize code

Author: xfalcox

app/controllers/discourse_ai/discord/bot_controller.rb

@@ -15,48 +15,18 @@ def interactions
           return head :unauthorized
         end
 
-        body = JSON.parse(request.body.read)
+        body = request.body.read
+        interaction = JSON.parse(body, object_class: OpenStruct)
 
-        if body["type"] == 1
+        if interaction.type == 1
           # Respond to Discord PING request
           render json: { type: 1 }
         else
           response = { type: 5, data: { content: "Searching..." } }
           hijack { render json: response }
 
-          pp request.headers
-          pp body
-
-          # Respond to /commands
-          persona = DiscourseAi::AiBot::Personas::DiscourseHelper
-          bot =
-            DiscourseAi::AiBot::Bot.as(
-              Discourse.system_user,
-              persona: persona.new,
-              model: "custom:6",
-            )
-
-          query = body["data"]["options"].first["value"]
-          reply = ""
-          reply =
-            bot.reply({ conversation_context: [{ type: :user, content: query }] }) { |a, b, c| nil }
-
-          pp reply.last.first
-
-          discord_reply = reply.last.first
-
-          api_endpoint =
-            "https://discord.com/api/webhooks/#{SiteSetting.ai_discord_app_id}/#{body["token"]}"
-
-          conn = Faraday.new { |f| f.adapter FinalDestination::FaradayAdapter }
-          response =
-            conn.post(
-              api_endpoint,
-              { content: discord_reply }.to_json,
-              { "Content-Type" => "application/json" },
-            )
-
-          pp response
+          # Respond to Discord command
+          Jobs.enqueue(:stream_discord_reply, interaction: body.dup)
         end
       end
 
@@ -69,7 +39,6 @@ def verify_request!
       end
 
       def verify_key
-        # TODO remove this gem dependency
         Ed25519::VerifyKey.new([SiteSetting.ai_discord_app_public_key].pack("H*")).freeze
       end
     end

app/jobs/regular/stream_discord_reply.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Jobs
+  class StreamDiscordReply < ::Jobs::Base
+    sidekiq_options retry: false
+
+    def execute(args)
+      interaction = args[:interaction]
+
+      DiscourseAi::Discord::Bot::PersonaReplier.new(interaction).handle_interaction!
+    end
+  end
+end

config/settings.yml

@@ -438,3 +438,13 @@ discourse_ai:
   ai_discord_app_public_key:
     default: ""
     client: false
+  ai_discord_search_mode:
+    default: "search"
+    type: enum
+    choices:
+      - search
+      - persona
+  ai_discord_search_persona:
+    default: ""
+    type: enum
+    enum: "DiscourseAi::Configuration::PersonaEnumerator"

lib/configuration/persona_enumerator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "enum_site_setting"
+
+module DiscourseAi
+  module Configuration
+    class PersonaEnumerator < ::EnumSiteSetting
+      def self.valid_value?(val)
+        true
+      end
+
+      def self.values
+        AiPersona.all_personas.map { |persona| { name: persona.name, value: persona.id } }
+      end
+    end
+  end
+end

lib/discord/bot/base.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Discord::Bot
+    class Base
+      def initialize(body)
+        @interaction = JSON.parse(body, object_class: OpenStruct)
+        @query = @interaction.data.options.first.value
+        @token = @interaction.token
+      end
+
+      def handle_interaction!
+        raise NotImplementedError
+      end
+
+      def create_reply(reply)
+        api_endpoint = "https://discord.com/api/webhooks/#{SiteSetting.ai_discord_app_id}/#{@token}"
+        conn = Faraday.new { |f| f.adapter FinalDestination::FaradayAdapter }
+        response =
+          conn.post(
+            api_endpoint,
+            { content: reply }.to_json,
+            { "Content-Type" => "application/json" },
+          )
+        @reply_response = JSON.parse(response.body, symbolize_names: true)
+        Rails.logger.info("Discord reply created: #{@reply_response}")
+        @reply_response
+      end
+
+      def update_reply(reply)
+        api_endpoint =
+          "https://discord.com/api/webhooks/#{SiteSetting.ai_discord_app_id}/#{@token}/messages/@original"
+        conn = Faraday.new { |f| f.adapter FinalDestination::FaradayAdapter }
+        response =
+          conn.patch(
+            api_endpoint,
+            { content: reply }.to_json,
+            { "Content-Type" => "application/json" },
+          )
+        @last_update_response = JSON.parse(response.body, symbolize_names: true)
+        Rails.logger.info("Discord reply updated: #{@last_update_response}")
+        @last_update_response
+      end
+    end
+  end
+end

lib/discord/bot/persona_replier.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Discord::Bot
+    class PersonaReplier < Base
+      def initialize(body)
+        @persona =
+          AiPersona
+            .all_personas
+            .find { |persona| persona.id == SiteSetting.ai_discord_search_persona.to_i }
+            .new
+        @bot =
+          DiscourseAi::AiBot::Bot.as(
+            Discourse.system_user,
+            persona: @persona,
+            model: AiPersona.find(@persona.id).default_llm, # TODO this is weird
+          )
+        super(body)
+      end
+
+      def handle_interaction!
+        last_update_sent_at = Time.now - 1
+        reply = +""
+        full_reply =
+          @bot.reply(
+            { conversation_context: [{ type: :user, content: @query }], skip_tool_details: true },
+          ) do |partial, _cancel, _something|
+            reply << partial
+            next if reply.blank?
+
+            if @reply_response.nil?
+              create_reply(reply.dup)
+            elsif @last_update_response.nil?
+              update_reply(reply.dup)
+            elsif Time.now - last_update_sent_at > 1
+              update_reply(reply.dup)
+              last_update_sent_at = Time.now
+            end
+          end
+
+        discord_reply = full_reply.last.first
+
+        if @reply_response.nil?
+          create_reply(discord_reply)
+        else
+          update_reply(discord_reply)
+        end
+      end
+    end
+  end
+end