Check entire project with mypy

Author: dolfinus

.github/workflows/codeql-analysis.yml

@@ -55,7 +55,7 @@ jobs:
           make venv-install
 
       - name: Run mypy
-        run: uv run mypy --config-file ./pyproject.toml ./syncmaster/server
+        run: uv run mypy syncmaster
 
   codeql:
     name: CodeQL

.pre-commit-config.yaml

@@ -85,7 +85,7 @@ repos:
     hooks:
       - id: pretty-format-yaml
         args: [--autofix, --indent, '2', --offset, '2']
-        priority: 8
+        priority: 7
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
@@ -95,32 +95,32 @@ repos:
         additional_dependencies:
           - tomli
         exclude: .*\.svg
-        priority: 9
+        priority: 8
 
   - repo: https://github.com/astral-sh/uv-pre-commit
     rev: 0.9.18
     hooks:
       - id: uv-lock
-        priority: 10
+        priority: 9
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.10
     hooks:
       - id: ruff-format
-        priority: 10
+        priority: 9
       - id: ruff-check
         args: [--fix]
-        priority: 11
+        priority: 10
 
   - repo: local
     hooks:
       - id: mypy
         name: mypy
-        entry: mypy ./syncmaster/server --config-file ./pyproject.toml
+        entry: mypy syncmaster
         language: python
         require_serial: true
         pass_filenames: false
-        priority: 11
+        priority: 10
 
   - repo: meta
     hooks:

pyproject.toml

@@ -201,10 +201,6 @@ ignore_missing_imports = true
 module = "celery.*"
 ignore_missing_imports = true
 
-[[tool.mypy.overrides]]
-module = "fastapi.*"
-ignore_missing_imports = true
-
 [[tool.mypy.overrides]]
 module = "kombu.*"
 ignore_missing_imports = true
@@ -213,20 +209,16 @@ ignore_missing_imports = true
 module = "onetl.*"
 ignore_missing_imports = true
 
-[[tool.mypy.overrides]]
-module = "pyspark.*"
-ignore_missing_imports = true
-
 [[tool.mypy.overrides]]
 module = "sqlalchemy_utils.*"
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = "starlette.*"
+module = "apscheduler.*"
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = "uvicorn.*"
+module = "pydantic_settings_logging"
 ignore_missing_imports = true
 
 [tool.pytest.ini_options]

syncmaster/db/migrations/env.py

@@ -24,7 +24,7 @@
 
 
 class MigrationAppSettings(BaseSettings):
-    database: DatabaseSettings = Field(default_factory=DatabaseSettings, description="Database settings")
+    database: DatabaseSettings = Field(default_factory=DatabaseSettings, description="Database settings")  # type: ignore[arg-type]
     logging: LoggingSettings = Field(default=DEFAULT_LOGGING_SETTINGS, description="Logging settings")
 
 

syncmaster/db/models/auth_data.py

@@ -10,6 +10,8 @@
 
 
 class AuthData(Base, TimestampMixin):
+    __table_name__ = "auth_data"
+
     connection_id: Mapped[int] = mapped_column(
         BigInteger,
         ForeignKey("connection.id", ondelete="CASCADE"),

syncmaster/db/models/base.py

@@ -1,28 +1,18 @@
 # SPDX-FileCopyrightText: 2023-present MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-import re
-
 from sqlalchemy import MetaData
-from sqlalchemy.orm import DeclarativeBase, declared_attr
+from sqlalchemy.orm import DeclarativeBase
 
 convention = {
-    "all_column_names": lambda constraint, table: "_".join([column.name for column in constraint.columns.values()]),
     "ix": "ix__%(table_name)s__%(all_column_names)s",
     "uq": "uq__%(table_name)s__%(all_column_names)s",
     "ck": "ck__%(table_name)s__%(constraint_name)s",
     "fk": ("fk__%(table_name)s__%(all_column_names)s__%(referred_table_name)s"),
     "pk": "pk__%(table_name)s",
 }
 
-model_metadata = MetaData(naming_convention=convention)
-
 
 # as_declarative decorator causes mypy errors.
 # Use inheritance from DeclarativeBase.
 class Base(DeclarativeBase):
-    metadata = model_metadata
-
-    @declared_attr
-    def __tablename__(cls) -> str:  # noqa: N805
-        name_list = re.findall(r"[A-Z][a-z\d]*", cls.__name__)
-        return "_".join(name_list).lower()
+    metadata = MetaData(naming_convention=convention)

syncmaster/db/models/connection.py

@@ -33,6 +33,7 @@ class ConnectionType(StrEnum):
 
 
 class Connection(Base, ResourceMixin, TimestampMixin):
+    __table_name__ = "connection"
     __table_args__ = (
         UniqueConstraint("name", "group_id"),
         Index("idx_connection_search_vector", "search_vector", postgresql_using="gin"),

syncmaster/db/models/group.py

@@ -66,6 +66,8 @@ def roles_at_least(cls, role: str | GroupMemberRole) -> list[str]:
 
 
 class Group(Base, TimestampMixin):
+    __table_name__ = "group"
+
     id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     name: Mapped[str] = mapped_column(String(128), nullable=False, unique=True)
     description: Mapped[str] = mapped_column(String(512), nullable=False, default="")
@@ -99,7 +101,9 @@ def __repr__(self) -> str:
 
 
 class UserGroup(Base):
+    __table_name__ = "user_group"
     __table_args__ = (PrimaryKeyConstraint("user_id", "group_id"),)
+
     user_id: Mapped[int] = mapped_column(
         BigInteger,
         ForeignKey("user.id", ondelete="CASCADE"),

syncmaster/db/models/queue.py

@@ -12,6 +12,8 @@
 
 
 class Queue(Base, ResourceMixin, TimestampMixin):
+    __table_name__ = "queue"
+
     name: Mapped[str] = mapped_column(String(128), nullable=False)
     slug: Mapped[str] = mapped_column(String(256), nullable=False, unique=True)
 

syncmaster/db/models/run.py

@@ -30,6 +30,8 @@ class RunType(enum.StrEnum):
 
 
 class Run(Base, TimestampMixin):
+    __table_name__ = "run"
+
     id: Mapped[int] = mapped_column(
         BigInteger,
         primary_key=True,