fix(types): P2 — wire _MixinBase + col() across sqlmodel_repo; suppress pydantic/SQLModel column typing false positives
- Add _MixinBase abstract class to _helpers.py: declares _session(), _deserialize_attacker(), _assert_pending(), _check_and_bump_version(), and list_running_topology_deckies() so mypy can see cross-mixin contracts - Add _require(val, msg) helper for narrowing T | None → T - Inherit _MixinBase in all 26 leaf mixin classes - Wrap SQLAlchemy column method calls (.is_(), .like(), .notin_(), .in_(), .contains()) with col() from sqlmodel — fixes attr-defined false positives caused by pydantic plugin typing class-level fields as Python value types - Wrap select(Model.field) with select(col(Model.field)) for column projections - Add pyproject.toml [[tool.mypy.overrides]] to disable arg-type in sqlmodel_repo.*: pydantic plugin resolves .where(Model.field == v) as where(bool), a false positive; call-arg still catches real argument errors - Remove 9 stale # type: ignore comments (logging, helpers, credentials) - Fix telemetry.py traced() overload no-redef + misc - Fix logs.py datetime/str operator and nullable PK comparison with col() - sqlmodel_repo/ now has 0 mypy errors
This commit is contained in:
@@ -9,10 +9,15 @@ from sqlalchemy import desc, func, select, text
|
||||
|
||||
from decnet.web.db.models import Topology, TopologyStatusEvent
|
||||
from decnet.web.db.models.topology import TopologySummary
|
||||
from decnet.web.db.sqlmodel_repo._helpers import _serialize_json_fields
|
||||
from sqlmodel import col
|
||||
|
||||
from decnet.web.db.sqlmodel_repo._helpers import (
|
||||
_MixinBase,
|
||||
_serialize_json_fields
|
||||
)
|
||||
|
||||
|
||||
class TopologyCoreMixin:
|
||||
class TopologyCoreMixin(_MixinBase):
|
||||
"""Topologies CRUD + ``_assert_pending`` / ``_check_and_bump_version``.
|
||||
|
||||
The two private helpers live here because every other topology
|
||||
@@ -184,8 +189,8 @@ class TopologyCoreMixin:
|
||||
"""Return ids of topologies currently in ``active|degraded``."""
|
||||
async with self._session() as session:
|
||||
result = await session.execute(
|
||||
select(Topology.id).where(
|
||||
Topology.status.in_(["active", "degraded"])
|
||||
select(col(Topology.id)).where(
|
||||
col(Topology.status).in_(["active", "degraded"])
|
||||
)
|
||||
)
|
||||
return [r for r in result.scalars().all()]
|
||||
|
||||
@@ -10,12 +10,13 @@ from sqlalchemy import asc, select, text, update
|
||||
from decnet.web.db.models import TopologyDecky
|
||||
from decnet.web.db.models.topology import DeckyRow
|
||||
from decnet.web.db.sqlmodel_repo._helpers import (
|
||||
_MixinBase,
|
||||
_deserialize_json_fields,
|
||||
_serialize_json_fields,
|
||||
)
|
||||
|
||||
|
||||
class TopologyDeckiesMixin:
|
||||
class TopologyDeckiesMixin(_MixinBase):
|
||||
"""``self._assert_pending`` / ``self._check_and_bump_version`` resolve
|
||||
through ``TopologyCoreMixin`` via MRO."""
|
||||
|
||||
|
||||
@@ -9,7 +9,9 @@ from decnet.web.db.models import TopologyEdge, TopologyStatusEvent
|
||||
from decnet.web.db.models.topology import EdgeRow
|
||||
|
||||
|
||||
class TopologyEdgesMixin:
|
||||
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
|
||||
|
||||
class TopologyEdgesMixin(_MixinBase):
|
||||
"""``self._assert_pending`` / ``self._check_and_bump_version`` resolve
|
||||
through ``TopologyCoreMixin`` via MRO."""
|
||||
|
||||
|
||||
@@ -9,7 +9,9 @@ from decnet.web.db.models import LAN, TopologyEdge
|
||||
from decnet.web.db.models.topology import LANRow
|
||||
|
||||
|
||||
class LansMixin:
|
||||
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
|
||||
|
||||
class LansMixin(_MixinBase):
|
||||
"""``self._assert_pending`` / ``self._check_and_bump_version`` resolve
|
||||
through ``TopologyCoreMixin`` via MRO."""
|
||||
|
||||
|
||||
@@ -10,7 +10,9 @@ from sqlalchemy import asc, desc, select, text
|
||||
from decnet.web.db.models import TopologyMutation
|
||||
|
||||
|
||||
class TopologyMutationsMixin:
|
||||
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
|
||||
|
||||
class TopologyMutationsMixin(_MixinBase):
|
||||
"""``self._check_and_bump_version`` resolves through
|
||||
``TopologyCoreMixin`` via MRO."""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user