xcpcio 0.64.2__py3-none-any.whl → 0.64.3__py3-none-any.whl

xcpcio/__init__.py

@@ -1,4 +1,4 @@
-from . import ccs, constants, types
+from . import clics, constants, types
 from .__version__ import __version__
 
-__all__ = [constants, types, ccs, __version__]
+__all__ = [constants, types, clics, __version__]

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.2'
+__version__ = VERSION = '0.64.3'

xcpcio/api/__init__.py

@@ -0,0 +1,15 @@
+from .client import ApiClient
+from .models import (
+    HTTPValidationError,
+    UploadBoardDataReq,
+    UploadBoardDataResp,
+    ValidationError,
+)
+
+__all__ = [
+    ApiClient,
+    HTTPValidationError,
+    UploadBoardDataReq,
+    UploadBoardDataResp,
+    ValidationError,
+]

xcpcio/api/client.py

@@ -0,0 +1,74 @@
+from typing import Any, Dict, Optional
+
+import aiohttp
+
+from .models import UploadBoardDataReq, UploadBoardDataResp
+
+
+class ApiClient:
+    def __init__(
+        self,
+        base_url: str = "https://board-admin.xcpcio.com",
+        token: Optional[str] = None,
+        timeout: int = 10,
+    ):
+        self._base_url = base_url.rstrip("/")
+        self._token = token
+        self._timeout = aiohttp.ClientTimeout(total=timeout)
+        self._session: Optional[aiohttp.ClientSession] = None
+
+    async def __aenter__(self):
+        self._session = aiohttp.ClientSession(timeout=self._timeout)
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        if self._session:
+            await self._session.close()
+
+    async def _ensure_session(self):
+        if self._session is None:
+            self._session = aiohttp.ClientSession(timeout=self._timeout)
+
+    async def _ensure_token(self):
+        if self._token is None:
+            raise ValueError(
+                "Token is required for this operation. Please provide a token when initializing the client."
+            )
+
+    async def close(self):
+        if self._session:
+            await self._session.close()
+            self._session = None
+
+    async def ping(self) -> Dict[str, Any]:
+        await self._ensure_session()
+        async with self._session.get(f"{self._base_url}/api/ping") as response:
+            response.raise_for_status()
+            return await response.json()
+
+    async def upload_board_data(
+        self,
+        config: Optional[str] = None,
+        teams: Optional[str] = None,
+        submissions: Optional[str] = None,
+        extra_files: Optional[Dict[str, str]] = None,
+    ) -> UploadBoardDataResp:
+        await self._ensure_session()
+        await self._ensure_token()
+
+        request_data = UploadBoardDataReq(
+            token=self._token,
+            config=config,
+            teams=teams,
+            submissions=submissions,
+            extra_files=extra_files,
+        )
+
+        async with self._session.post(
+            f"{self._base_url}/api/upload-board-data",
+            json=request_data.model_dump(exclude_none=True),
+            headers={"Content-Type": "application/json"},
+        ) as response:
+            response.raise_for_status()
+            data = await response.json()
+            return UploadBoardDataResp(**data)

xcpcio/api/models.py

@@ -0,0 +1,25 @@
+from typing import Dict, List, Optional, Union
+
+from pydantic import BaseModel, Field
+
+
+class ValidationError(BaseModel):
+    loc: List[Union[str, int]] = Field(..., title="Location")
+    msg: str = Field(..., title="Message")
+    type: str = Field(..., title="Error Type")
+
+
+class HTTPValidationError(BaseModel):
+    detail: Optional[List[ValidationError]] = Field(None, title="Detail")
+
+
+class UploadBoardDataReq(BaseModel):
+    token: str = Field(..., title="Token")
+    config: Optional[str] = Field(None, title="Config")
+    teams: Optional[str] = Field(None, title="Teams")
+    submissions: Optional[str] = Field(None, title="Submissions")
+    extra_files: Optional[Dict[str, str]] = Field(None, title="Extra Files")
+
+
+class UploadBoardDataResp(BaseModel):
+    pass

xcpcio/clics/__init__.py

@@ -0,0 +1,9 @@
+from . import api_server, base, contest_archiver, model, reader
+
+__all__ = [
+    model,
+    contest_archiver,
+    api_server,
+    base,
+    reader,
+]

xcpcio/clics/api_server/app.py

@@ -0,0 +1,43 @@
+"""
+Contest API Server Application
+
+FastAPI application instance for Contest API Server.
+This module can be used directly with uvicorn for reload support.
+"""
+
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+from xcpcio.__version__ import __version__
+
+from .routes import create_router
+
+
+def create_app() -> FastAPI:
+    """
+    Create and configure FastAPI application.
+
+    Returns:
+        Configured FastAPI application instance
+    """
+    app = FastAPI(
+        title="Contest API Server",
+        description="REST API for Contest Control System specifications",
+        version=__version__,
+        docs_url="/docs",
+        redoc_url="/redoc",
+        openapi_url="/openapi.json",
+    )
+
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+
+    router = create_router()
+    app.include_router(router)
+
+    return app

xcpcio/{ccs → clics}/api_server/dependencies.py

@@ -9,10 +9,9 @@ from typing import Annotated, Dict
 
 from fastapi import Depends
 
-from xcpcio.ccs.reader.base_ccs_reader import BaseCCSReader
-from xcpcio.ccs.reader.contest_package_reader import ContestPackageReader
+from xcpcio.clics.reader import BaseContestReader, ContestPackageReader
 
