From 9d38e51cf510def63a2f61dd508a5fe92f25d461 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 18 Sep 2024 10:37:40 +1000 Subject: [PATCH] syntax tree --- .../discourse_ai/admin/ai_personas_controller.rb | 5 +---- .../discourse_ai/admin/rag_document_fragments_controller.rb | 1 - app/models/rag_document_fragment.rb | 6 +----- config/routes.rb | 6 ++++-- spec/jobs/regular/generate_rag_embeddings_spec.rb | 6 +++--- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/app/controllers/discourse_ai/admin/ai_personas_controller.rb b/app/controllers/discourse_ai/admin/ai_personas_controller.rb index 2519fe0a..ee653d5b 100644 --- a/app/controllers/discourse_ai/admin/ai_personas_controller.rb +++ b/app/controllers/discourse_ai/admin/ai_personas_controller.rb @@ -5,8 +5,7 @@ module DiscourseAi class AiPersonasController < ::Admin::AdminController requires_plugin ::DiscourseAi::PLUGIN_NAME - before_action :find_ai_persona, - only: %i[show update destroy create_user] + before_action :find_ai_persona, only: %i[show update destroy create_user] def index ai_personas = @@ -75,7 +74,6 @@ module DiscourseAi end end - private def find_ai_persona @@ -133,7 +131,6 @@ module DiscourseAi end end end - end end end diff --git a/app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb b/app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb index cd166822..fecc2c01 100644 --- a/app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb +++ b/app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb @@ -70,7 +70,6 @@ module DiscourseAi ) end end - end end end diff --git a/app/models/rag_document_fragment.rb b/app/models/rag_document_fragment.rb index 17d47e99..744568d6 100644 --- a/app/models/rag_document_fragment.rb +++ b/app/models/rag_document_fragment.rb @@ -72,11 +72,7 @@ class RagDocumentFragment < ActiveRecord::Base end def publish_status(upload, status) - MessageBus.publish( - "/discourse-ai/rag/#{upload.id}", - status, - user_ids: [upload.user_id], - ) + MessageBus.publish("/discourse-ai/rag/#{upload.id}", status, user_ids: [upload.user_id]) end end end diff --git a/config/routes.rb b/config/routes.rb index 381256de..3ad50caa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,8 +58,10 @@ Discourse::Application.routes.draw do 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" + 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], diff --git a/spec/jobs/regular/generate_rag_embeddings_spec.rb b/spec/jobs/regular/generate_rag_embeddings_spec.rb index 10f9bd75..0f45f0cc 100644 --- a/spec/jobs/regular/generate_rag_embeddings_spec.rb +++ b/spec/jobs/regular/generate_rag_embeddings_spec.rb @@ -38,9 +38,9 @@ RSpec.describe Jobs::GenerateRagEmbeddings do describe "Publishing progress updates" do it "sends an update through mb after a batch finishes" do updates = - MessageBus.track_publish( - "/discourse-ai/rag/#{rag_document_fragment_1.upload_id}", - ) { subject.execute(fragment_ids: [rag_document_fragment_1.id]) } + MessageBus.track_publish("/discourse-ai/rag/#{rag_document_fragment_1.upload_id}") do + subject.execute(fragment_ids: [rag_document_fragment_1.id]) + end upload_index_stats = updates.last.data