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.

cleanup: remove dead code and consolidate remove_think_tags duplication (#2894)

LearningCircuit150fc44ab0aa
diff --git a/.gitleaksignore b/.gitleaksignore
index e24889a568..e9703d118b 100644
--- a/.gitleaksignore
+++ b/.gitleaksignore
@@ -548,8 +548,8 @@ src/local_deep_research/followup_research/routes.py:generic-secret:219
src/local_deep_research/followup_research/routes.py:generic-secret:222
# Password utility helper - variable names, not actual secrets
-src/local_deep_research/web/auth/password_utils.py:generic-secret:32
-src/local_deep_research/web/auth/password_utils.py:generic-secret:45
+src/local_deep_research/web/auth/password_utils.py:generic-secret:37
+src/local_deep_research/web/auth/password_utils.py:generic-secret:50
src/local_deep_research/followup_research/routes.py:generic-secret:206
# Semantic search routes — db_password variable names (false positives)
@@ -575,8 +575,8 @@ src/local_deep_research/research_library/search/routes/search_routes.py:generic-
src/local_deep_research/research_library/search/routes/search_routes.py:generic-secret:273
# Shared engine filtering - variable names, not actual secrets
-src/local_deep_research/web_search_engines/search_engines_config.py:generic-secret:322
-src/local_deep_research/web_search_engines/search_engines_config.py:generic-secret:360
+src/local_deep_research/web_search_engines/search_engines_config.py:generic-secret:329
+src/local_deep_research/web_search_engines/search_engines_config.py:generic-secret:367
# Placeholder API key for local servers without auth (e.g. llama.cpp)
7c84e267390264c58c3857881c70f9b80677d76b:src/local_deep_research/config/llm_config.py:generic-secret:516
diff --git a/src/local_deep_research/mcp/server.py b/src/local_deep_research/mcp/server.py
index 5c16f243a0..4bc36e3df5 100644
--- a/src/local_deep_research/mcp/server.py
+++ b/src/local_deep_research/mcp/server.py
@@ -137,17 +137,6 @@ def _validate_max_results(max_results: int) -> int:
return max_results
-def _validate_temperature(temperature: Optional[float]) -> Optional[float]:
- """Validate temperature parameter."""
- if temperature is None:
- return None
- if not isinstance(temperature, (int, float)):
- raise ValidationError("Temperature must be a number")
- if temperature < 0.0 or temperature > 2.0:
- raise ValidationError("Temperature must be between 0.0 and 2.0")
- return float(temperature)
-
-
def _validate_search_engine(engine: Optional[str]) -> Optional[str]:
"""Validate search engine name against available engines."""
if engine is None:
diff --git a/src/local_deep_research/settings/manager.py b/src/local_deep_research/settings/manager.py
index 03e14a6a67..406b5c8a22 100644
--- a/src/local_deep_research/settings/manager.py
+++ b/src/local_deep_research/settings/manager.py
@@ -1254,57 +1254,6 @@ class SettingsManager(ISettingsManager):
logger.debug(f"Deleting extraneous setting: {key}")
self.delete_setting(key, commit=False)
- def _create_setting(self, key, value, setting_type):
- """Create a setting with appropriate metadata"""
-
- # Determine appropriate category
- category = None
- ui_element = "text"
-
- # Determine category based on key pattern
- if key.startswith("app."):
- category = "app_interface"
- elif key.startswith("llm."):
- if any(
- param in key
- for param in [
- "temperature",
- "max_tokens",
- "n_batch",
- "n_gpu_layers",
- ]
- ):
- category = "llm_parameters"
- else:
- category = "llm_general"
- elif key.startswith("search."):
- if any(
- param in key
- for param in ["iterations", "questions", "results", "region"]
- ):
- category = "search_parameters"
- else:
- category = "search_general"
- elif key.startswith("report."):
- category = "report_parameters"
-
- # Determine UI element type based on value
- ui_element = _infer_ui_element(value)
-
- # Build setting object
- setting_dict = {
- "key": key,
- "value": value,
- "type": setting_type.value.lower(),
- "name": key.split(".")[-1].replace("_", " ").title(),
- "description": f"Setting for {key}",
- "category": category,
- "ui_element": ui_element,
- }
-
- # Create the setting in the database
- self.create_or_update_setting(setting_dict, commit=False)
-
def _emit_settings_changed(self, changed_keys: Optional[List[Any]] = None):
"""
Emit WebSocket event when settings change
diff --git a/src/local_deep_research/utilities/json_utils.py b/src/local_deep_research/utilities/json_utils.py
index 12d762113a..6cecba47c3 100644
--- a/src/local_deep_research/utilities/json_utils.py
+++ b/src/local_deep_research/utilities/json_utils.py
@@ -12,6 +12,8 @@ from typing import Optional, Type, Union
from loguru import logger
+from .search_utilities import remove_think_tags as _remove_think_tags
+
def get_llm_response_text(response) -> str:
"""Extract text content from an LLM response object.
@@ -155,18 +157,6 @@ def extract_json(
# ---------------------------------------------------------------------------
-def _remove_think_tags(text: str) -> str:
- """Remove <think>...</think> tags from text.
-
- Duplicated from search_utilities to keep this module free of
- internal package dependencies (follows type_utils.py convention).
- """
- text = re.sub(r"<think>.*?</think>", "", text, flags=re.DOTALL)
- text = re.sub(r"</think>", "", text)
- text = re.sub(r"<think>", "", text)
- return text.strip()
-
-
def _strip_code_fences(text: str) -> str:
"""Remove markdown code fences from text.
diff --git a/tests/mcp/test_server_coverage.py b/tests/mcp/test_server_coverage.py
index 4beefdaf9b..e1efc62fba 100644
--- a/tests/mcp/test_server_coverage.py
+++ b/tests/mcp/test_server_coverage.py
@@ -7,7 +7,6 @@ tests/mcp/test_validation.py:
- _validate_iterations max_val enforcement
- _validate_questions_per_iteration upper bound
- _validate_max_results boundaries
-- _validate_temperature boundaries
- _build_settings_overrides with various parameter combinations
- analyze_documents validation (empty collection_name)
- generate_report searches_per_section validation
@@ -186,48 +185,6 @@ class TestValidateMaxResults:
assert self._vmr(100) == 100
-# ---------------------------------------------------------------------------
-# _validate_temperature
-# ---------------------------------------------------------------------------
-
-
-class TestValidateTemperature:
- def _vt(self, val):
- from local_deep_research.mcp.server import _validate_temperature
-
- return _validate_temperature(val)
-
- def test_none_returns_none(self):
- assert self._vt(None) is None
-
- def test_valid_float(self):
- assert self._vt(0.7) == pytest.approx(0.7)
-
- def test_below_zero_raises(self):
- from local_deep_research.mcp.server import ValidationError
-
- with pytest.raises(ValidationError):
- self._vt(-0.1)
-
- def test_above_two_raises(self):
- from local_deep_research.mcp.server import ValidationError
-
- with pytest.raises(ValidationError):
- self._vt(2.1)
-
- def test_boundaries_allowed(self):
- from local_deep_research.mcp.server import _validate_temperature
-
- assert _validate_temperature(0.0) == 0.0
- assert _validate_temperature(2.0) == 2.0
-
- def test_non_numeric_raises(self):
- from local_deep_research.mcp.server import ValidationError
-
- with pytest.raises(ValidationError):
- self._vt("hot")
-
-
# ---------------------------------------------------------------------------
# _build_settings_overrides
# ---------------------------------------------------------------------------
diff --git a/tests/mcp/test_server_validators.py b/tests/mcp/test_server_validators.py
index 81f73fe210..cb6d27693e 100644
--- a/tests/mcp/test_server_validators.py
+++ b/tests/mcp/test_server_validators.py
@@ -29,7 +29,6 @@ def _import_server():
_validate_query,
_validate_questions_per_iteration,
_validate_search_engine,
- _validate_temperature,
)
return {
@@ -42,7 +41,6 @@ def _import_server():
"_validate_query": _validate_query,
"_validate_questions_per_iteration": _validate_questions_per_iteration,
"_validate_search_engine": _validate_search_engine,
- "_validate_temperature": _validate_temperature,
}
@@ -247,52 +245,6 @@ class TestValidateMaxResults:
srv["_validate_max_results"]("10")
-# ---------------------------------------------------------------------------
-# _validate_temperature
-# ---------------------------------------------------------------------------
-
-
-class TestValidateTemperature:
- """Tests for _validate_temperature."""
-
- def test_none_returns_none(self):
- srv = _import_server()
- assert srv["_validate_temperature"](None) is None
-
- def test_valid_float(self):
- srv = _import_server()
- assert srv["_validate_temperature"](0.5) == 0.5
-
- def test_zero(self):
- srv = _import_server()
- assert srv["_validate_temperature"](0.0) == 0.0
-
- def test_max_boundary(self):
- srv = _import_server()
- assert srv["_validate_temperature"](2.0) == 2.0
-
- def test_below_min_raises(self):
- srv = _import_server()
- with pytest.raises(srv["ValidationError"]):
- srv["_validate_temperature"](-0.1)
-
- def test_above_max_raises(self):
- srv = _import_server()
- with pytest.raises(srv["ValidationError"]):
- srv["_validate_temperature"](2.1)
-
- def test_string_raises(self):
- srv = _import_server()
- with pytest.raises(srv["ValidationError"], match="must be a number"):
- srv["_validate_temperature"]("0.5")
-
- def test_int_accepted_returns_float(self):
- srv = _import_server()
- result = srv["_validate_temperature"](1)
- assert result == 1.0
- assert isinstance(result, float)
-
-
# ---------------------------------------------------------------------------
# _build_settings_overrides
# ---------------------------------------------------------------------------
diff --git a/tests/mcp/test_validation.py b/tests/mcp/test_validation.py
index 3ed461c139..5d9ebbab15 100644
--- a/tests/mcp/test_validation.py
+++ b/tests/mcp/test_validation.py
@@ -196,48 +196,6 @@ class TestValidationFunctions:
with pytest.raises(ValidationError, match="cannot exceed 100"):
_validate_max_results(101)
- def test_validate_temperature_valid(self):
- """Test valid temperature passes validation."""
- from local_deep_research.mcp.server import _validate_temperature
-
- assert _validate_temperature(0.7) == 0.7
- assert _validate_temperature(0.0) == 0.0
- assert _validate_temperature(2.0) == 2.0
-
- def test_validate_temperature_none_allowed(self):
- """Test None temperature returns None."""
- from local_deep_research.mcp.server import _validate_temperature
-
- assert _validate_temperature(None) is None
-
- def test_validate_temperature_int_converted_to_float(self):
- """Test integer temperature is converted to float."""
- from local_deep_research.mcp.server import _validate_temperature
-
- result = _validate_temperature(1)
- assert result == 1.0
- assert isinstance(result, float)
-
- def test_validate_temperature_negative_raises(self):
- """Test negative temperature raises ValidationError."""
- from local_deep_research.mcp.server import (
- _validate_temperature,
- ValidationError,
- )
-
- with pytest.raises(ValidationError, match="between 0.0 and 2.0"):
- _validate_temperature(-0.1)
-
- def test_validate_temperature_exceeds_max_raises(self):
- """Test temperature exceeding max raises ValidationError."""
- from local_deep_research.mcp.server import (
- _validate_temperature,
- ValidationError,
- )
-
- with pytest.raises(ValidationError, match="between 0.0 and 2.0"):
- _validate_temperature(2.1)
-
class TestValidationInTools:
"""Tests for validation being applied in tool functions."""
diff --git a/tests/settings/test_settings_parsing.py b/tests/settings/test_settings_parsing.py
deleted file mode 100644
index 087e50d98f..0000000000
--- a/tests/settings/test_settings_parsing.py
+++ /dev/null
@@ -1,223 +0,0 @@
-"""Tests for SettingsManager._create_setting metadata inference.
-
-_create_setting infers category, ui_element, and other metadata from key
-patterns and value types during bulk import operations.
-"""
-
-from unittest.mock import MagicMock
-
-import pytest
-
-
-class TestCreateSettingCategoryInference:
- """Tests for _create_setting category determination from key prefix."""
-
- @pytest.fixture
- def mock_manager(self):
- """Create a mock SettingsManager with _create_setting accessible."""
- from enum import Enum
-
- class MockSettingType(Enum):
- DATABASE = "database"
-
- from local_deep_research.settings.manager import SettingsManager
-
- manager = MagicMock()
- manager._create_setting = SettingsManager._create_setting.__get__(
- manager, type(manager)
- )
- return manager, MockSettingType.DATABASE
-
- def test_app_prefix_category(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.theme", "dark", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "app_interface"
- )
-
- def test_llm_temperature_gets_parameters_category(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("llm.temperature", 0.7, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "llm_parameters"
- )
-
- def test_llm_max_tokens_gets_parameters_category(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("llm.max_tokens", 4096, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "llm_parameters"
- )
-
- def test_llm_general_setting(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("llm.provider", "openai", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "llm_general"
- )
-
- def test_search_iterations_gets_parameters(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("search.iterations", 3, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "search_parameters"
- )
-
- def test_search_questions_gets_parameters(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("search.questions", 5, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "search_parameters"
- )
-
- def test_search_general_setting(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("search.engine", "ddg", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "search_general"
- )
-
- def test_report_prefix_category(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("report.format", "pdf", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"]
- == "report_parameters"
- )
-
- def test_unknown_prefix_gets_none(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("custom.setting", "val", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["category"] is None
- )
-
-
-class TestCreateSettingUIElementInference:
- """Tests for _create_setting UI element inference from value types."""
-
- @pytest.fixture
- def mock_manager(self):
- from enum import Enum
-
- class MockSettingType(Enum):
- DATABASE = "database"
-
- from local_deep_research.settings.manager import SettingsManager
-
- manager = MagicMock()
- manager._create_setting = SettingsManager._create_setting.__get__(
- manager, type(manager)
- )
- return manager, MockSettingType.DATABASE
-
- def test_bool_value_checkbox(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.enabled", True, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "checkbox"
- )
-
- def test_int_value_number(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.count", 42, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "number"
- )
-
- def test_float_value_number(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.ratio", 0.5, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "number"
- )
-
- def test_dict_value_json(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.config", {"k": "v"}, st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "json"
- )
-
- def test_list_value_json(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.items", [1, 2], st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "json"
- )
-
- def test_string_value_text(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.name", "hello", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["ui_element"]
- == "text"
- )
-
-
-class TestCreateSettingNameDerivation:
- """Tests for setting name and description generation."""
-
- @pytest.fixture
- def mock_manager(self):
- from enum import Enum
-
- class MockSettingType(Enum):
- DATABASE = "database"
-
- from local_deep_research.settings.manager import SettingsManager
-
- manager = MagicMock()
- manager._create_setting = SettingsManager._create_setting.__get__(
- manager, type(manager)
- )
- return manager, MockSettingType.DATABASE
-
- def test_name_from_last_segment(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("llm.model_name", "gpt-4", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["name"]
- == "Model Name"
- )
-
- def test_description_includes_key(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.theme", "dark", st)
- assert (
- "app.theme"
- in manager.create_or_update_setting.call_args[0][0]["description"]
- )
-
- def test_key_stored_correctly(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("search.engine", "ddg", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["key"]
- == "search.engine"
- )
-
- def test_value_stored_correctly(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.flag", True, st)
- assert manager.create_or_update_setting.call_args[0][0]["value"] is True
-
- def test_type_stored_as_lowercase(self, mock_manager):
- manager, st = mock_manager
- manager._create_setting("app.x", "v", st)
- assert (
- manager.create_or_update_setting.call_args[0][0]["type"]
- == "database"
- )
diff --git a/tests/web/services/test_settings_manager_extended.py b/tests/web/services/test_settings_manager_extended.py
index 6671cf1e78..634f3a9fec 100644
--- a/tests/web/services/test_settings_manager_extended.py
+++ b/tests/web/services/test_settings_manager_extended.py
@@ -677,68 +677,6 @@ class TestVersionChecking:
mock_session.commit.assert_called_once()
-class TestCreateSetting:
- """Tests for _create_setting helper method."""
-
- def test_create_setting_llm_key(self):
- """_create_setting determines LLM category correctly."""
- from local_deep_research.settings.manager import (
- SettingsManager,
- )
- from local_deep_research.database.models import SettingType
-
- mock_session = Mock()
- mock_query = Mock()
- mock_query.filter.return_value.first.return_value = None
- mock_session.query.return_value = mock_query
-
- manager = SettingsManager(db_session=mock_session)
-
- with patch.object(manager, "_emit_settings_changed"):
- manager._create_setting("llm.temperature", 0.7, SettingType.LLM)
-
- # Verify create_or_update_setting was called
- mock_session.add.assert_called()
-
- def test_create_setting_search_key(self):
- """_create_setting determines search category correctly."""
- from local_deep_research.settings.manager import (
- SettingsManager,
- )
- from local_deep_research.database.models import SettingType
-
- mock_session = Mock()
- mock_query = Mock()
- mock_query.filter.return_value.first.return_value = None
- mock_session.query.return_value = mock_query
-
- manager = SettingsManager(db_session=mock_session)
-
- with patch.object(manager, "_emit_settings_changed"):
- manager._create_setting("search.iterations", 3, SettingType.SEARCH)
-
- mock_session.add.assert_called()
-
- def test_create_setting_bool_value(self):
- """_create_setting sets checkbox ui_element for bool."""
- from local_deep_research.settings.manager import (
- SettingsManager,
- )
- from local_deep_research.database.models import SettingType
-
- mock_session = Mock()
- mock_query = Mock()
- mock_query.filter.return_value.first.return_value = None
- mock_session.query.return_value = mock_query
-
- manager = SettingsManager(db_session=mock_session)
-
- with patch.object(manager, "_emit_settings_changed"):
- manager._create_setting("app.debug", True, SettingType.APP)
-
- mock_session.add.assert_called()
-
-
class TestWebSocketEmission:
"""Tests for WebSocket event emission."""