chore: formatting

alembic/env.py

@@ -17,9 +17,10 @@
     fileConfig(config.config_file_name)
 
 # Read settings YAML file
+import os  # noqa: E402
 from pathlib import Path  # noqa: E402
+
 from yaml import safe_load  # noqa: E402
-import os  # noqa: E402
 
 app_settings_path = os.getenv("SETTINGS_PATH", "settings.yaml")
 app_settings = safe_load(Path(app_settings_path).read_text())

alembic/versions/_2024_02_10_23_52_upgrade_empty_to_head.py

@@ -9,9 +9,9 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "8ff07476cbc4"

alembic/versions/_2024_02_13_03_10_user_schedule_access_key.py

@@ -9,9 +9,9 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "cba1388a6e8f"

alembic/versions/_2024_02_13_05_37_music_room_sports_moodle_hidden.py

@@ -9,9 +9,9 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "6f44af938cdf"

alembic/versions/_2024_03_10_21_21_extract_predefined_data.py

@@ -9,9 +9,9 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "a5e80abc2e66"

alembic/versions/_2024_09_13_16_39_moodle_authtoken.py

@@ -9,9 +9,9 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "65da8a75e495"

alembic/versions/_2024_09_22_16_35_add_timezone_to_updated_at_and_created_.py

@@ -9,10 +9,11 @@
 # ruff: noqa: E501
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
+from alembic import op
+
 # revision identifiers, used by Alembic.
 revision: str = "6b17213f3f14"
 down_revision: Union[str, None] = "65da8a75e495"

pyproject.toml

@@ -32,4 +32,6 @@ lint.ignore = [
     # wildcard imports are fine
     "F403",
     "F405",
+    "PLR"
 ]
+lint.extend-select = ["I", "UP", "PL"]

scripts/alembic_auto_migrations.py

@@ -1,5 +1,5 @@
-import sys
 import pathlib
+import sys
 
 import alembic.config
 

scripts/migrate_users_from_account_to_events.py

@@ -42,7 +42,7 @@ async def main():
 
     type_adapter = TypeAdapter(list[InputUser])
 
-    with open(args.input_file, "r") as file:
+    with open(args.input_file) as file:
         data = file.read()
         users = type_adapter.validate_json(data)
 

src/api/app.py

@@ -58,9 +58,10 @@
 app.include_router(router_users)
 
 if settings.environment == Environment.DEVELOPMENT:
-    from src.logging_ import logger
     import logging
 
+    from src.logging_ import logger
+
     logger.warn("Enable sqlalchemy logging")
     logging.basicConfig()
     logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO)

src/api/lifespan.py

@@ -9,10 +9,10 @@
 
 
 async def setup_repositories() -> SQLAlchemyStorage:
-    from src.modules.users.repository import user_repository
     from src.modules.event_groups.repository import event_group_repository
-    from src.modules.tags.repository import tag_repository
     from src.modules.innohassle_accounts import innohassle_accounts
+    from src.modules.tags.repository import tag_repository
+    from src.modules.users.repository import user_repository
 
     # ------------------- Repositories Dependencies -------------------
 
@@ -28,6 +28,7 @@ async def setup_repositories() -> SQLAlchemyStorage:
 
 def setup_predefined_data_from_file():
     import json
+
     from src.modules.predefined.storage import JsonPredefinedUsers
     from src.modules.predefined.utils import setup_predefined_data_from_object
 

src/config.py

@@ -3,7 +3,7 @@
 import os
 from pathlib import Path
 
-from src.config_schema import Settings, Environment
+from src.config_schema import Environment, Settings
 
 settings_path = os.getenv("SETTINGS_PATH", "settings.yaml")
 settings: Settings = Settings.from_yaml(Path(settings_path))

src/config_schema.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 import yaml
-from pydantic import BaseModel, SecretStr, ConfigDict
+from pydantic import BaseModel, ConfigDict, SecretStr
 
 
 class Environment(StrEnum):
@@ -67,7 +67,7 @@ class Settings(SettingsEntityModel):
 
     @classmethod
     def from_yaml(cls, path: Path) -> "Settings":
-        with open(path, "r", encoding="utf-8") as f:
+        with open(path, encoding="utf-8") as f:
             yaml_config: dict = yaml.safe_load(f)
             yaml_config.pop("$schema", None)
 

src/exceptions.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Any
+from typing import Any, ClassVar
 
 from fastapi import HTTPException
 from starlette import status

src/logging_.py

@@ -4,7 +4,7 @@
 import inspect
 import logging.config
 import os
