Move more rag stuff into reusable components

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -6,7 +6,7 @@ class AiPersonasController < ::Admin::AdminController
       requires_plugin ::DiscourseAi::PLUGIN_NAME
 
       before_action :find_ai_persona,
-                    only: %i[show update destroy create_user indexing_status_check]
+                    only: %i[show update destroy create_user]
 
       def index
         ai_personas =
@@ -76,10 +76,6 @@ def destroy
       end
 
 
-      def indexing_status_check
-        render json: RagDocumentFragment.indexing_status(@ai_persona, @ai_persona.uploads)
-      end
-
       private
 
       def find_ai_persona

app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb

@@ -5,6 +5,18 @@ module Admin
     class RagDocumentFragmentsController < ::Admin::AdminController
       requires_plugin ::DiscourseAi::PLUGIN_NAME
 
+      def indexing_status_check
+        if params[:target_type] == "AiPersona"
+          @target = AiPersona.find(params[:target_id])
+        elsif params[:target_type] == "AiTool"
+          @target = AiTool.find(params[:target_id])
+        else
+          raise Discourse::InvalidParameters.new("Invalid target type")
+        end
+
+        render json: RagDocumentFragment.indexing_status(@target, @target.uploads)
+      end
+
       def upload_file
         file = params[:file] || params[:files].first
 

app/models/rag_document_fragment.rb

@@ -73,7 +73,7 @@ def indexing_status(persona, uploads)
 
     def publish_status(upload, status)
       MessageBus.publish(
-        "/discourse-ai/ai-persona-rag/#{upload.id}",
+        "/discourse-ai/rag/#{upload.id}",
         status,
         user_ids: [upload.user_id],
       )

assets/javascripts/discourse/components/ai-persona-editor.gjs

