xcpcio 0.76.8__tar.gz → 0.82.0__tar.gz

{xcpcio-0.76.8 → xcpcio-0.82.0}/PKG-INFO

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

{xcpcio-0.76.8 → xcpcio-0.82.0}/tests/test_contest.py

@@ -16,13 +16,11 @@ class TestContest:
         assert contest.thaw_time == 0x3F3F3F3F3F3F3F3F
         assert contest.penalty == 20 * 60  # 20 minutes
         assert contest.problem_id is None
-        assert contest.organization == "School"
         assert contest.medal is None
         assert contest.balloon_color is None
         assert contest.logo is None
         assert contest.banner is None
         assert contest.banner_mode is None
-        assert contest.badge is None
         assert contest.group is None
         assert contest.tag is None
         assert contest.board_link is None
@@ -46,7 +44,6 @@ class TestContest:
             penalty=20 * 60,  # 20 minutes
             problem_quantity=12,
             problem_id=["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"],
-            organization="ICPC",
             medal="icpc",  # Use Literal value
             options=contest_options,
         )
@@ -57,7 +54,6 @@ class TestContest:
         assert len(contest.problem_id) == 12
         assert contest.problem_id[0] == "A"
         assert contest.problem_id[-1] == "L"
-        assert contest.organization == "ICPC"
         assert contest.medal == "icpc"
         assert contest.options == contest_options
 
@@ -68,14 +64,12 @@ class TestContest:
             start_time=1000000000,
             end_time=1000000000 + 60 * 60 * 5,
             problem_id=["A", "B", "C", "D", "E"],
-            organization="Test Org",
         )
 
         # Test model_dump
         contest_dict = contest.model_dump()
         assert contest_dict["contest_name"] == "Test Contest"
         assert contest_dict["start_time"] == 1000000000
-        assert contest_dict["organization"] == "Test Org"
 
         # Test JSON round-trip
         contest_json = contest.model_dump_json()
@@ -175,7 +169,6 @@ class TestContest:
             contest_name="Complex Contest",
             start_time=1234567890,
             end_time=1234567890 + 5 * 60 * 60,
-            organization="Complex Org",
             medal="ccpc",  # Use preset instead of dict
         )
 

{xcpcio-0.76.8 → xcpcio-0.82.0}/tests/test_team.py

@@ -13,7 +13,7 @@ class TestTeam:
         team = Team()
         assert team.id == ""
         assert team.name == ""
-        assert team.organization == ""
+        assert team.organization is None
         assert team.members is None
         assert team.coaches is None
         assert team.location is None

{xcpcio-0.76.8 → xcpcio-0.82.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.76.8'
+__version__ = VERSION = '0.82.0'

xcpcio-0.82.0/xcpcio/clics/base/types.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Optional
+
+
+@dataclass
+class FileAttr:
+    path: Path
+    media_type: str
+    name: str
+
+
+@dataclass
+class Image:
+    base64: str
+
+    mime_type: Optional[str] = None
+    width: Optional[int] = None
+    height: Optional[int] = None

{xcpcio-0.76.8 → xcpcio-0.82.0}/xcpcio/clics/reader/contest_package_reader.py

@@ -1,3 +1,4 @@
+import base64
 import bisect
 import json
 import logging
@@ -7,12 +8,20 @@ from typing import Any, Dict, List, Optional, Union
 
 from fastapi import HTTPException
 
-from xcpcio.clics.base.types import FileAttr
+from xcpcio.clics.base.types import FileAttr, Image
 from xcpcio.clics.reader.interface import BaseContestReader
 
 logger = logging.getLogger(__name__)
 
 
+def image_to_base64(image_path: Path):
+    with open(image_path, "rb") as image_file:
+        binary_data = image_file.read()
+        base64_bytes = base64.b64encode(binary_data)
+        base64_string = base64_bytes.decode("utf-8")
+        return base64_string
+
+
 class ContestPackageReader(BaseContestReader):
     def __init__(self, contest_package_dir: Path):
         self.contest_package_dir = contest_package_dir
@@ -239,6 +248,19 @@ class ContestPackageReader(BaseContestReader):
                 detail=f"Organization logo not found. [contest_id={self.contest_id}] [organization_id={organization_id}] [err={e}]",
             )
 
+    def get_organization_logo_image(self, organization_id: str) -> Optional[Image]:
+        org_list = self.get_organization(organization_id).get("logo", [])
+        if len(org_list) == 0:
+            return None
+
+        org: Dict = org_list[0]
+        return Image(
+            base64=image_to_base64(self.contest_package_dir / f"organizations/{organization_id}/{org['filename']}"),
+            mime_type=str(org.get("mime")),
+            width=int(org.get("width")),
+            height=int(org.get("height")),
+        )
+
     # Group operations
     def get_groups(self) -> List[Dict[str, Any]]:
         return self.groups

{xcpcio-0.76.8 → xcpcio-0.82.0}/xcpcio/clics/reader/interface.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 
-from xcpcio.clics.base.types import FileAttr
+from xcpcio.clics.base.types import FileAttr, Image
 
 
 class BaseContestReader(ABC):
@@ -83,6 +83,10 @@ class BaseContestReader(ABC):
     def get_organization_logo(self, organization_id: str) -> FileAttr:
         pass
 
+    @abstractmethod
+    def get_organization_logo_image(self, organization_id: str) -> Optional[Image]:
+        pass
+
     # Group operations
     @abstractmethod
     def get_groups(self) -> List[Dict[str, Any]]:

{xcpcio-0.76.8 → xcpcio-0.82.0}/xcpcio/types.py

@@ -98,9 +98,11 @@ class Organization(BaseModel):
     name: Text
 
     logo: Optional[Image] = None
+    icpc_id: Optional[str] = None
 
 
-Organizations = List[Organization]
+class Organizations(RootModel[List[Organization]]):
+    pass
 
 
 class BalloonColor(BaseModel):
@@ -162,7 +164,7 @@ class Team(BaseModel):
     id: str = ""
     name: Text = ""
 
-    organization: str = ""
+    organization: Optional[str] = None
     organization_id: Optional[str] = None
 
     group: List[str] = Field(default_factory=list)
@@ -197,6 +199,7 @@ class Teams(RootModel[List[Team]]):
 
 
 class ContestOptions(BaseModel):
+    enable_organization: Optional[bool] = None
     calculation_of_penalty: Optional[CalculationOfPenalty] = None
     submission_timestamp_unit: Optional[TimeUnit] = None
 
@@ -204,6 +207,14 @@ class ContestOptions(BaseModel):
     reaction_video_url_template: Optional[str] = None
 
     team_photo_url_template: Optional[Image] = None
+    team_webcam_stream_url_template: Optional[str] = None
+    team_screen_stream_url_template: Optional[str] = None
+
+    submission_external_url_template: Optional[str] = None
+    submission_source_code_url_template: Optional[str] = None
+
+    realtime_reaction_webcam_stream_url_template: Optional[str] = None
+    realtime_reaction_screen_stream_url_template: Optional[str] = None
 
 
 class Contest(BaseModel):
@@ -225,9 +236,6 @@ class Contest(BaseModel):
 
     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
 
     group: Optional[Dict[str, str]] = None

xcpcio-0.76.8/xcpcio/clics/base/types.py

@@ -1,9 +0,0 @@
-from dataclasses import dataclass
-from pathlib import Path
-
-
-@dataclass
-class FileAttr:
-    path: Path
-    media_type: str
-    name: str