xcpcio 0.65.1__tar.gz → 0.66.0__tar.gz

{xcpcio-0.65.1 → xcpcio-0.66.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xcpcio
-Version: 0.65.1
+Version: 0.66.0
 Summary: xcpcio python lib
 Project-URL: homepage, https://github.com/xcpcio/xcpcio
 Project-URL: documentation, https://github.com/xcpcio/xcpcio

{xcpcio-0.65.1 → xcpcio-0.66.0}/tests/test_contest.py

@@ -30,7 +30,7 @@ class TestContest:
 
         # Check default values
         assert contest.status_time_display == constants.FULL_STATUS_TIME_DISPLAY
-        assert isinstance(contest.options, ContestOptions)
+        assert contest.options is None
 
     def test_contest_creation_with_values(self):
         """Test Contest creation with provided values"""

{xcpcio-0.65.1 → xcpcio-0.66.0}/tests/test_submission.py

@@ -13,7 +13,6 @@ class TestSubmission:
         """Test Submission creation with default values"""
         submission = Submission()
         assert submission.id is None
-        assert submission.submission_id is None
         assert submission.team_id == ""
         assert submission.problem_id == 0
         assert submission.timestamp == 0
@@ -215,7 +214,7 @@ class TestSubmissions:
                     problem_id=1,
                     timestamp=123,
                 ),
-                Submission(),  # All defaults
+                Submission(id="sub_default"),  # All other defaults
             ]
         )
 

{xcpcio-0.65.1 → xcpcio-0.66.0}/tests/test_team.py

@@ -93,14 +93,21 @@ class TestTeamSerialization:
         assert team_dict["coaches"] == "Dr. Smith"
         assert team_dict["location"] == "Building A"
         assert team_dict["group"] == ["undergraduate", "local"]
-        assert team_dict["extra"] == {"room": "101", "contact": "alice@test.edu"}
+        assert "extra" not in team_dict  # extra field is excluded from serialization
 
     def test_model_validate(self, sample_team: Team):
         """Test Team model_validate method"""
         team_dict = sample_team.model_dump()
         reconstructed_team = Team.model_validate(team_dict)
 
-        assert reconstructed_team == sample_team
+        assert reconstructed_team.id == sample_team.id
+        assert reconstructed_team.name == sample_team.name
+        assert reconstructed_team.organization == sample_team.organization
+        assert reconstructed_team.members == sample_team.members
+        assert reconstructed_team.coaches == sample_team.coaches
+        assert reconstructed_team.location == sample_team.location
+        assert reconstructed_team.group == sample_team.group
+        assert reconstructed_team.extra == {}  # extra is not serialized
 
     def test_model_dump_json(self, sample_team: Team):
         """Test Team model_dump_json method"""
@@ -117,21 +124,42 @@ class TestTeamSerialization:
         team_json = sample_team.model_dump_json()
         reconstructed_team = Team.model_validate_json(team_json)
 
-        assert reconstructed_team == sample_team
+        assert reconstructed_team.id == sample_team.id
+        assert reconstructed_team.name == sample_team.name
+        assert reconstructed_team.organization == sample_team.organization
+        assert reconstructed_team.members == sample_team.members
+        assert reconstructed_team.coaches == sample_team.coaches
+        assert reconstructed_team.location == sample_team.location
+        assert reconstructed_team.group == sample_team.group
+        assert reconstructed_team.extra == {}  # extra is not serialized
 
     def test_round_trip_dict(self, sample_team: Team):
         """Test complete round-trip through dict serialization"""
         team_dict = sample_team.model_dump()
         reconstructed_team = Team.model_validate(team_dict)
 
-        assert reconstructed_team == sample_team
+        assert reconstructed_team.id == sample_team.id
+        assert reconstructed_team.name == sample_team.name
+        assert reconstructed_team.organization == sample_team.organization
+        assert reconstructed_team.members == sample_team.members
+        assert reconstructed_team.coaches == sample_team.coaches
+        assert reconstructed_team.location == sample_team.location
+        assert reconstructed_team.group == sample_team.group
+        assert reconstructed_team.extra == {}  # extra is excluded and won't round-trip
 
     def test_round_trip_json(self, sample_team: Team):
         """Test complete round-trip through JSON serialization"""
         team_json = sample_team.model_dump_json()
         reconstructed_team = Team.model_validate_json(team_json)
 
-        assert reconstructed_team == sample_team
+        assert reconstructed_team.id == sample_team.id
+        assert reconstructed_team.name == sample_team.name
+        assert reconstructed_team.organization == sample_team.organization
+        assert reconstructed_team.members == sample_team.members
+        assert reconstructed_team.coaches == sample_team.coaches
+        assert reconstructed_team.location == sample_team.location
+        assert reconstructed_team.group == sample_team.group
+        assert reconstructed_team.extra == {}  # extra is excluded and won't round-trip
 
     def test_minimal_team_serialization(self):
         """Test serialization of team with default/minimal values"""

{xcpcio-0.65.1 → xcpcio-0.66.0}/xcpcio/__version__.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '0.65.1'
+__version__ = VERSION = '0.66.0'

