WIP: fix linter warnings

Author: jmaupetit

src/api/qualicharge/api/v1/routers/static.py

@@ -1,12 +1,13 @@
 """QualiCharge API v1 statique router."""
 
 import logging
-from typing import Annotated, List, Optional
+from typing import Annotated, List, Optional, cast
 
 from annotated_types import Len
 from fastapi import APIRouter, Depends, HTTPException, Path, Query, Request, status
 from pydantic import AnyHttpUrl, BaseModel, computed_field
 from sqlalchemy import func
+from sqlalchemy.schema import Column as SAColumn
 from sqlmodel import Session, select
 
 from qualicharge.conf import settings
@@ -75,7 +76,7 @@ async def list(
     """List statique items."""
     current_url = request.url
     previous_url = next_url = None
-    total = session.exec(select(func.count(PointDeCharge.id_pdc_itinerance))).one()
+    total = session.exec(select(func.count(cast(SAColumn, PointDeCharge.id)))).one()
     statiques = [statique for statique in list_statique(session, offset, limit)]
 
     previous_offset = offset - limit if offset > limit else 0

src/api/qualicharge/schemas/static.py

@@ -139,7 +139,7 @@ def set_geometry_point(cls, value: Coordinate, info: ValidationInfo) -> str:
 
     @field_serializer("coordonneesXY")
     def serialize_coordonneesXY(
-        self, value: Union[str, Geometry], _
+        self, value: Union[str, WKBElement], _
     ) -> Union[str, Coordinate]:
         """Serialize coordonneesXY field.
 

src/api/qualicharge/schemas/utils.py

@@ -1,10 +1,11 @@
 """QualiCharge schemas utilities."""
 
 import logging
-from typing import Generator, List, NamedTuple, Optional, Set, Tuple, Type
+from typing import Generator, List, NamedTuple, Optional, Set, Tuple, Type, cast
 
 from sqlalchemy import func
 from sqlalchemy.exc import MultipleResultsFound
+from sqlalchemy.schema import Column as SAColumn
 from sqlmodel import Session, SQLModel, select
 
 from ..exceptions import (
@@ -153,7 +154,7 @@ def save_statique(session: Session, statique: Statique) -> Statique:
     session.commit()
     session.refresh(pdc)
 
-    return pdc_to_statique(pdc)
+    return pdc_to_statique(cast(PointDeCharge, pdc))
 
 
 def update_statique(
@@ -169,7 +170,7 @@ def update_statique(
     # Check that the statique to update exists
     if (
         session.exec(
-            select(func.count(PointDeCharge.id)).where(
+            select(func.count(cast(SAColumn, PointDeCharge.id))).where(
                 PointDeCharge.id_pdc_itinerance == id_pdc_itinerance
             )
         ).one()
@@ -192,7 +193,7 @@ def save_statiques(
     # Ignore already existing PDC
     db_pdcs = session.exec(
         select(PointDeCharge.id_pdc_itinerance).filter(
-            PointDeCharge.id_pdc_itinerance.in_(submitted_pdcs)
+            cast(SAColumn, PointDeCharge.id_pdc_itinerance).in_(submitted_pdcs)
         )
     ).all()
     statiques = list(filter(lambda s: s.id_pdc_itinerance not in db_pdcs, statiques))
@@ -232,7 +233,10 @@ class StatiqueSchemasEntryIndex(NamedTuple):
         enseigne = Enseigne(**statique.get_fields_for_schema(Enseigne))
         localisation = Localisation(**statique.get_fields_for_schema(Localisation))
 
-        indexes = ()
+        indexes = []
+        # FIXME
+        # Looks like mypy does not recognize types for tuple of tuples to unpack,
+        # ignored unrelevant typing errors.
         for entry, entries in (
             (pdc, points_de_charge),
             (station, stations),
@@ -241,12 +245,16 @@ class StatiqueSchemasEntryIndex(NamedTuple):
             (enseigne, enseignes),
             (localisation, localisations),
         ):
-            if entry not in entries:
-                entries.append(entry)
-            indexes += (entries.index(entry),)
+            if entry not in entries:  # type: ignore[operator]
+                entries.append(entry)  # type: ignore[attr-defined]
+            indexes.append(entries.index(entry))  # type: ignore[attr-defined]
         statiques_db_refs.append(StatiqueSchemasEntryIndex(*indexes))
 
     # Create database entries for each schema
+    #
+    # FIXME
+    # Looks like mypy does not recognize types for tuple of tuples to unpack,
+    # ignored unrelevant typing errors.
     for entries, fields in (
         (points_de_charge, {"id_pdc_itinerance"}),
         (stations, {"id_station_itinerance"}),
@@ -255,12 +263,12 @@ class StatiqueSchemasEntryIndex(NamedTuple):
         (enseignes, None),
         (localisations, {"adresse_station"}),
     ):
-        for idx, entry in enumerate(entries):
+        for idx, entry in enumerate(entries):  # type: ignore[arg-type]
             _, db_entry = get_or_create(
                 session, entry, fields, add=False, commit=False, refresh=False
             )
-            entries[idx] = db_entry
-        session.add_all(entries)
+            entries[idx] = db_entry  # type: ignore[index]
+        session.add_all(entries)  # type: ignore[arg-type]
 
     # Handle relationships
     for (

src/api/tests/api/v1/routers/test_statique.py

@@ -16,7 +16,7 @@ def test_list(client_auth, db_session):
     assert response.status_code == status.HTTP_200_OK
     json_response = response.json()
     assert json_response == {
-        "limit": 10,
+        "limit": 100,
         "offset": 0,
         "previous": None,
         "next": None,
@@ -35,7 +35,7 @@ def test_list(client_auth, db_session):
     assert response.status_code == status.HTTP_200_OK
     json_response = response.json()
     assert json_response == {
-        "limit": 10,
+        "limit": 100,
         "offset": 0,
         "previous": None,
         "next": None,
@@ -50,8 +50,8 @@ def test_list_pagination(client_auth, db_session):
     n_statiques = 3
     list(save_statiques(db_session, StatiqueFactory.batch(n_statiques)))
 
-    offset: int = 0
-    limit: int = 2
+    offset = 0
+    limit = 2
     response = client_auth.get(f"/statique/?{offset=}&{limit=}")
     assert response.status_code == status.HTTP_200_OK
     json_response = response.json()