Programming exercises: Improve preliminary AI feedback

src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java

@@ -629,7 +629,7 @@ public boolean isAutomatic() {
      * @return true if the result is an automatic AI Athena result
      */
     @JsonIgnore
-    public boolean isAthenaAutomatic() {
+    public boolean isAthenaBased() {
         return AssessmentType.AUTOMATIC_ATHENA == assessmentType;
     }
 

src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java

@@ -562,8 +562,9 @@ public Submission findLatestSubmissionWithRatedResultWithCompletionDate(Particip
             boolean ratedOrPractice = Boolean.TRUE.equals(result.isRated()) || participation.isPracticeMode();
             boolean noProgrammingAndAssessmentOver = !isProgrammingExercise && isAssessmentOver;
             // For programming exercises we check that the assessment due date has passed (if set) for manual results otherwise we always show the automatic result
-            boolean programmingAfterAssessmentOrAutomatic = isProgrammingExercise && ((result.isManual() && isAssessmentOver) || result.isAutomatic());
-            if (ratedOrPractice && (noProgrammingAndAssessmentOver || programmingAfterAssessmentOrAutomatic)) {
+            boolean programmingAfterAssessmentOrAutomaticOrAthena = isProgrammingExercise
+                    && ((result.isManual() && isAssessmentOver) || result.isAutomatic() || result.isAthenaBased());
+            if (ratedOrPractice && (noProgrammingAndAssessmentOver || programmingAfterAssessmentOrAutomaticOrAthena)) {
                 // take the first found result that fulfills the above requirements
                 // or
                 // take newer results and thus disregard older ones

src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java

@@ -162,7 +162,7 @@ public Result getResultForCorrectionRound(int correctionRound) {
      */
     @NotNull
     private List<Result> filterNonAutomaticResults() {
-        return results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaAutomatic())).toList();
+        return results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaBased())).toList();
     }
 
     /**
@@ -188,8 +188,7 @@ public boolean hasResultForCorrectionRound(int correctionRound) {
      */
     @JsonIgnore
     public void removeAutomaticResults() {
-        this.results = this.results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaAutomatic()))
-                .collect(Collectors.toCollection(ArrayList::new));
+        this.results = this.results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaBased())).collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**
@@ -214,7 +213,7 @@ public List<Result> getResults() {
 
     @JsonIgnore
     public List<Result> getManualResults() {
-        return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
+        return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaBased()).collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**
@@ -224,7 +223,7 @@ public List<Result> getManualResults() {
      */
     @JsonIgnore
     public List<Result> getNonAthenaResults() {
-        return results.stream().filter(result -> result != null && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
+        return results.stream().filter(result -> result != null && !result.isAthenaBased()).collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**

src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java

@@ -20,7 +20,6 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 
-import org.apache.velocity.exception.ResourceNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -382,7 +381,7 @@ private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exerc
             throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
         }
         if (exercise.getDueDate() != null && now().isAfter(exercise.getDueDate())) {
-            throw new BadRequestAlertException("The due date is over", "participation", "preconditions not met");
+            throw new BadRequestAlertException("The due date is over", "participation", "feedbackRequestAfterDueDate", true);
         }
         if (exercise instanceof ProgrammingExercise) {
             ((ProgrammingExercise) exercise).validateSettingsForFeedbackRequest();
@@ -393,7 +392,7 @@ private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exerc
         StudentParticipation participation = (exercise instanceof ProgrammingExercise)
                 ? programmingExerciseParticipationService.findStudentParticipationByExerciseAndStudentId(exercise, principal.getName())
                 : studentParticipationRepository.findByExerciseIdAndStudentLogin(exercise.getId(), principal.getName())
-                        .orElseThrow(() -> new ResourceNotFoundException("Participation not found"));
+                        .orElseThrow(() -> new BadRequestAlertException("Submission not found", "participation", "noSubmissionExists", true));
 
         checkAccessPermissionOwner(participation, user);
         participation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
@@ -406,15 +405,14 @@ private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exerc
         }
         else if (exercise instanceof ProgrammingExercise) {
             if (participation.findLatestLegalResult() == null) {
-                throw new BadRequestAlertException("User has not reached the conditions to submit a feedback request", "participation", "preconditions not met");
+                throw new BadRequestAlertException("You need to submit at least once and have the build results", "participation", "noSubmissionExists", true);
             }
         }
 
         // Check if feedback has already been requested
-        var currentDate = now();
-        var participationIndividualDueDate = participation.getIndividualDueDate();
-        if (participationIndividualDueDate != null && currentDate.isAfter(participationIndividualDueDate)) {
-            throw new BadRequestAlertException("Request has already been sent", "participation", "already sent");
+        var latestResult = participation.findLatestResult();
+        if (latestResult != null && latestResult.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA && latestResult.getCompletionDate().isAfter(now())) {
+            throw new BadRequestAlertException("Request has already been sent", "participation", "feedbackRequestAlreadySent", true);
         }
 
         // Process feedback request

src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java

@@ -712,8 +712,7 @@ private boolean checkForRatedAndAssessedResult(Result result) {
      * @return true if the result is manual and the assessment is over, or it is an automatic result, false otherwise
      */
     private boolean checkForAssessedResult(Result result) {
-        return result.getCompletionDate() != null
-                && ((result.isManual() && ExerciseDateService.isAfterAssessmentDueDate(this)) || result.isAutomatic() || result.isAthenaAutomatic());
+        return result.getCompletionDate() != null && ((result.isManual() && ExerciseDateService.isAfterAssessmentDueDate(this)) || result.isAutomatic() || result.isAthenaBased());
     }
 
     @Override

src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java

@@ -4,13 +4,15 @@
 import static java.time.ZonedDateTime.now;
 
 import java.time.ZonedDateTime;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
@@ -59,6 +61,9 @@ public class ProgrammingExerciseCodeReviewFeedbackService {
 
     private final ProgrammingMessagingService programmingMessagingService;
 
+    @Value("${artemis.athena.allowed-feedback-attempts:20}")
+    private int allowedFeedbackAttempts;
+
     public ProgrammingExerciseCodeReviewFeedbackService(GroupNotificationService groupNotificationService,
             Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService, SubmissionService submissionService, ResultService resultService,
             ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, ResultRepository resultRepository,
@@ -111,14 +116,14 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici
         var submissionOptional = programmingExerciseParticipationService.findProgrammingExerciseParticipationWithLatestSubmissionAndResult(participation.getId())
                 .findLatestSubmission();
         if (submissionOptional.isEmpty()) {
-            throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
+            throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmissionExists");
         }
         var submission = submissionOptional.get();
 
         // save result and transmit it over websockets to notify the client about the status
         var automaticResult = this.submissionService.saveNewEmptyResult(submission);
         automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
-        automaticResult.setRated(false);
+        automaticResult.setRated(true); // we want to use this feedback to give the grade in the future
         automaticResult.setScore(100.0);
         automaticResult.setSuccessful(null);
         automaticResult.setCompletionDate(ZonedDateTime.now().plusMinutes(5)); // we do not want to show dates without a completion date, but we want the students to know their
@@ -127,7 +132,6 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici
 
         try {
 
-            setIndividualDueDateAndLockRepository(participation, programmingExercise, false);
             this.programmingMessagingService.notifyUserAboutNewResult(automaticResult, participation);
             // now the client should be able to see new result
 
@@ -158,9 +162,10 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici
                         feedback.setDetailText(individualFeedbackItem.description());
                         feedback.setHasLongFeedbackText(false);
                         feedback.setType(FeedbackType.AUTOMATIC);
-                        feedback.setCredits(0.0);
+                        feedback.setCredits(individualFeedbackItem.credits());
                         return feedback;
-                    }).toList();
+                    }).sorted(Comparator.comparing(Feedback::getCredits, Comparator.nullsLast(Comparator.naturalOrder()))).toList();
+            ;
 
             automaticResult.setSuccessful(true);
             automaticResult.setCompletionDate(ZonedDateTime.now());
@@ -176,9 +181,6 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici
             this.resultRepository.save(automaticResult);
             this.programmingMessagingService.notifyUserAboutNewResult(automaticResult, participation);
         }
-        finally {
-            unlockRepository(participation, programmingExercise);
-        }
     }
 
     /**
@@ -225,15 +227,10 @@ private void checkRateLimitOrThrow(ProgrammingExerciseStudentParticipation parti
 
         List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
 
-        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
-
         long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count();
 
-        if (countOfAthenaResultsInProcessOrSuccessful >= 3) {
-            throw new BadRequestAlertException("Cannot send additional AI feedback requests now. Try again later!", "participation", "preconditions not met");
-        }
-        if (countOfSuccessfulRequests >= 20) {
-            throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met");
+        if (countOfSuccessfulRequests >= this.allowedFeedbackAttempts) {
+            throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "maxAthenaResultsReached", true);
         }
     }
 }

src/main/webapp/app/entities/result.model.ts

@@ -39,24 +39,6 @@ export class Result implements BaseEntity {
         this.successful = false; // default value
     }
 
-    /**
-     * Checks whether the result is a manual result. A manual result can be from type MANUAL or SEMI_AUTOMATIC
-     *
-     * @return true if the result is a manual result
-     */
-    public static isManualResult(that: Result): boolean {
-        return that.assessmentType === AssessmentType.MANUAL || that.assessmentType === AssessmentType.SEMI_AUTOMATIC;
-    }
-
-    /**
-     * Checks whether the result is generated by Athena AI.
-     *
-     * @return true if the result is an automatic Athena AI result
-     */
-    public static isAthenaAIResult(that: Result): boolean {
-        return that.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
-    }
-
     /**
      * Checks whether the given result has an assessment note that is not empty.
      * @param that the result of which the presence of an assessment note is being checked

src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts

@@ -26,6 +26,7 @@ import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
 import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
 import { HttpResponse } from '@angular/common/http';
 import { AlertService } from 'app/core/util/alert.service';
+import { isManualResult as isManualResultFunction } from 'app/exercises/shared/result/result.utils';
 
 @Component({
     selector: 'jhi-code-editor-student',
@@ -148,7 +149,7 @@ export class CodeEditorStudentContainerComponent implements OnInit, OnDestroy {
         let hasTutorFeedback = false;
         if (this.latestResult) {
             // latest result is the first element of results, see loadParticipationWithLatestResult
-            isManualResult = Result.isManualResult(this.latestResult);
+            isManualResult = isManualResultFunction(this.latestResult);
             if (isManualResult) {
                 hasTutorFeedback = this.latestResult.feedbacks!.some((feedback) => feedback.type === FeedbackType.MANUAL);
             }

src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts

@@ -13,6 +13,7 @@ import { SubmissionType } from 'app/entities/submission.model';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { hasParticipationChanged } from 'app/exercises/shared/participation/participation.utils';
+import { isManualResult } from 'app/exercises/shared/result/result.utils';
 
 /**
  * Component for triggering a build for the CURRENT submission of the student (does not create a new commit!).
@@ -60,7 +61,7 @@ export abstract class ProgrammingExerciseTriggerBuildButtonComponent implements
             if (hasDueDatePassed(this.exercise)) {
                 // If the last result was manual, the instructor might not want to override it with a new automatic result.
                 const newestResult = !!this.participation.results && head(orderBy(this.participation.results, ['id'], ['desc']));
-                this.lastResultIsManual = !!newestResult && Result.isManualResult(newestResult);
+                this.lastResultIsManual = !!newestResult && isManualResult(newestResult);
             }
             // We can trigger the build only if the participation is active (has build plan), if the build plan was archived (new build plan will be created)
             // or the due date is over.
@@ -126,7 +127,7 @@ export abstract class ProgrammingExerciseTriggerBuildButtonComponent implements
             .pipe(
                 filter((result) => !!result),
                 tap((result: Result) => {
-                    this.lastResultIsManual = !!result && Result.isManualResult(result);
+                    this.lastResultIsManual = !!result && isManualResult(result);
                 }),
             )
             .subscribe();

src/main/webapp/app/exercises/programming/shared/code-editor/actions/code-editor-actions.component.html

@@ -1,3 +1,6 @@
+@if (!!participation()?.exercise) {
+    <jhi-request-feedback-button class="me-3" [exercise]="participation()!.exercise!"></jhi-request-feedback-button>
+}
 @if (commitState === CommitState.CONFLICT) {
     <div>
         <button

src/main/webapp/app/exercises/programming/shared/code-editor/actions/code-editor-actions.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, input } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { catchError, switchMap, tap } from 'rxjs/operators';
@@ -14,6 +14,7 @@ import { CodeEditorConfirmRefreshModalComponent } from './code-editor-confirm-re
 import { AUTOSAVE_CHECK_INTERVAL, AUTOSAVE_EXERCISE_INTERVAL } from 'app/shared/constants/exercise-exam-constants';
 import { faCircleNotch, faSync, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { faPlayCircle } from '@fortawesome/free-regular-svg-icons';
+import { Participation } from 'app/entities/participation/participation.model';
 
 @Component({
     selector: 'jhi-code-editor-actions',
@@ -34,6 +35,7 @@ export class CodeEditorActionsComponent implements OnInit, OnDestroy, OnChanges
     @Input() get commitState() {
         return this.commitStateValue;
     }
+    participation = input<Participation>();
 
     @Output() commitStateChange = new EventEmitter<CommitState>();
     @Output() editorStateChange = new EventEmitter<EditorState>();

src/main/webapp/app/exercises/programming/shared/code-editor/code-editor.module.ts

@@ -23,6 +23,7 @@ import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code
 import { CodeEditorFileBrowserBadgeComponent } from 'app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser-badge.component';
 import { CodeEditorMonacoComponent } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
 
 @NgModule({
@@ -35,6 +36,7 @@ import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.co
         ArtemisProgrammingManualAssessmentModule,
         MonacoEditorComponent,
         ArtemisSharedComponentModule,
+        RequestFeedbackButtonComponent,
     ],
     declarations: [
         CodeEditorGridComponent,

src/main/webapp/app/exercises/programming/shared/code-editor/container/code-editor-container.component.html

@@ -20,6 +20,7 @@ <h4 class="editor-title"><ng-content select="[editorTitle]" /></h4>
                     (onRefreshFiles)="onRefreshFiles()"
                     (commitStateChange)="onCommitStateChange.emit($event)"
                     (onError)="onError($event)"
+                    [participation]="participation"
                 />
             }
         </div>