{xcpcio-0.65.1 → xcpcio-0.66.0}/xcpcio/clics/reader/contest_package_reader.py

@@ -54,15 +54,15 @@ class ContestPackageReader(BaseContestReader):
         self.access = self._load_json_file("access.json")
 
         self.accounts = self._load_json_file("accounts.json")
-        self.accounts_by_id = {account["id"] for account in self.accounts}
+        self.accounts_by_id = {account["id"]: account for account in self.accounts}
 
         self.api_info = self._load_json_file("api.json")
 
         self.awards = self._load_json_file("awards.json")
-        self.awards_by_id = {award["id"] for award in self.awards}
+        self.awards_by_id = {award["id"]: award for award in self.awards}
 
         self.clarifications = self._load_json_file("clarifications.json")
-        self.clarifications_by_id = {clarification["id"] for clarification in self.clarifications}
+        self.clarifications_by_id = {clarification["id"]: clarification for clarification in self.clarifications}
 
         self.contest = self._load_json_file("contest.json")
         self.contest_state = self._load_json_file("state.json")
@@ -71,14 +71,14 @@ class ContestPackageReader(BaseContestReader):
         self.groups_by_id = {group["id"]: group for group in self.groups}
 
         self.judgement_types = self._load_json_file("judgement-types.json")
-        self.judgement_types_by_id = {judgement_type["id"] for judgement_type in self.judgement_types}
+        self.judgement_types_by_id = {judgement_type["id"]: judgement_type for judgement_type in self.judgement_types}
 
         self.judgements = self._load_json_file("judgements.json")
-        self.judgements_by_id = {judgement["id"] for judgement in self.judgements}
+        self.judgements_by_id = {judgement["id"]: judgement for judgement in self.judgements}
         self.judgements_by_submission_id = self._create_index_by_id(self.judgements, "submission_id")
 
         self.languages = self._load_json_file("languages.json")
-        self.languages_by_id = {language["id"] for language in self.languages}
+        self.languages_by_id = {language["id"]: language for language in self.languages}
 
         self.organizations = self._load_json_file("organizations.json")
         self.organizations_by_id = {org["id"]: org for org in self.organizations}
@@ -87,7 +87,7 @@ class ContestPackageReader(BaseContestReader):
         self.problems_by_id = {problem["id"]: problem for problem in self.problems}
 
         self.runs = self._load_json_file("runs.json")
-        self.runs_by_id = {run["id"] for run in self.runs}
+        self.runs_by_id = {run["id"]: run for run in self.runs}
         self.runs_by_judgement_id = self._create_index_by_id(self.runs, "judgement_id")
 
         self.submissions = self._load_json_file("submissions.json")

{xcpcio-0.65.1 → xcpcio-0.66.0}/xcpcio/types.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field, RootModel
 
@@ -88,6 +88,7 @@ class BalloonColor(BaseModel):
 
 class Person(BaseModel):
     name: Text
+
     cf_id: Optional[str] = None
     icpc_id: Optional[str] = None
 
@@ -98,9 +99,12 @@ Persons = List[Person]
 class Problem(BaseModel):
     id: str
     label: str
+
     name: Optional[Text] = None
+
     time_limit: Optional[str] = None
     memory_limit: Optional[str] = None
+
     balloon_color: Optional[BalloonColor] = None
 
 
@@ -112,8 +116,7 @@ class SubmissionReaction(BaseModel):
 
 
 class Submission(BaseModel):
-    id: Optional[str] = None
-    submission_id: Optional[str] = None
+    id: str = None
 
     team_id: str = ""
     problem_id: Union[int, str] = 0
@@ -144,11 +147,12 @@ class Team(BaseModel):
     members: Optional[Union[Text, List[Text], Persons]] = None
 
     badge: Optional[Image] = None
+    photo: Optional[Image] = None
 
     location: Optional[str] = None
     icpc_id: Optional[str] = None
 
-    extra: Dict[str, str] = Field(default_factory=dict)
+    extra: Dict[str, Any] = Field(default_factory=dict, exclude=True)
 
     def add_group(self, group: str):
         if group not in self.group:
@@ -166,9 +170,13 @@ class Teams(RootModel[List[Team]]):
 class ContestOptions(BaseModel):
     calculation_of_penalty: Optional[CalculationOfPenalty] = None
     submission_timestamp_unit: Optional[TimeUnit] = None
+
     has_reaction_videos: Optional[bool] = None
     reaction_video_url_template: Optional[str] = None
 
+    has_team_photos: Optional[bool] = None
+    team_photo_url_template: Optional[Image] = None
+
 
 class Contest(BaseModel):
     contest_name: Text = ""
@@ -202,9 +210,9 @@ class Contest(BaseModel):
 
     version: Optional[str] = None
 
-    options: ContestOptions = Field(default_factory=ContestOptions)
+    options: Optional[ContestOptions] = None
 
-    unfrozen_time: int = 0x3F3F3F3F3F3F3F3F
+    unfrozen_time: int = Field(default=0x3F3F3F3F3F3F3F3F, exclude=True)
 
     def append_balloon_color(self, color: BalloonColor):
         if self.balloon_color is None: