Merge branch 'main' into sentiment-analysis

Author: keegangeorge

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.5.0.beta1-dev: bdef136080074a993e7c4f5ca562edc31a8ba756
 < 3.4.0.beta4-dev: a53719ab8eb071459f215227421b3ea4987e5f87
 < 3.4.0.beta4-dev: 20612fde52d3f740cad64823ef8aadb0748b567f
 < 3.4.0.beta3-dev: decf1bb49d737ea15308400f22f89d1d1e71d13d

.gitignore

@@ -2,3 +2,5 @@ node_modules
 /gems
 /auto_generated
 .env
+evals/log
+evals/cases

Gemfile.lock

@@ -29,7 +29,7 @@ GEM
       racc
     prettier_print (1.2.1)
     racc (1.8.0)
-    rack (3.1.6)
+    rack (3.1.10)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
     rexml (3.3.9)

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-edit.js

@@ -14,5 +14,7 @@ export default class DiscourseAiToolsEditRoute extends DiscourseRoute {
 
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
+    controller.set("llms", toolsModel.resultSetMeta.llms);
+    controller.set("settings", toolsModel.resultSetMeta.settings);
   }
 }

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js

@@ -11,5 +11,7 @@ export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
 
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
+    controller.set("llms", toolsModel.resultSetMeta.llms);
+    controller.set("settings", toolsModel.resultSetMeta.settings);
   }
 }

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.hbs

@@ -3,5 +3,7 @@
     @tools={{this.allTools}}
     @model={{this.model}}
     @presets={{this.presets}}
+    @llms={{this.llms}}
+    @settings={{this.settings}}
   />
 </section>

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs

@@ -3,5 +3,7 @@
     @tools={{this.allTools}}
     @model={{this.model}}
     @presets={{this.presets}}
+    @llms={{this.llms}}
+    @settings={{this.settings}}
   />
 </section>

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -23,14 +23,28 @@ def index
           .each do |tool|
             tools << {
               id: "custom-#{tool.id}",
-              name: I18n.t("discourse_ai.tools.custom_name", name: tool.name.capitalize),
+              name:
+                I18n.t(
+                  "discourse_ai.tools.custom_name",
+                  name: tool.name.capitalize,
+                  tool_name: tool.tool_name,
+                ),
             }
           end
         llms =
-          DiscourseAi::Configuration::LlmEnumerator
-            .values(allowed_seeded_llms: SiteSetting.ai_bot_allowed_seeded_models)
-            .map { |hash| { id: hash[:value], name: hash[:name] } }
-        render json: { ai_personas: ai_personas, meta: { tools: tools, llms: llms } }
+          DiscourseAi::Configuration::LlmEnumerator.values_for_serialization(
+            allowed_seeded_llm_ids: SiteSetting.ai_bot_allowed_seeded_models_map,
+          )
+        render json: {
+                 ai_personas: ai_personas,
+                 meta: {
+                   tools: tools,
+                   llms: llms,
+                   settings: {
+                     rag_images_enabled: SiteSetting.ai_rag_images_enabled,
+                   },
+                 },
+               }
       end
 
       def new
@@ -182,15 +196,16 @@ def ai_persona_params
             :priority,
             :top_p,
             :temperature,
-            :default_llm,
+            :default_llm_id,
             :user_id,
             :max_context_posts,
             :vision_enabled,
             :vision_max_pixels,
             :rag_chunk_tokens,
             :rag_chunk_overlap_tokens,
             :rag_conversation_chunks,
-            :question_consolidator_llm,
+            :rag_llm_model_id,
+            :question_consolidator_llm_id,
             :allow_chat_channel_mentions,
             :allow_chat_direct_messages,
             :allow_topic_mentions,

app/controllers/discourse_ai/admin/ai_tools_controller.rb

@@ -84,11 +84,13 @@ def ai_tool_params
           .require(:ai_tool)
           .permit(
             :name,
+            :tool_name,
             :description,
             :script,
             :summary,
             :rag_chunk_tokens,
             :rag_chunk_overlap_tokens,
+            :rag_llm_model_id,
             rag_uploads: [:id],
             parameters: [:name, :type, :description, :required, enum: []],
           )

app/controllers/discourse_ai/admin/rag_document_fragments_controller.rb

@@ -20,7 +20,7 @@ def indexing_status_check
       def upload_file
         file = params[:file] || params[:files].first
 
-        if !SiteSetting.ai_embeddings_enabled?
+        if !DiscourseAi::Embeddings.enabled?
           raise Discourse::InvalidAccess.new("Embeddings not enabled")
         end
 
@@ -48,7 +48,8 @@ def upload_file
 
       def validate_extension!(filename)
         extension = File.extname(filename)[1..-1] || ""
-        authorized_extensions = %w[txt md]
+        authorized_extensions = %w[txt md pdf]
+        authorized_extensions.concat(%w[png jpg jpeg]) if SiteSetting.ai_rag_images_enabled
         if !authorized_extensions.include?(extension)
           raise Discourse::InvalidParameters.new(
                   I18n.t(