Refactor app helpers and use AppStateDep in config router

Move service-dependent helper wrappers from app.utils to app.helpers and update config router activation/rollback to use explicit AppState dependency.

backend/app/services/action_config_service.py

@@ -17,6 +17,12 @@ from pathlib import Path
 
 import structlog
 
+from app.exceptions import ConfigWriteError, JailNotFoundInConfigError
+from app.helpers.config_file_helpers import (
+    _get_active_jail_names,
+    _parse_jails_sync,
+)
+from app.helpers.jail_helpers import reload_jails
 from app.models.config import (
     ActionConfig,
     ActionConfigUpdate,
@@ -25,14 +31,7 @@ from app.models.config import (
     ActionUpdateRequest,
     AssignActionRequest,
 )
-from app.exceptions import JailNotFoundError
-from app.utils.config_file_utils import (
-    _parse_jails_sync,
-    _get_active_jail_names,
-)
-from app.exceptions import ConfigWriteError, JailNotFoundInConfigError
 from app.utils import conffile_parser
-from app.utils.jail_utils import reload_jails
 
 log: structlog.stdlib.BoundLogger = structlog.get_logger()
 

backend/app/services/config_file_service.py

@@ -32,6 +32,8 @@ from typing import cast
 
 import structlog
 
+from app.exceptions import FilterInvalidRegexError, JailNotFoundError
+from app.helpers.jail_helpers import reload_jails
 from app.models.config import (
     ActionConfig,
     ActionConfigUpdate,
@@ -54,9 +56,7 @@ from app.models.config import (
     JailValidationResult,
     RollbackResponse,
 )
-from app.exceptions import FilterInvalidRegexError, JailNotFoundError
 from app.utils import conffile_parser
-from app.utils.jail_utils import reload_jails
 from app.utils.fail2ban_client import (
     Fail2BanClient,
     Fail2BanConnectionError,

backend/app/services/config_service.py

@@ -29,6 +29,8 @@ if TYPE_CHECKING:
 
 from app import __version__
 from app.exceptions import ConfigOperationError, ConfigValidationError, JailNotFoundError
+from app.helpers.log_helpers import preview_log as util_preview_log
+from app.helpers.log_helpers import test_regex as util_test_regex
 from app.models.config import (
     AddLogPathRequest,
     BantimeEscalation,
@@ -48,8 +50,6 @@ from app.models.config import (
     ServiceStatusResponse,
 )
 from app.utils.fail2ban_client import Fail2BanClient
-from app.utils.log_utils import preview_log as util_preview_log
-from app.utils.log_utils import test_regex as util_test_regex
 from app.utils.setup_utils import (
     get_map_color_thresholds as util_get_map_color_thresholds,
 )

backend/app/services/filter_config_service.py

@@ -18,6 +18,11 @@ from pathlib import Path
 import structlog
 
 from app.exceptions import FilterInvalidRegexError
+from app.helpers.config_file_helpers import (
+    _get_active_jail_names,
+    _parse_jails_sync,
+)
+from app.helpers.jail_helpers import reload_jails
 from app.models.config import (
     AssignFilterRequest,
     FilterConfig,
@@ -28,11 +33,6 @@ from app.models.config import (
 )
 from app.services.config_file_service import _TRUE_VALUES, ConfigWriteError, JailNotFoundInConfigError
 from app.utils import conffile_parser
-from app.utils.config_file_utils import (
-    _get_active_jail_names,
-    _parse_jails_sync,
-)
-from app.utils.jail_utils import reload_jails
 
 log: structlog.stdlib.BoundLogger = structlog.get_logger()
 

backend/app/services/jail_config_service.py

@@ -21,6 +21,13 @@ from typing import cast
 import structlog
 
 from app.exceptions import JailNotFoundError
+from app.helpers.config_file_helpers import (
+    _build_inactive_jail,
+    _get_active_jail_names,
+    _parse_jails_sync,
+    _validate_jail_config_sync,
+)
+from app.helpers.jail_helpers import reload_jails
 from app.models.config import (
     ActivateJailRequest,
     InactiveJail,
@@ -29,14 +36,7 @@ from app.models.config import (
     JailValidationResult,
     RollbackResponse,
 )
-from app.utils.config_file_utils import (
-    _build_inactive_jail,
-    _get_active_jail_names,
-    _parse_jails_sync,
-    _validate_jail_config_sync,
-)
 from app.utils.fail2ban_client import Fail2BanClient
-from app.utils.jail_utils import reload_jails
 
 log: structlog.stdlib.BoundLogger = structlog.get_logger()
 
@@ -461,7 +461,7 @@ async def start_daemon(start_cmd_parts: list[str]) -> bool:
         return False
 
 
-# Shared functions from config_file_service are imported from app.utils.config_file_utils
+# Shared functions from config_file_service are imported from app.helpers.config_file_helpers
 
 
 # ---------------------------------------------------------------------------