lint error fixed

Author: kwonkwonn

src/ai/backend/manager/repositories/project_config/db_source/db_source.py

@@ -9,7 +9,6 @@
 from __future__ import annotations
 
 import uuid
-from typing import Optional
 
 import sqlalchemy as sa
 
@@ -44,7 +43,7 @@ def __init__(self, db: ExtendedAsyncSAEngine) -> None:
         self._db = db
 
     async def resolve_project(
-        self, domain_name: Optional[str], project_id_or_name: uuid.UUID | str
+        self, domain_name: str | None, project_id_or_name: uuid.UUID | str
     ) -> ResolvedProject:
         """
         Resolve project identity (id + domain_name) in a single query.
@@ -92,7 +91,7 @@ async def get_dotfiles(self, project_id: uuid.UUID) -> ProjectDotfilesResult:
         """
         async with self._db.begin_readonly_session() as session:
             conn = await session.connection()
-            dotfiles, leftover_space = await query_group_dotfiles(conn, project_id)  # type: ignore[arg-type]
+            dotfiles, leftover_space = await query_group_dotfiles(conn, project_id)
             if dotfiles is None:
                 raise DotfileNotFound
             return ProjectDotfilesResult(dotfiles=dotfiles, leftover_space=leftover_space)
@@ -111,7 +110,7 @@ async def add_dotfile(self, project_id: uuid.UUID, dotfile: DotfileInput) -> Non
         """Add a new dotfile to the project in a single session."""
         async with self._db.begin_session() as session:
             conn = await session.connection()
-            dotfiles, leftover_space = await query_group_dotfiles(conn, project_id)  # type: ignore[arg-type]
+            dotfiles, leftover_space = await query_group_dotfiles(conn, project_id)
             if dotfiles is None:
                 raise DotfileNotFound
 
@@ -143,7 +142,7 @@ async def modify_dotfile(self, project_id: uuid.UUID, dotfile: DotfileInput) ->
         """Update an existing dotfile in the project in a single session."""
         async with self._db.begin_session() as session:
             conn = await session.connection()
-            dotfiles, _ = await query_group_dotfiles(conn, project_id)  # type: ignore[arg-type]
+            dotfiles, _ = await query_group_dotfiles(conn, project_id)
             if dotfiles is None:
                 raise DotfileNotFound
 
@@ -169,7 +168,7 @@ async def remove_dotfile(self, project_id: uuid.UUID, path: str) -> None:
         """Remove a dotfile from the project in a single session."""
         async with self._db.begin_session() as session:
             conn = await session.connection()
-            dotfiles, _ = await query_group_dotfiles(conn, project_id)  # type: ignore[arg-type]
+            dotfiles, _ = await query_group_dotfiles(conn, project_id)
             if dotfiles is None:
                 raise DotfileNotFound
 

src/ai/backend/manager/repositories/project_config/repository.py

@@ -9,7 +9,6 @@
 from __future__ import annotations
 
 import uuid
-from typing import Optional
 
 from ai.backend.common.metrics.metric import DomainType, LayerType
 from ai.backend.common.resilience.policies.metrics import MetricArgs, MetricPolicy
