Iris: Upgrade settings system for Pyris V2

docs/dev/guidelines/database.rst

@@ -295,7 +295,7 @@ Best Practices
         // IrisSubSettings.java
         @Column(name = "allowed_models")
         @Convert(converter = IrisModelListConverter.class)
-        private TreeSet<String> allowedModels = new TreeSet<>();
+        private TreeSet<String> allowedVariants = new TreeSet<>();
 
 
   * **Ordered Collection with duplicates**: When you want to order the collection of (potentially duplicated) objects of the relationship, then always use a ``List``. It is important to note here that there is no inherent order in a database table. One could argue that you can use the ``id`` field for the ordering, but there are edge cases where this can lead to problems. Therefore, for an ordered collection with duplicates, **always** annotate it with ``@OrderColumn``. An order column indicates to Hibernate that we want to order our collection based on a specific column of our data table. By default, the column name it expects is *tablenameS\_order*. For ordered collections, we also recommend that you annotate them with ``cascade = CascadeType.ALL`` and ``orphanRemoval = true``. E.g.:

src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java

@@ -28,7 +28,7 @@
 
 /**
  * An IrisSession represents a list of messages of Artemis, a user, and an LLM.
- * See {@link IrisExerciseChatSession} and {@link IrisHestiaSession} for concrete implementations.
+ * See {@link IrisExerciseChatSession} and {@link IrisCourseChatSession} for concrete implementations.
  */
 @Entity
 @Table(name = "iris_session")
@@ -40,7 +40,6 @@
 @JsonSubTypes({
     @JsonSubTypes.Type(value = IrisExerciseChatSession.class, name = "chat"), // TODO: Legacy. Should ideally be "exercise_chat"
     @JsonSubTypes.Type(value = IrisCourseChatSession.class, name = "course_chat"),
-    @JsonSubTypes.Type(value = IrisHestiaSession.class, name = "hestia"),
 })
 // @formatter:on
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java

@@ -1,31 +1,21 @@
 package de.tum.cit.aet.artemis.iris.domain.settings;
 
 import jakarta.annotation.Nullable;
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import de.tum.cit.aet.artemis.iris.domain.IrisTemplate;
-
 /**
  * An {@link IrisSubSettings} implementation for chat settings.
  * Chat settings notably provide settings for the rate limit.
- * Chat settings provide a single {@link IrisTemplate} for the chat messages.
  */
 @Entity
 @DiscriminatorValue("CHAT")
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class IrisChatSubSettings extends IrisSubSettings {
 
-    @Nullable
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-    private IrisTemplate template;
-
     @Nullable
     @Column(name = "rate_limit")
     private Integer rateLimit;
@@ -34,15 +24,6 @@ public class IrisChatSubSettings extends IrisSubSettings {
     @Column(name = "rate_limit_timeframe_hours")
     private Integer rateLimitTimeframeHours;
 
-    @Nullable
-    public IrisTemplate getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(@Nullable IrisTemplate template) {
-        this.template = template;
-    }
-
     @Nullable
     public Integer getRateLimit() {
         return rateLimit;

src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java

@@ -1,36 +1,16 @@
 package de.tum.cit.aet.artemis.iris.domain.settings;
 
-import jakarta.annotation.Nullable;
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import de.tum.cit.aet.artemis.iris.domain.IrisTemplate;
-
 /**
  * An {@link IrisSubSettings} implementation for the settings for competency generation.
- * CompetencyGeneration settings provide a single {@link IrisTemplate}
  */
 @Entity
 @DiscriminatorValue("COMPETENCY_GENERATION")
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class IrisCompetencyGenerationSubSettings extends IrisSubSettings {
 
-    @Nullable
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-    private IrisTemplate template;
-
-    @Nullable
-    public IrisTemplate getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(@Nullable IrisTemplate template) {
-        this.template = template;
-    }
-
 }

src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java

@@ -32,19 +32,10 @@ public class IrisCourseSettings extends IrisSettings {
     @JoinColumn(name = "iris_lecture_ingestion_settings_id")
     private IrisLectureIngestionSubSettings irisLectureIngestionSettings;
 
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-    @JoinColumn(name = "iris_hestia_settings_id")
-    private IrisHestiaSubSettings irisHestiaSettings;
-
     @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false)
     @JoinColumn(name = "iris_competency_generation_settings_id")
     private IrisCompetencyGenerationSubSettings irisCompetencyGenerationSettings;
 
-    @Override
-    public boolean isValid() {
-        return course != null;
-    }
-
     public Course getCourse() {
         return course;
     }
@@ -73,16 +64,6 @@ public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) {
         this.irisChatSettings = irisChatSettings;
     }
 
-    @Override
-    public IrisHestiaSubSettings getIrisHestiaSettings() {
-        return irisHestiaSettings;
-    }
-
-    @Override
-    public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) {
-        this.irisHestiaSettings = irisHestiaSettings;
-    }
-
     @Override
     public IrisCompetencyGenerationSubSettings getIrisCompetencyGenerationSettings() {
         return irisCompetencyGenerationSettings;

src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java

@@ -28,11 +28,6 @@ public class IrisExerciseSettings extends IrisSettings {
     @JoinColumn(name = "iris_chat_settings_id")
     private IrisChatSubSettings irisChatSettings;
 
-    @Override
-    public boolean isValid() {
-        return exercise != null;
-    }
-
     public Exercise getExercise() {
         return exercise;
     }
@@ -60,16 +55,6 @@ public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) {
         this.irisChatSettings = irisChatSettings;
     }
 
-    @Override
-    public IrisHestiaSubSettings getIrisHestiaSettings() {
-        return null;
-    }
-
-    @Override
-    public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) {
-
-    }
-
     @Override
     public IrisCompetencyGenerationSubSettings getIrisCompetencyGenerationSettings() {
         return null;