anti/DECNET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(types): P2 — wire _MixinBase + col() across sqlmodel_repo; suppress pydantic/SQLModel column typing false positives

Browse Source 
- 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:
anti
2026-05-01 00:49:18 -04:00
parent d777a1c4e0
commit 614780f144
30 changed files with 221 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
decnet/web/db/sqlmodel_repo/attackers/_core.py
View File

@@ -12,11 +12,14 @@ import uuid as _uuid
from typing import Any, List, Optional
from sqlalchemy import desc, func, outerjoin, select
from sqlmodel import col
from decnet.web.db.models import Attacker, AttackerIntel
class AttackersCoreMixin:
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
class AttackersCoreMixin(_MixinBase):
@staticmethod
def _deserialize_attacker(d: dict[str, Any]) -> dict[str, Any]:
for key in ("services", "deckies", "fingerprints", "commands"):
@@ -63,16 +66,16 @@ class AttackersCoreMixin:
sort_by: str = "recent",
service: Optional[str] = None,
) -> List[dict[str, Any]]:
order = {
order: Any = {
"active": desc(Attacker.event_count),
"traversals": desc(Attacker.is_traversal),
}.get(sort_by, desc(Attacker.last_seen))
statement = select(Attacker).order_by(order).offset(offset).limit(limit)
if search:
statement = statement.where(Attacker.ip.like(f"%{search}%"))
statement = statement.where(col(Attacker.ip).like(f"%{search}%"))
if service:
statement = statement.where(Attacker.services.like(f'%"{service}"%'))
statement = statement.where(col(Attacker.services).like(f'%"{service}"%'))
async with self._session() as session:
result = await session.execute(statement)
@@ -121,9 +124,9 @@ class AttackersCoreMixin:
) -> int:
statement = select(func.count()).select_from(Attacker)
if search:
statement = statement.where(Attacker.ip.like(f"%{search}%"))
statement = statement.where(col(Attacker.ip).like(f"%{search}%"))
if service:
statement = statement.where(Attacker.services.like(f'%"{service}"%'))
statement = statement.where(col(Attacker.services).like(f'%"{service}"%'))
async with self._session() as session:
result = await session.execute(statement)

23
decnet/web/db/sqlmodel_repo/attackers/activity.py
View File

@@ -10,11 +10,14 @@ import json
from typing import Any, Optional
from sqlalchemy import desc, func, select
from sqlmodel import col
from decnet.web.db.models import Attacker, Bounty, Log
class AttackerActivityMixin:
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
class AttackerActivityMixin(_MixinBase):
async def get_attacker_commands(
self,
uuid: str,
@@ -24,7 +27,7 @@ class AttackerActivityMixin:
) -> dict[str, Any]:
async with self._session() as session:
result = await session.execute(
select(Attacker.commands).where(Attacker.uuid == uuid)
select(col(Attacker.commands)).where(Attacker.uuid == uuid)
)
raw = result.scalar_one_or_none()
if raw is None:
@@ -52,13 +55,13 @@ class AttackerActivityMixin:
"""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == attacker_uuid)
select(col(Attacker.ip)).where(Attacker.uuid == attacker_uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:
return []
rows = await session.execute(
select(Log.service, Log.event_type)
select(col(Log.service), col(Log.event_type))
.where(Log.attacker_ip == ip)
.distinct()
)
@@ -75,7 +78,7 @@ class AttackerActivityMixin:
rotation detection."""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == attacker_uuid)
select(col(Attacker.ip)).where(Attacker.uuid == attacker_uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:
@@ -104,7 +107,7 @@ class AttackerActivityMixin:
"""Cheap COUNT(*) for XFF-rotation detection."""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == attacker_uuid)
select(col(Attacker.ip)).where(Attacker.uuid == attacker_uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:
@@ -126,7 +129,7 @@ class AttackerActivityMixin:
"""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == uuid)
select(col(Attacker.ip)).where(Attacker.uuid == uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:
@@ -150,7 +153,7 @@ class AttackerActivityMixin:
"""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == uuid)
select(col(Attacker.ip)).where(Attacker.uuid == uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:
@@ -176,7 +179,7 @@ class AttackerActivityMixin:
rows = await session.execute(
select(Log)
.where(Log.event_type == "session_recorded")
.where(Log.fields.contains(needle))
.where(col(Log.fields).contains(needle))
.limit(1)
)
row = rows.scalars().first()
@@ -192,7 +195,7 @@ class AttackerActivityMixin:
"""
async with self._session() as session:
ip_res = await session.execute(
select(Attacker.ip).where(Attacker.uuid == uuid)
select(col(Attacker.ip)).where(Attacker.uuid == uuid)
)
ip = ip_res.scalar_one_or_none()
if not ip:

9
decnet/web/db/sqlmodel_repo/attackers/behavior.py
View File

@@ -7,11 +7,14 @@ from datetime import datetime, timezone
from typing import Any, Optional
from sqlalchemy import select
from sqlmodel import col
from decnet.web.db.models import Attacker, AttackerBehavior
class AttackerBehaviorMixin:
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
class AttackerBehaviorMixin(_MixinBase):
async def upsert_attacker_behavior(
self,
attacker_uuid: str,
@@ -56,9 +59,9 @@ class AttackerBehaviorMixin:
return {}
async with self._session() as session:
result = await session.execute(
select(Attacker.ip, AttackerBehavior)
select(col(Attacker.ip), AttackerBehavior)
.join(AttackerBehavior, Attacker.uuid == AttackerBehavior.attacker_uuid)
.where(Attacker.ip.in_(ips))
.where(col(Attacker.ip).in_(ips))
)
out: dict[str, dict[str, Any]] = {}
for ip, row in result.all():

4
decnet/web/db/sqlmodel_repo/attackers/sessions.py
View File

@@ -9,7 +9,9 @@ from sqlalchemy import select
from decnet.web.db.models import SessionProfile
class SessionProfilesMixin:
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
class SessionProfilesMixin(_MixinBase):
async def upsert_session_profile(
self,
sid: str,

4
decnet/web/db/sqlmodel_repo/attackers/smtp.py
View File

@@ -10,7 +10,9 @@ from sqlalchemy import desc, func, select
from decnet.web.db.models import SmtpTarget
class SmtpTargetsMixin:
from decnet.web.db.sqlmodel_repo._helpers import _MixinBase
class SmtpTargetsMixin(_MixinBase):
async def increment_smtp_target(self, attacker_uuid: str, domain: str) -> None:
"""Upsert an (attacker_uuid, domain) pair and bump count + last_seen.