@@ -488,7 +488,7 @@ export default class PersonaEditor extends Component {
       {{#if this.siteSettings.ai_embeddings_enabled}}
         <div class="control-group">
           <RagUploader
-            @persona={{this.editingModel}}
+            @target={{this.editingModel}}
             @updateUploads={{this.updateUploads}}
             @onRemove={{this.removeUpload}}
           />

assets/javascripts/discourse/components/rag-upload-progress.gjs

@@ -9,20 +9,19 @@ import I18n from "discourse-i18n";
 
 export default class RagUploadProgress extends Component {
   @service messageBus;
-
   @tracked updatedProgress = null;
 
   willDestroy() {
     super.willDestroy(...arguments);
     this.messageBus.unsubscribe(
-      `/discourse-ai/ai-persona-rag/${this.args.upload.id}`
+      `/discourse-ai/rag/${this.args.upload.id}`
     );
   }
 
   @action
   trackProgress() {
     this.messageBus.subscribe(
-      `/discourse-ai/ai-persona-rag/${this.args.upload.id}`,
+      `/discourse-ai/rag/${this.args.upload.id}`,
       this.onIndexingUpdate
     );
   }
@@ -72,18 +71,18 @@ export default class RagUploadProgress extends Component {
         {{#if this.fullyIndexed}}
           <span class="indexed">
             {{icon "check"}}
-            {{I18n.t "discourse_ai.ai_persona.uploads.indexed"}}
+            {{I18n.t "discourse_ai.rag.uploads.indexed"}}
           </span>
         {{else}}
           <span class="indexing">
             {{icon "robot"}}
-            {{I18n.t "discourse_ai.ai_persona.uploads.indexing"}}
+            {{I18n.t "discourse_ai.rag.uploads.indexing"}}
             {{this.calculateProgress}}%
           </span>
         {{/if}}
       {{else}}
         <span class="uploaded">{{I18n.t
-            "discourse_ai.ai_persona.uploads.uploaded"
+            "discourse_ai.rag.uploads.uploaded"
           }}</span>
       {{/if}}
     </td>

assets/javascripts/discourse/components/rag-uploader.gjs

@@ -12,9 +12,7 @@ import discourseDebounce from "discourse-common/lib/debounce";
 import I18n from "discourse-i18n";
 import RagUploadProgress from "./rag-upload-progress";
 
-export default class RagUploader extends Component.extend(
-  UppyUploadMixin
-) {
+export default class RagUploader extends Component.extend(UppyUploadMixin) {
   @service appEvents;
 
   @tracked term = null;
@@ -33,12 +31,14 @@ export default class RagUploader extends Component.extend(
       this._uppyInstance?.cancelAll();
     }
 
-    this.ragUploads = this.persona?.rag_uploads || [];
+    this.ragUploads = this.target?.rag_uploads || [];
     this.filteredUploads = this.ragUploads;
 
-    if (this.ragUploads?.length && this.persona?.id) {
+    const targetName = this.target?.constructor?.name;
+
+    if (this.ragUploads?.length && this.target?.id) {
       ajax(
-        `/admin/plugins/discourse-ai/ai-personas/${this.persona.id}/files/status.json`
+        `/admin/plugins/discourse-ai/rag-document-fragments/files/status.json?target_type=${targetName}&target_id=${this.target.id}`
       ).then((statuses) => {
         this.set("ragIndexingStatuses", statuses);
       });
@@ -47,7 +47,7 @@ export default class RagUploader extends Component.extend(
     this.appEvents.on(
       `upload-mixin:${this.id}:all-uploads-complete`,
       this,
-      "_updatePersonaWithUploads"
+      "_updateTargetWithUploads"
     );
   }
 
@@ -56,18 +56,18 @@ export default class RagUploader extends Component.extend(
     this.appEvents.off(
       `upload-mixin:${this.id}:all-uploads-complete`,
       this,
-      "_updatePersonaWithUploads"
+      "_updateTargetWithUploads"
     );
   }
 
-  _updatePersonaWithUploads() {
+  _updateTargetWithUploads() {
     this.updateUploads(this.ragUploads);
   }
 
   uploadDone(uploadedFile) {
     const newUpload = uploadedFile.upload;
     newUpload.status = "uploaded";
-    newUpload.statusText = I18n.t("discourse_ai.ai_persona.uploads.uploaded");
+    newUpload.statusText = I18n.t("discourse_ai.rag.uploads.uploaded");
     this.ragUploads.pushObject(newUpload);
     this.debouncedSearch();
   }
@@ -113,19 +113,16 @@ export default class RagUploader extends Component.extend(
 
   <template>
     <div class="rag-uploader">
-      <h3>{{I18n.t "discourse_ai.ai_persona.uploads.title"}}</h3>
-      <p>{{I18n.t "discourse_ai.ai_persona.uploads.description"}}</p>
+      <h3>{{I18n.t "discourse_ai.rag.uploads.title"}}</h3>
+      <p>{{I18n.t "discourse_ai.rag.uploads.description"}}</p>
 
       {{#if this.ragUploads}}
         <div class="rag-uploader__search-input-container">
           <div class="rag-uploader__search-input">
-            {{icon
-              "search"
-              class="rag-uploader__search-input__search-icon"
-            }}
+            {{icon "search" class="rag-uploader__search-input__search-icon"}}
             <Input
               class="rag-uploader__search-input__input"
-              placeholder={{I18n.t "discourse_ai.ai_persona.uploads.filter"}}
+              placeholder={{I18n.t "discourse_ai.rag.uploads.filter"}}
               @value={{this.term}}
               {{on "keyup" this.debouncedSearch}}
             />
@@ -138,9 +135,7 @@ export default class RagUploader extends Component.extend(
           {{#each this.filteredUploads as |upload|}}
             <tr>
               <td>
-                <span class="rag-uploader__rag-file-icon">{{icon
-                    "file"
-                  }}</span>
+                <span class="rag-uploader__rag-file-icon">{{icon "file"}}</span>
                 {{upload.original_filename}}
               </td>
               <RagUploadProgress
@@ -150,7 +145,7 @@ export default class RagUploader extends Component.extend(
               <td class="rag-uploader__remove-file">
                 <DButton
                   @icon="times"
-                  @title="discourse_ai.ai_persona.uploads.remove"
+                  @title="discourse_ai.rag.uploads.remove"
                   @action={{fn this.removeUpload upload}}
                   @class="btn-flat"
                 />
@@ -165,13 +160,13 @@ export default class RagUploader extends Component.extend(
                 {{upload.original_filename}}</td>
               <td class="rag-uploader__upload-status">
                 <div class="spinner small"></div>
-                <span>{{I18n.t "discourse_ai.ai_persona.uploads.uploading"}}
+                <span>{{I18n.t "discourse_ai.rag.uploads.uploading"}}
                   {{upload.uploadProgress}}%</span>
               </td>
               <td class="rag-uploader__remove-file">
                 <DButton
                   @icon="times"
-                  @title="discourse_ai.ai_persona.uploads.remove"
+                  @title="discourse_ai.rag.uploads.remove"
                   @action={{fn this.cancelUploading upload}}
                   @class="btn-flat"
                 />
@@ -189,9 +184,9 @@ export default class RagUploader extends Component.extend(
         accept=".txt,.md"
       />
       <DButton
-        @label="discourse_ai.ai_persona.uploads.button"
+        @label="discourse_ai.rag.uploads.button"
         @icon="plus"
-        @title="discourse_ai.ai_persona.uploads.button"
+        @title="discourse_ai.rag.uploads.button"
         @action={{this.submitFiles}}
         class="btn-default"
       />

config/locales/client.en.yml

@@ -178,9 +178,10 @@ en:
 
           Moreover, you can set it up so that certain user groups have access to specific personas. This means you can have different AI behaviors for different sections of your forum, further enhancing the diversity and richness of your community's interactions.
 
+      rag:
         uploads:
           title: "Uploads"
-          description: "Your AI persona will be able to search and reference the content of included files. Uploaded files should be formatted as plaintext (.txt) or markdown (.md)."
+          description: "Uploaded files should be formatted as plaintext (.txt) or markdown (.md)."
           button: "Add Files"
           filter: "Filter uploads"
           indexed: "Indexed"

config/routes.rb

@@ -54,10 +54,13 @@
     ) { post :test, on: :collection }
 
     post "/ai-personas/:id/create-user", to: "discourse_ai/admin/ai_personas#create_user"
-    post "/rag-document-fragments/files/upload", to: "discourse_ai/admin/rag_document_fragments#upload_file"
+
     put "/ai-personas/:id/files/remove", to: "discourse_ai/admin/ai_personas#remove_file"
     get "/ai-personas/:id/files/status", to: "discourse_ai/admin/ai_personas#indexing_status_check"
 
+    post "/rag-document-fragments/files/upload", to: "discourse_ai/admin/rag_document_fragments#upload_file"
+    get "/rag-document-fragments/files/status", to: "discourse_ai/admin/rag_document_fragments#indexing_status_check"
+
     resources :ai_llms,
               only: %i[index create show update destroy],
               path: "ai-llms",

spec/jobs/regular/generate_rag_embeddings_spec.rb

@@ -39,7 +39,7 @@
       it "sends an update through mb after a batch finishes" do
         updates =
           MessageBus.track_publish(
-            "/discourse-ai/ai-persona-rag/#{rag_document_fragment_1.upload_id}",
+            "/discourse-ai/rag/#{rag_document_fragment_1.upload_id}",
           ) { subject.execute(fragment_ids: [rag_document_fragment_1.id]) }
 
         upload_index_stats = updates.last.data

spec/requests/admin/ai_personas_controller_spec.rb

@@ -369,17 +369,6 @@
     end
   end
 
-  describe "POST #upload_file" do
-    it "works" do
-      post "/admin/plugins/discourse-ai/ai-personas/files/upload.json",
-           params: {
-             file: Rack::Test::UploadedFile.new(file_from_fixtures("spec.txt", "md")),
-           }
-
-      expect(response.status).to eq(200)
-    end
-  end
-
   describe "DELETE #destroy" do
     it "destroys the requested ai_persona" do
       expect {