xcpcio 0.65.0__tar.gz → 0.65.2__tar.gz

{xcpcio-0.65.0 → xcpcio-0.65.2}/PKG-INFO

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

{xcpcio-0.65.0 → xcpcio-0.65.2}/tests/test_contest.py

@@ -15,8 +15,7 @@ class TestContest:
         assert contest.frozen_time == 60 * 60  # 1 hour
         assert contest.unfrozen_time == 0x3F3F3F3F3F3F3F3F
         assert contest.penalty == 20 * 60  # 20 minutes
-        assert contest.problem_quantity == 0
-        assert contest.problem_id == []
+        assert contest.problem_id is None
         assert contest.organization == "School"
         assert contest.medal is None
         assert contest.balloon_color is None
@@ -31,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"""
@@ -55,7 +54,6 @@ class TestContest:
         assert contest.contest_name == "ICPC World Finals 2024"
         assert contest.start_time == 1234567890
         assert contest.end_time == 1234567890 + 5 * 60 * 60
-        assert contest.problem_quantity == 12
         assert len(contest.problem_id) == 12
         assert contest.problem_id[0] == "A"
         assert contest.problem_id[-1] == "L"
@@ -69,7 +67,6 @@ class TestContest:
             contest_name="Test Contest",
             start_time=1000000000,
             end_time=1000000000 + 60 * 60 * 5,
-            problem_quantity=5,
             problem_id=["A", "B", "C", "D", "E"],
             organization="Test Org",
         )
@@ -78,7 +75,6 @@ class TestContest:
         contest_dict = contest.model_dump()
         assert contest_dict["contest_name"] == "Test Contest"
         assert contest_dict["start_time"] == 1000000000
-        assert contest_dict["problem_quantity"] == 5
         assert contest_dict["organization"] == "Test Org"
 
         # Test JSON round-trip
@@ -97,7 +93,6 @@ class TestContest:
 
         contest = Contest(
             contest_name="Contest with Media",
-            problem_quantity=2,
             balloon_color=colors,
             logo=logo,
             banner=banner,
@@ -135,32 +130,32 @@ class TestContest:
 
     def test_fill_problem_id(self):
         """Test fill_problem_id method"""
-        contest = Contest(problem_quantity=5)
+        contest = Contest()
 
         # Initially empty
-        assert contest.problem_id == []
+        assert contest.problem_id is None
 
         # Fill with A-E
-        contest.fill_problem_id()
+        contest.fill_problem_id(5)
 
         assert len(contest.problem_id) == 5
         assert contest.problem_id == ["A", "B", "C", "D", "E"]
 
         # Test with larger quantity
-        contest.problem_quantity = 10
-        contest.fill_problem_id()
+        contest.fill_problem_id(10)
 
         assert len(contest.problem_id) == 10
         assert contest.problem_id == ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]
 
     def test_fill_balloon_color(self):
         """Test fill_balloon_color method"""
-        contest = Contest(problem_quantity=3)
+        contest = Contest()
 
         # Initially no colors
         assert contest.balloon_color is None
 
-        # Fill with default colors
+        # Fill problem IDs first, then balloon colors
+        contest.fill_problem_id(3)
         contest.fill_balloon_color()
 
         assert contest.balloon_color is not None
@@ -180,13 +175,12 @@ class TestContest:
             contest_name="Complex Contest",
             start_time=1234567890,
             end_time=1234567890 + 5 * 60 * 60,
-            problem_quantity=3,
             organization="Complex Org",
             medal="ccpc",  # Use preset instead of dict
         )
 
         # Add problem IDs and colors
-        contest.fill_problem_id()
+        contest.fill_problem_id(3)
         contest.fill_balloon_color()
 
         # Add logo

{xcpcio-0.65.0 → xcpcio-0.65.2}/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.0 → xcpcio-0.65.2}/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.0 → xcpcio-0.65.2}/tests/test_types.py

@@ -101,8 +101,8 @@ class TestSubmissionReaction:
 
     def test_reaction_empty(self):
         """Test SubmissionReaction with default values"""
-        reaction = SubmissionReaction()
-        assert reaction.url is None
+        reaction = SubmissionReaction(url="")
+        assert reaction.url == ""
 
     def test_reaction_with_url(self):
         """Test SubmissionReaction with URL"""
@@ -124,10 +124,10 @@ class TestSubmissionReaction:
 
     def test_reaction_no_url_serialization(self):
         """Test SubmissionReaction serialization with no URL"""
-        reaction = SubmissionReaction()
+        reaction = SubmissionReaction(url="")
 
         reaction_dict = reaction.model_dump()
-        assert reaction_dict["url"] is None
+        assert reaction_dict["url"] == ""
 
         # Test JSON round-trip
         reaction_json = reaction.model_dump_json()

{xcpcio-0.65.0 → xcpcio-0.65.2}/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.0'
+__version__ = VERSION = '0.65.2'

{xcpcio-0.65.0 → xcpcio-0.65.2}/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
 
@@ -74,15 +74,6 @@ class I18NStringSet(BaseModel):
 Text = Union[str, I18NStringSet]
 
 
-class Person(BaseModel):
-    name: Text
-    cf_id: Optional[str] = None
-    icpc_id: Optional[str] = None
-
-
-Persons = List[Person]
-
-
 class Image(BaseModel):
     url: Optional[str] = None
     base64: Optional[str] = None
@@ -95,12 +86,25 @@ class BalloonColor(BaseModel):
     background_color: str
 
 
+class Person(BaseModel):
+    name: Text
+
+    cf_id: Optional[str] = None
+    icpc_id: Optional[str] = None
+
+
+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
 
 
@@ -108,12 +112,11 @@ Problems = List[Problem]
 
 
 class SubmissionReaction(BaseModel):
-    url: Optional[str] = None
+    url: str
 
 
 class Submission(BaseModel):
-    id: Optional[str] = None
-    submission_id: Optional[str] = None
+    id: str = None
 
     team_id: str = ""
     problem_id: Union[int, str] = 0
@@ -129,7 +132,7 @@ class Submission(BaseModel):
 
 
 class Submissions(RootModel[List[Submission]]):
-    root: List[Submission]
+    pass
 
 
 class Team(BaseModel):
@@ -138,7 +141,7 @@ class Team(BaseModel):
 
     organization: str = ""
     group: List[str] = Field(default_factory=list)
-    tag: List[str] = Field(default_factory=list)
+    tag: Optional[List[str]] = None
 
     coaches: Optional[Union[Text, List[Text], Persons]] = None
     members: Optional[Union[Text, List[Text], Persons]] = None
@@ -148,7 +151,7 @@ class Team(BaseModel):
     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:
@@ -179,14 +182,13 @@ class Contest(BaseModel):
 
     freeze_time: Optional[Union[int, DateTimeISO8601String]] = None
     frozen_time: int = 60 * 60  # unit: seconds
-    unfrozen_time: int = 0x3F3F3F3F3F3F3F3F
 
     problems: Optional[Problems] = None
-    problem_quantity: int = 0
-    problem_id: List[str] = Field(default_factory=list)
+
+    problem_id: Optional[List[str]] = None
     balloon_color: Optional[List[BalloonColor]] = None
 
-    status_time_display: Optional[Dict[str, bool]] = constants.FULL_STATUS_TIME_DISPLAY
+    status_time_display: Dict[str, bool] = constants.FULL_STATUS_TIME_DISPLAY
 
     badge: Optional[str] = None
     organization: str = "School"
@@ -203,7 +205,9 @@ class Contest(BaseModel):
 
     version: Optional[str] = None
 
-    options: ContestOptions = Field(default_factory=ContestOptions)
+    options: Optional[ContestOptions] = None
+
+    unfrozen_time: int = Field(default=0x3F3F3F3F3F3F3F3F, exclude=True)
 
     def append_balloon_color(self, color: BalloonColor):
         if self.balloon_color is None:
@@ -211,8 +215,8 @@ class Contest(BaseModel):
         self.balloon_color.append(color)
         return self
 
-    def fill_problem_id(self):
-        self.problem_id = [chr(ord("A") + i) for i in range(self.problem_quantity)]
+    def fill_problem_id(self, problem_quantity: int):
+        self.problem_id = [chr(ord("A") + i) for i in range(problem_quantity)]
         return self
 
     def fill_balloon_color(self):
@@ -232,7 +236,6 @@ class Contest(BaseModel):
             BalloonColor(background_color="rgba(144, 238, 144, 0.7)", color="#000"),
             BalloonColor(background_color="rgba(77, 57, 0, 0.7)", color="#fff"),
         ]
-
-        self.balloon_color = default_balloon_color_list[: self.problem_quantity]
+        self.balloon_color = default_balloon_color_list[: len(self.problem_id)]
 
         return self