DEV: add subject

Author: keegangeorge

app/controllers/discourse_ai/admin/ai_embeddings_controller.rb

@@ -85,7 +85,8 @@ def destroy
           embedding_id: embedding_def.id,
           display_name: embedding_def.display_name,
           provider: embedding_def.provider,
-          dimensions: embedding_def.dimensions
+          dimensions: embedding_def.dimensions,
+          subject: embedding_def.display_name # Use display_name as the subject for EmbeddingDefinition
         }
 
         if embedding_def.destroy
@@ -149,7 +150,8 @@ def log_ai_embedding_creation(embedding_def)
           embedding_id: embedding_def.id,
           display_name: embedding_def.display_name,
           provider: embedding_def.provider,
-          dimensions: embedding_def.dimensions
+          dimensions: embedding_def.dimensions,
+          subject: embedding_def.display_name # Use display_name as the subject for EmbeddingDefinition
         }
 
         # Only include tokenizer if present
@@ -162,6 +164,9 @@ def log_ai_embedding_creation(embedding_def)
           log_details[:api_key_set] = true
         end
 
+        # Get subject for the log
+        subject = log_details[:subject]
+        
         # Log the action
         StaffActionLogger.new(current_user).log_custom("create_ai_embedding", log_details)
       end
@@ -170,7 +175,8 @@ def log_ai_embedding_update(embedding_def, initial_attributes)
         # Create log details
         log_details = {
           embedding_id: embedding_def.id,
-          display_name: embedding_def.display_name
+          display_name: embedding_def.display_name,
+          subject: embedding_def.display_name # Use display_name as the subject for EmbeddingDefinition
         }
 
         # Track changes in fields
@@ -204,11 +210,20 @@ def log_ai_embedding_update(embedding_def, initial_attributes)
         # Only log if there are actual changes
         if changed_fields.any?
           log_details[:changed_fields] = changed_fields
+          
+          # Get subject for the log
+          subject = log_details[:subject]
+          
+          # Log the action
           StaffActionLogger.new(current_user).log_custom("update_ai_embedding", log_details)
         end
       end
 
       def log_ai_embedding_deletion(embedding_details)
+        # Get subject for the log (but keep it in the details hash)
+        subject = embedding_details[:subject]
+        
+        # Log the action
         StaffActionLogger.new(current_user).log_custom("delete_ai_embedding", embedding_details)
       end
     end

app/controllers/discourse_ai/admin/ai_llms_controller.rb

@@ -207,101 +207,96 @@ def ai_llm_params(updating: nil)
       end
 
       def log_llm_model_creation(llm_model)
