fix: resolve mypy errors and fix .dockerignore for test builds

Alexander Martynenko · claude · Alexander Martynenko · commit 0a5416ae2b8a · 2026-03-14T17:05:23.000+01:00
mypy (52 errors → 0):
- Add int() casts for struct.unpack return values (no-any-return)
- Add type annotations to collector.py and app.py route handlers
- Fix IPv4/IPv6 union types in FlowKey.from_bytes
- Add LbStats bytes property alias to avoid shadowing builtin
- Cast int flags to VipFlags/RealFlags enums at call sites
- Add assert guards for Optional map types in service.py
- Fix BpfMap.__bool__ None check before comparison
- Add types-PyYAML to dev dependencies

.dockerignore:
- Remove tests/ and katran-bpfs/ exclusions that broke
  integration/e2e Docker builds (COPY tests/, COPY katran-bpfs/)

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,5 @@
 .venv/
 .git/
-tests/
-katran-bpfs/
 samples/
 htmlcov/
 .pytest_cache/
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,6 +42,7 @@ dev = [
     "httpx>=0.24.0",
     "ruff>=0.1.0",
     "mypy>=1.5.0",
+    "types-PyYAML>=6.0",
     "black>=23.0.0",
 ]
 
diff --git a/src/katran/api/rest/app.py b/src/katran/api/rest/app.py
@@ -101,7 +101,7 @@ def _vip_to_response(vip: Any) -> VipResponse:
     )
 
 
-def _lookup_vip(svc, address: str, port: int, protocol: Protocol):
+def _lookup_vip(svc: Any, address: str, port: int, protocol: Protocol) -> Any:
     """Get a VIP or raise 404."""
     vip = svc.vip_manager.get_vip(address=address, port=port, protocol=protocol)
     if vip is None:
@@ -117,7 +117,7 @@ def _lookup_vip(svc, address: str, port: int, protocol: Protocol):
 # ---------------------------------------------------------------------------
 
 
-def get_service(request: Request):
+def get_service(request: Request) -> Any:
     """FastAPI dependency that returns the KatranService or raises 503."""
     service = request.app.state.service
     if service is None or not service.is_running:
@@ -136,7 +136,7 @@ def get_service(request: Request):
 }
 
 
-def _katran_error_handler(request: Request, exc: KatranError) -> JSONResponse:
+def _katran_error_handler(request: Request, exc: Exception) -> JSONResponse:
     for err_cls, status in _KATRAN_ERROR_STATUS.items():
         if isinstance(exc, err_cls):
             return JSONResponse(status_code=status, content={"detail": str(exc)})
@@ -148,7 +148,7 @@ def _katran_error_handler(request: Request, exc: KatranError) -> JSONResponse:
 # ---------------------------------------------------------------------------
 
 
-def create_app(service=None) -> FastAPI:
+def create_app(service: Any = None) -> FastAPI:
     """Create the FastAPI application."""
     app = FastAPI(title="Katran Control Plane", version="0.1.0")
     app.state.service = service
@@ -163,7 +163,7 @@ def create_app(service=None) -> FastAPI:
             registry = CollectorRegistry()
             registry.register(KatranMetricsCollector(service))
 
-            def _metrics_handler():
+            def _metrics_handler() -> Response:
                 try:
                     output = generate_latest(registry)
                     return Response(content=output, media_type=CONTENT_TYPE_LATEST)
@@ -184,7 +184,7 @@ def _metrics_handler():
     # --- Health -----------------------------------------------------------
 
     @app.get("/health")
-    def health():
+    def health() -> dict[str, str]:
         svc = app.state.service
         if svc is None or not svc.is_running:
             raise HTTPException(status_code=503, detail="Service not running")
@@ -193,7 +193,7 @@ def health():
     # --- VIP endpoints ----------------------------------------------------
 
     @app.post("/api/v1/vips", status_code=201, response_model=VipResponse)
-    def add_vip(req: AddVipRequest, svc=Depends(get_service)):
+    def add_vip(req: AddVipRequest, svc: Any = Depends(get_service)) -> VipResponse:
         proto = _parse_protocol(req.protocol)
         vip = svc.vip_manager.add_vip(
             address=req.address,
@@ -209,8 +209,8 @@ def get_vips(
         address: Optional[str] = Query(None),
         port: Optional[int] = Query(None),
         protocol: Optional[str] = Query(None),
-        svc=Depends(get_service),
-    ):
+        svc: Any = Depends(get_service),
+    ) -> Any:
         params = [address, port, protocol]
         provided = sum(p is not None for p in params)
 