-from typing import Dict, Any
+from typing import Any, Dict
 
 import fastapi.routing
 import yaml
@@ -18,7 +18,7 @@ def filter(self, record: logging.LogRecord) -> bool:
         return True
 
 
-with open("logging.yaml", "r") as f:
+with open("logging.yaml") as f:
     config = yaml.safe_load(f)
     logging.config.dictConfig(config)
 

src/modules/crud.py

@@ -1,10 +1,10 @@
 __all__ = ["AbstractCRUDRepository", "CRUDFactory"]
 
-from abc import abstractmethod, ABCMeta
-from typing import Type, TypeVar, Generic
+from abc import ABCMeta, abstractmethod
+from typing import Generic, Type, TypeVar
 
 from pydantic import BaseModel as PydanticModel
-from sqlalchemy import or_, and_, ColumnElement
+from sqlalchemy import ColumnElement, and_, or_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.sql.base import ExecutableOption
 
@@ -71,7 +71,8 @@ def CRUDFactory(
     UpdateScheme: Type[UpdateType] = None,
     get_options: tuple[ExecutableOption, ...] = (),
 ) -> AbstractCRUDRepository[CreateType, ViewType, UpdateType]:
-    from sqlalchemy import delete, insert, select, update as sql_update
+    from sqlalchemy import delete, insert, select
+    from sqlalchemy import update as sql_update
     from sqlalchemy.dialects.postgresql import insert as postgres_insert
     from sqlalchemy.inspection import inspect
 

src/modules/event_groups/repository.py

@@ -1,20 +1,19 @@
 __all__ = ["SqlEventGroupRepository", "event_group_repository"]
 
-from typing import Optional, cast, Iterable
+from typing import Iterable, Optional, cast
 
-from sqlalchemy import select, update, delete
+from sqlalchemy import delete, select, update
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.modules.crud import CRUDFactory, AbstractCRUDRepository
-from src.modules.ownership import setup_ownership_method
-from src.modules.ownership import OwnershipEnum
+from src.modules.crud import AbstractCRUDRepository, CRUDFactory
 from src.modules.event_groups.schemas import (
-    CreateEventGroupWithoutTags,
-    ViewEventGroup,
     CreateEventGroup,
+    CreateEventGroupWithoutTags,
     UpdateEventGroup,
+    ViewEventGroup,
 )
+from src.modules.ownership import OwnershipEnum, setup_ownership_method
 from src.storages.sql import SQLAlchemyStorage
 from src.storages.sql.models import EventGroup
 

src/modules/event_groups/routes.py

@@ -2,20 +2,19 @@
 
 import aiofiles
 import icalendar
-from fastapi import APIRouter
-from fastapi import UploadFile, HTTPException, Body
+from fastapi import APIRouter, Body, HTTPException, UploadFile
 from sqlalchemy.exc import IntegrityError
 from starlette.responses import JSONResponse
 
 from src.api.dependencies import VERIFY_PARSER_DEPENDENCY
 from src.exceptions import (
     EventGroupNotFoundException,
     EventGroupWithMissingPath,
-    IncorrectCredentialsException,
     ForbiddenException,
+    IncorrectCredentialsException,
 )
 from src.modules.event_groups.repository import event_group_repository
-from src.modules.event_groups.schemas import ViewEventGroup, ListEventGroupsResponse, CreateEventGroup, UpdateEventGroup
+from src.modules.event_groups.schemas import CreateEventGroup, ListEventGroupsResponse, UpdateEventGroup, ViewEventGroup
 from src.modules.parse.utils import locate_ics_by_path
 
 router = APIRouter(prefix="/event-groups", tags=["Event Groups"])

src/modules/event_groups/schemas.py

@@ -7,11 +7,11 @@
 ]
 
 import datetime
-from typing import Optional, Iterable
+from typing import Iterable, Optional
 
-from pydantic import BaseModel, Field, ConfigDict, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
-from src.modules.tags.schemas import ViewTag, CreateTag
+from src.modules.tags.schemas import CreateTag, ViewTag
 
 
 class CreateEventGroupWithoutTags(BaseModel):

src/modules/events/repository.py

@@ -7,12 +7,12 @@
 
 from src.modules.crud import CRUDFactory
 from src.modules.events.schemas import (
+    AddEventPatch,
     CreateEvent,
     UpdateEvent,
+    UpdateEventPatch,
     ViewEvent,
-    AddEventPatch,
     ViewEventPatch,
-    UpdateEventPatch,
 )
 from src.storages.sql import SQLAlchemyStorage
 from src.storages.sql.models import Event, EventPatch

