Merge pull request #490 from dres-dev/feature/467-perpetual-task

Perpetual tasks

Author: lucaro

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,

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
     )
 }

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)
-}
+}

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!!,

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>,

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>,

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
     }
 }

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

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.")
                     }
                 )

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.")
                     }
                 )