refactor: complete Task 2/3 geo decouple + exceptions centralization; mark as done

backend/app/routers/bans.py

@@ -20,8 +20,8 @@ from fastapi import APIRouter, HTTPException, Request, status
 from app.dependencies import AuthDep
 from app.models.ban import ActiveBanListResponse, BanRequest, UnbanAllResponse, UnbanRequest
 from app.models.jail import JailCommandResponse
-from app.services import jail_service
-from app.services.jail_service import JailNotFoundError, JailOperationError
+from app.services import geo_service, jail_service
+from app.exceptions import JailNotFoundError, JailOperationError
 from app.utils.fail2ban_client import Fail2BanConnectionError
 
 router: APIRouter = APIRouter(prefix="/api/bans", tags=["Bans"])
@@ -73,6 +73,7 @@ async def get_active_bans(
     try:
         return await jail_service.get_active_bans(
             socket_path,
+            geo_batch_lookup=geo_service.lookup_batch,
             http_session=http_session,
             app_db=app_db,
         )

backend/app/routers/blocklist.py

@@ -42,7 +42,7 @@ from app.models.blocklist import (
     ScheduleConfig,
     ScheduleInfo,
 )
-from app.services import blocklist_service
+from app.services import blocklist_service, geo_service
 from app.tasks import blocklist_import as blocklist_import_task
 
 router: APIRouter = APIRouter(prefix="/api/blocklists", tags=["Blocklists"])
@@ -131,7 +131,13 @@ async def run_import_now(
     """
     http_session: aiohttp.ClientSession = request.app.state.http_session
     socket_path: str = request.app.state.settings.fail2ban_socket
-    return await blocklist_service.import_all(db, http_session, socket_path)
+    return await blocklist_service.import_all(
+        db,
+        http_session,
+        socket_path,
+        geo_is_cached=geo_service.is_cached,
+        geo_batch_lookup=geo_service.lookup_batch,
+    )
 
 
 @router.get(

backend/app/routers/config.py

@@ -93,12 +93,7 @@ from app.services.config_file_service import (
     JailNameError,
     JailNotFoundInConfigError,
 )
-from app.services.config_service import (
-    ConfigOperationError,
-    ConfigValidationError,
-    JailNotFoundError,
-)
-from app.services.jail_service import JailOperationError
+from app.exceptions import ConfigOperationError, ConfigValidationError, JailNotFoundError, JailOperationError
 from app.tasks.health_check import _run_probe
 from app.utils.fail2ban_client import Fail2BanConnectionError
 

backend/app/routers/dashboard.py

@@ -29,7 +29,7 @@ from app.models.ban import (
     TimeRange,
 )
 from app.models.server import ServerStatus, ServerStatusResponse
-from app.services import ban_service
+from app.services import ban_service, geo_service
 
 router: APIRouter = APIRouter(prefix="/api/dashboard", tags=["Dashboard"])
 
@@ -119,6 +119,7 @@ async def get_dashboard_bans(
         page_size=page_size,
         http_session=http_session,
         app_db=None,
+        geo_batch_lookup=geo_service.lookup_batch,
         origin=origin,
     )
 
@@ -162,6 +163,8 @@ async def get_bans_by_country(
         socket_path,
         range,
         http_session=http_session,
+        geo_cache_lookup=geo_service.lookup_cached_only,
+        geo_batch_lookup=geo_service.lookup_batch,
         app_db=None,
         origin=origin,
     )

backend/app/routers/geo.py

@@ -19,9 +19,8 @@ import aiosqlite
 from fastapi import APIRouter, Depends, HTTPException, Path, Request, status
 
 from app.dependencies import AuthDep, get_db
-from app.models.geo import GeoCacheStatsResponse, GeoDetail, IpLookupResponse
+from app.models.geo import GeoCacheStatsResponse, GeoDetail, GeoInfo, IpLookupResponse
 from app.services import geo_service, jail_service
-from app.services.geo_service import GeoInfo
 from app.utils.fail2ban_client import Fail2BanConnectionError
 
 router: APIRouter = APIRouter(prefix="/api/geo", tags=["Geo"])

backend/app/routers/jails.py

@@ -31,8 +31,8 @@ from app.models.jail import (
     JailDetailResponse,
     JailListResponse,
 )
-from app.services import jail_service
-from app.services.jail_service import JailNotFoundError, JailOperationError
+from app.services import geo_service, jail_service
+from app.exceptions import JailNotFoundError, JailOperationError
 from app.utils.fail2ban_client import Fail2BanConnectionError
 
 router: APIRouter = APIRouter(prefix="/api/jails", tags=["Jails"])
@@ -606,6 +606,7 @@ async def get_jail_banned_ips(
             page=page,
             page_size=page_size,
             search=search,
+            geo_batch_lookup=geo_service.lookup_batch,
             http_session=http_session,
             app_db=app_db,
         )

backend/app/routers/server.py

@@ -15,7 +15,7 @@ from fastapi import APIRouter, HTTPException, Request, status
 from app.dependencies import AuthDep
 from app.models.server import ServerSettingsResponse, ServerSettingsUpdate
 from app.services import server_service
-from app.services.server_service import ServerOperationError
+from app.exceptions import ServerOperationError
 from app.utils.fail2ban_client import Fail2BanConnectionError
 
 router: APIRouter = APIRouter(prefix="/api/server", tags=["Server"])