diff --git a/backend/adapters/services/steamgriddb_types.py b/backend/adapters/services/steamgriddb_types.py index bade565f4..a302dacaa 100644 --- a/backend/adapters/services/steamgriddb_types.py +++ b/backend/adapters/services/steamgriddb_types.py @@ -1,5 +1,6 @@ import enum -from typing import Mapping, TypedDict +from collections.abc import Mapping +from typing import TypedDict @enum.unique diff --git a/backend/endpoints/feeds.py b/backend/endpoints/feeds.py index d5a99bb48..1822bc99d 100644 --- a/backend/endpoints/feeds.py +++ b/backend/endpoints/feeds.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from config import DISABLE_DOWNLOAD_ENDPOINT_AUTH, FRONTEND_RESOURCES_PATH from decorators.auth import protected_route diff --git a/backend/endpoints/responses/identity.py b/backend/endpoints/responses/identity.py index 229f462dc..590e13037 100644 --- a/backend/endpoints/responses/identity.py +++ b/backend/endpoints/responses/identity.py @@ -8,7 +8,7 @@ from .base import BaseModel RAProgression = TypedDict( # type: ignore[misc] "RAProgression", - dict((k, NotRequired[v]) for k, v in get_type_hints(RAUserProgression).items()), + {k: NotRequired[v] for k, v in get_type_hints(RAUserProgression).items()}, total=False, ) diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py index 7a15892ba..e2f81ecd5 100644 --- a/backend/endpoints/responses/rom.py +++ b/backend/endpoints/responses/rom.py @@ -22,32 +22,32 @@ SORT_COMPARE_REGEX = re.compile(r"^([Tt]he|[Aa]|[Aa]nd)\s") RomIGDBMetadata = TypedDict( # type: ignore[misc] "RomIGDBMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(IGDBMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(IGDBMetadata).items()}, total=False, ) RomMobyMetadata = TypedDict( # type: ignore[misc] "RomMobyMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(MobyMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(MobyMetadata).items()}, total=False, ) RomSSMetadata = TypedDict( # type: ignore[misc] "RomSSMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(SSMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(SSMetadata).items()}, total=False, ) RomRAMetadata = TypedDict( # type: ignore[misc] "RomRAMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(RAMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(RAMetadata).items()}, total=False, ) RomLaunchboxMetadata = TypedDict( # type: ignore[misc] "RomLaunchboxMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(LaunchboxMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(LaunchboxMetadata).items()}, total=False, ) RomHasheousMetadata = TypedDict( # type: ignore[misc] "RomHasheousMetadata", - dict((k, NotRequired[v]) for k, v in get_type_hints(HasheousMetadata).items()), + {k: NotRequired[v] for k, v in get_type_hints(HasheousMetadata).items()}, total=False, ) diff --git a/backend/endpoints/search.py b/backend/endpoints/search.py index c2fcf7651..58e24877c 100644 --- a/backend/endpoints/search.py +++ b/backend/endpoints/search.py @@ -172,7 +172,7 @@ async def search_cover( covers = await meta_sgdb_handler.get_details(search_term=search_term) except SGDBInvalidAPIKeyException as err: raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, detail=str("Invalid SGDB API key") + status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid SGDB API key" ) from err return [SearchCoverSchema.model_validate(cover) for cover in covers] diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py index 7bab00990..5c1eb28e9 100644 --- a/backend/handler/auth/base_handler.py +++ b/backend/handler/auth/base_handler.py @@ -1,6 +1,6 @@ import uuid from datetime import datetime, timedelta, timezone -from typing import Any, Tuple +from typing import Any from config import OIDC_ENABLED, ROMM_AUTH_SECRET_KEY, ROMM_BASE_URL from decorators.auth import oauth @@ -190,7 +190,7 @@ class AuthHandler: ) return token - def verify_invite_link_token(self, token: str) -> Tuple[str, str]: + def verify_invite_link_token(self, token: str) -> tuple[str, str]: """ Verify the invite link token. Args: diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py index 1a40a1733..8388f3855 100644 --- a/backend/handler/database/collections_handler.py +++ b/backend/handler/database/collections_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.collection import Collection, CollectionRom, VirtualCollection diff --git a/backend/handler/database/firmware_handler.py b/backend/handler/database/firmware_handler.py index 59398b1e9..43e1bd0f7 100644 --- a/backend/handler/database/firmware_handler.py +++ b/backend/handler/database/firmware_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.firmware import Firmware diff --git a/backend/handler/database/platforms_handler.py b/backend/handler/database/platforms_handler.py index 74dcfc69b..0895ee25d 100644 --- a/backend/handler/database/platforms_handler.py +++ b/backend/handler/database/platforms_handler.py @@ -1,5 +1,5 @@ import functools -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.platform import Platform diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py index 2e05918b7..8cfff606a 100644 --- a/backend/handler/database/roms_handler.py +++ b/backend/handler/database/roms_handler.py @@ -1,6 +1,5 @@ import functools -from collections.abc import Iterable -from typing import List, Sequence, Tuple +from collections.abc import Iterable, Sequence from config import ROMM_DB_DRIVER from decorators.database import begin_session @@ -637,7 +636,7 @@ class DBRomsHandler(DBBaseHandler): @begin_session def get_char_index( self, query: Query, session: Session = None - ) -> List[Row[Tuple[str, int]]]: + ) -> list[Row[tuple[str, int]]]: # Get the row number and first letter for each item subquery = query.add_columns( func.lower(func.substring(Rom.name, 1, 1)).label("letter"), diff --git a/backend/handler/database/saves_handler.py b/backend/handler/database/saves_handler.py index 44f9c39e5..f7d673a57 100644 --- a/backend/handler/database/saves_handler.py +++ b/backend/handler/database/saves_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.assets import Save diff --git a/backend/handler/database/screenshots_handler.py b/backend/handler/database/screenshots_handler.py index 401a39814..98734741d 100644 --- a/backend/handler/database/screenshots_handler.py +++ b/backend/handler/database/screenshots_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.assets import Screenshot diff --git a/backend/handler/database/states_handler.py b/backend/handler/database/states_handler.py index 095308853..495fca4a5 100644 --- a/backend/handler/database/states_handler.py +++ b/backend/handler/database/states_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.assets import State diff --git a/backend/handler/database/users_handler.py b/backend/handler/database/users_handler.py index c7808fdd7..c605f3690 100644 --- a/backend/handler/database/users_handler.py +++ b/backend/handler/database/users_handler.py @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence from decorators.database import begin_session from models.user import Role, User diff --git a/backend/tools/xml_diagnostics.py b/backend/tools/xml_diagnostics.py index 57b366588..2a3687e20 100644 --- a/backend/tools/xml_diagnostics.py +++ b/backend/tools/xml_diagnostics.py @@ -64,7 +64,7 @@ def diagnose_xml(filename): # Try to get context around the error try: - with open(filename, "r", encoding="utf-8") as f: + with open(filename, encoding="utf-8") as f: lines = f.readlines() line_num = e.position[0] start = max(0, line_num - 2) diff --git a/backend/utils/archive_7zip.py b/backend/utils/archive_7zip.py index 320de9d97..ad6e02b3b 100644 --- a/backend/utils/archive_7zip.py +++ b/backend/utils/archive_7zip.py @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable from py7zr import Py7zIO, WriterFactory