xcpcio 0.64.2__tar.gz → 0.64.4__tar.gz

{xcpcio-0.64.2 → xcpcio-0.64.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xcpcio
-Version: 0.64.2
+Version: 0.64.4
 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.2 → xcpcio-0.64.4}/README.md

@@ -53,4 +53,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.2/cli/ccs_archiver_cli.py → xcpcio-0.64.4/app/clics_archiver.py

@@ -13,7 +13,7 @@ import click
 import zstandard as zstd
 
 from xcpcio import __version__
-from xcpcio.ccs.contest_archiver import APICredentials, ArchiveConfig, ContestArchiver
+from xcpcio.clics.contest_archiver import APICredentials, ArchiveConfig, ContestArchiver
 
 
 def setup_logging(level: str = "INFO"):
@@ -96,22 +96,22 @@ def main(
     Examples:
 
         # Output to directory
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o ./output -u admin -p secret
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o ./output -u admin -p secret
 
         # Output to ZIP archive
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o contest.zip --token abc123
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o contest.zip --token abc123
 
         # Output to tar.gz archive
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o contest.tar.gz -u admin -p secret
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o contest.tar.gz -u admin -p secret
 
         # Output to tar.zst archive
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o contest.tar.zst -u admin -p secret
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o contest.tar.zst -u admin -p secret
 
         # Only archive specific endpoints
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o ./output -u admin -p secret -e teams -e problems
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o ./output -u admin -p secret -e teams -e problems
 
         # Skip file downloads
-        ccs-archiver --base-url https://api.example.com/api --contest-id contest123 -o ./output --no-files
+        clics-archiver --base-url https://domjudge/api --contest-id contest123 -o ./output --no-files
     """
 
     if verbose:
@@ -130,7 +130,10 @@ def main(
     def cleanup_temp_dir():
         if temp_dir and temp_dir.exists():
             click.echo(f"Cleaning up temporary directory: {temp_dir}")
-            shutil.rmtree(temp_dir)
+            try:
+                shutil.rmtree(temp_dir)
+            except Exception as e:
+                click.echo(f"Warning: Failed to cleanup temporary directory: {e}", err=True)
 
     atexit.register(cleanup_temp_dir)
 
@@ -145,7 +148,7 @@ def main(
     credentials = APICredentials(username=username, password=password, token=token)
 
     if is_archive:
-        temp_dir = Path(tempfile.mkdtemp(prefix="ccs_archive_"))
+        temp_dir = Path(tempfile.mkdtemp(prefix="clics_archive_"))
         output_dir = temp_dir
     else:
         output_dir = output
@@ -208,7 +211,6 @@ def main(
             click.echo(f"  SHA512: {checksums['sha512']}")
         else:
             click.echo(click.style(f"Contest package created successfully in: {config.output_dir}", fg="green"))
-
     except KeyboardInterrupt:
         click.echo(click.style("Archive interrupted by user", fg="yellow"), err=True)
         raise click.Abort()

xcpcio-0.64.2/app/contest_api_server.py → xcpcio-0.64.4/app/clics_server.py

@@ -11,7 +11,7 @@ import click
 import zstandard as zstd
 
 from xcpcio import __version__
-from xcpcio.ccs.api_server.server import ContestAPIServer
+from xcpcio.clics.api_server.server import ContestAPIServer
 
 
 def setup_logging(level: str = "INFO"):
@@ -55,7 +55,6 @@ def extract_archive(archive_path: Path, dest_dir: Path) -> None:
 )
 @click.option("--host", default="0.0.0.0", help="Host to bind to")
 @click.option("--port", default=8000, type=int, help="Port to bind to")
-@click.option("--reload", is_flag=True, help="Enable auto-reload for development")
 @click.option(
     "--log-level",
     default="info",
@@ -63,25 +62,22 @@ def extract_archive(archive_path: Path, dest_dir: Path) -> None:
     help="Log level",
 )
 @click.option("--verbose", "-v", is_flag=True, help="Enable verbose logging (same as --log-level debug)")
-def main(contest_package: Path, host: str, port: int, reload: bool, log_level: str, verbose: bool):
+def main(contest_package: Path, host: str, port: int, log_level: str, verbose: bool):
     """
     Start the Contest API Server.
 
     Examples:
 
         # Start server with contest directory
-        contest-api-server -p /path/to/contest
+        clics-server -p /path/to/contest
 
         # Start server with archive file
-        contest-api-server -p /path/to/contest.zip
-        contest-api-server -p /path/to/contest.tar.gz
-        contest-api-server -p /path/to/contest.tar.zst
+        clics-server -p /path/to/contest.zip
+        clics-server -p /path/to/contest.tar.gz
+        clics-server -p /path/to/contest.tar.zst
 
         # Custom host and port
-        contest-api-server -p /path/to/contest --host 127.0.0.1 --port 9000
-
-        # Enable reload for development
-        contest-api-server -p /path/to/contest --reload
+        clics-server -p /path/to/contest --host 127.0.0.1 --port 9000
     """
     if verbose:
         log_level = "debug"
@@ -92,7 +88,10 @@ def main(contest_package: Path, host: str, port: int, reload: bool, log_level: s
     def cleanup_temp_dir():
         if temp_dir and temp_dir.exists():
             click.echo(f"Cleaning up temporary directory: {temp_dir}")
-            shutil.rmtree(temp_dir)
+            try:
+                shutil.rmtree(temp_dir)
+            except Exception as e:
+                click.echo(f"Warning: Failed to cleanup temporary directory: {e}", err=True)
 
     atexit.register(cleanup_temp_dir)
 
@@ -105,7 +104,7 @@ def main(contest_package: Path, host: str, port: int, reload: bool, log_level: s
             raise click.Abort()
 
         click.echo(f"Extracting archive: {contest_package}")
-        temp_dir = Path(tempfile.mkdtemp(prefix="ccs_package_"))
+        temp_dir = Path(tempfile.mkdtemp(prefix="clics_package_"))
 
         try:
             extract_archive(contest_package, temp_dir)
@@ -123,12 +122,11 @@ def main(contest_package: Path, host: str, port: int, reload: bool, log_level: s
     click.echo(f"Contest directory: {actual_contest_dir}")
     click.echo(f"Host: {host}")
     click.echo(f"Port: {port}")
-    click.echo(f"Reload: {reload}")
     click.echo(f"Log level: {log_level}")
 
     try:
         server = ContestAPIServer(actual_contest_dir)
-        server.run(host=host, port=port, reload=reload, log_level=log_level.lower())
+        server.run(host=host, port=port, log_level=log_level.lower())
     except KeyboardInterrupt:
         click.echo("\nServer stopped by user")
     except Exception as e:

{xcpcio-0.64.2 → xcpcio-0.64.4}/pyproject.toml

@@ -38,7 +38,8 @@ documentation = "https://github.com/xcpcio/xcpcio"
 repository = "https://github.com/xcpcio/xcpcio"
 
 [project.scripts]
-ccs-archiver = "cli.ccs_archiver_cli:main"
+clics-archiver = "app.clics_archiver:main"
+clics-server = "app.clics_server:main"
 
 [tool.ruff]
 line-length = 120

{xcpcio-0.64.2 → xcpcio-0.64.4}/scripts/generate_ccs_models.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 CUR_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 PYTHON_DIR="$(dirname "${CUR_DIR}")"
 CCS_SPECS_DIR="${PYTHON_DIR}/ccs-specs"
-CCS_MODELS_DIR="${PYTHON_DIR}/xcpcio/ccs/model"
+CCS_MODELS_DIR="${PYTHON_DIR}/xcpcio/clics/model"
 
 BRANCH="${1:-2023-06}"
 CCS_REPO_URL="https://github.com/icpc/ccs-specs.git"

{xcpcio-0.64.2 → xcpcio-0.64.4}/tests/test_contest.py

@@ -1,5 +1,3 @@
-
-
 from xcpcio import constants
 from xcpcio.types import Color, Contest, ContestOptions, Image
 
@@ -10,7 +8,7 @@ class TestContest:
     def test_contest_creation_defaults(self):
         """Test Contest creation with default values"""
         contest = Contest()
-        
+
         assert contest.contest_name == ""
         assert contest.start_time == 0
         assert contest.end_time == 0
@@ -30,7 +28,7 @@ class TestContest:
         assert contest.tag is None
         assert contest.board_link is None
         assert contest.version is None
-        
+
         # Check default values
         assert contest.status_time_display == constants.FULL_STATUS_TIME_DISPLAY
         assert isinstance(contest.options, ContestOptions)
@@ -38,10 +36,9 @@ class TestContest:
     def test_contest_creation_with_values(self):
         """Test Contest creation with provided values"""
         contest_options = ContestOptions(
-            calculation_of_penalty=constants.CALCULATION_OF_PENALTY_IN_SECONDS,
-            has_reaction_videos=True
+            calculation_of_penalty=constants.CALCULATION_OF_PENALTY_IN_SECONDS, has_reaction_videos=True
         )
-        
+
         contest = Contest(
             contest_name="ICPC World Finals 2024",
             start_time=1234567890,
@@ -52,9 +49,9 @@ class TestContest:
             problem_id=["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"],
             organization="ICPC",
             medal="icpc",  # Use Literal value
-            options=contest_options
+            options=contest_options,
         )
-        
+
         assert contest.contest_name == "ICPC World Finals 2024"
         assert contest.start_time == 1234567890
         assert contest.end_time == 1234567890 + 5 * 60 * 60
@@ -74,16 +71,16 @@ class TestContest:
             end_time=1000000000 + 60 * 60 * 5,
             problem_quantity=5,
             problem_id=["A", "B", "C", "D", "E"],
-            organization="Test Org"
+            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["problem_quantity"] == 5
         assert contest_dict["organization"] == "Test Org"
-        
+
         # Test JSON round-trip
         contest_json = contest.model_dump_json()
         reconstructed_contest = Contest.model_validate_json(contest_json)
@@ -93,20 +90,20 @@ class TestContest:
         """Test Contest with balloon colors, logo, and banner"""
         colors = [
             Color(color="#fff", background_color="rgba(255, 0, 0, 0.7)"),
-            Color(color="#000", background_color="rgba(0, 255, 0, 0.7)")
+            Color(color="#000", background_color="rgba(0, 255, 0, 0.7)"),
         ]
         logo = Image(url="https://example.com/logo.png", type="png")
         banner = Image(url="https://example.com/banner.jpg", type="jpg")
-        
+
         contest = Contest(
             contest_name="Contest with Media",
             problem_quantity=2,
             balloon_color=colors,
             logo=logo,
             banner=banner,
-            banner_mode="ALL"  # Use correct Literal value
+            banner_mode="ALL",  # Use correct Literal value
         )
-        
+
         assert len(contest.balloon_color) == 2
         assert contest.balloon_color[0].color == "#fff"
         assert contest.balloon_color[1].background_color == "rgba(0, 255, 0, 0.7)"
@@ -117,59 +114,59 @@ class TestContest:
     def test_append_balloon_color(self):
         """Test append_balloon_color method"""
         contest = Contest()
-        
+
         # Initially no colors
         assert contest.balloon_color is None
-        
+
         # Add first color
         red_color = Color(color="#fff", background_color="red")
         contest.append_balloon_color(red_color)
-        
+
         assert contest.balloon_color is not None
         assert len(contest.balloon_color) == 1
         assert contest.balloon_color[0] == red_color
-        
+
         # Add second color
         blue_color = Color(color="#fff", background_color="blue")
         contest.append_balloon_color(blue_color)
-        
+
         assert len(contest.balloon_color) == 2
         assert contest.balloon_color[1] == blue_color
 
     def test_fill_problem_id(self):
         """Test fill_problem_id method"""
         contest = Contest(problem_quantity=5)
-        
+
         # Initially empty
         assert contest.problem_id == []
-        
+
         # Fill with A-E
         contest.fill_problem_id()
-        
+
         assert len(contest.problem_id) == 5
         assert contest.problem_id == ["A", "B", "C", "D", "E"]
-        
+
         # Test with larger quantity
         contest.problem_quantity = 10
         contest.fill_problem_id()
-        
+
         assert len(contest.problem_id) == 10
         assert contest.problem_id == ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]
 
     def test_fill_balloon_color(self):
         """Test fill_balloon_color method"""
         contest = Contest(problem_quantity=3)
-        
+
         # Initially no colors
         assert contest.balloon_color is None
-        
+
         # Fill with default colors
         contest.fill_balloon_color()
-        
+
         assert contest.balloon_color is not None
         assert len(contest.balloon_color) == 3
         assert all(isinstance(color, Color) for color in contest.balloon_color)
-        
+
         # Check first few default colors
         assert contest.balloon_color[0].background_color == "rgba(189, 14, 14, 0.7)"
         assert contest.balloon_color[0].color == "#fff"
@@ -185,20 +182,20 @@ class TestContest:
             end_time=1234567890 + 5 * 60 * 60,
             problem_quantity=3,
             organization="Complex Org",
-            medal="ccpc"  # Use preset instead of dict
+            medal="ccpc",  # Use preset instead of dict
         )
-        
+
         # Add problem IDs and colors
         contest.fill_problem_id()
         contest.fill_balloon_color()
-        
+
         # Add logo
         contest.logo = Image(url="https://example.com/logo.png")
-        
+
         # Test serialization
         contest_json = contest.model_dump_json()
         reconstructed_contest = Contest.model_validate_json(contest_json)
-        
+
         # Verify all data is preserved
         assert reconstructed_contest.contest_name == contest.contest_name
         assert reconstructed_contest.start_time == contest.start_time
@@ -212,18 +209,15 @@ class TestContest:
         """Test contest with custom group and status display"""
         custom_group = {"team_a": "Team A", "team_b": "Team B"}
         custom_status = {"show_penalty": True, "show_time": False}
-        
-        contest = Contest(
-            group=custom_group,
-            status_time_display=custom_status
-        )
-        
+
+        contest = Contest(group=custom_group, status_time_display=custom_status)
+
         # Custom values should override defaults
         assert contest.group == custom_group
         assert contest.status_time_display == custom_status
-        
+
         # Test serialization preserves custom values
         contest_json = contest.model_dump_json()
         reconstructed = Contest.model_validate_json(contest_json)
         assert reconstructed.group == custom_group
-        assert reconstructed.status_time_display == custom_status
+        assert reconstructed.status_time_display == custom_status

xcpcio-0.64.4/xcpcio/__init__.py

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

{xcpcio-0.64.2 → xcpcio-0.64.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.64.2'
+__version__ = VERSION = '0.64.4'

xcpcio-0.64.4/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-0.64.4/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-0.64.4/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-0.64.4/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-0.64.4/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-0.64.2/xcpcio/ccs → xcpcio-0.64.4/xcpcio/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-0.64.2/xcpcio/ccs → xcpcio-0.64.4/xcpcio/clics}/api_server/routes/__init__.py

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