@@ -48,7 +47,7 @@ def __init__(self, db: ExtendedAsyncSAEngine) -> None:
 
     @project_config_repository_resilience.apply()
     async def resolve_project(
-        self, domain_name: Optional[str], project_id_or_name: uuid.UUID | str
+        self, domain_name: str | None, project_id_or_name: uuid.UUID | str
     ) -> ResolvedProject:
         """
         Resolve project identity (id + domain_name) in a single query.

src/ai/backend/manager/services/project_config/actions/base.py

@@ -2,7 +2,7 @@
 
 import uuid
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseAction
 
@@ -12,7 +12,7 @@ class ProjectConfigAction(BaseAction):
     """Base action for project config operations."""
 
     project_id_or_name: uuid.UUID | str
-    domain_name: Optional[str]
+    domain_name: str | None
 
     @override
     @classmethod

src/ai/backend/manager/services/project_config/actions/create_dotfile.py

@@ -2,7 +2,7 @@
 
 import uuid
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseActionResult
 from ai.backend.manager.services.project_config.actions.base import ProjectConfigAction
@@ -15,7 +15,7 @@ class CreateDotfileAction(ProjectConfigAction):
     permission: str
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id_or_name)
 
     @override
@@ -29,5 +29,5 @@ class CreateDotfileActionResult(BaseActionResult):
     project_id: uuid.UUID
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id)

src/ai/backend/manager/services/project_config/actions/delete_dotfile.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseActionResult
 from ai.backend.manager.services.project_config.actions.base import ProjectConfigAction
@@ -12,7 +12,7 @@ class DeleteDotfileAction(ProjectConfigAction):
     path: str
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id_or_name)
 
     @override
@@ -26,5 +26,5 @@ class DeleteDotfileActionResult(BaseActionResult):
     success: bool
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return None

src/ai/backend/manager/services/project_config/actions/get_dotfile.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseActionResult
 from ai.backend.manager.models.group import GroupDotfile
@@ -17,7 +17,7 @@ class GetDotfileAction(ProjectConfigAction):
     path: str
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id_or_name)
 
     @override
@@ -31,5 +31,5 @@ class GetDotfileActionResult(BaseActionResult):
     dotfile: GroupDotfile
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return None

src/ai/backend/manager/services/project_config/actions/list_dotfiles.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseActionResult
 from ai.backend.manager.models.group import GroupDotfile
@@ -11,7 +11,7 @@
 @dataclass
 class ListDotfilesAction(ProjectConfigAction):
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id_or_name)
 
     @override
@@ -25,5 +25,5 @@ class ListDotfilesActionResult(BaseActionResult):
     dotfiles: list[GroupDotfile]
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return None

src/ai/backend/manager/services/project_config/actions/update_dotfile.py

@@ -2,7 +2,7 @@
 
 import uuid
 from dataclasses import dataclass
-from typing import Optional, override
+from typing import override
 
 from ai.backend.manager.actions.action import BaseActionResult
 from ai.backend.manager.services.project_config.actions.base import ProjectConfigAction
@@ -15,7 +15,7 @@ class UpdateDotfileAction(ProjectConfigAction):
     permission: str
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id_or_name)
 
     @override
@@ -29,5 +29,5 @@ class UpdateDotfileActionResult(BaseActionResult):
     project_id: uuid.UUID
 
     @override
-    def entity_id(self) -> Optional[str]:
+    def entity_id(self) -> str | None:
         return str(self.project_id)

src/ai/backend/manager/services/project_config/service.py

@@ -63,7 +63,8 @@ async def _resolve_project_for_admin(
         Validates that admin has permission to modify the project's dotfiles.
         """
         user = current_user()
-        assert user is not None
+        if user is None:
+            raise InsufficientPrivilege("Authentication required")
 
         project = await self._project_config_repository.resolve_project(
             domain_name, project_id_or_name
@@ -88,7 +89,8 @@ async def _resolve_project_for_user(
         Validates that user has permission to access the project's dotfiles.
         """
         user = current_user()
-        assert user is not None
+        if user is None:
+            raise InsufficientPrivilege("Authentication required")
 
         project = await self._project_config_repository.resolve_project(
             domain_name, project_id_or_name

tests/unit/manager/services/project_config/test_service.py

@@ -14,7 +14,8 @@
 
 import pytest
 
-from ai.backend.common.contexts.user import UserData, with_user
+from ai.backend.common.contexts.user import with_user
+from ai.backend.common.data.user.types import UserData, UserRole
 from ai.backend.manager.errors.api import InvalidAPIParameters
 from ai.backend.manager.errors.storage import (
     DotfileAlreadyExists,
@@ -73,7 +74,7 @@ def user_context(user_id: uuid.UUID, domain_name: str) -> Iterator[UserData]:
         is_authorized=True,
         is_admin=True,
         is_superadmin=True,
-        role="superadmin",
+        role=UserRole.SUPERADMIN,
         domain_name=domain_name,
     )
     with with_user(user_data):