updates and bug fix

Author: seemantTUI

app/jobs/generate_automatic_comments_job.rb

@@ -5,35 +5,33 @@ class GenerateAutomaticCommentsJob < ApplicationJob
   def perform(request_for_comment, current_user)
     chat_gpt_user = InternalUser.find_by(email: '[email protected]')
     chat_gpt_service = ChatGptService::ChatGptRequest.new
-    chat_gpt_disclaimer = I18n.t('exercises.editor.chat_gpt_disclaimer')
     request_for_comment.submission.files.each do |file|
-      response_data = perform_chat_gpt_request(request_for_comment, file, chat_gpt_service)
+      response_data = perform_request(request_for_comment, file, chat_gpt_service)
       next unless response_data.present?
 
-      create_general_comments(
+      create_general_comment(
         response_data,
         file,
         chat_gpt_user,
-        chat_gpt_disclaimer,
         request_for_comment,
         current_user
       )
 
       # Create comments for each line-specific comment
-      create_line_specific_comments(response_data, file, chat_gpt_user, chat_gpt_disclaimer)
+      create_line_comments(response_data, file, chat_gpt_user)
     end
   end
 
   private
 
-  def perform_chat_gpt_request(request_for_comment, file, chat_gpt_service)
+  def perform_request(request_for_comment, file, chat_gpt_service)
     prompt = ChatGptHelper.format_prompt(
       learner_solution: file.content,
       exercise: request_for_comment.submission.exercise.description,
       test_results: Testrun.where(submission_id: request_for_comment.submission.id).map(&:log).join("\n"),
       question: request_for_comment.question
     )
-    response = chat_gpt_service.make_chat_gpt_request(prompt, true)
+    response = chat_gpt_service.execute(prompt, true)
     ChatGptHistoryOnRfc.create!(
       rfc_id: request_for_comment.id,
       prompt: prompt,
@@ -42,10 +40,10 @@ def perform_chat_gpt_request(request_for_comment, file, chat_gpt_service)
     ChatGptHelper.format_response(response)
   end
 
-  def create_general_comments(response_data, file, chat_gpt_user, chat_gpt_disclaimer, request_for_comment, current_user)
+  def create_general_comment(response_data, file, chat_gpt_user, request_for_comment, current_user)
     if response_data[:requirements_comments].present?
       comment = create_comment(
-        text: "#{response_data[:requirements_comments]}\n\n#{chat_gpt_disclaimer}",
+        text: response_data[:requirements_comments],
         file_id: file.id,
         row: '0',
         column: '0',
@@ -55,10 +53,10 @@ def create_general_comments(response_data, file, chat_gpt_user, chat_gpt_disclai
     send_emails(comment, request_for_comment, current_user, chat_gpt_user) if comment.persisted?
   end
 
-  def create_line_specific_comments(response_data, file, chat_gpt_user, chat_gpt_disclaimer)
+  def create_line_comments(response_data, file, chat_gpt_user)
     response_data[:line_specific_comments].each do |line_comment|
-      comment = create_comment(
-        text: "#{line_comment[:comment]}\n\n#{chat_gpt_disclaimer}",
+      create_comment(
+        text: line_comment[:comment],
         file_id: file.id,
         row: (line_comment[:line_number].positive? ? line_comment[:line_number] - 1 : line_comment[:line_number]).to_s,
         column: '0',
@@ -68,8 +66,9 @@ def create_line_specific_comments(response_data, file, chat_gpt_user, chat_gpt_d
   end
 
   def create_comment(attributes)
+    chat_gpt_disclaimer = I18n.t('exercises.editor.chat_gpt_disclaimer')
     Comment.create(
-      text: attributes[:text],
+      text: "#{attributes[:text]}\n\n#{chat_gpt_disclaimer}",
       file_id: attributes[:file_id],
       row: attributes[:row],
       column: attributes[:column],

app/models/testrun.rb

@@ -40,13 +40,14 @@ def generate_ai_feedback
 
     chatgpt_request = ChatGptService::ChatGptRequest.new
 
+
     prompt = ChatGptHelper.format_prompt(
-      learner_solution: submission.main_file.content,
-      exercise: submission.exercise.description,
+      learner_solution: submission&.files&.select { |file| !file.read_only }.map(&:content).join("\n\n"),
+      exercise: submission&.exercise&.description,
       test_results: output
     )
 
-    feedback_message = chatgpt_request.make_chat_gpt_request(prompt, false)
+    feedback_message = chatgpt_request.execute(prompt, false)
 
     # Store AI feedback history
     ChatGptHistoryOnScore.create!(

app/services/chat_gpt_service/chat_gpt_request.rb

@@ -8,7 +8,7 @@ def initialize
       @client = OpenAI::Client.new(access_token: fetch_api_key)
     end
 
-    def make_chat_gpt_request(prompt, response_format_needed = false)
+    def execute(prompt, response_format_needed = false)
       wrap_api_error! do
         data = {
           model: MODEL_NAME,