dres-dev · lucaro · May 28, 2026 · Jun 3, 2024 · Jun 19, 2024 · Jun 19, 2024
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ We provide a dedicated __client__ DRES OpenApi specifications for systems to be
 
 ## Requirements
 
-To deploy and run DRES, a JRE of at least Java 11 is required, e.g. the [OpenJDK 11](https://jdk.java.net/java-se-ri/11).
+To deploy and run DRES, a JRE of at least Java 17 is required, e.g. the [OpenJDK 17](https://jdk.java.net/java-se-ri/17).
 For development, besides the JDK, addtitionally [NPM](https://www.npmjs.com/) and the [Angular CLI](https://cli.angular.io/) is recommended.
 
 ## Citation

diff --git a/backend/build.gradle b/backend/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'idea'
 
 mainClassName = 'dev.dres.DRES'
-sourceCompatibility = 11
+sourceCompatibility = 17
 
 /* Configuration for frontend classpath files (see dependencies). */
 configurations {
@@ -37,11 +37,11 @@ repositories {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
     compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
     compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
 }
 
@@ -105,18 +105,18 @@ dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: version_junit
 
     ///// Jackson / Kotlin
-    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.13.0'
+    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: version_jackson_kotlin
 
     ///// Kotlin
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: version_kotlin
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: version_kotlin
-    implementation group: 'org.jetbrains.kotlinx', name:'kotlinx-serialization-json', version: '1.6.2'
+    implementation group: 'org.jetbrains.kotlinx', name:'kotlinx-serialization-json', version: version_kotlinx_serialization
 }
 
 kapt {
     correctErrorTypes true
     useBuildCache true
-    targetCompatibility = 11
+    targetCompatibility = 17
 }
 
 
@@ -220,3 +220,6 @@ startScripts {
         windowsScript.text = windowsScript.text.replaceAll('set CLASSPATH=.*', 'set CLASSPATH=.;%APP_HOME%/lib/*')
     }
 }
+
+/* Exclude logback-classic. 8. July 2024: Leak comes from openapi-annotation */
+configurations.all*.exclude module: "logback-classic"
diff --git a/backend/src/main/kotlin/dev/dres/DRES.kt b/backend/src/main/kotlin/dev/dres/DRES.kt
@@ -42,7 +42,7 @@ import kotlin.system.exitProcess
  */
 object DRES {
     /** Version of DRES. */
-    const val VERSION = "2.0.4"
+    const val VERSION = "2.0.5"
 
     /** Application root; should be relative to JAR file or classes path. */
     val APPLICATION_ROOT: Path =

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/handler/judgement/DequeueJudgementHandler.kt b/backend/src/main/kotlin/dev/dres/api/rest/handler/judgement/DequeueJudgementHandler.kt
@@ -53,7 +53,7 @@ class DequeueJudgementHandler : AbstractJudgementHandler(),
     private fun nextRequest(ctx: Context): ApiJudgementRequest? {
         val evaluationManager = ctx.eligibleManagerForId<RunManager>()
         checkEligibility(ctx, evaluationManager)
-        val validator = evaluationManager.judgementValidators.find { it.hasOpen } ?: return null
+        val validator = evaluationManager.judgementValidators.sortedBy { it.priority }.reversed().find { it.hasOpen } ?: return null
         val next = validator.next() ?: return null
         val taskDescription = validator.taskTemplate.textualDescription()
         return ApiJudgementRequest(

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/handler/judgement/DequeueVoteHandler.kt b/backend/src/main/kotlin/dev/dres/api/rest/handler/judgement/DequeueVoteHandler.kt
@@ -52,7 +52,7 @@ class DequeueVoteHandler: AbstractJudgementHandler(), GetRestHandler<ApiJudgemen
     fun nextRequest(ctx: Context): ApiJudgementRequest? { //TODO needs adjustment to deal with answerSets
         val evaluationManager = ctx.eligibleManagerForId<RunManager>()
 
-        val validator = evaluationManager.judgementValidators.filterIsInstance<VoteValidator>().find { it.isActive } ?: return null
+        val validator = evaluationManager.judgementValidators.filterIsInstance<VoteValidator>().sortedBy { it.priority }.reversed().find { it.isActive } ?: return null
         val next = validator.next()
             ?: /* No submission awaiting judgement */
             return null

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiClientTaskTemplateInfo.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiClientTaskTemplateInfo.kt
@@ -12,7 +12,7 @@ data class ApiClientTaskTemplateInfo(
     val name: String,
     val taskGroup: String,
     val taskType: String,
-    val duration: Long
+    val duration: Long?
 ) {
     constructor(task: ApiTaskTemplate) : this(
         task.name,

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiEvaluationState.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiEvaluationState.kt
@@ -18,7 +18,7 @@ data class ApiEvaluationState(
     val taskId: String?,
     val taskStatus: ApiTaskStatus,
     val taskTemplateId: String?,
-    val timeLeft: Long,
+    val timeLeft: Long?,
     val timeElapsed: Long
 ) {
     constructor(run: InteractiveRunManager, context: RunActionContext) : this(
@@ -27,7 +27,7 @@ data class ApiEvaluationState(
         run.currentTask(context)?.taskId,
         run.currentTask(context)?.status ?: ApiTaskStatus.NO_TASK,
         run.currentTaskTemplate(context).templateId,
-        run.timeLeft(context) / 1000,
+        run.timeLeft(context)?.div(1000),
         run.timeElapsed(context) / 1000
     )
 }
diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiTaskOverview.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiTaskOverview.kt
@@ -9,7 +9,7 @@ data class ApiTaskOverview(
     val name: String,
     val type: String,
     val group: String,
-    val duration: Long,
+    val duration: Long?,
     val taskId: String,
     val status: ApiTaskStatus,
     val started: Long?,
@@ -24,4 +24,4 @@ data class ApiTaskOverview(
         task.status,
         task.started,
         task.ended)
-}
+}
diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiTaskTemplateInfo.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/evaluation/ApiTaskTemplateInfo.kt
@@ -19,7 +19,7 @@ data class ApiTaskTemplateInfo(
     val comment: String?,
     val taskGroup: String,
     val taskType: String,
-    val duration: Long
+    val duration: Long?
 ) {
     constructor(task: ApiTaskTemplate) : this(
         task.id!!,

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/ApiTaskTemplate.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/ApiTaskTemplate.kt
@@ -23,7 +23,7 @@ data class ApiTaskTemplate(
     val name: String,
     val taskGroup: String,
     val taskType: String,
-    val duration: Long,
+    val duration: Long?,
     val collectionId: CollectionId,
     val targets: List<ApiTarget>,
     val hints: List<ApiHint>,

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/ApiTaskType.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/ApiTaskType.kt
@@ -22,7 +22,7 @@ import java.nio.file.StandardOpenOption
 @Serializable
 data class ApiTaskType(
     val name: String,
-    val duration: Long,
+    val duration: Long?,
     val targetOption: ApiTargetOption,
     val hintOptions: List<ApiHintOption>,
     val submissionOptions: List<ApiSubmissionOption>,

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/options/ApiScoreOption.kt b/backend/src/main/kotlin/dev/dres/api/rest/types/template/tasks/options/ApiScoreOption.kt
@@ -10,7 +10,7 @@ import dev.dres.data.model.template.task.options.DbScoreOption
  * @version 1.1.0
  */
 enum class ApiScoreOption {
-    KIS, AVS, LEGACY_AVS;
+    KIS, AVS, LEGACY_AVS, NOOP;
 
     /**
      * Converts this [ApiScoreOption] to a [DbScoreOption] representation. Requires an ongoing transaction.
@@ -21,5 +21,6 @@ enum class ApiScoreOption {
         KIS -> DbScoreOption.KIS
         AVS -> DbScoreOption.AVS
         LEGACY_AVS -> DbScoreOption.LEGACY_AVS
+        NOOP -> DbScoreOption.NOOP
     }
 }
diff --git a/backend/src/main/kotlin/dev/dres/data/model/run/AbstractInteractiveTask.kt b/backend/src/main/kotlin/dev/dres/data/model/run/AbstractInteractiveTask.kt
@@ -20,8 +20,8 @@ import kotlinx.dnq.query.*
 abstract class AbstractInteractiveTask(store: TransientEntityStore, task: DbTask) : AbstractTask(store, task) {
 
 
-    /** The total duration in milliseconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! */
-    abstract override var duration: Long
+    /** The total duration in seconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! */
+    abstract override var duration: Long?
 
     /** The [AnswerSetValidator] used to validate [DbSubmission]s. */
     final override val validator: AnswerSetValidator
@@ -50,7 +50,7 @@ abstract class AbstractInteractiveTask(store: TransientEntityStore, task: DbTask
                             .asSequence().map {
                                 ItemRange(it.item?.name!!, it.start!!, it.end!!)
                             }.toSet()
-                    BasicJudgementValidator(template.toApi(), this.store, knownCorrectRanges = knownRanges)
+                    BasicJudgementValidator(template.toApi(), this.store, template.taskGroup.type.toApi(), knownCorrectRanges = knownRanges)
                 }
 
                 DbTargetOption.VOTE -> {
@@ -62,12 +62,12 @@ abstract class AbstractInteractiveTask(store: TransientEntityStore, task: DbTask
                     val parameters =
                         template.taskGroup.type.configurations.filter { it.key eq targetOption.description }
                             .asSequence().associate { it.key to it.value }
-                    BasicVoteValidator(template.toApi(), this.store, knownCorrectRanges = knownRanges, parameters = parameters)
+                    BasicVoteValidator(template.toApi(), this.store, template.taskGroup.type.toApi(), knownCorrectRanges = knownRanges, parameters = parameters)
                 }
 
                 else -> throw IllegalStateException("The provided target option ${targetOption.description} is not supported by interactive tasks.")
             }
         }
     }
 
-}
+}
diff --git a/backend/src/main/kotlin/dev/dres/data/model/run/AbstractNonInteractiveTask.kt b/backend/src/main/kotlin/dev/dres/data/model/run/AbstractNonInteractiveTask.kt
@@ -43,11 +43,11 @@ abstract class AbstractNonInteractiveTask(store: TransientEntityStore, task: DbT
                             .asSequence().map {
                             ItemRange(it.item?.name!!, it.start!!, it.end!!)
                         }.toSet()
-                    BasicJudgementValidator(template.toApi(), this.store, knownCorrectRanges = knownRanges)
+                    BasicJudgementValidator(template.toApi(), this.store, template.taskGroup.type.toApi(), knownCorrectRanges = knownRanges)
                 }
 
                 else -> throw IllegalStateException("The provided target option ${targetOption.description} is not supported by interactive tasks.")
             }
         }
     }
-}
+}
diff --git a/backend/src/main/kotlin/dev/dres/data/model/run/InteractiveAsynchronousEvaluation.kt b/backend/src/main/kotlin/dev/dres/data/model/run/InteractiveAsynchronousEvaluation.kt
@@ -16,10 +16,7 @@ import dev.dres.run.filter.basics.SubmissionFilter
 import dev.dres.run.filter.basics.CombiningSubmissionFilter
 import dev.dres.run.score.scoreboard.MaxNormalizingScoreBoard
 import dev.dres.run.score.scoreboard.Scoreboard
-import dev.dres.run.score.scorer.AvsTaskScorer
-import dev.dres.run.score.scorer.CachingTaskScorer
-import dev.dres.run.score.scorer.KisTaskScorer
-import dev.dres.run.score.scorer.LegacyAvsTaskScorer
+import dev.dres.run.score.scorer.*
 import dev.dres.run.transformer.MapToSegmentTransformer
 import dev.dres.run.transformer.SubmissionTaskMatchTransformer
 import dev.dres.run.transformer.basics.SubmissionTransformer
@@ -161,8 +158,8 @@ class InteractiveAsynchronousEvaluation(store: TransientEntityStore, evaluation:
         /** The [CachingTaskScorer] instance used by this [InteractiveAsynchronousEvaluation].*/
         override val scorer: CachingTaskScorer
 
-        /** The total duration in milliseconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! */
-        override var duration: Long = this.template.duration
+        /** The total duration in seconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! NULL represents perpetual task*/
+        override var duration: Long? = this.template.duration
 
         val teamId = this.dbTask.team!!.id
 
@@ -220,6 +217,7 @@ class InteractiveAsynchronousEvaluation(store: TransientEntityStore, evaluation:
 
                         DbScoreOption.AVS -> AvsTaskScorer(this, store)
                         DbScoreOption.LEGACY_AVS -> LegacyAvsTaskScorer(this, store)
+                        DbScoreOption.NOOP -> NoOpTaskScorer(this)
                         else -> throw IllegalStateException("The task score option $scoreOption is currently not supported.")
                     }
                 )

diff --git a/backend/src/main/kotlin/dev/dres/data/model/run/InteractiveSynchronousEvaluation.kt b/backend/src/main/kotlin/dev/dres/data/model/run/InteractiveSynchronousEvaluation.kt
@@ -16,10 +16,7 @@ import dev.dres.run.filter.basics.SubmissionFilter
 import dev.dres.run.filter.basics.CombiningSubmissionFilter
 import dev.dres.run.score.scoreboard.MaxNormalizingScoreBoard
 import dev.dres.run.score.scoreboard.Scoreboard
-import dev.dres.run.score.scorer.AvsTaskScorer
-import dev.dres.run.score.scorer.CachingTaskScorer
-import dev.dres.run.score.scorer.KisTaskScorer
-import dev.dres.run.score.scorer.LegacyAvsTaskScorer
+import dev.dres.run.score.scorer.*
 import dev.dres.run.transformer.MapToSegmentTransformer
 import dev.dres.run.transformer.SubmissionTaskMatchTransformer
 import dev.dres.run.transformer.basics.SubmissionTransformer
@@ -118,8 +115,8 @@ class InteractiveSynchronousEvaluation(store: TransientEntityStore, evaluation:
         /** The [CachingTaskScorer] instance used by this [ISTaskRun]. */
         override val scorer: CachingTaskScorer
 
-        /** The total duration in milliseconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! */
-        override var duration: Long = this.template.duration
+        /** The total duration in seconds of this task. Usually determined by the [DbTaskTemplate] but can be adjusted! NULL represents perpetual task */
+        override var duration: Long? = this.template.duration
 
         /** */
         override val teams: List<TeamId> =
@@ -176,6 +173,7 @@ class InteractiveSynchronousEvaluation(store: TransientEntityStore, evaluation:
 
                         DbScoreOption.AVS -> AvsTaskScorer(this, store)
                         DbScoreOption.LEGACY_AVS -> LegacyAvsTaskScorer(this, store)
+                        DbScoreOption.NOOP -> NoOpTaskScorer(this)
                         else -> throw IllegalStateException("The task score option $scoreOption is currently not supported.")
                     }
                 )

diff --git a/backend/src/main/kotlin/dev/dres/data/model/run/NonInteractiveEvaluation.kt b/backend/src/main/kotlin/dev/dres/data/model/run/NonInteractiveEvaluation.kt
@@ -73,12 +73,13 @@ class NonInteractiveEvaluation(store: TransientEntityStore, evaluation: DbEvalua
                 DbScoreOption.KIS -> throw IllegalStateException("KIS task scorer is not applicable to non-interactive evaluations")
                 DbScoreOption.AVS -> AvsTaskScorer(this, store)
                 DbScoreOption.LEGACY_AVS -> LegacyAvsTaskScorer(this, store)
+                DbScoreOption.NOOP -> NoOpTaskScorer(this)
                 else -> throw IllegalStateException("The task score option $scoreOption is currently not supported.")
             }
         ) }
 
         override val transformer: SubmissionTransformer = store.transactional {
-            if (task.template.taskGroup.type.options.filter { it eq DbTaskOption.MAP_TO_SEGMENT }.any()) {
+            if (task.template.taskGroup.type.options.contains(DbTaskOption.MAP_TO_SEGMENT)) {
                 CombiningSubmissionTransformer(
                     listOf(
                         SubmissionTaskMatchTransformer(this.taskId),

diff --git a/backend/src/main/kotlin/dev/dres/data/model/template/task/DbTaskTemplate.kt b/backend/src/main/kotlin/dev/dres/data/model/template/task/DbTaskTemplate.kt
@@ -46,7 +46,7 @@ class DbTaskTemplate(entity: Entity) : PersistentEntity(entity), TaskTemplate {
     var collection by xdLink1(DbMediaCollection)
 
     /** The duration of the [DbTaskTemplate] in seconds. */
-    var duration by xdRequiredLongProp { min(0L)  }
+    var duration by xdNullableLongProp()
 
     /** The [DbTaskTemplateTarget]s that identify the target. Multiple entries indicate the existence of multiple targets. */
     val targets by xdChildren1_N<DbTaskTemplate, DbTaskTemplateTarget>(DbTaskTemplateTarget::task)

diff --git a/backend/src/main/kotlin/dev/dres/data/model/template/task/DbTaskType.kt b/backend/src/main/kotlin/dev/dres/data/model/template/task/DbTaskType.kt
@@ -29,8 +29,8 @@ class DbTaskType(entity: Entity) : XdEntity(entity) {
     /** The [DbEvaluationTemplate] this [DbTaskType] belongs to. */
     var evaluation: DbEvaluationTemplate by xdParent<DbTaskType,DbEvaluationTemplate>(DbEvaluationTemplate::taskTypes)
 
-    /** The (default) duration of this [DbTaskType] in seconds. */
-    var duration by xdRequiredLongProp() { min(0L) }
+    /** The (default) duration of this [DbTaskType] in seconds. Defaults to no duration, which means perpetually running task. */
+    var duration by xdNullableLongProp()
 
     /** The [DbTargetOption] for this [DbTaskType]. Specifies the type of target. */
     var target by xdLink1(DbTargetOption)

diff --git a/backend/src/main/kotlin/dev/dres/data/model/template/task/options/DbScoreOption.kt b/backend/src/main/kotlin/dev/dres/data/model/template/task/options/DbScoreOption.kt
@@ -17,6 +17,7 @@ class DbScoreOption(entity: Entity) : XdEnumEntity(entity) {
         val KIS by enumField { description = "KIS" }
         val AVS by enumField { description = "AVS" }
         val LEGACY_AVS by enumField {description = "LEGACY_AVS"}
+        val NOOP by enumField { description = "NOOP" }
     }
 
     /** Name / description of the [DbScoreOption]. */