-from .services.contest_service import ContestService
+from .services import ContestService
 
 _contest_service_instance = None
 
@@ -43,7 +42,7 @@ def configure_dependencies(contest_package_dir: Path) -> None:
         contest_package_dir: Path to contest package directory
     """
     global _contest_service_instance
-    reader_dict: Dict[str, BaseCCSReader] = {}
+    reader_dict: Dict[str, BaseContestReader] = {}
     contest_package_reader = ContestPackageReader(contest_package_dir)
     reader_dict[contest_package_reader.get_contest_id()] = contest_package_reader
     _contest_service_instance = ContestService(reader_dict)

xcpcio/{ccs → clics}/api_server/routes/__init__.py

@@ -49,4 +49,4 @@ def create_router() -> APIRouter:
     return router
 
 
-__all__ = ["create_router"]
+__all__ = [create_router]

xcpcio/{ccs → clics}/api_server/server.py

@@ -8,13 +8,9 @@ import logging
 from pathlib import Path
 
 import uvicorn
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-
-from xcpcio.__version__ import __version__
 
+from .app import create_app
 from .dependencies import configure_dependencies
-from .routes import create_router
 
 logger = logging.getLogger(__name__)
 
@@ -35,42 +31,21 @@ class ContestAPIServer:
             contest_packages: Dictionary mapping contest_id to contest package directory
         """
         self.contest_package_dir = contest_package_dir
-
-        # Configure dependency injection for multi-contest mode
-        # This might need adjustment based on how dependencies work
         configure_dependencies(contest_package_dir)
-
-        # Create FastAPI application
-        self.app = FastAPI(
-            title="Contest API Server",
-            description="REST API for Contest Control System specifications",
-            version=__version__,
-            docs_url="/docs",
-            redoc_url="/redoc",
-            openapi_url="/openapi.json",
-        )
-
-        # Add CORS middleware
-        self.app.add_middleware(
-            CORSMiddleware,
-            allow_origins=["*"],
-            allow_credentials=True,
-            allow_methods=["*"],
-            allow_headers=["*"],
-        )
-
-        # Include all routes
-        router = create_router()
-        self.app.include_router(router)
-
-    def run(self, host: str = "0.0.0.0", port: int = 8000, reload: bool = True, log_level: str = "info"):
+        self.app = create_app()
+
+    def run(
+        self,
+        host: str = "0.0.0.0",
+        port: int = 8000,
+        log_level: str = "info",
+    ):
         """
         Run the contest API server.
 
         Args:
             host: Host to bind to
             port: Port to bind to
-            reload: Enable auto-reload for development
             log_level: Log level (debug, info, warning, error, critical)
         """
 
@@ -80,4 +55,9 @@ class ContestAPIServer:
         logger.info(f"Interactive docs at: http://{host}:{port}/docs")
         logger.info(f"ReDoc at: http://{host}:{port}/redoc")
 
-        uvicorn.run(self.app, host=host, port=port, reload=reload, log_level=log_level)
+        uvicorn.run(
+            self.app,
+            host=host,
+            port=port,
+            log_level=log_level,
+        )

xcpcio/{ccs → clics}/api_server/services/__init__.py

@@ -6,4 +6,6 @@ Contains business logic and data access layers.
 
 from .contest_service import ContestService
 
-__all__ = ["ContestService"]
+__all__ = [
+    ContestService,
+]

xcpcio/{ccs → clics}/api_server/services/contest_service.py

@@ -11,8 +11,8 @@ from typing import Any, Dict, List, Optional
 from fastapi import HTTPException
 
 from xcpcio.__version__ import __version__
-from xcpcio.ccs.base.types import FileAttr
-from xcpcio.ccs.reader.base_ccs_reader import BaseCCSReader
+from xcpcio.clics.base.types import FileAttr
+from xcpcio.clics.reader.interface import BaseContestReader
 
 logger = logging.getLogger(__name__)
 
@@ -20,10 +20,10 @@ logger = logging.getLogger(__name__)
 class ContestService:
     """Service class for contest-related operations"""
 
-    def __init__(self, reader_dict: Dict[str, BaseCCSReader]):
+    def __init__(self, reader_dict: Dict[str, BaseContestReader]):
         self.reader_dict = reader_dict
 
-    def _get_reader(self, contest_id: str) -> BaseCCSReader:
+    def _get_reader(self, contest_id: str) -> BaseContestReader:
         if contest_id not in self.reader_dict:
             raise HTTPException(status_code=404, detail=f"Contest {contest_id} not found")
         return self.reader_dict[contest_id]

xcpcio/clics/clics_api_client.py

