xcpcio 0.63.7__py3-none-any.whl → 0.64.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.63.7'
+__version__ = VERSION = '0.64.1'

xcpcio/ccs/api_server/dependencies.py

@@ -5,13 +5,15 @@ Dependency injection system for Contest API Server.
 """
 
 from pathlib import Path
-from typing import Annotated
+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 .services.contest_service import ContestService
 
-# Global contest service instance cache
 _contest_service_instance = None
 
 
@@ -41,7 +43,10 @@ def configure_dependencies(contest_package_dir: Path) -> None:
         contest_package_dir: Path to contest package directory
     """
     global _contest_service_instance
-    _contest_service_instance = ContestService(contest_package_dir)
+    reader_dict: Dict[str, BaseCCSReader] = {}
+    contest_package_reader = ContestPackageReader(contest_package_dir)
+    reader_dict[contest_package_reader.get_contest_id()] = contest_package_reader
+    _contest_service_instance = ContestService(reader_dict)
 
 
 # Type alias for dependency injection

xcpcio/ccs/api_server/routes/contests.py

@@ -1,9 +1,8 @@
 import json
 import logging
-from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-from fastapi import APIRouter, HTTPException, Query
+from fastapi import APIRouter, Query
 from fastapi import Path as FastAPIPath
 from fastapi.responses import FileResponse, StreamingResponse
 
