xcpcio 0.74.1__py3-none-any.whl → 0.82.1__py3-none-any.whl

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.74.1'
+__version__ = VERSION = '0.82.1'

xcpcio/clics/base/types.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Optional
 
 
 @dataclass
@@ -7,3 +8,12 @@ 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/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/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/types.py

@@ -82,11 +82,11 @@ class Image(BaseModel):
     base64: Optional[str] = None
     type: Optional[Literal["png", "svg", "jpg", "jpeg"]] = None
 
-    preset: Optional[ImagePreset] = None
-
     width: Optional[int] = None
     height: Optional[int] = None
 
+    preset: Optional[ImagePreset] = None
+
 
 class DataItem(BaseModel):
     url: UrlString
@@ -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):
@@ -151,6 +153,7 @@ class Submission(BaseModel):
     is_ignore: Optional[bool] = None
 
     reaction: Optional[SubmissionReaction] = None
+    missing_reaction: Optional[bool] = None
 
 
 class Submissions(RootModel[List[Submission]]):
@@ -161,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)
@@ -178,6 +181,8 @@ class Team(BaseModel):
     location: Optional[str] = None
     icpc_id: Optional[str] = None
 
+    ip: Optional[str] = None
+
     extra: Dict[str, Any] = Field(default_factory=dict, exclude=True)
 
     def add_group(self, group: str):
@@ -194,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
 
@@ -201,10 +207,20 @@ 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):
     contest_name: Text = ""
+    description: Optional[Text] = None
+    og_image: Optional[Image] = None
 
     start_time: Union[int, DateTimeISO8601String] = 0
     end_time: Union[int, DateTimeISO8601String] = 0
@@ -220,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
@@ -231,14 +244,14 @@ class Contest(BaseModel):
     logo: Optional[Image] = None
     banner: Optional[Image] = None
     banner_mode: Optional[BannerMode] = None
-    board_link: Optional[str] = None
-
-    version: Optional[str] = None
 
     options: Optional[ContestOptions] = None
 
     organizations: Optional[Union[DataItem, Organizations]] = None
 
+    board_link: Optional[str] = None
+    version: Optional[str] = None
+
     thaw_time: int = Field(default=0x3F3F3F3F3F3F3F3F, exclude=True)
 
     def append_balloon_color(self, color: BalloonColor):

{xcpcio-0.74.1.dist-info → xcpcio-0.82.1.dist-info}/METADATA

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

{xcpcio-0.74.1.dist-info → xcpcio-0.82.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 xcpcio/__init__.py,sha256=NB6wpVr5JUrOx2vLIQSVtYuCz0d7kNFE39TSQlvoENk,125
-xcpcio/__version__.py,sha256=9-FaWjjQZglZF5o70uDxsdSHL9D21XYjVh1N9mugIgw,172
+xcpcio/__version__.py,sha256=UDXTg6gwUXRTSIg8RWbAOyIKL3Rf_Z37L8tollwF_Bc,172
 xcpcio/constants.py,sha256=MjpAgNXiBlUsx1S09m7JNT-nekNDR-aE6ggvGL3fg0I,2297
-xcpcio/types.py,sha256=CLhRp_HaVbK9YK8yNOHDNDIis8XOAo5BWz5lZS-qbvw,7927
+xcpcio/types.py,sha256=Eemic_dUJo2TfMCOh6rerOk-SmXSTI978fQp42ut4hQ,8511
 xcpcio/api/__init__.py,sha256=fFRUU0d_cUG-uzG2rLgirqRng8Z3UoV5ZCkBiYuXdu0,302
 xcpcio/api/client.py,sha256=TEcf3tjLu537HHhyBBVHlQ3fFL7_abjG3IrQtp39oks,2389
 xcpcio/api/models.py,sha256=DBS9TjtPSX32TpwO3gYnnGo7RFHLHrxYpRIAhxCHmLs,1258
@@ -35,14 +35,14 @@ xcpcio/clics/api_server/routes/teams.py,sha256=euDs-GDHLqmJS3zPTNxm9LfKXQYEuhwAl
 xcpcio/clics/api_server/services/__init__.py,sha256=yQqrH72olLFG9KEivWNYmaIES_vi8mnzZGX2frdB5cQ,177
 xcpcio/clics/api_server/services/contest_service.py,sha256=1vnt9NB0ZOKJjjParbudHrpnC8_kQRFVuOVxNVR9Drs,7477
 xcpcio/clics/base/__init__.py,sha256=JYKVtcQG-VGM2OfCg6VhxcXCeCp7r2zxpg_7s9AThS0,39
-xcpcio/clics/base/types.py,sha256=NfAG-XJjex7p2DfFTRecLWhmwpeO8Ul42nNMnZH39sM,137
+xcpcio/clics/base/types.py,sha256=pWCdrZFu7GhGv6fgsJkrbiWoVQ6PNgjZWvjbTpb-LH8,309
 xcpcio/clics/model/__init__.py,sha256=cZE1q5JY-iHDEKZpsx0UZaMhH-23H4oAHaYOkW7dZ5s,43
 xcpcio/clics/model/model_2023_06/__init__.py,sha256=VzBaFcAwYw9G18p0Lh7rNPrvchyaYx_jgw6YE4W1yNg,168
 xcpcio/clics/model/model_2023_06/model.py,sha256=bVMDWpJTwPSpz1fHPxWrWerxCBIboH3LKVZpIZGQ2pY,15287
 xcpcio/clics/reader/__init__.py,sha256=Nfi78X8J1tJPh7WeSRPLMRUprlS2JYelYJHW4DfyJ7U,162
-xcpcio/clics/reader/contest_package_reader.py,sha256=W9pNAl6Za1LXG_OjDYj-szVPXczeHBUhL-ajOApL7BU,15089
-xcpcio/clics/reader/interface.py,sha256=lK2JXU1n8GJ4PecXnfFBijMaCVLYk404e4QwV_Ti2Hk,3918
-xcpcio-0.74.1.dist-info/METADATA,sha256=61srz0S3luEblVIB91bq7JoIHs2jrdD-UkDfKBA8L9c,2237
-xcpcio-0.74.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xcpcio-0.74.1.dist-info/entry_points.txt,sha256=KxviS5TVXlZ9KqS9UNMx3nI15xhEGvkTq86RaPhUhs4,158
-xcpcio-0.74.1.dist-info/RECORD,,
+xcpcio/clics/reader/contest_package_reader.py,sha256=o6NOMdwTCzmkomChZl7hkdPLgKFqXFAYeG73EfStQRM,15897
+xcpcio/clics/reader/interface.py,sha256=OAV_OaBVRXWf5FBq-mwhPpqVMWVZmaldJzUP_s259nY,4043
+xcpcio-0.82.1.dist-info/METADATA,sha256=fg9H5ttYsSptfOpGD7M63_v9iksywO4cYCLYRQeV0pY,2237
+xcpcio-0.82.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+xcpcio-0.82.1.dist-info/entry_points.txt,sha256=KxviS5TVXlZ9KqS9UNMx3nI15xhEGvkTq86RaPhUhs4,158
+xcpcio-0.82.1.dist-info/RECORD,,

{xcpcio-0.74.1.dist-info → xcpcio-0.82.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any