src/modules/events/schemas.py

@@ -4,7 +4,7 @@
 from typing import Optional
 
 from icalendar import vRecur
-from pydantic import BaseModel, Field, field_validator, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 
 class CreateEvent(BaseModel):

src/modules/ics/routes.py

@@ -1,19 +1,18 @@
 from urllib.parse import unquote
 
-from fastapi import APIRouter
-from fastapi import HTTPException
-from starlette.responses import FileResponse, StreamingResponse, Response
+from fastapi import APIRouter, HTTPException
+from starlette.responses import FileResponse, Response, StreamingResponse
 
 from src.api.dependencies import CURRENT_USER_ID_DEPENDENCY
 from src.config import settings
-from src.exceptions import EventGroupNotFoundException, ObjectNotFound, ForbiddenException
+from src.exceptions import EventGroupNotFoundException, ForbiddenException, ObjectNotFound
 from src.modules.event_groups.repository import event_group_repository
 from src.modules.ics.utils import (
     generate_ics_from_url,
+    get_moodle_ics,
     get_personal_event_groups_ics,
-    get_personal_sport_ics,
     get_personal_music_room_ics,
-    get_moodle_ics,
+    get_personal_sport_ics,
 )
 from src.modules.parse.utils import locate_ics_by_path
 from src.modules.users.linked import LinkedCalendarView

src/modules/ics/utils.py

@@ -49,7 +49,7 @@ async def generate_ics_from_url(url: str, headers: dict = None) -> AsyncGenerato
 
 async def _generate_ics_from_multiple(user: ViewUser, *ics: Path) -> AsyncGenerator[bytes, None]:
     async def _async_read_schedule(ics_path: Path):
-        async with aiofiles.open(ics_path, "r") as f:
+        async with aiofiles.open(ics_path) as f:
             content = await f.read()
             _cal = icalendar.Calendar.from_ical(content)
             return _cal
@@ -176,7 +176,7 @@ async def get_personal_sport_ics(user: ViewUser) -> bytes:
     def _training_to_vevent(training: Training) -> icalendar.Event:
         string_to_hash = str(training.extendedProps.id)
         hash_ = crc32(string_to_hash.encode("utf-8"))
-        uid = "sport-%x@innohassle.ru" % abs(hash_)
+        uid = f"sport-{abs(hash_):x}@innohassle.ru"
 
         vevent = icalendar.Event()
         vevent.add("uid", uid)

src/modules/ownership.py

@@ -2,7 +2,7 @@
 
 from enum import StrEnum
 
-from pydantic import BaseModel, field_validator, ConfigDict
+from pydantic import BaseModel, ConfigDict, field_validator
 from sqlalchemy import delete
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.ext.asyncio import AsyncSession

src/modules/parse/bootcamp.py

@@ -1,10 +1,10 @@
 import datetime
 import re
 from typing import Generator
+from zlib import crc32
 
 import icalendar
-from pydantic import BaseModel, Field, ConfigDict, field_validator
-from zlib import crc32
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from src.modules.parse.utils import get_color
 
@@ -76,7 +76,7 @@ def get_uid(self) -> str:
         else:
             string_to_hash = str(("bootcamp", self.summary, self.location, self.dtstart))
         hash_ = crc32(string_to_hash.encode("utf-8"))
-        return "%x#bootcamp@innohassle.ru" % abs(hash_)
+        return f"{abs(hash_):x}#bootcamp@innohassle.ru"
 
     def get_vevent(self) -> icalendar.Event:
         """

src/modules/parse/cleaning.py

@@ -92,7 +92,7 @@ def get_uid(self) -> str:
         string_to_hash = str(("cleaning", self.summary, self.location, self.date.isoformat()))
         hash_ = crc32(string_to_hash.encode("utf-8"))
 
-        return "%x#cleaning@innohassle.ru" % abs(hash_)
+        return f"{abs(hash_):x}#cleaning@innohassle.ru"
 
     def get_vevent(self) -> icalendar.Event:
         """
@@ -126,7 +126,7 @@ def get_uid(self) -> str:
         """
         string_to_hash = str(("linen", self.summary, self.location))
         hash_ = crc32(string_to_hash.encode("utf-8"))
-        return "%x#linen@innohassle.ru" % abs(hash_)
+        return f"{abs(hash_):x}#linen@innohassle.ru"
 
     def get_vevent(self) -> icalendar.Event:
         """