@@ -55,22 +54,8 @@ async def get_contest_banner(
     contest_id: str = FastAPIPath(..., description="Contest identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    expected_href = f"contests/{contest_id}/banner"
-
-    try:
-        banners = service.contest.get("banner", [])
-        for banner in banners:
-            href = banner["href"]
-            if href == expected_href:
-                filename = banner["filename"]
-                banner_file: Path = service.contest_package_dir / "contest" / filename
-                if banner_file.exists():
-                    mime_type = banner["mime"]
-                    return FileResponse(path=banner_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(status_code=404, detail=f"Banner not found. [contest_id={contest_id}] [err={e}]")
+    file_attr = service.get_contest_banner(contest_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)
 
 
 @router.get(
@@ -82,22 +67,8 @@ async def get_contest_problem_set(
     contest_id: str = FastAPIPath(..., description="Contest identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    expected_href = f"contests/{contest_id}/problemset"
-
-    try:
-        problem_set_list = service.contest.get("problemset", [])
-        for problem_set in problem_set_list:
-            href = problem_set["href"]
-            if href == expected_href:
-                filename = problem_set["filename"]
-                problem_set_file: Path = service.contest_package_dir / "contest" / filename
-                if problem_set_file.exists():
-                    mime_type = problem_set["mime"]
-                    return FileResponse(path=problem_set_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(status_code=404, detail=f"Problem set not found. [contest_id={contest_id}] [err={e}]")
+    file_attr = service.get_contest_problemset(contest_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)
 
 
 @router.get(

xcpcio/ccs/api_server/routes/organizations.py

@@ -1,8 +1,7 @@
 import logging
-from pathlib import Path
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 from fastapi import Path as FastAPIPath
 from fastapi.responses import FileResponse
 
@@ -47,25 +46,5 @@ async def get_organization_logo(
     organization_id: str = FastAPIPath(..., description="Organization identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    org = service.organizations_by_id.get(organization_id)
-    if not org:
-        raise HTTPException(status_code=404, detail=f"Organization {organization_id} not found")
-
-    expected_href = f"contests/{contest_id}/organizations/{organization_id}/logo"
-
-    try:
-        logos = org["logo"]
-        for logo in logos:
-            href = logo["href"]
-            if href == expected_href:
-                filename = logo["filename"]
-                logo_file: Path = service.contest_package_dir / "organizations" / organization_id / filename
-                if logo_file.exists():
-                    mime_type = logo["mime"]
-                    return FileResponse(path=logo_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(
-            status_code=404, detail=f"Logo file not found. [organization_id={organization_id}] [err={e}]"
-        )
+    file_attr = service.get_organization_logo(contest_id, organization_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)

xcpcio/ccs/api_server/routes/problems.py

@@ -1,8 +1,7 @@
 import logging
-from pathlib import Path
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 from fastapi import Path as FastAPIPath
 from fastapi.responses import FileResponse
 
@@ -47,23 +46,5 @@ async def get_problem_statement(
     problem_id: str = FastAPIPath(..., description="Problem identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    problem: Dict = service.problems_by_id.get(problem_id)
-    if not problem:
-        raise HTTPException(status_code=404, detail=f"Problem {problem_id} not found")
-
-    expected_href = f"contests/{contest_id}/problems/{problem_id}/statement"
-
-    try:
-        statements = problem.get("statement", [])
-        for statement in statements:
-            href = statement["href"]
-            filename = statement["filename"]
-            if href == expected_href and filename:
-                statement_file: Path = service.contest_package_dir / "problems" / problem_id / filename
-                if statement_file.exists():
-                    mime_type = statement["mime"]
-                    return FileResponse(path=statement_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(status_code=404, detail=f"Statement not found. [problem_id={problem_id}] [err={e}]")
+    file_attr = service.get_problem_statement(contest_id, problem_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)

xcpcio/ccs/api_server/routes/submissions.py

@@ -1,8 +1,7 @@
 import logging
-from pathlib import Path
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 from fastapi import Path as FastAPIPath
 from fastapi.responses import FileResponse
 
@@ -47,25 +46,5 @@ async def get_submission_files(
     submission_id: str = FastAPIPath(..., description="Submission identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    submission = service.submissions_by_id.get(submission_id)
-    if not submission:
-        raise HTTPException(status_code=404, detail=f"Submission {submission_id} not found")
-
-    expected_href = f"contests/{contest_id}/submissions/{submission_id}/files"
-
-    try:
-        files: List[Dict] = submission["files"]
-        for file_info in files:
-            href = file_info["href"]
-            if href == expected_href:
-                filename = file_info["filename"]
-                submission_file: Path = service.contest_package_dir / "submissions" / submission_id / filename
-                if submission_file.exists():
-                    mime_type = file_info["mime"]
-                    return FileResponse(path=submission_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(
-            status_code=404, detail=f"Submission files not found. [submission_id={submission_id}] [err={e}]"
-        )
+    file_attr = service.get_submission_file(contest_id, submission_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)

xcpcio/ccs/api_server/routes/teams.py

@@ -1,8 +1,7 @@
 import logging
-from pathlib import Path
 from typing import Any, Dict, List
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 from fastapi import Path as FastAPIPath
 from fastapi.responses import FileResponse
 
@@ -47,23 +46,5 @@ async def get_team_photo(
     team_id: str = FastAPIPath(..., description="Team identifier"),
     service: ContestServiceDep = None,
 ) -> FileResponse:
-    service.validate_contest_id(contest_id)
-
-    team = service.teams_by_id.get(team_id)
-    if not team:
-        raise HTTPException(status_code=404, detail=f"Team {team_id} not found")
-
-    expected_href = f"contests/{contest_id}/teams/{team_id}/photo"
-
-    try:
-        photos = team["photo"]
-        for photo in photos:
-            href = photo["href"]
-            if href == expected_href:
-                filename = photo["filename"]
-                photo_file: Path = service.contest_package_dir / "teams" / team_id / filename
-                if photo_file.exists():
-                    mime_type = photo["mime"]
-                    return FileResponse(path=photo_file, media_type=mime_type, filename=filename)
-    except Exception as e:
-        raise HTTPException(status_code=404, detail=f"Photo not found. [team_id={team_id}] [err={e}]")
+    file_attr = service.get_team_photo(contest_id, team_id)
+    return FileResponse(path=file_attr.path, media_type=file_attr.media_type, filename=file_attr.name)