Skip to content

Commit

Permalink
Fix linter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jmaupetit committed Feb 4, 2025
1 parent 58473d1 commit 22f2617
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 12 deletions.
3 changes: 2 additions & 1 deletion src/api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ exclude = [

[[tool.mypy.overrides]]
module = [
"postgresql_audit.*",
"shapely.*",
"sqlalchemy_utils.*"
"sqlalchemy_utils.*",
]
ignore_missing_imports = true
2 changes: 1 addition & 1 deletion src/api/qualicharge/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ async def lifespan(app: FastAPI):
"""Application life span."""
engine = get_engine()

# FIXME
versioning_manager.init(declarative_base(metadata=SQLModel.metadata))
print(f"{versioning_manager.__dict__}")

# Sentry
if settings.SENTRY_DSN is not None:
Expand Down
5 changes: 1 addition & 4 deletions src/api/qualicharge/schemas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from sqlalchemy.types import DateTime
from sqlmodel import Field, SQLModel


versioning_manager.init(declarative_base(metadata=SQLModel.metadata))


Expand Down Expand Up @@ -44,9 +43,7 @@ class BaseTimestampedSQLModel(SQLModel):
class BaseAuditableSQLModel(BaseTimestampedSQLModel):
"""A base class for SQL models for which we track changes making them auditable."""

__versioned__ = {
"exclude": ["created_at", "updated_at"]
}
__versioned__ = {"exclude": ["created_at", "updated_at"]}

created_by_id: Optional[UUID] = Field(default=None, foreign_key="user.id")
updated_by_id: Optional[UUID] = Field(default=None, foreign_key="user.id")
3 changes: 1 addition & 2 deletions src/api/qualicharge/schemas/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

from geoalchemy2.shape import to_shape
from geoalchemy2.types import Geometry, WKBElement
from postgresql_audit import versioning_manager
from pydantic import (
EmailStr,
PastDate,
Expand All @@ -24,7 +23,7 @@
from sqlalchemy import Select, event
from sqlalchemy import cast as SA_cast
from sqlalchemy.dialects.postgresql import ENUM as PgEnum
from sqlalchemy.orm import declarative_base, registry
from sqlalchemy.orm import registry
from sqlalchemy.schema import Column as SAColumn
from sqlalchemy.schema import Index
from sqlalchemy.types import Date, DateTime, String
Expand Down
2 changes: 1 addition & 1 deletion src/api/qualicharge/schemas/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from ..auth.schemas import User
from ..exceptions import ObjectDoesNotExist, ProgrammingError
from ..models.static import Statique
from . import BaseAuditableSQLModel, BaseTimestampedSQLModel
from . import BaseAuditableSQLModel
from .core import (
Amenageur,
Enseigne,
Expand Down
2 changes: 1 addition & 1 deletion src/api/qualicharge/schemas/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
from sqlalchemy import func
from sqlalchemy.exc import MultipleResultsFound
from sqlalchemy.schema import Column as SAColumn
from qualicharge.schemas import BaseAuditableSQLModel
from sqlmodel import Session, SQLModel, select

from qualicharge.auth.schemas import User
from qualicharge.schemas import BaseAuditableSQLModel

from ..exceptions import (
DatabaseQueryException,
Expand Down
4 changes: 2 additions & 2 deletions src/api/tests/api/v1/routers/test_statique.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
from typing import cast

import pytest
from sqlalchemy.types import UUID
from fastapi import status
from postgresql_audit import versioning_manager
from pydantic_extra_types.coordinate import Coordinate
from sqlalchemy import Column as SAColumn
from sqlalchemy import func, text
from sqlalchemy import func
from sqlalchemy.types import UUID
from sqlalchemy_utils import refresh_materialized_view
from sqlmodel import select

Expand Down

0 comments on commit 22f2617

Please sign in to comment.