T-10: Fix get_geo_batch_lookup for proper injection with GeoCache instance
Instead of returning a bound method (geo_cache.lookup_batch), now inject the GeoCache instance directly into routers and services. This provides proper runtime isolation since T-04 made GeoCache a proper object. Changes: - Remove get_geo_batch_lookup() dependency provider - Add GeoCacheDep type alias for injecting GeoCache instances - Update all routers (bans, blocklist, dashboard, jails) to use GeoCacheDep - Update ban_service, blocklist_service, jail_service to accept GeoCache - Update service protocols to match new signatures - Update docstrings to reference GeoCache methods instead of module functions All callers now call geo_cache.lookup_batch(...) directly instead of geo_batch_lookup(...), providing real dependency injection with proper testing isolation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -38,7 +38,8 @@ if TYPE_CHECKING:
|
||||
MapColorThresholdsUpdate,
|
||||
RegexTestResponse,
|
||||
)
|
||||
from app.models.geo import GeoBatchLookup, GeoEnricher, GeoInfo
|
||||
from app.models.geo import GeoEnricher, GeoInfo
|
||||
from app.services.geo_cache import GeoCache
|
||||
from app.models.history import HistoryListResponse, IpDetailResponse
|
||||
from app.models.jail import JailDetailResponse, JailListResponse
|
||||
from app.models.server import ServerSettingsResponse, ServerSettingsUpdate, ServerStatus
|
||||
@@ -188,7 +189,7 @@ class BlocklistService(Protocol):
|
||||
db: aiosqlite.Connection,
|
||||
*,
|
||||
geo_is_cached: Callable[[str], bool] | None = None,
|
||||
geo_batch_lookup: GeoBatchLookup | None = None,
|
||||
geo_cache: GeoCache | None = None,
|
||||
ban_ip: Callable[[str, str, str], Awaitable[None]],
|
||||
) -> ImportSourceResult:
|
||||
...
|
||||
@@ -201,7 +202,7 @@ class BlocklistService(Protocol):
|
||||
*,
|
||||
ban_ip: Callable[[str, str, str], Awaitable[None]],
|
||||
geo_is_cached: Callable[[str], bool] | None = None,
|
||||
geo_batch_lookup: GeoBatchLookup | None = None,
|
||||
geo_cache: GeoCache | None = None,
|
||||
) -> ImportRunResult:
|
||||
...
|
||||
|
||||
|
||||
Reference in New Issue
Block a user