@@ -0,0 +1,215 @@
+"""
+CLICS API Client
+A reusable client for interacting with CLICS (Contest Logging for ICPC Systems) APIs.
+
+Based on the CCS Contest API specification:
+https://ccs-specs.icpc.io/2023-06/contest_api
+"""
+
+import asyncio
+import logging
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Dict, Optional
+from urllib.parse import urljoin
+
+import aiofiles
+import aiohttp
+import semver
+from tenacity import before_sleep_log, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class APICredentials:
+    """API authentication credentials"""
+
+    username: Optional[str] = None
+    password: Optional[str] = None
+    token: Optional[str] = None
+
+
+@dataclass
+class ClicsApiConfig:
+    """Configuration for CLICS API client"""
+
+    base_url: str
+    credentials: APICredentials
+    timeout: int = 30
+    max_concurrent: int = 10
+
+
+class ClicsApiClient:
+    """
+    Client for interacting with CLICS (Contest Logging for ICPC Systems) APIs.
+
+    Provides async methods for fetching JSON data and downloading files from
+    CLICS-compliant contest management systems.
+    """
+
+    def __init__(self, config: ClicsApiConfig):
+        self._config = config
+        self._session: Optional[aiohttp.ClientSession] = None
+        self._semaphore = asyncio.Semaphore(config.max_concurrent)
+        self._api_info: Optional[Dict[str, Any]] = None
+        self._provider_name: Optional[str] = None
+        self._provider_version: Optional[semver.VersionInfo] = None
+
+    def _build_url(self, endpoint: str) -> str:
+        """Build API URL ensuring proper path joining"""
+        base = self._config.base_url.rstrip("/") + "/"
+        endpoint = endpoint.lstrip("/")
+        return urljoin(base, endpoint)
+
+    async def __aenter__(self):
+        """Async context manager entry"""
+        await self.start_session()
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        """Async context manager exit"""
+        await self.close_session()
+
+    async def start_session(self):
+        """Initialize the HTTP session with authentication"""
+        auth = None
+        headers = {}
+
+        if self._config.credentials.username and self._config.credentials.password:
+            auth = aiohttp.BasicAuth(self._config.credentials.username, self._config.credentials.password)
+        elif self._config.credentials.token:
+            headers["Authorization"] = f"Bearer {self._config.credentials.token}"
+
+        self._session = aiohttp.ClientSession(auth=auth, headers=headers)
+
+    async def close_session(self):
+        """Close the HTTP session"""
+        if self._session:
+            await self._session.close()
+
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, min=1, max=10),
+        retry=retry_if_exception_type((asyncio.TimeoutError, aiohttp.ClientError)),
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+        reraise=True,
+    )
+    async def _fetch_json_internal(self, url: str, override_timeout: Optional[int] = None) -> Optional[Dict[str, Any]]:
+        """Internal fetch method with retry logic"""
+        logger.info(f"Fetching {url}")
+        timeout = aiohttp.ClientTimeout(total=override_timeout or self._config.timeout)
+        async with self._session.get(url, timeout=timeout) as response:
+            if response.status == 404:
+                logger.warning(f"Endpoint not found: {url}")
+                return None
+            elif response.status != 200:
+                raise aiohttp.ClientResponseError(
+                    request_info=response.request_info, history=response.history, status=response.status
+                )
+
+            data = await response.json()
+            logger.debug(f"Fetched {len(str(data))} bytes from {url}")
+            return data
+
+    async def fetch_json(self, endpoint: str, override_timeout: Optional[int] = None) -> Optional[Dict[str, Any]]:
+        """Fetch JSON data from an API endpoint"""
+        url = self._build_url(endpoint)
+
+        async with self._semaphore:
+            try:
+                return await self._fetch_json_internal(url, override_timeout)
+            except Exception as e:
+                logger.error(f"Failed to fetch. [url={url}] [err={e}]")
+                return None
+
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, min=1, max=10),
+        retry=retry_if_exception_type((asyncio.TimeoutError, aiohttp.ClientError)),
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+        reraise=True,
+    )
+    async def _fetch_file_internal(
+        self, file_url: str, output_path: Path, override_timeout: Optional[int] = None
+    ) -> bool:
+        """Internal file download method with retry logic"""
+        logger.info(f"Downloading {file_url} -> {output_path}")
+        output_path.parent.mkdir(parents=True, exist_ok=True)
+
+        timeout = aiohttp.ClientTimeout(total=override_timeout or self._config.timeout)
+        async with self._session.get(file_url, timeout=timeout) as response:
+            if response.status != 200:
+                raise aiohttp.ClientResponseError(
+                    request_info=response.request_info, history=response.history, status=response.status
+                )
+
+            async with aiofiles.open(output_path, "wb") as f:
+                async for chunk in response.content.iter_chunked(8192):
+                    await f.write(chunk)
+
+        logger.debug(f"Downloaded {output_path}")
+        return True
+
+    async def fetch_file(
+        self, file_url: Optional[str], output_path: Path, override_timeout: Optional[int] = None
+    ) -> bool:
+        """Download a file from URL to local path"""
+        if not file_url:
+            return False
+
+        if not file_url.startswith(("http://", "https://")):
+            file_url = self._build_url(file_url)
+
+        async with self._semaphore:
+            try:
+                return await self._fetch_file_internal(file_url, output_path, override_timeout)
+            except Exception as e:
+                logger.error(f"Failed to download {file_url} after retries: {e}")
+                return False
+
+    async def fetch_api_info(self) -> Optional[Dict[str, Any]]:
+        """Fetch API root endpoint information and parse provider details"""
+        data = await self.fetch_json("/")
+        if not data:
+            return None
+
+        self._api_info = data
+
+        if "provider" in data:
+            provider: Dict = data.get("provider", {})
+            self._provider_name = provider.get("name", "")
+
+            version_str: str = provider.get("version", "")
+            if version_str:
+                try:
+                    version_clean = version_str.split("/")[0]
+                    if version_clean.endswith("DEV"):
+                        version_clean = version_clean[:-3] + "-dev"
+
+                    self._provider_version = semver.VersionInfo.parse(version_clean)
+                    logger.info(
+                        f"Detected API provider: {self._provider_name} version {version_str} (parsed: {self._provider_version})"
+                    )
+                except (ValueError, TypeError) as e:
+                    logger.warning(f"Could not parse version string: {version_str}, error: {e}")
+                    self._provider_version = None
+            else:
+                logger.info(f"Detected API provider: {self._provider_name} (no version)")
+
+        return data
+
+    @property
+    def api_info(self) -> Optional[Dict[str, Any]]:
+        """Get cached API information"""
+        return self._api_info
+
+    @property
+    def provider_name(self) -> Optional[str]:
+        """Get the detected API provider name"""
+        return self._provider_name
+
+    @property
+    def provider_version(self) -> Optional[semver.VersionInfo]:
+        """Get the detected API provider version"""
+        return self._provider_version

