Remove aws_repository from the submission data class (fixes #173). (#174)

* Remove aws_repository from the submission data class.

* Minor formatting fixes.

* Fix aws submission template.

* Rename AWS template file.

---------

Co-authored-by: Martin Jonáš <martin.jonas@mail.muni.cz>

Author: martinjonas

smtcomp/defs.py

@@ -1227,8 +1227,6 @@ class Participation(BaseModel, extra="forbid"):
     divisions: add all the logics of those divisions in each track
     logics: add all the specified logics in each selected track it exists
 
-    aws_repository should be used only in conjunction with Cloud and Parallel track
-
     archive and command should not be used with Cloud and Parallel track. They superseed the one given at the root.
     """
 
@@ -1237,18 +1235,10 @@ class Participation(BaseModel, extra="forbid"):
     divisions: list[Division] = []
     archive: Archive | None = None
     command: Command | None = None
-    aws_repository: str | None = None
     experimental: bool = False
 
     @model_validator(mode="after")
     def check_archive(self) -> Participation:
-        aws_track = {Track.Cloud, Track.Parallel}
-        if self.aws_repository is None and not set(self.tracks).isdisjoint(aws_track):
-            raise ValueError("aws_repository is required by Cloud and Parallel track")
-        if self.aws_repository is not None and not set(self.tracks).issubset(aws_track):
-            raise ValueError("aws_repository can be used only with Cloud and Parallel track")
-        if (self.archive is not None or self.command is not None) and not set(self.tracks).isdisjoint(aws_track):
-            raise ValueError("archive and command field can't be used with Cloud and Parallel track")
         return self
 
     def get(self, d: None | dict[Track, dict[Division, set[Logic]]] = None) -> dict[Track, dict[Division, set[Logic]]]:
@@ -1274,8 +1264,6 @@ def get_logics_by_track(self) -> dict[Track, set[Logic]]:
     def complete(self, archive: Archive | None, command: Command | None) -> ParticipationCompleted:
         archive = cast(Archive, archive if self.archive is None else self.archive)
         command = cast(Command, command if self.command is None else self.command)
-        if (self.aws_repository is not None) or set(self.tracks).issubset({Track.Cloud, Track.Parallel}):
-            raise ValueError("can't complete Cloud and Parallel track participations")
         return ParticipationCompleted(
             tracks=self.get(), archive=archive, command=command, experimental=self.experimental
         )
@@ -1339,14 +1327,10 @@ class Submission(BaseModel, extra="forbid"):
 
     @model_validator(mode="after")
     def check_archive(self) -> Submission:
-        if self.archive is None and not all(p.archive or p.aws_repository for p in self.participations.root):
-            raise ValueError(
-                "Field archive (or aws_repository) is needed in all participations if not present at the root"
-            )
-        if self.command is None and not all(p.command or p.aws_repository for p in self.participations.root):
-            raise ValueError(
-                "Field command (or aws_repository) is needed in all participations if not present at the root"
-            )
+        if self.archive is None and not all(p.archive for p in self.participations.root):
+            raise ValueError("Field archive is needed in all participations if not present at the root")
+        if self.command is None and not all(p.command for p in self.participations.root):
+            raise ValueError("Field command is needed in all participations if not present at the root")
 
         def check_archive(archive: None | Archive) -> None:
             if archive:
@@ -1364,7 +1348,7 @@ def uniq_id(self) -> str:
 
     def complete_participations(self) -> list[ParticipationCompleted]:
         """Push defaults from the submission into participations"""
-        return [p.complete(self.archive, self.command) for p in self.participations.root if p.aws_repository is None]
+        return [p.complete(self.archive, self.command) for p in self.participations.root]
 
 
 class Smt2File(BaseModel):

…ssions/template/template_aws_tracks.json …missions/template/template_parallel.jsonsubmissions/template/template_aws_tracks.json renamed to submissions/template/template_parallel.json submissions/template/template_aws_tracks.json renamed to submissions/template/template_parallel.json

@@ -6,24 +6,15 @@
     ],
     "contacts": ["contact name <contact@email.com>"],
     "website": "http://example.com/",
+    "archive": { "url": "https://github.com/project/repository" },
+    "command": ["relative_cmd", "default_command_line"],
     "system_description": "http://example.com/system.pdf",
     "solver_type": "Standalone",
     "seed": "42",
     "participations": [
-        {
-            "tracks": ["Cloud"],
-            "divisions": ["Equality"],
-            "aws_repository": "https://github.com/project/repository"
-        },
         {
             "tracks": ["Parallel"],
-            "logics": "QF_.*LRA.*",
-            "aws_repository": "https://github.com/project/repository"
-        },
-        {
-            "tracks": ["Cloud"],
-            "logics": ["LIA"],
-            "aws_repository": "https://github.com/project/repository"
+            "logics": "QF_.*LRA.*"
         }
     ]
 }

tests/test_validate.py

@@ -17,7 +17,7 @@
 good_cases = [
     "tests/test1.json",
     "submissions/template/template.json",
-    "submissions/template/template_aws_tracks.json",
+    "submissions/template/template_parallel.json",
     "tests/test_good_final.json",
 ]
 bad_cases = ["tests/test_bad.json", "tests/test_bad_final.json"]