xcpcio 0.69.2__py3-none-any.whl → 0.69.3__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.69.2'
+__version__ = VERSION = '0.69.3'

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/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 return 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.dist-info → xcpcio-0.69.3.dist-info}/METADATA

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

{xcpcio-0.69.2.dist-info → xcpcio-0.69.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 xcpcio/__init__.py,sha256=NB6wpVr5JUrOx2vLIQSVtYuCz0d7kNFE39TSQlvoENk,125
-xcpcio/__version__.py,sha256=PvjPXbHRuuaoDW81aw_C7GwWvp2Ic1Jtr2QT5eokctk,172
+xcpcio/__version__.py,sha256=R-fwXng-b9alv8lljdhgYSn2tC-cwKkSYHJu34eewE4,172
 xcpcio/constants.py,sha256=MjpAgNXiBlUsx1S09m7JNT-nekNDR-aE6ggvGL3fg0I,2297
 xcpcio/types.py,sha256=GElkg8wz2BloN6PzyjvLrrd2h7Lm5itaaNnZv3hVQ-U,7591
 xcpcio/api/__init__.py,sha256=fFRUU0d_cUG-uzG2rLgirqRng8Z3UoV5ZCkBiYuXdu0,302
@@ -11,7 +11,7 @@ xcpcio/app/clics_uploader.py,sha256=9sgjnIvmuEhP3LjsdmVa0Rps42ij3j49dHBnr3KsM3I,
 xcpcio/clics/__init__.py,sha256=coTZiqxzXesn2SYmI2ZCsDZW6XaFi_6p-PFozZ4dfl4,150
 xcpcio/clics/clics_api_client.py,sha256=N6mYlou6eTrQYiUKxE4fdwCClCt9DrmVyKQmpc53iaY,9670
 xcpcio/clics/contest_archiver.py,sha256=9q3qB4hOPfd4ttaG78cQ7sg7vWkumO_KUZpqwYlHDlM,9933
-xcpcio/clics/contest_uploader.py,sha256=6U22U7YYHQY4F4GC8mjyD528QD-LAF5nopHs-zXTeOQ,9930
+xcpcio/clics/contest_uploader.py,sha256=IaN2-SJpQj6K6ZB-yhMZnJm-s_iIgs7tdpZ-I5DD-fo,10851
 xcpcio/clics/api_server/__init__.py,sha256=ASvVJ_ibGkXFDSNmy05eb9gESXRS8hjYHCrBecSnaS0,174
 xcpcio/clics/api_server/app.py,sha256=dYvkxaR8PjkDIHbSX8YyU3TvPud93Dg29k6midylakE,979
 xcpcio/clics/api_server/dependencies.py,sha256=2Zhom6vUnAOikr9bh-_kXYCc3g6JGXReVuQX7Ok90r4,1444
@@ -40,9 +40,9 @@ xcpcio/clics/model/__init__.py,sha256=cZE1q5JY-iHDEKZpsx0UZaMhH-23H4oAHaYOkW7dZ5
 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=baUEtH62ci4q7yMwR0BnTqUy6YU7zd5XogVVqZtEk0s,15081
+xcpcio/clics/reader/contest_package_reader.py,sha256=JzjUioKu-LsaigXW3iDO7eujbZKwTSCTNwJ3yYHrYXM,15091
 xcpcio/clics/reader/interface.py,sha256=lK2JXU1n8GJ4PecXnfFBijMaCVLYk404e4QwV_Ti2Hk,3918
-xcpcio-0.69.2.dist-info/METADATA,sha256=Ez3KGwkANQ9rTmProPurxv1jehMBkyq8fpM9YAvAMLs,2233
-xcpcio-0.69.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xcpcio-0.69.2.dist-info/entry_points.txt,sha256=KxviS5TVXlZ9KqS9UNMx3nI15xhEGvkTq86RaPhUhs4,158
-xcpcio-0.69.2.dist-info/RECORD,,
+xcpcio-0.69.3.dist-info/METADATA,sha256=3xO8AlbE6MXCQhI0G7eS7oFGhqUJWo2rOEtEFcwFG7U,2233
+xcpcio-0.69.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+xcpcio-0.69.3.dist-info/entry_points.txt,sha256=KxviS5TVXlZ9KqS9UNMx3nI15xhEGvkTq86RaPhUhs4,158
+xcpcio-0.69.3.dist-info/RECORD,,