xcpcio/{ccs → clics}/contest_archiver.py

@@ -14,24 +14,13 @@ import json
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Dict, List, Optional
-from urllib.parse import urljoin
+from typing import Any, List, Optional
 
 import aiofiles
-import aiohttp
-import semver
-from tenacity import before_sleep_log, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
 
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class APICredentials:
-    """API authentication credentials"""
+from xcpcio.clics.clics_api_client import APICredentials, ClicsApiClient, ClicsApiConfig
 
-    username: Optional[str] = None
-    password: Optional[str] = None
-    token: Optional[str] = None
+logger = logging.getLogger(__name__)
 
 
 @dataclass
@@ -48,6 +37,15 @@ class ArchiveConfig:
     max_concurrent: int = 10
     include_event_feed: bool = False
 
+    def to_api_config(self) -> ClicsApiConfig:
+        """Convert to ClicsApiConfig"""
+        return ClicsApiConfig(
+            base_url=self.base_url,
+            credentials=self.credentials,
+            timeout=self.timeout,
+            max_concurrent=self.max_concurrent,
+        )
+
 
 class ContestArchiver:
     """
@@ -93,134 +91,22 @@ class ContestArchiver:
         "runs",
         "clarifications",
         "awards",
-        "scoreboard",
     ]
 
     def __init__(self, config: ArchiveConfig):
         self._config = config
-        self._session: Optional[aiohttp.ClientSession] = None
-        self._semaphore = asyncio.Semaphore(config.max_concurrent)
-        self._api_info: Optional[Dict[str, Any]] = None
-        self._provider_name: Optional[str] = None
-        self._provider_version: Optional[semver.VersionInfo] = None
+        self._client = ClicsApiClient(config.to_api_config())
 
-        # Create output directory
         self._config.output_dir.mkdir(parents=True, exist_ok=True)
 
-    def _build_url(self, endpoint: str) -> str:
-        """Build API URL ensuring proper path joining"""
-        # Ensure base_url ends with / and endpoint doesn't start with /
-        base = self._config.base_url.rstrip("/") + "/"
-        endpoint = endpoint.lstrip("/")
-        return urljoin(base, endpoint)
-
     async def __aenter__(self):
         """Async context manager entry"""
-        await self.start_session()
+        await self._client.__aenter__()
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         """Async context manager exit"""
-        await self.close_session()
-
-    async def start_session(self):
-        """Initialize the HTTP session with authentication"""
-        # Setup authentication
-        auth = None
-        headers = {}
-
-        if self._config.credentials.username and self._config.credentials.password:
-            auth = aiohttp.BasicAuth(self._config.credentials.username, self._config.credentials.password)
-        elif self._config.credentials.token:
-            headers["Authorization"] = f"Bearer {self._config.credentials.token}"
-
-        self._session = aiohttp.ClientSession(auth=auth, headers=headers)
-
-    async def close_session(self):
-        """Close the HTTP session"""
-        if self._session:
-            await self._session.close()
-
-    @retry(
-        stop=stop_after_attempt(3),
-        wait=wait_exponential(multiplier=1, min=1, max=10),
-        retry=retry_if_exception_type((asyncio.TimeoutError, aiohttp.ClientError)),
-        before_sleep=before_sleep_log(logger, logging.WARNING),
-        reraise=True,
-    )
-    async def _fetch_json_internal(self, url: str, override_timeout: Optional[int] = None) -> Optional[Dict[str, Any]]:
-        """Internal fetch method with retry logic"""
-        logger.info(f"Fetching {url}")
-        timeout = aiohttp.ClientTimeout(total=override_timeout or self._config.timeout)
-        async with self._session.get(url, timeout=timeout) as response:
-            if response.status == 404:
-                logger.warning(f"Endpoint not found: {url}")
-                return None
-            elif response.status != 200:
-                raise aiohttp.ClientResponseError(
-                    request_info=response.request_info, history=response.history, status=response.status
-                )
-
-            data = await response.json()
-            logger.debug(f"Fetched {len(str(data))} bytes from {url}")
-            return data
-
-    async def fetch_json(self, endpoint: str, override_timeout: Optional[int] = None) -> Optional[Dict[str, Any]]:
-        """Fetch JSON data from an API endpoint"""
-        url = self._build_url(endpoint)
-
-        async with self._semaphore:
-            try:
-                return await self._fetch_json_internal(url, override_timeout)
-            except Exception as e:
-                logger.error(f"Failed to fetch. [url={url}] [err={e}]")
-                return None
-
-    @retry(
-        stop=stop_after_attempt(3),
-        wait=wait_exponential(multiplier=1, min=1, max=10),
-        retry=retry_if_exception_type((asyncio.TimeoutError, aiohttp.ClientError)),
-        before_sleep=before_sleep_log(logger, logging.WARNING),
-        reraise=True,
-    )
-    async def _fetch_file_internal(
-        self, file_url: str, output_path: Path, override_timeout: Optional[int] = None
-    ) -> bool:
-        """Internal file download method with retry logic"""
-        logger.info(f"Downloading {file_url} -> {output_path}")
-        output_path.parent.mkdir(parents=True, exist_ok=True)
-
-        timeout = aiohttp.ClientTimeout(total=override_timeout or self._config.timeout)
-        async with self._session.get(file_url, timeout=timeout) as response:
-            if response.status != 200:
-                raise aiohttp.ClientResponseError(
-                    request_info=response.request_info, history=response.history, status=response.status
-                )
-
-            async with aiofiles.open(output_path, "wb") as f:
-                async for chunk in response.content.iter_chunked(8192):
-                    await f.write(chunk)
-
-        logger.debug(f"Downloaded {output_path}")
-        return True
-
-    async def fetch_file(
-        self, file_url: Optional[str], output_path: Path, override_timeout: Optional[int] = None
-    ) -> bool:
-        """Download a file from URL to local path"""
-        if not file_url:
-            return False
-
-        # Handle relative URLs
-        if not file_url.startswith(("http://", "https://")):
-            file_url = self._build_url(file_url)
-
-        async with self._semaphore:
-            try:
-                return await self._fetch_file_internal(file_url, output_path, override_timeout)
-            except Exception as e:
-                logger.error(f"Failed to download {file_url} after retries: {e}")
-                return False
+        await self._client.__aexit__(exc_type, exc_val, exc_tb)
 
     def _get_file_output_path(
         self, filename: str, base_path: Optional[str] = None, object_id: Optional[str] = None
@@ -265,8 +151,7 @@ class ContestArchiver:
         if not file_refs:
             return
 
-        # Download all files in parallel (controlled by self.semaphore)
-        download_tasks = [self.fetch_file(href, output_path) for href, output_path in file_refs]
+        download_tasks = [self._client.fetch_file(href, output_path) for href, output_path in file_refs]
 
         if download_tasks:
             await asyncio.gather(*download_tasks, return_exceptions=True)
@@ -285,37 +170,10 @@ class ContestArchiver:
         """Dump API root endpoint information"""
         logger.info("Dumping API information...")
 
-        data = await self.fetch_json("/")
+        data = await self._client.fetch_api_info()
         if not data:
             raise RuntimeError("Failed to fetch API information")
 
-        self._api_info = data  # Store API info for later use
-
-        # Parse provider information
-        if "provider" in data:
-            provider: Dict = data.get("provider", {})
-            self._provider_name = provider.get("name", "")
-
-            # Parse version string to semver.VersionInfo
-            version_str: str = provider.get("version", "")
-            if version_str:
-                try:
-                    # Clean version string: "8.3.1/3324986cd" -> "8.3.1", "9.0.0DEV/26e89f701" -> "9.0.0-dev"
-                    version_clean = version_str.split("/")[0]
-                    # Convert DEV suffix to semver prerelease format
-                    if version_clean.endswith("DEV"):
-                        version_clean = version_clean[:-3] + "-dev"
-
-                    self._provider_version = semver.VersionInfo.parse(version_clean)
-                    logger.info(
-                        f"Detected API provider: {self._provider_name} version {version_str} (parsed: {self._provider_version})"
-                    )
-                except (ValueError, TypeError) as e:
-                    logger.warning(f"Could not parse version string: {version_str}, error: {e}")
-                    self._provider_version = None
-            else:
-                logger.info(f"Detected API provider: {self._provider_name} (no version)")
-
         await self.save_data("api.json", data)
         await self._download_file_references(data, "api")
 
@@ -324,7 +182,7 @@ class ContestArchiver:
         logger.info("Dumping contest information...")
 
         endpoint = f"contests/{self._config.contest_id}"
-        data = await self.fetch_json(endpoint)
+        data = await self._client.fetch_json(endpoint)
         if data:
             await self.save_data("contest.json", data)
             await self._download_file_references(data, "contest")
@@ -334,7 +192,7 @@ class ContestArchiver:
         logger.info(f"Dumping {endpoint}...")
 
         api_endpoint = f"contests/{self._config.contest_id}/{endpoint}"
-        data = await self.fetch_json(api_endpoint)
+        data = await self._client.fetch_json(api_endpoint)
 
         if data is None:
             return
@@ -352,7 +210,7 @@ class ContestArchiver:
         logger.info(f"Dumping {endpoint}...")
 
         api_endpoint = f"contests/{self._config.contest_id}/{endpoint}"
-        data = await self.fetch_json(api_endpoint)
+        data = await self._client.fetch_json(api_endpoint)
 
         if data is None:
             return
@@ -365,8 +223,7 @@ class ContestArchiver:
         logger.info("Dumping event-feed...")
 
         api_endpoint = f"contests/{self._config.contest_id}/event-feed?stream=false"
-        # Use extended timeout for event-feed as it may contain large amounts of data
-        await self.fetch_file(
+        await self._client.fetch_file(
             api_endpoint,
             output_path=self._get_file_output_path("event-feed.ndjson"),
             override_timeout=self._config.timeout * 10,
@@ -374,13 +231,14 @@ class ContestArchiver:
 
     async def get_available_endpoints(self) -> List[str]:
         """Get list of available endpoints based on API provider and version"""
-        # Check if it's DOMjudge with version < 9.0.0
-        if self._provider_name == "DOMjudge" and self._provider_version and self._provider_version.major < 9:
-            logger.info(f"Using DOMjudge known endpoints for version < 9.0.0 (detected: {self._provider_version})")
+        provider_name = self._client.provider_name
+        provider_version = self._client.provider_version
+
+        if provider_name == "DOMjudge" and provider_version and provider_version.major < 9:
+            logger.info(f"Using DOMjudge known endpoints for version < 9.0.0 (detected: {provider_version})")
             return self.DOMJUDGE_KNOWN_ENDPOINTS
 
-        # For other providers or DOMjudge >= 9.0.0, try to get from access endpoint
-        access_data = await self.fetch_json(f"contests/{self._config.contest_id}/access")
+        access_data = await self._client.fetch_json(f"contests/{self._config.contest_id}/access")
 
         if not access_data or "endpoints" not in access_data:
             logger.warning("Could not fetch access info, using default endpoints")

xcpcio/{ccs → clics}/model/model_2023_06/__init__.py

@@ -4,4 +4,4 @@ CCS (Contest Control System) models for branch 2023-06.
 Auto-generated from https://github.com/icpc/ccs-specs/tree/2023-06
 """
 
