Skip to content

~95% on SimpleQA (e.g. Qwen3.6-27B on a 3090). Supports all local and cloud LLMs (llama.cpp, Ollama, Google, ...). 10+ search engines - arXiv, PubMed, your private documents. Everything Local & Encrypted.

refactor(settings): extract _filter_editable_settings helper (DRY) (#4469)

LearningCircuite629697aabed
diff --git a/src/local_deep_research/web/routes/settings_routes.py b/src/local_deep_research/web/routes/settings_routes.py
index 3e76891509..893fc4e965 100644
--- a/src/local_deep_research/web/routes/settings_routes.py
+++ b/src/local_deep_research/web/routes/settings_routes.py
@@ -88,6 +88,30 @@ from ..warning_checks import calculate_warnings
# Create a Blueprint for settings
settings_bp = Blueprint("settings", __name__, url_prefix="/settings")
+
+def _filter_editable_settings(form_data: dict, db_session) -> dict:
+ """Remove non-editable keys from *form_data* in place.
+
+ Returns the ``{key: Setting}`` dict so callers can reuse it for
+ further validation (e.g. egress-policy checks).
+ """
+ all_db_settings = {
+ setting.key: setting for setting in db_session.query(Setting).all()
+ }
+
+ non_editable_keys = [
+ key
+ for key in form_data.keys()
+ if key in all_db_settings and not all_db_settings[key].editable
+ ]
+ if non_editable_keys:
+ logger.warning(f"Skipping non-editable settings: {non_editable_keys}")
+ for key in non_editable_keys:
+ del form_data[key]
+
+ return all_db_settings
+
+
# NOTE: Routes use session["username"] (not .get()) intentionally.
# @login_required guarantees the key exists; direct access fails fast
# if the decorator is ever removed.
@@ -344,23 +368,8 @@ def save_all_settings(db_session=None, settings_manager=None):
# Store original values for better messaging
original_values = {}
- # Fetch all settings once to avoid N+1 query problem
- all_db_settings = {
- setting.key: setting for setting in db_session.query(Setting).all()
- }
-
- # Filter out non-editable settings
- non_editable_keys = [
- key
- for key in form_data.keys()
- if key in all_db_settings and not all_db_settings[key].editable
- ]
- if non_editable_keys:
- logger.warning(
- f"Skipping non-editable settings: {non_editable_keys}"
- )
- for key in non_editable_keys:
- del form_data[key]
+ # Fetch all settings and remove non-editable keys
+ all_db_settings = _filter_editable_settings(form_data, db_session)
# Cross-field egress-policy validation (H4 layer 2): reject the
# incoherent STRICT + meta-picker combination at save time so the
@@ -750,23 +759,8 @@ def save_settings(db_session=None, settings_manager=None):
failed_count = 0
rejected_count = 0
- # Fetch all settings once to avoid N+1 query problem
- all_db_settings = {
- setting.key: setting for setting in db_session.query(Setting).all()
- }
-
- # Filter out non-editable settings
- non_editable_keys = [
- key
- for key in form_data.keys()
- if key in all_db_settings and not all_db_settings[key].editable
- ]
- if non_editable_keys:
- logger.warning(
- f"Skipping non-editable settings: {non_editable_keys}"
- )
- for key in non_editable_keys:
- del form_data[key]
+ # Fetch all settings and remove non-editable keys
+ all_db_settings = _filter_editable_settings(form_data, db_session)
# Egress-policy validators — the JSON route (save_all_settings) runs
# these; the POST fallback must too, or a JS-disabled client could