@@ -224,8 +224,8 @@ def get_vips(
                 detail="Provide all of address, port, protocol — or none",
             )
 
-        # Single VIP lookup
-        proto = _parse_protocol(protocol)
+        # Single VIP lookup — all three are non-None at this point
+        proto = _parse_protocol(protocol or "")
         vip = svc.vip_manager.get_vip(address=address, port=port, protocol=proto)
         if vip is None:
             raise HTTPException(
@@ -235,7 +235,7 @@ def get_vips(
         return _vip_to_response(vip)
 
     @app.post("/api/v1/vips/remove")
-    def remove_vip(req: VipId, svc=Depends(get_service)):
+    def remove_vip(req: VipId, svc: Any = Depends(get_service)) -> dict[str, str]:
         proto = _parse_protocol(req.protocol)
         removed = svc.vip_manager.remove_vip(
             address=req.address,
@@ -253,7 +253,7 @@ def remove_vip(req: VipId, svc=Depends(get_service)):
     # --- Backend endpoints ------------------------------------------------
 
     @app.post("/api/v1/backends/add", status_code=201, response_model=RealResponse)
-    def add_backend(req: AddBackendRequest, svc=Depends(get_service)):
+    def add_backend(req: AddBackendRequest, svc: Any = Depends(get_service)) -> RealResponse:
         proto = _parse_protocol(req.vip.protocol)
         vip = _lookup_vip(svc, req.vip.address, req.vip.port, proto)
         real = svc.real_manager.add_real(vip, address=req.address, weight=req.weight)
@@ -267,7 +267,7 @@ def add_backend(req: AddBackendRequest, svc=Depends(get_service)):
         return RealResponse(address=str(real.address), weight=real.weight, index=real.index)
 
     @app.post("/api/v1/backends/remove")
-    def remove_backend(req: BackendId, svc=Depends(get_service)):
+    def remove_backend(req: BackendId, svc: Any = Depends(get_service)) -> dict[str, str]:
         proto = _parse_protocol(req.vip.protocol)
         vip = _lookup_vip(svc, req.vip.address, req.vip.port, proto)
         removed = svc.real_manager.remove_real(vip, address=req.address)
@@ -283,7 +283,7 @@ def remove_backend(req: BackendId, svc=Depends(get_service)):
         return {"status": "removed"}
 
     @app.post("/api/v1/backends/drain")
-    def drain_backend(req: BackendId, svc=Depends(get_service)):
+    def drain_backend(req: BackendId, svc: Any = Depends(get_service)) -> dict[str, str]:
         proto = _parse_protocol(req.vip.protocol)
         vip = _lookup_vip(svc, req.vip.address, req.vip.port, proto)
         drained = svc.real_manager.drain_real(vip, address=req.address)
diff --git a/src/katran/bpf/map_manager.py b/src/katran/bpf/map_manager.py
@@ -128,7 +128,7 @@ def _bpf_syscall(cmd: int, attr: ctypes.Structure, size: int) -> int:
     if result < 0:
         err = ctypes.get_errno()
         return -err
-    return result
+    return int(result)
 
 
 # =============================================================================
@@ -500,7 +500,7 @@ def values(self) -> Iterator[V]:
 
     def __bool__(self) -> bool:
         """Map is truthy when the FD is open."""
-        return self._fd >= 0
+        return self._fd is not None and self._fd >= 0
 
     def __contains__(self, key: K) -> bool:
         """Check if key exists in map."""
diff --git a/src/katran/bpf/maps/ch_rings_map.py b/src/katran/bpf/maps/ch_rings_map.py
@@ -85,13 +85,13 @@ def _serialize_key(self, key: int) -> bytes:
         return struct.pack("<I", key)
 
     def _deserialize_key(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     def _serialize_value(self, value: int) -> bytes:
         return struct.pack("<I", value)
 
     def _deserialize_value(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     # -------------------------------------------------------------------------
     # Ring index calculation
diff --git a/src/katran/bpf/maps/ctl_array.py b/src/katran/bpf/maps/ctl_array.py
@@ -67,7 +67,7 @@ def _serialize_key(self, key: int) -> bytes:
         return struct.pack("<I", key)
 
     def _deserialize_key(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     def _serialize_value(self, value: CtlValue) -> bytes:
         return value.to_bytes()
diff --git a/src/katran/bpf/maps/hc_reals_map.py b/src/katran/bpf/maps/hc_reals_map.py
@@ -86,13 +86,13 @@ def _serialize_key(self, key: int) -> bytes:
         return struct.pack("<I", key)
 
     def _deserialize_key(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     def _serialize_value(self, value: int) -> bytes:
         return struct.pack("<I", value)
 
     def _deserialize_value(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     # -------------------------------------------------------------------------
     # Healthcheck mapping operations
diff --git a/src/katran/bpf/maps/lru_map.py b/src/katran/bpf/maps/lru_map.py
@@ -25,6 +25,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from katran.bpf.map_manager import BpfMap
 from katran.core.constants import DEFAULT_LRU_SIZE
 from katran.core.types import (
@@ -178,7 +180,7 @@ def invalidate_backend(self, real_index: int) -> int:
 
         return count
 
-    def get_cache_stats(self) -> dict[str, int]:
+    def get_cache_stats(self) -> dict[str, Any]:
         """
         Get LRU cache statistics.
 
diff --git a/src/katran/bpf/maps/reals_map.py b/src/katran/bpf/maps/reals_map.py
@@ -81,7 +81,7 @@ def _serialize_key(self, key: int) -> bytes:
         return struct.pack("<I", key)
 
     def _deserialize_key(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     def _serialize_value(self, value: RealDefinition) -> bytes:
         return value.to_bytes()
diff --git a/src/katran/bpf/maps/stats_map.py b/src/katran/bpf/maps/stats_map.py
@@ -111,7 +111,7 @@ def _serialize_key(self, key: int) -> bytes:
         return struct.pack("<I", key)
 
     def _deserialize_key(self, data: bytes) -> int:
-        return struct.unpack("<I", data)[0]
+        return int(struct.unpack("<I", data)[0])
 
     def _serialize_value(self, value: LbStats) -> bytes:
         return value.to_bytes()
diff --git a/src/katran/bpf/maps/vip_map.py b/src/katran/bpf/maps/vip_map.py
@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 from katran.bpf.map_manager import BpfMap, IndexAllocator
-from katran.core.constants import MAX_VIPS
+from katran.core.constants import MAX_VIPS, VipFlags
 from katran.core.exceptions import VipExistsError
 from katran.core.types import (
     VIP_KEY_SIZE,
@@ -209,7 +209,7 @@ def update_flags(self, key: VipKey, flags: int) -> bool:
                 return False
 
             # Update flags, keep vip_num
-            new_meta = VipMeta(flags=flags, vip_num=meta.vip_num)
+            new_meta = VipMeta(flags=VipFlags(flags), vip_num=meta.vip_num)
             self.set(key, new_meta)
 
             # Update cache
diff --git a/src/katran/core/types.py b/src/katran/core/types.py
@@ -381,8 +381,8 @@ def from_bytes(cls, data: bytes) -> FlowKey:
             is_ipv6 = any(data[4:16]) or any(data[20:32])
 
             if is_ipv6:
-                src_addr = IPv6Address(data[:16])
-                dst_addr = IPv6Address(data[16:32])
+                src_addr: IpAddress = IPv6Address(data[:16])
+                dst_addr: IpAddress = IPv6Address(data[16:32])
             else:
                 src_addr = IPv4Address(data[:4])
                 dst_addr = IPv4Address(data[16:20])
@@ -527,11 +527,11 @@ def as_mac(self) -> str:
 
     def as_ifindex(self) -> int:
         """Return value as interface index."""
-        return struct.unpack("<I", self.value[:4])[0]
+        return int(struct.unpack("<I", self.value[:4])[0])
 
     def as_u64(self) -> int:
         """Return value as 64-bit integer."""
-        return struct.unpack("<Q", self.value)[0]
+        return int(struct.unpack("<Q", self.value)[0])
 
     def to_bytes(self) -> bytes:
         """Serialize to BPF map value format (8 bytes)."""
@@ -560,6 +560,9 @@ def from_bytes(cls, data: bytes) -> CtlValue:
 
 LB_STATS_SIZE = 16
 
+# Alias to avoid shadowing the built-in `bytes` type inside LbStats
+_Bytes = bytes
+
 
 @dataclass
 class LbStats:
@@ -590,15 +593,15 @@ def __add__(self, other: LbStats) -> LbStats:
         """Add two LbStats together (for aggregating per-CPU values)."""
         return LbStats(v1=self.v1 + other.v1, v2=self.v2 + other.v2)
 
-    def to_bytes(self) -> bytes:
+    def to_bytes(self) -> _Bytes:
         """Serialize to BPF map value format (16 bytes)."""
         try:
             return struct.pack("<QQ", self.v1, self.v2)
         except Exception as e:
             raise SerializationError("LbStats", "serialize", str(e)) from e
 
     @classmethod
-    def from_bytes(cls, data: bytes) -> LbStats:
+    def from_bytes(cls, data: _Bytes) -> LbStats:
         """Deserialize from BPF map value format."""
         if len(data) != LB_STATS_SIZE:
             raise SerializationError(
diff --git a/src/katran/lb/real_manager.py b/src/katran/lb/real_manager.py
@@ -22,7 +22,7 @@
 
 from katran.bpf.maps.ch_rings_map import ChRingsMap
 from katran.bpf.maps.reals_map import RealsMap
-from katran.core.constants import MAX_REALS
+from katran.core.constants import MAX_REALS, RealFlags
 from katran.core.exceptions import (
     RealExistsError,
 )
@@ -169,7 +169,7 @@ def add_real(
                 address=address,
                 weight=weight,
                 index=real_meta.num,
-                flags=real_meta.flags,
+                flags=RealFlags(real_meta.flags),
             )
 
             # Add to VIP's backend list
@@ -474,7 +474,7 @@ def _increase_ref_count(self, address: IpAddress) -> RealMeta:
             self._num_to_reals[idx] = address
 
             # Write to BPF reals array
-            real_def = RealDefinition(address=address, flags=meta.flags)
+            real_def = RealDefinition(address=address, flags=RealFlags(meta.flags))
             self._reals_map.set(idx, real_def)
 
             logger.debug(f"Allocated new backend {address} at index {idx}, ref_count=1")
diff --git a/src/katran/service.py b/src/katran/service.py
@@ -6,9 +6,10 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from typing import Any, Optional
 
 from katran.bpf import (
+    BpfMap,
     ChRingsMap,
     CtlArray,
     HcRealsMap,
@@ -82,7 +83,7 @@ def _open_maps(self) -> None:
         self.stats_map = StatsMap(pin_path, max_vips=maps_cfg.max_vips)
         self.ctl_array = CtlArray(pin_path)
 
-        required_maps = [
+        required_maps: list[BpfMap[Any, Any]] = [
             self.vip_map,
             self.reals_map,
             self.ch_rings_map,
@@ -97,23 +98,27 @@ def _open_maps(self) -> None:
 
         # Optional maps – tolerate missing pins (e.g. hc_reals comes from a
         # separate TC healthcheck program that may not be loaded).
-        optional_specs = [
+        optional_specs: list[tuple[str, Any]] = [
             ("hc_reals_map", lambda: HcRealsMap(pin_path)),
             ("lru_map", lambda: LruMap(pin_path, max_entries=maps_cfg.lru_size)),
         ]
 
         for attr, factory in optional_specs:
             try:
-                m = factory()
-                m.open()
-                setattr(self, attr, m)
-                self._opened_maps.append(m)
-                logger.debug("Opened optional map: %s", type(m).__name__)
+                opt_map: BpfMap[Any, Any] = factory()
+                opt_map.open()
+                setattr(self, attr, opt_map)
+                self._opened_maps.append(opt_map)
+                logger.debug("Opened optional map: %s", type(opt_map).__name__)
             except Exception:
                 logger.info("Optional map %s unavailable, skipping", attr)
 
     def _initialize_managers(self) -> None:
         """Create VipManager and RealManager with correct signatures."""
+        assert self.vip_map is not None
+        assert self.ch_rings_map is not None
+        assert self.reals_map is not None
+
         self.vip_manager = VipManager(
             self.vip_map,
             self.ch_rings_map,
diff --git a/src/katran/stats/collector.py b/src/katran/stats/collector.py

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ dev = [`
`42`	`42`	`"httpx>=0.24.0",`
`43`	`43`	`"ruff>=0.1.0",`
`44`	`44`	`"mypy>=1.5.0",`
	`45`	`+ "types-PyYAML>=6.0",`
`45`	`46`	`"black>=23.0.0",`
`46`	`47`	`]`
`47`	`48`