-from .model import * # noqa: F403
+from .model import *  # noqa: F403

xcpcio/clics/reader/__init__.py

@@ -0,0 +1,7 @@
+from .contest_package_reader import ContestPackageReader
+from .interface import BaseContestReader
+
+__all__ = [
+    BaseContestReader,
+    ContestPackageReader,
+]

xcpcio/{ccs → clics}/reader/contest_package_reader.py

@@ -7,13 +7,13 @@ from typing import Any, Dict, List, Optional, Union
 
 from fastapi import HTTPException
 
-from xcpcio.ccs.base.types import FileAttr
-from xcpcio.ccs.reader.base_ccs_reader import BaseCCSReader
+from xcpcio.clics.base.types import FileAttr
+from xcpcio.clics.reader.interface import BaseContestReader
 
 logger = logging.getLogger(__name__)
 
 
-class ContestPackageReader(BaseCCSReader):
+class ContestPackageReader(BaseContestReader):
     def __init__(self, contest_package_dir: Path):
         self.contest_package_dir = contest_package_dir
         if not self.contest_package_dir.exists():

xcpcio/{ccs/reader/base_ccs_reader.py → clics/reader/interface.py}

@@ -1,10 +1,10 @@
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 
-from xcpcio.ccs.base.types import FileAttr
+from xcpcio.clics.base.types import FileAttr
 
 
-class BaseCCSReader(ABC):
+class BaseContestReader(ABC):
     # API Information
     @abstractmethod
     def get_api_info(self) -> Dict[str, Any]:

