diff --git a/pyproject.toml b/pyproject.toml index 892cc35..1205444 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ ignore = ["E501"] python-version = "3.14" [tool.ty.rules] -unresolved-import = "ignore" +import-not-found = "ignore" [tool.bandit] # Honoured by the python-service archetype via `-c pyproject.toml` (gitops #725). diff --git a/src/models/errors.py b/src/models/errors.py index e5b4c9d..31b88ec 100644 --- a/src/models/errors.py +++ b/src/models/errors.py @@ -99,7 +99,7 @@ class ValidationErrorResponse(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="VALIDATION_ERROR", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", @@ -140,7 +140,7 @@ class Error400Response(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="BAD_REQUEST", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", @@ -156,7 +156,7 @@ class Error401Response(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="UNAUTHORIZED", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", @@ -172,7 +172,7 @@ class Error403Response(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="FORBIDDEN", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", @@ -188,7 +188,7 @@ class Error404Response(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="NOT_FOUND", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", @@ -208,7 +208,7 @@ class Error500Response(StandardErrorResponse): description="Human-readable error message", ) # Preserve the non-null Pydantic field in specialized error schemas. - error_code: str = Field( # ty: ignore[invalid-mutable-override] + error_code: str = Field( # ty: ignore[incompatible-mutable-override] default="INTERNAL_ERROR", pattern=SAFE_STRING_PATTERN, description="Machine-readable error code", diff --git a/src/routers/security/dependency_inventory.py b/src/routers/security/dependency_inventory.py index 36d47c5..5454e7f 100644 --- a/src/routers/security/dependency_inventory.py +++ b/src/routers/security/dependency_inventory.py @@ -250,7 +250,9 @@ async def list_workspace_dependencies( selected = normalize_repo(repo) if repo is not None else None except ValueError as exc: raise HTTPException(status_code=422, detail=str(exc)) from exc - ecosystems = {"pypi", "crates.io"} if ecosystem == "auto" else {ecosystem} + ecosystems: set[Literal["pypi", "crates.io"]] = ( + {"pypi", "crates.io"} if ecosystem == "auto" else {ecosystem} + ) # Tenant gate FIRST: nothing runs for a name that is not the caller's. workspace = await validate_and_get_container_for_tenant(container_name, tenant_id) diff --git a/src/services/system_dependency_manager.py b/src/services/system_dependency_manager.py index 0e4b231..c6b017d 100644 --- a/src/services/system_dependency_manager.py +++ b/src/services/system_dependency_manager.py @@ -817,6 +817,10 @@ def _install_packages_with_retry( self, packages: list[str], timeout: int = 300, max_retries: int = 2 ) -> bool: """Install packages with retry logic.""" + if not self.package_manager: + logger.error("No supported package manager detected") + return False + for attempt in range(max_retries + 1): try: if self.package_manager == PackageManager.APT: @@ -862,7 +866,7 @@ def _install_packages_with_retry( capture_output=True, ) else: - pm_name = self.package_manager.value if self.package_manager else "unknown" + pm_name = self.package_manager.value logger.error(f"Unsupported package manager: {pm_name}") return False