-        # Create field configuration with appropriate types
-        field_config = {
-          display_name: {},
-          name: {},
-          provider: {},
-          tokenizer: {},
-          url: {},
-          api_key: { type: :sensitive },
-          max_prompt_tokens: {},
-          max_output_tokens: {},
-          enabled_chat_bot: {},
-          vision_enabled: {},
-          input_cost: {},
-          output_cost: {},
-          cached_input_cost: {},
-          provider_params: {}
-        }
-        
-        # Create basic entity details
-        entity_details = {
+        # Create basic entity details with important attributes
+        log_details = {
           model_id: llm_model.id,
           model_name: llm_model.name,
-          display_name: llm_model.display_name
+          display_name: llm_model.display_name,
+          provider: llm_model.provider,
+          tokenizer: llm_model.tokenizer
         }
 
-        # Create logger instance
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        
-        # Extract attributes based on field configuration
-        log_details = entity_details.dup
-        log_details.merge!(logger.send(:extract_entity_attributes, llm_model, field_config))
+        # Add API key indication if present (without showing the key)
+        if llm_model.api_key.present?
+          log_details[:api_key_set] = true
+        end
+
+        # Add token limits if set
+        if llm_model.max_prompt_tokens.present?
+          log_details[:max_prompt_tokens] = llm_model.max_prompt_tokens
+        end
 
+        if llm_model.max_output_tokens.present?
+          log_details[:max_output_tokens] = llm_model.max_output_tokens
+        end
+          
         # Add quota information as a special case
         if llm_model.llm_quotas.any?
           log_details[:quotas] = llm_model.llm_quotas.map do |quota|
             "Group #{quota.group_id}: #{quota.max_tokens} tokens, #{quota.max_usages} usages, #{quota.duration_seconds}s"
           end.join("; ")
         end
 
-        logger.log_custom("create_ai_llm_model", log_details)
+        # Use StaffActionLogger directly with the proper subject
+        StaffActionLogger.new(current_user).log_custom("create_ai_llm_model", log_details.merge(subject: llm_model.display_name))
       end
 
       def log_llm_model_update(llm_model, initial_attributes, initial_quotas)
-        # Create field configuration with appropriate types
-        field_config = {
-          display_name: {},
-          name: {},
-          provider: {},
-          tokenizer: {},
-          url: {},
-          api_key: { type: :sensitive },
-          max_prompt_tokens: {},
-          max_output_tokens: {},
-          enabled_chat_bot: {},
-          vision_enabled: {},
-          input_cost: {},
-          output_cost: {},
-          cached_input_cost: {},
-          provider_params: {},
-          json_fields: %w[provider_params]
-        }
-        
         # Create basic entity details
-        entity_details = {
+        log_details = {
           model_id: llm_model.id,
           model_name: llm_model.name,
           display_name: llm_model.display_name
         }
 
-        # Create logger instance
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
+        # Track simple changes
+        %w[display_name name provider tokenizer url max_prompt_tokens max_output_tokens enabled_chat_bot vision_enabled].each do |field|
+          if initial_attributes[field] != llm_model.attributes[field]
+            log_details["#{field}_changed"] = true
+            
+            # For simple fields, show the before/after values
+            unless field == "api_key" # Skip sensitive fields
+              initial_value = initial_attributes[field]
+              current_value = llm_model.attributes[field]
+              log_details[field] = "#{initial_value} → #{current_value}"
+            end
+          end
+        end
 
-        # Create a changes hash to track all changes
-        changes = {}
-        current_quotas = llm_model.llm_quotas.reload.map(&:attributes)
+        # Handle API key changes specially
+        if initial_attributes["api_key"].present? != llm_model.api_key.present?
+          log_details[:api_key_changed] = true
+          if llm_model.api_key.present?
+            log_details[:api_key_status] = "set"
+          else
+            log_details[:api_key_status] = "removed"
+          end
+        end
 
         # Track quota changes separately as they're a special case
+        current_quotas = llm_model.llm_quotas.reload.map(&:attributes)
         if initial_quotas != current_quotas
           initial_quota_summary = initial_quotas.map { |q| "Group #{q['group_id']}: #{q['max_tokens']} tokens" }.join("; ")
           current_quota_summary = current_quotas.map { |q| "Group #{q['group_id']}: #{q['max_tokens']} tokens" }.join("; ")
-          changes[:quotas] = "#{initial_quota_summary} → #{current_quota_summary}"
+          log_details[:quotas_changed] = true
+          log_details[:quotas] = "#{initial_quota_summary} → #{current_quota_summary}"
         end
 
-        # Let the logger handle standard field changes
-        logger.log_update("llm_model", llm_model, initial_attributes, field_config, entity_details)
+        # Check JSON fields like provider_params
+        if initial_attributes["provider_params"].to_s != llm_model.attributes["provider_params"].to_s
+          log_details[:provider_params_changed] = true
+        end
 
-        # If we have quota changes but no other changes were detected, log them separately
-        if changes.key?(:quotas)
-          logger.log_custom("update_ai_llm_model", entity_details.merge(changes))
+        # Only log if there are actual changes
+        if log_details.keys.any? { |k| k.to_s.end_with?("_changed") }
+          # Use StaffActionLogger directly with the proper subject
+          StaffActionLogger.new(current_user).log_custom("update_ai_llm_model", log_details.merge(subject: llm_model.display_name))
         end
       end
 
       def log_llm_model_deletion(model_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        logger.log_deletion("llm_model", model_details)
+        # Use StaffActionLogger directly with the proper subject
+        StaffActionLogger.new(current_user).log_custom("delete_ai_llm_model", model_details.merge(subject: model_details[:display_name]))
       end
     end
   end

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -276,98 +276,83 @@ def permit_examples(examples)
       end
 
       def log_ai_persona_creation(ai_persona)
-        # Create field configuration with appropriate types
-        field_config = {
-          name: {},
-          description: {},
-          enabled: {},
-          priority: {},
-          system_prompt: { type: :large_text },
-          default_llm_id: {},
-          temperature: {},
-          top_p: {},
-          user_id: {},
-          vision_enabled: {},
-          vision_max_pixels: {},
-          max_context_posts: {},
-          rag_chunk_tokens: {},
-          rag_chunk_overlap_tokens: {},
-          rag_conversation_chunks: {},
-          rag_llm_model_id: {},
-          question_consolidator_llm_id: {},
-          tool_details: {},
-          forced_tool_count: {},
-          allow_chat_channel_mentions: {},
-          allow_chat_direct_messages: {},
-          allow_topic_mentions: {},
-          allow_personal_messages: {}
-        }
-        
-        # Create basic entity details
-        entity_details = {
+        # Create basic entity details with important attributes
+        log_details = {
           persona_id: ai_persona.id,
-          persona_name: ai_persona.name
+          persona_name: ai_persona.name,
+          description: ai_persona.description
         }
 
-        # Create logger instance
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
+        # Include basic configuration fields if present
+        %w[enabled priority temperature top_p default_llm_id].each do |field|
+          value = ai_persona.send(field) if ai_persona.respond_to?(field)
+          log_details[field] = value if value.present?
+        end
 
-        # Extract attributes based on field configuration
-        log_details = entity_details.dup
-        log_details.merge!(logger.send(:extract_entity_attributes, ai_persona, field_config))
+        # Handle system prompt specially (truncate if too long)
+        if ai_persona.system_prompt.present?
+          if ai_persona.system_prompt.length > 100
+            log_details[:system_prompt] = ai_persona.system_prompt.truncate(100)
+          else
+            log_details[:system_prompt] = ai_persona.system_prompt
+          end
+        end
 
         # Add tools count separately as it's not a direct attribute
         log_details[:tools_count] = (ai_persona.tools || []).size
 
         # Add allowed_group_ids
         log_details[:allowed_group_ids] = ai_persona.allowed_group_ids if ai_persona.allowed_group_ids.present?
 
-        logger.log_custom("create_ai_persona", log_details)
+        # Use StaffActionLogger directly with the proper subject
+        StaffActionLogger.new(current_user).log_custom("create_ai_persona", log_details.merge(subject: ai_persona.name))
       end
 
       def log_ai_persona_update(ai_persona, initial_attributes)
-        # Create field configuration with appropriate types
-        field_config = {
-          name: {},
-          description: {},
-          enabled: {},
-          priority: {},
-          system_prompt: { type: :large_text },
-          default_llm_id: {},
-          temperature: {},
-          top_p: {},
-          user_id: {},
-          vision_enabled: {},
-          vision_max_pixels: {},
-          max_context_posts: {},
-          rag_chunk_tokens: {},
-          rag_chunk_overlap_tokens: {},
-          rag_conversation_chunks: {},
-          rag_llm_model_id: {},
-          question_consolidator_llm_id: {},
-          tool_details: {},
-          forced_tool_count: {},
-          allow_chat_channel_mentions: {},
-          allow_chat_direct_messages: {},
-          allow_topic_mentions: {},
-          allow_personal_messages: {},
-          json_fields: %w[allowed_group_ids tools response_format examples]
-        }
-        
         # Create basic entity details
-        entity_details = {
+        log_details = {
           persona_id: ai_persona.id,
           persona_name: ai_persona.name
         }
 
-        # Create logger instance and log the update
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        logger.log_update("persona", ai_persona, initial_attributes, field_config, entity_details)
+        # Track simple changes
+        %w[name description enabled priority system_prompt default_llm_id temperature top_p
+           vision_enabled vision_max_pixels max_context_posts rag_chunk_tokens rag_chunk_overlap_tokens
+           rag_conversation_chunks rag_llm_model_id question_consolidator_llm_id forced_tool_count
+           allow_chat_channel_mentions allow_chat_direct_messages allow_topic_mentions allow_personal_messages].each do |field|
+          
+          if initial_attributes[field] != ai_persona.attributes[field]
+            log_details["#{field}_changed"] = true
+            
+            # For large text fields, don't include the values
+            if field == "system_prompt"
+              log_details["#{field}_updated"] = true
+            else 
+              # For simple fields, show the before/after values
+              initial_value = initial_attributes[field]
+              current_value = ai_persona.attributes[field]
+              log_details[field] = "#{initial_value} → #{current_value}"
+            end
+          end
+        end
+        
+        # Check JSON fields
+        %w[allowed_group_ids tools response_format examples].each do |field|
+          if initial_attributes[field].to_s != ai_persona.attributes[field].to_s
+            log_details["#{field}_changed"] = true
+          end
+        end
+        
+        # Only log if there are actual changes
+        if log_details.keys.any? { |k| k.to_s.end_with?("_changed") }
+          # Use StaffActionLogger directly with the proper subject
+          StaffActionLogger.new(current_user).log_custom("update_ai_persona", log_details.merge(subject: ai_persona.name))
+        end
       end
 
       def log_ai_persona_deletion(persona_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        logger.log_deletion("persona", persona_details)
+        # Use StaffActionLogger directly with the proper subject
+        StaffActionLogger.new(current_user).log_custom("delete_ai_persona", persona_details.merge(subject: persona_details[:name]))
       end
     end
   end