{xcpcio-0.64.2.dist-info → xcpcio-0.64.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xcpcio
-Version: 0.64.2
+Version: 0.64.3
 Summary: xcpcio python lib
 Project-URL: homepage, https://github.com/xcpcio/xcpcio
 Project-URL: documentation, https://github.com/xcpcio/xcpcio
@@ -83,4 +83,6 @@ For detailed documentation, visit:
 
 ## License
 
-MIT License © 2020-PRESENT [Dup4](https://github.com/Dup4)
+[MIT](../LICENSE) License © 2020 - PRESENT [XCPCIO][xcpcio]
+
+[xcpcio]: https://xcpcio.com

xcpcio-0.64.3.dist-info/RECORD

@@ -0,0 +1,44 @@
+xcpcio/__init__.py,sha256=NB6wpVr5JUrOx2vLIQSVtYuCz0d7kNFE39TSQlvoENk,125
+xcpcio/__version__.py,sha256=LxfvIcnxuKT4V2X_7iFD7f1csO3sp0l-FcxO8fLkvo8,172
+xcpcio/constants.py,sha256=MjpAgNXiBlUsx1S09m7JNT-nekNDR-aE6ggvGL3fg0I,2297
+xcpcio/types.py,sha256=AkYby2haJgxwtozlgaPMG2ryAZdvsSc3sH-p6qXcM4g,6575
+xcpcio/api/__init__.py,sha256=B9gLdAlR3FD7070cvAC5wAwMy3iV63I8hh4mUrnrKpk,274
+xcpcio/api/client.py,sha256=BuzH8DbJYudJ-Kne-2XziLW__B_7iEqElJ4n2SGZCoY,2374
+xcpcio/api/models.py,sha256=_dChApnIHVNN3hEL7mR5zonq8IUcxW_h7z1kUz6reSs,772
+xcpcio/clics/__init__.py,sha256=coTZiqxzXesn2SYmI2ZCsDZW6XaFi_6p-PFozZ4dfl4,150
+xcpcio/clics/clics_api_client.py,sha256=jQiOYPNZlYs_cOmQIbp-QovWVMYcmT1yo-33SWoyAn0,7966
+xcpcio/clics/contest_archiver.py,sha256=66a4YTqHqSoHMe7dFTXo4OrdK40AUnavo0ICSd9UNGo,9911
+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
+xcpcio/clics/api_server/server.py,sha256=lM87sRrFc5dWCRRrXyzs8Bl4wY77QLadiJnAkmjJt7U,1705
+xcpcio/clics/api_server/routes/__init__.py,sha256=y4rxsXe3g-HCwuky1bvr3I2YWa8NjVxz2uAvLqlyeiE,1535
+xcpcio/clics/api_server/routes/access.py,sha256=O-RGLmgLNBQ-ccu8rlHOgonTjl02fYOdi3VTsUa-T0w,434
+xcpcio/clics/api_server/routes/accounts.py,sha256=nAwiIz-y4fGmqHBniMuQifk9jVt4i9YPZWBB7w40q5Q,994
+xcpcio/clics/api_server/routes/awards.py,sha256=gBPSFlDj6PM6Poys6JbO7VMsfCljKz6QrTjKEqQcS8w,957
+xcpcio/clics/api_server/routes/clarifications.py,sha256=vvMNMvQkZTOn1VJ8C5U86gpIkN3yNrxBll1VMTJjzQg,1046
+xcpcio/clics/api_server/routes/contests.py,sha256=VbvegfP5ZnVNKdqoHmy7_Wd2L6xEBqON7UD2OQ6sQ8A,2979
+xcpcio/clics/api_server/routes/general.py,sha256=xLH-sqyeC4dSd6SUYpjg-w-1ZtmSqZAgIupoVOyYwD4,763
+xcpcio/clics/api_server/routes/groups.py,sha256=kWKFFty2iWckMN-j6G3NbgMVKCPQ478_mYKrYsHXgMA,949
+xcpcio/clics/api_server/routes/judgement_types.py,sha256=S3Dt0VYjntVBQBvLYhJGcDNSy7O8Zh7b7NSfrronZSU,1057
+xcpcio/clics/api_server/routes/judgements.py,sha256=3w0LHYbZazli_v587l98U23r5PuolRs_vtbNLMwgjTU,1127
+xcpcio/clics/api_server/routes/languages.py,sha256=2BYqTaSBWx0E5XlaTjofElLb7z4HTsVs3rrozdyqz0s,985
+xcpcio/clics/api_server/routes/organizations.py,sha256=6xMl0Iqo7pjLaJbR7L1NWwo8JXwnXhH2O8hJKiLoRa0,1712
+xcpcio/clics/api_server/routes/problems.py,sha256=XAhXkShHwewZdugsffLj1UxvFNSorrxc-PyZymdBQTY,1632
+xcpcio/clics/api_server/routes/runs.py,sha256=1L6fo1KPcDeKwOEkTxCwEetmyfNKY_Z0uxATqBJftIs,1046
+xcpcio/clics/api_server/routes/submissions.py,sha256=ByVX_wzab0Q9EHFmuE8JQtikvboMXtt_kXecEy6yiRc,1675
+xcpcio/clics/api_server/routes/teams.py,sha256=euDs-GDHLqmJS3zPTNxm9LfKXQYEuhwAlX-BF2tcrk4,1556
+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/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=0wIzQp4zzdaB10zMY4WALLIeoXcMuhMJ6nRrfKxWhgw,14179
+xcpcio/clics/reader/interface.py,sha256=lK2JXU1n8GJ4PecXnfFBijMaCVLYk404e4QwV_Ti2Hk,3918
+xcpcio-0.64.3.dist-info/METADATA,sha256=INRnI5HBYrv2D3sSUEH4zyHUt0w7iBQXEKcDEB-o_KU,2233
+xcpcio-0.64.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+xcpcio-0.64.3.dist-info/entry_points.txt,sha256=vJ7vcfzL_j7M1jvq--10ENgAJNB15O6WVGjwiRWAgas,96
+xcpcio-0.64.3.dist-info/RECORD,,

xcpcio-0.64.3.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+clics-archiver = app.clics_archiver:main
+clics-server = app.clics_server:main

xcpcio/ccs/__init__.py

@@ -1,3 +0,0 @@
-from . import api_server, contest_archiver, model
-
-__all__ = [model, contest_archiver, api_server]

xcpcio-0.64.2.dist-info/RECORD

@@ -1,39 +0,0 @@
-xcpcio/__init__.py,sha256=kjd6itqBRSQ-OT83qUJXHt81KQQDRUtaIuykzfaWXLM,121
-xcpcio/__version__.py,sha256=6ddC-elV7Uw3Fsy5ndjK8ZE0aXQ1P_auAsXjJeT0Jrg,172
-xcpcio/constants.py,sha256=MjpAgNXiBlUsx1S09m7JNT-nekNDR-aE6ggvGL3fg0I,2297
-xcpcio/types.py,sha256=AkYby2haJgxwtozlgaPMG2ryAZdvsSc3sH-p6qXcM4g,6575
-xcpcio/ccs/__init__.py,sha256=LSoKFblEuSoIVBYcUxOFF8fn2bH2R6kSg9xNrBfzC0g,99
-xcpcio/ccs/contest_archiver.py,sha256=ICogyPzKfFRoO7J5D2Eu-3JwIirC3etMev7hyTjn4z8,16198
-xcpcio/ccs/api_server/__init__.py,sha256=ASvVJ_ibGkXFDSNmy05eb9gESXRS8hjYHCrBecSnaS0,174
-xcpcio/ccs/api_server/dependencies.py,sha256=cbLHcP91SaRBj2W9OfC0yCQ1fasI2DofxGUhPPNs3F8,1518
-xcpcio/ccs/api_server/server.py,sha256=3gft3MqDXvKWug5UCLhdV681bcQMRrewDkwQ7qSPtRU,2598
-xcpcio/ccs/api_server/routes/__init__.py,sha256=uz65H4L5Wzef7QPi5PsLQM1xbMdG6FoZ0Np0y039_2k,1537
-xcpcio/ccs/api_server/routes/access.py,sha256=O-RGLmgLNBQ-ccu8rlHOgonTjl02fYOdi3VTsUa-T0w,434
-xcpcio/ccs/api_server/routes/accounts.py,sha256=nAwiIz-y4fGmqHBniMuQifk9jVt4i9YPZWBB7w40q5Q,994
-xcpcio/ccs/api_server/routes/awards.py,sha256=gBPSFlDj6PM6Poys6JbO7VMsfCljKz6QrTjKEqQcS8w,957
-xcpcio/ccs/api_server/routes/clarifications.py,sha256=vvMNMvQkZTOn1VJ8C5U86gpIkN3yNrxBll1VMTJjzQg,1046
-xcpcio/ccs/api_server/routes/contests.py,sha256=VbvegfP5ZnVNKdqoHmy7_Wd2L6xEBqON7UD2OQ6sQ8A,2979
-xcpcio/ccs/api_server/routes/general.py,sha256=xLH-sqyeC4dSd6SUYpjg-w-1ZtmSqZAgIupoVOyYwD4,763
-xcpcio/ccs/api_server/routes/groups.py,sha256=kWKFFty2iWckMN-j6G3NbgMVKCPQ478_mYKrYsHXgMA,949
-xcpcio/ccs/api_server/routes/judgement_types.py,sha256=S3Dt0VYjntVBQBvLYhJGcDNSy7O8Zh7b7NSfrronZSU,1057
-xcpcio/ccs/api_server/routes/judgements.py,sha256=3w0LHYbZazli_v587l98U23r5PuolRs_vtbNLMwgjTU,1127
-xcpcio/ccs/api_server/routes/languages.py,sha256=2BYqTaSBWx0E5XlaTjofElLb7z4HTsVs3rrozdyqz0s,985
-xcpcio/ccs/api_server/routes/organizations.py,sha256=6xMl0Iqo7pjLaJbR7L1NWwo8JXwnXhH2O8hJKiLoRa0,1712
-xcpcio/ccs/api_server/routes/problems.py,sha256=XAhXkShHwewZdugsffLj1UxvFNSorrxc-PyZymdBQTY,1632
-xcpcio/ccs/api_server/routes/runs.py,sha256=1L6fo1KPcDeKwOEkTxCwEetmyfNKY_Z0uxATqBJftIs,1046
-xcpcio/ccs/api_server/routes/submissions.py,sha256=ByVX_wzab0Q9EHFmuE8JQtikvboMXtt_kXecEy6yiRc,1675
-xcpcio/ccs/api_server/routes/teams.py,sha256=euDs-GDHLqmJS3zPTNxm9LfKXQYEuhwAlX-BF2tcrk4,1556
-xcpcio/ccs/api_server/services/__init__.py,sha256=WQLNrLVomhtICl8HlFYaCoRewIHVZfUiiwrSBUOOWDg,171
-xcpcio/ccs/api_server/services/contest_service.py,sha256=Jmt7h4rQoZLXPAkHx3FdQNsRtYOPpdSOlh7QA41nIm4,7467
-xcpcio/ccs/base/__init__.py,sha256=JYKVtcQG-VGM2OfCg6VhxcXCeCp7r2zxpg_7s9AThS0,39
-xcpcio/ccs/base/types.py,sha256=NfAG-XJjex7p2DfFTRecLWhmwpeO8Ul42nNMnZH39sM,137
-xcpcio/ccs/model/__init__.py,sha256=cZE1q5JY-iHDEKZpsx0UZaMhH-23H4oAHaYOkW7dZ5s,43
-xcpcio/ccs/model/model_2023_06/__init__.py,sha256=OmDQZqmigBpL64LXk5lIOGoQ3Uqis8-2z6qQpOO5aJc,167
-xcpcio/ccs/model/model_2023_06/model.py,sha256=bVMDWpJTwPSpz1fHPxWrWerxCBIboH3LKVZpIZGQ2pY,15287
-xcpcio/ccs/reader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xcpcio/ccs/reader/base_ccs_reader.py,sha256=fS7M0hD3-3PAEV7EYyorVZsBhD4HtABkQeV4fXNldhA,3912
-xcpcio/ccs/reader/contest_package_reader.py,sha256=DPuKp3eptRNMi0-Ssx_K2roN5_0xXILMltucWy1NTPI,14173
-xcpcio-0.64.2.dist-info/METADATA,sha256=Ay3dU_2FC8jDzF0WqZqn7ml18-lOJRJITv1l4nRL7e4,2202
-xcpcio-0.64.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xcpcio-0.64.2.dist-info/entry_points.txt,sha256=qvzh8oDJxIHqTN-rg2lRN6xR99AqxbWnlAQI7uzDibI,59
-xcpcio-0.64.2.dist-info/RECORD,,

xcpcio-0.64.2.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-ccs-archiver = cli.ccs_archiver_cli:main