xcpcio 0.65.1__tar.gz → 0.65.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xcpcio
-Version: 0.65.1
+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.1 → xcpcio-0.65.2}/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.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.1 → 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.1 → 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.1'
+__version__ = VERSION = '0.65.2'

{xcpcio-0.65.1 → 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
 
@@ -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
@@ -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:
@@ -202,9 +205,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: