Fix broken import, more typing updates

Author: nmaytan

tiled/_tests/test_protocols.py

@@ -426,7 +426,7 @@ async def accesspolicy_protocol_functions(
     policy: AccessPolicy,
     node: BaseAdapter,
     principal: Principal,
-    authn_access_tags: Optional[Set[str]],
+    authn_access_tags: Optional[AccessTags],
     authn_scopes: Scopes,
     scopes: Scopes,
 ) -> None:

tiled/access_control/access_policies.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from types import Optional, Tuple
+from typing import Optional, Tuple
 
 from ..adapters.protocols import BaseAdapter
 from ..queries import AccessBlobFilter

tiled/server/authentication.py

@@ -4,7 +4,7 @@
 import warnings
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
-from typing import Annotated, Any, Callable, Optional, Sequence, Set
+from typing import Annotated, Any, Callable, Optional, Sequence
 
 from fastapi import (
     APIRouter,
@@ -60,6 +60,7 @@
     lookup_valid_pending_session_by_user_code,
     lookup_valid_session,
 )
+from ..type_aliases import AccessTags
 from ..utils import SHARE_TILED_PATH, SingleUserPrincipal
 from . import schemas
 from .connection_pool import get_database_session_factory
@@ -230,7 +231,7 @@ async def get_session_state(decoded_access_token=Depends(get_decoded_access_toke
 
 async def get_access_tags_from_api_key(
     api_key: str, authenticated: bool, db: Optional[AsyncSession]
-) -> Optional[Set[str]]:
+) -> Optional[AccessTags]:
     if not authenticated:
         # Tiled is in a "single user" mode with only one API key.
         # In this mode, there is no meaningful access tag limit.
@@ -258,7 +259,7 @@ async def get_current_access_tags(
     db_factory: Callable[[], Optional[AsyncSession]] = Depends(
         get_database_session_factory
     ),
-) -> Optional[Set[str]]:
+) -> Optional[AccessTags]:
     if api_key is not None:
         async with db_factory() as db:
             return await get_access_tags_from_api_key(
@@ -292,7 +293,7 @@ async def get_current_access_tags_websocket(
     db_factory: Callable[[], Optional[AsyncSession]] = Depends(
         get_database_session_factory
     ),
-) -> Optional[Set[str]]:
+) -> Optional[AccessTags]:
     if api_key is not None:
         async with db_factory() as db:
             return await get_access_tags_from_api_key(

tiled/server/dependencies.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Set
+from typing import List, Optional
 
 import pydantic_settings
 from fastapi import HTTPException, Query, Request
@@ -7,7 +7,7 @@
 from ..access_control.protocols import AccessPolicy
 from ..adapters.protocols import AnyAdapter
 from ..structures.core import StructureFamily
-from ..type_aliases import Scopes
+from ..type_aliases import AccessTags, Scopes
 from ..utils import BrokenLink
 from .core import NoEntry
 from .schemas import Principal
@@ -22,7 +22,7 @@ async def get_entry(
     path: str,
     security_scopes: List[str],
     principal: Optional[Principal],
-    authn_access_tags: Optional[Set[str]],
+    authn_access_tags: Optional[AccessTags],
     authn_scopes: Scopes,
     root_tree: pydantic_settings.BaseSettings,
     session_state: dict,

tiled/server/utils.py

@@ -1,7 +1,7 @@
 import contextlib
 import time
 from collections.abc import Generator
-from typing import Any, Literal, Mapping, Optional, Sequence, Set
+from typing import Any, Literal, Mapping, Optional, Sequence
 
 from fastapi import Request, WebSocket
 from starlette.types import Scope
@@ -10,7 +10,7 @@
 from ..access_control.protocols import AccessPolicy
 from ..adapters.mapping import MapAdapter
 from ..server.schemas import Principal
-from ..type_aliases import Scopes
+from ..type_aliases import AccessTags, Scopes
 
 EMPTY_NODE = MapAdapter({})
 API_KEY_COOKIE_NAME = "tiled_api_key"
@@ -89,7 +89,7 @@ async def filter_for_access(
     entry,
     access_policy: Optional[AccessPolicy],
     principal: Principal,
-    authn_access_tags: Optional[Set[str]],
+    authn_access_tags: Optional[AccessTags],
     authn_scopes: Scopes,
     scopes: Sequence[str],
     metrics: dict[str, Any],

tiled/server/zarr.py

@@ -1,6 +1,6 @@
 import json
 import re
-from typing import Optional, Set, Tuple, Union
+from typing import Optional, Tuple, Union
 
 import numcodecs
 import orjson
@@ -10,7 +10,7 @@
 from starlette.status import HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR
 
 from ..structures.core import StructureFamily
-from ..type_aliases import Scopes
+from ..type_aliases import AccessTags, Scopes
 from ..utils import ensure_awaitable
 from .authentication import (
     get_current_access_tags,
@@ -56,7 +56,7 @@ async def get_zarr_attrs(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -92,7 +92,7 @@ async def get_zarr_group_metadata(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -120,7 +120,7 @@ async def get_zarr_array_metadata(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -164,7 +164,7 @@ async def get_zarr_array(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -283,7 +283,7 @@ async def get_zarr_metadata(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -375,7 +375,7 @@ async def get_zarr_array(
         path: str,
         block: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),
@@ -456,7 +456,7 @@ async def get_zarr_group(
         request: Request,
         path: str,
         principal: Union[Principal] = Depends(get_current_principal),
-        authn_access_tags: Optional[Set[str]] = Depends(get_current_access_tags),
+        authn_access_tags: Optional[AccessTags] = Depends(get_current_access_tags),
         authn_scopes: Scopes = Depends(get_current_scopes),
         root_tree: pydantic_settings.BaseSettings = Depends(get_root_tree),
         session_state: dict = Depends(get_session_state),