xcpcio 0.69.2__tar.gz → 0.69.4__tar.gz

{xcpcio-0.69.2 → xcpcio-0.69.4}/PKG-INFO

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

{xcpcio-0.69.2 → xcpcio-0.69.4}/tests/test_contest.py

@@ -13,7 +13,7 @@ class TestContest:
         assert contest.start_time == 0
         assert contest.end_time == 0
         assert contest.frozen_time == 60 * 60  # 1 hour
-        assert contest.unfrozen_time == 0x3F3F3F3F3F3F3F3F
+        assert contest.thaw_time == 0x3F3F3F3F3F3F3F3F
         assert contest.penalty == 20 * 60  # 20 minutes
         assert contest.problem_id is None
         assert contest.organization == "School"

{xcpcio-0.69.2 → xcpcio-0.69.4}/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.69.2'
+__version__ = VERSION = '0.69.4'

{xcpcio-0.69.2 → xcpcio-0.69.4}/xcpcio/clics/contest_uploader.py

@@ -193,6 +193,24 @@ class ContestUploader:
                 else:
                     logger.warning(f"No validation result for {file_key}, will retry on next poll")
 
+    async def _fetch_api_data(
+        self,
+        api_files: Dict[str, FileData],
+        changed_api_files: list[str],
+        unchanged_files: list[str],
+    ):
+        api_data = await self._clics_client.fetch_api_info()
+        if api_data:
+            filename = "api.json"
+            content = json.dumps(api_data, ensure_ascii=False)
+
+            if self._cache.has_changed(filename, content):
+                checksum = self._cache.calculate_checksum(content)
+                api_files[filename] = FileData(content=content, checksum=checksum)
+                changed_api_files.append(filename)
+            else:
+                unchanged_files.append(filename)
+
     async def _fetch_contest_data(
         self,
     ) -> tuple[Dict[str, FileData], list[str], list[str]]:
@@ -248,9 +266,15 @@ class ContestUploader:
         return response
 
     async def fetch_and_upload(self) -> Optional[Dict]:
-        await self._clics_client.fetch_api_info()
+        api_files, changed_api_files, unchanged_files = ({}, [], [])
+
+        await self._fetch_api_data(api_files, changed_api_files, unchanged_files)
+
+        contest_files, contest_changed, contest_unchanged = await self._fetch_contest_data()
+        api_files.update(contest_files)
+        changed_api_files.extend(contest_changed)
+        unchanged_files.extend(contest_unchanged)
 
-        api_files, changed_api_files, unchanged_files = await self._fetch_contest_data()
         await self._fetch_endpoint_data(api_files, changed_api_files, unchanged_files)
 
         if changed_api_files:

{xcpcio-0.69.2 → xcpcio-0.69.4}/xcpcio/clics/reader/contest_package_reader.py

@@ -38,7 +38,7 @@ class ContestPackageReader(BaseContestReader):
                 return json.load(f)
         except FileNotFoundError:
             if default_value is not None:
-                logger.warning("File not found, will return default value. [filepath={}]", filepath)
+                logger.warning(f"File not found, will load default value. [full_path={full_path}]")
                 return default_value
             raise HTTPException(status_code=404, detail=f"File not found: {filepath}")
         except json.JSONDecodeError as e:
@@ -56,7 +56,7 @@ class ContestPackageReader(BaseContestReader):
             return data
         except FileNotFoundError:
             if default_value is not None:
-                logger.warning("File not found, will load default value. [filepath={}]", filepath)
+                logger.warning(f"File not found, will load default value. [full_path={full_path}]")
                 return default_value
             raise HTTPException(status_code=404, detail=f"File not found: {filepath}")
         except json.JSONDecodeError as e:
@@ -111,7 +111,7 @@ class ContestPackageReader(BaseContestReader):
         self.event_feed = self._load_ndjson_file("event-feed.ndjson", default_value=[])
         self.event_feed_tokens = [event["token"] for event in self.event_feed]
 
-        self.contest_id = self.contest["id"]
+        self.contest_id = self.contest.get("id", "")
 
     def _get_file_attr(self, expected_href: str, base_path: Path, files: List[Dict]) -> FileAttr:
         for file in files:

{xcpcio-0.69.2 → xcpcio-0.69.4}/xcpcio/types.py

@@ -219,7 +219,7 @@ class Contest(BaseModel):
 
     options: Optional[ContestOptions] = None
 
-    unfrozen_time: int = Field(default=0x3F3F3F3F3F3F3F3F, exclude=True)
+    thaw_time: int = Field(default=0x3F3F3F3F3F3F3F3F, exclude=True)
 
     def append_balloon_color(self, color: BalloonColor):
         if self.balloon_color is None: