xcpcio 0.64.5__tar.gz → 0.65.1__tar.gz

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

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

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

@@ -1,5 +1,5 @@
 from xcpcio import constants
-from xcpcio.types import Color, Contest, ContestOptions, Image
+from xcpcio.types import BalloonColor, Contest, ContestOptions, Image
 
 
 class TestContest:
@@ -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
@@ -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
@@ -89,15 +85,14 @@ class TestContest:
     def test_contest_with_colors_and_images(self):
         """Test Contest with balloon colors, logo, and banner"""
         colors = [
-            Color(color="#fff", background_color="rgba(255, 0, 0, 0.7)"),
-            Color(color="#000", background_color="rgba(0, 255, 0, 0.7)"),
+            BalloonColor(color="#fff", background_color="rgba(255, 0, 0, 0.7)"),
+            BalloonColor(color="#000", background_color="rgba(0, 255, 0, 0.7)"),
         ]
         logo = Image(url="https://example.com/logo.png", type="png")
         banner = Image(url="https://example.com/banner.jpg", type="jpg")
 
         contest = Contest(
             contest_name="Contest with Media",
-            problem_quantity=2,
             balloon_color=colors,
             logo=logo,
             banner=banner,
@@ -119,7 +114,7 @@ class TestContest:
         assert contest.balloon_color is None
 
         # Add first color
-        red_color = Color(color="#fff", background_color="red")
+        red_color = BalloonColor(color="#fff", background_color="red")
         contest.append_balloon_color(red_color)
 
         assert contest.balloon_color is not None
@@ -127,7 +122,7 @@ class TestContest:
         assert contest.balloon_color[0] == red_color
 
         # Add second color
-        blue_color = Color(color="#fff", background_color="blue")
+        blue_color = BalloonColor(color="#fff", background_color="blue")
         contest.append_balloon_color(blue_color)
 
         assert len(contest.balloon_color) == 2
@@ -135,37 +130,37 @@ 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
         assert len(contest.balloon_color) == 3
-        assert all(isinstance(color, Color) for color in contest.balloon_color)
+        assert all(isinstance(color, BalloonColor) for color in contest.balloon_color)
 
         # Check first few default colors
         assert contest.balloon_color[0].background_color == "rgba(189, 14, 14, 0.7)"
@@ -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.64.5 → xcpcio-0.65.1}/tests/test_submission.py

@@ -3,7 +3,7 @@ import json
 import pytest
 
 from xcpcio import constants
-from xcpcio.types import Reaction, Submission, Submissions
+from xcpcio.types import SubmissionReaction, Submission, Submissions
 
 
 class TestSubmission:
@@ -12,7 +12,8 @@ class TestSubmission:
     def test_submission_creation_defaults(self):
         """Test Submission creation with default values"""
         submission = Submission()
-        assert submission.id == ""
+        assert submission.id is None
+        assert submission.submission_id is None
         assert submission.team_id == ""
         assert submission.problem_id == 0
         assert submission.timestamp == 0
@@ -24,7 +25,7 @@ class TestSubmission:
 
     def test_submission_creation_with_values(self):
         """Test Submission creation with provided values"""
-        reaction = Reaction(url="https://reaction.com/video.mp4")
+        reaction = SubmissionReaction(url="https://reaction.com/video.mp4")
         submission = Submission(
             id="sub_001",
             status=constants.SUBMISSION_STATUS_ACCEPTED,
@@ -79,7 +80,7 @@ class TestSubmission:
 
     def test_submission_with_reaction_serialization(self):
         """Test Submission with Reaction serialization"""
-        reaction = Reaction(url="https://example.com/reaction.mp4")
+        reaction = SubmissionReaction(url="https://example.com/reaction.mp4")
         submission = Submission(
             id="sub_003",
             status=constants.SUBMISSION_STATUS_ACCEPTED,
@@ -125,7 +126,7 @@ class TestSubmissions:
                     timestamp=1234567891,
                     time=300,
                     language="C++",
-                    reaction=Reaction(url="https://reaction.com/video.mp4"),
+                    reaction=SubmissionReaction(url="https://reaction.com/video.mp4"),
                 ),
                 Submission(
                     id="sub_003",

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

@@ -15,7 +15,7 @@ class TestTeam:
         assert team.name == ""
         assert team.organization == ""
         assert team.members is None
-        assert team.coach is None
+        assert team.coaches is None
         assert team.location is None
         assert team.group == []
         assert team.extra == {}
@@ -27,7 +27,7 @@ class TestTeam:
             name="Test Team",
             organization="Test University",
             members=["Alice", "Bob", "Charlie"],
-            coach="Dr. Smith",
+            coaches="Dr. Smith",
             location="Building A",
         )
 
@@ -35,7 +35,7 @@ class TestTeam:
         assert team.name == "Test Team"
         assert team.organization == "Test University"
         assert team.members == ["Alice", "Bob", "Charlie"]
-        assert team.coach == "Dr. Smith"
+        assert team.coaches == "Dr. Smith"
         assert team.location == "Building A"
 
     def test_group_management(self):
@@ -75,7 +75,7 @@ class TestTeamSerialization:
             name="Alpha Team",
             organization="University A",
             members=["Alice", "Bob", "Charlie"],
-            coach="Dr. Smith",
+            coaches="Dr. Smith",
             location="Building A",
             group=["undergraduate", "local"],
             extra={"room": "101", "contact": "alice@test.edu"},
@@ -90,7 +90,7 @@ class TestTeamSerialization:
         assert team_dict["name"] == "Alpha Team"
         assert team_dict["organization"] == "University A"
         assert team_dict["members"] == ["Alice", "Bob", "Charlie"]
-        assert team_dict["coach"] == "Dr. Smith"
+        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"}
@@ -161,7 +161,7 @@ class TestTeamList:
                     name="Alpha Team",
                     organization="University A",
                     members=["Alice", "Bob"],
-                    coach="Coach A",
+                    coaches="Coach A",
                 ),
                 Team(
                     id="team002",

{xcpcio-0.64.5 → xcpcio-0.65.1}/tests/test_types.py

@@ -1,5 +1,5 @@
 from xcpcio import constants
-from xcpcio.types import Color, ContestOptions, Image, Reaction
+from xcpcio.types import BalloonColor, ContestOptions, Image, SubmissionReaction
 
 
 class TestImage:
@@ -35,18 +35,18 @@ class TestImage:
         assert reconstructed_image == image
 
 
-class TestColor:
-    """Test cases for Color Pydantic model"""
+class TestBalloonColor:
+    """Test cases for BalloonColor Pydantic model"""
 
     def test_color_creation(self):
-        """Test Color creation"""
-        color = Color(color="#ffffff", background_color="#000000")
+        """Test BalloonColor creation"""
+        color = BalloonColor(color="#ffffff", background_color="#000000")
         assert color.color == "#ffffff"
         assert color.background_color == "#000000"
 
     def test_color_serialization(self):
-        """Test Color serialization and deserialization"""
-        color = Color(color="red", background_color="blue")
+        """Test BalloonColor serialization and deserialization"""
+        color = BalloonColor(color="red", background_color="blue")
 
         # Test model_dump
         color_dict = color.model_dump()
@@ -55,7 +55,7 @@ class TestColor:
 
         # Test JSON round-trip
         color_json = color.model_dump_json()
-        reconstructed_color = Color.model_validate_json(color_json)
+        reconstructed_color = BalloonColor.model_validate_json(color_json)
         assert reconstructed_color == color
 
 
@@ -96,22 +96,22 @@ class TestContestOptions:
         assert reconstructed_options == options
 
 
-class TestReaction:
-    """Test cases for Reaction Pydantic model"""
+class TestSubmissionReaction:
+    """Test cases for SubmissionReaction Pydantic model"""
 
     def test_reaction_empty(self):
-        """Test Reaction with default values"""
-        reaction = Reaction()
-        assert reaction.url is None
+        """Test SubmissionReaction with default values"""
+        reaction = SubmissionReaction(url="")
+        assert reaction.url == ""
 
     def test_reaction_with_url(self):
-        """Test Reaction with URL"""
-        reaction = Reaction(url="https://reaction.com/video.mp4")
+        """Test SubmissionReaction with URL"""
+        reaction = SubmissionReaction(url="https://reaction.com/video.mp4")
         assert reaction.url == "https://reaction.com/video.mp4"
 
     def test_reaction_serialization(self):
-        """Test Reaction serialization"""
-        reaction = Reaction(url="https://test.com/reaction.mp4")
+        """Test SubmissionReaction serialization"""
+        reaction = SubmissionReaction(url="https://test.com/reaction.mp4")
 
         # Test model_dump
         reaction_dict = reaction.model_dump()
@@ -119,17 +119,17 @@ class TestReaction:
 
         # Test JSON round-trip
         reaction_json = reaction.model_dump_json()
-        reconstructed_reaction = Reaction.model_validate_json(reaction_json)
+        reconstructed_reaction = SubmissionReaction.model_validate_json(reaction_json)
         assert reconstructed_reaction == reaction
 
     def test_reaction_no_url_serialization(self):
-        """Test Reaction serialization with no URL"""
-        reaction = Reaction()
+        """Test SubmissionReaction serialization with no URL"""
+        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()
-        reconstructed_reaction = Reaction.model_validate_json(reaction_json)
+        reconstructed_reaction = SubmissionReaction.model_validate_json(reaction_json)
         assert reconstructed_reaction == reaction

{xcpcio-0.64.5 → xcpcio-0.65.1}/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.64.5'
+__version__ = VERSION = '0.65.1'

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

@@ -61,9 +61,19 @@ SubmissionStatus = Literal[
 ImagePreset = Literal["ICPC", "CCPC", "HUNAN_CPC"]
 MedalPreset = Literal["ccpc", "icpc"]
 BannerMode = Literal["ONLY_BANNER", "ALL"]
+Lang = Literal["en", "zh-CN"]
 DateTimeISO8601String = str
 
 
+class I18NStringSet(BaseModel):
+    fallback: Optional[str] = None
+    fallback_lang: Optional[Lang] = None
+    texts: Optional[Dict[Lang, str]] = None
+
+
+Text = Union[str, I18NStringSet]
+
+
 class Image(BaseModel):
     url: Optional[str] = None
     base64: Optional[str] = None
@@ -71,20 +81,42 @@ class Image(BaseModel):
     preset: Optional[ImagePreset] = None
 
 
-class Color(BaseModel):
+class BalloonColor(BaseModel):
     color: str
     background_color: str
 
 
-class Reaction(BaseModel):
-    url: Optional[str] = None
+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
+
+
+Problems = List[Problem]
+
+
+class SubmissionReaction(BaseModel):
+    url: str
 
 
 class Submission(BaseModel):
-    id: str = ""
+    id: Optional[str] = None
+    submission_id: Optional[str] = None
 
     team_id: str = ""
-    problem_id: int = 0
+    problem_id: Union[int, str] = 0
     timestamp: int = 0  # unit: seconds
     status: SubmissionStatus = constants.SUBMISSION_STATUS_UNKNOWN
 
@@ -93,23 +125,23 @@ class Submission(BaseModel):
 
     is_ignore: Optional[bool] = None
 
-    reaction: Optional[Reaction] = None
+    reaction: Optional[SubmissionReaction] = None
 
 
 class Submissions(RootModel[List[Submission]]):
-    root: List[Submission]
+    pass
 
 
 class Team(BaseModel):
     id: str = ""
-    name: str = ""
+    name: Text = ""
 
     organization: str = ""
     group: List[str] = Field(default_factory=list)
-    tag: List[str] = Field(default_factory=list)
+    tag: Optional[List[str]] = None
 
-    coach: Optional[str] = None
-    members: Optional[List[str]] = None
+    coaches: Optional[Union[Text, List[Text], Persons]] = None
+    members: Optional[Union[Text, List[Text], Persons]] = None
 
     badge: Optional[Image] = None
 
@@ -139,7 +171,7 @@ class ContestOptions(BaseModel):
 
 
 class Contest(BaseModel):
-    contest_name: str = ""
+    contest_name: Text = ""
 
     start_time: Union[int, DateTimeISO8601String] = 0
     end_time: Union[int, DateTimeISO8601String] = 0
@@ -147,17 +179,18 @@ class Contest(BaseModel):
 
     freeze_time: Optional[Union[int, DateTimeISO8601String]] = None
     frozen_time: int = 60 * 60  # unit: seconds
-    unfrozen_time: int = 0x3F3F3F3F3F3F3F3F
 
-    problem_quantity: int = 0
-    problem_id: List[str] = Field(default_factory=list)
+    problems: Optional[Problems] = None
 
-    organization: str = "School"
-    status_time_display: Optional[Dict[str, bool]] = constants.FULL_STATUS_TIME_DISPLAY
+    problem_id: Optional[List[str]] = None
+    balloon_color: Optional[List[BalloonColor]] = None
+
+    status_time_display: Dict[str, bool] = constants.FULL_STATUS_TIME_DISPLAY
 
     badge: Optional[str] = None
+    organization: str = "School"
+
     medal: Optional[Union[Dict[str, Dict[str, int]], MedalPreset]] = None
-    balloon_color: Optional[List[Color]] = None
 
     group: Optional[Dict[str, str]] = None
     tag: Optional[Dict[str, str]] = None
@@ -171,34 +204,35 @@ class Contest(BaseModel):
 
     options: ContestOptions = Field(default_factory=ContestOptions)
 
-    def append_balloon_color(self, color: Color):
+    unfrozen_time: int = 0x3F3F3F3F3F3F3F3F
+
+    def append_balloon_color(self, color: BalloonColor):
         if self.balloon_color is None:
             self.balloon_color = []
         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):
         default_balloon_color_list = [
-            Color(background_color="rgba(189, 14, 14, 0.7)", color="#fff"),
-            Color(background_color="rgba(149, 31, 217, 0.7)", color="#fff"),
-            Color(background_color="rgba(16, 32, 96, 0.7)", color="#fff"),
-            Color(background_color="rgba(38, 185, 60, 0.7)", color="#000"),
-            Color(background_color="rgba(239, 217, 9, 0.7)", color="#000"),
-            Color(background_color="rgba(243, 88, 20, 0.7)", color="#fff"),
-            Color(background_color="rgba(12, 76, 138, 0.7)", color="#fff"),
-            Color(background_color="rgba(156, 155, 155, 0.7)", color="#000"),
-            Color(background_color="rgba(4, 154, 115, 0.7)", color="#000"),
-            Color(background_color="rgba(159, 19, 236, 0.7)", color="#fff"),
-            Color(background_color="rgba(42, 197, 202, 0.7)", color="#000"),
-            Color(background_color="rgba(142, 56, 54, 0.7)", color="#fff"),
-            Color(background_color="rgba(144, 238, 144, 0.7)", color="#000"),
-            Color(background_color="rgba(77, 57, 0, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(189, 14, 14, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(149, 31, 217, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(16, 32, 96, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(38, 185, 60, 0.7)", color="#000"),
+            BalloonColor(background_color="rgba(239, 217, 9, 0.7)", color="#000"),
+            BalloonColor(background_color="rgba(243, 88, 20, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(12, 76, 138, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(156, 155, 155, 0.7)", color="#000"),
+            BalloonColor(background_color="rgba(4, 154, 115, 0.7)", color="#000"),
+            BalloonColor(background_color="rgba(159, 19, 236, 0.7)", color="#fff"),
+            BalloonColor(background_color="rgba(42, 197, 202, 0.7)", color="#000"),
+            BalloonColor(background_color="rgba(142, 56, 54, 0.7)", color="#fff"),
+            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