local-deep-research 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

local_deep_research/config/llm_config.py

@@ -1,8 +1,6 @@
 import logging
 import os
-from pathlib import Path
 
-from dynaconf.vendor.box.exceptions import BoxKeyError
 from langchain_anthropic import ChatAnthropic
 from langchain_community.llms import VLLM
 from langchain_ollama import ChatOllama
@@ -10,7 +8,6 @@ from langchain_openai import ChatOpenAI
 
 from ..utilities.db_utils import get_db_setting
 from ..utilities.search_utilities import remove_think_tags
-from .config_files import CONFIG_DIR, settings
 
 # Setup logging
 logger = logging.getLogger(__name__)
@@ -26,7 +23,6 @@ VALID_PROVIDERS = [
     "llamacpp",
     "none",
 ]
-SECRETS_FILE = CONFIG_DIR / ".secrets.toml"
 
 
 def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_url=None):
@@ -46,11 +42,11 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
 
     # Use database values for parameters if not provided
     if model_name is None:
-        model_name = get_db_setting("llm.model", settings.llm.model)
+        model_name = get_db_setting("llm.model", "gemma:latest")
     if temperature is None:
-        temperature = get_db_setting("llm.temperature", settings.llm.temperature)
+        temperature = get_db_setting("llm.temperature", 0.7)
     if provider is None:
-        provider = get_db_setting("llm.provider", settings.llm.provider)
+        provider = get_db_setting("llm.provider", "ollama")
 
     # Clean model name: remove quotes and extra whitespace
     if model_name:
@@ -77,21 +73,12 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
     common_params = {
         "temperature": temperature,
     }
-    try:
-        common_params["max_tokens"] = settings.llm.max_tokens
-    except BoxKeyError:
-        # Some providers don't support this parameter, in which case it can
-        # be omitted.
-        pass
+    if get_db_setting("llm.supports_max_tokens", True):
+        common_params["max_tokens"] = get_db_setting("llm.max_tokens", 30000)
 
     # Handle different providers
     if provider == "anthropic":
-        api_key_name = "ANTHROPIC_API_KEY"
-        api_key = settings.get(api_key_name, "")
-        if not api_key:
-            api_key = os.getenv(api_key_name)
-        if not api_key:
-            api_key = os.getenv("LDR_" + api_key_name)
+        api_key = get_db_setting("llm.anthropic.api_key")
         if not api_key:
             logger.warning(
                 "ANTHROPIC_API_KEY not found. Falling back to default model."
@@ -104,12 +91,7 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
         return wrap_llm_without_think_tags(llm)
 
     elif provider == "openai":
-        api_key_name = "OPENAI_API_KEY"
-        api_key = settings.get(api_key_name, "")
-        if not api_key:
-            api_key = os.getenv(api_key_name)
-        if not api_key:
-            api_key = os.getenv("LDR_" + api_key_name)
+        api_key = get_db_setting("llm.openai.api_key")
         if not api_key:
             logger.warning("OPENAI_API_KEY not found. Falling back to default model.")
             return get_fallback_model(temperature)
@@ -118,12 +100,7 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
         return wrap_llm_without_think_tags(llm)
 
     elif provider == "openai_endpoint":
-        api_key_name = "OPENAI_ENDPOINT_API_KEY"
-        api_key = settings.get(api_key_name, "")
-        if not api_key:
-            api_key = os.getenv(api_key_name)
-        if not api_key:
-            api_key = os.getenv("LDR_" + api_key_name)
+        api_key = get_db_setting("llm.openai_endpoint.api_key")
         if not api_key:
             logger.warning(
                 "OPENAI_ENDPOINT_API_KEY not found. Falling back to default model."
@@ -131,9 +108,9 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
             return get_fallback_model(temperature)
 
         # Get endpoint URL from settings
-        if openai_endpoint_url is not None:
+        if openai_endpoint_url is None:
             openai_endpoint_url = get_db_setting(
-                "llm.openai_endpoint_url", settings.llm.openai_endpoint_url
+                "llm.openai_endpoint.url", "https://openrouter.ai/api/v1"
             )
 
         llm = ChatOpenAI(
@@ -163,10 +140,7 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
     elif provider == "ollama":
         try:
             # Use the configurable Ollama base URL
-            base_url = os.getenv(
-                "OLLAMA_BASE_URL",
-                settings.llm.get("ollama_base_url", "http://localhost:11434"),
-            )
+            base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
 
             # Check if Ollama is available before trying to use it
             if not is_ollama_available():
@@ -230,15 +204,14 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
 
     elif provider == "lmstudio":
         # LM Studio supports OpenAI API format, so we can use ChatOpenAI directly
-        lmstudio_url = settings.llm.get("lmstudio_url", "http://localhost:1234")
-        lmstudio_url = get_db_setting("llm.lmstudio_url", lmstudio_url)
+        lmstudio_url = get_db_setting("llm.lmstudio.url", "http://localhost:1234")
 
         llm = ChatOpenAI(
             model=model_name,
             api_key="lm-studio",  # LM Studio doesn't require a real API key
             base_url=f"{lmstudio_url}/v1",  # Use the configured URL with /v1 endpoint
             temperature=temperature,
-            max_tokens=get_db_setting("llm.max_tokens", settings.llm.max_tokens),
+            max_tokens=get_db_setting("llm.max_tokens", 30000),
         )
         return wrap_llm_without_think_tags(llm)
 
@@ -247,25 +220,21 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
         from langchain_community.llms import LlamaCpp
 
         # Get LlamaCpp model path from settings
-        model_path = settings.llm.get("llamacpp_model_path", "")
-        model_path = get_db_setting("llm.llamacpp_model_path", model_path)
+        model_path = get_db_setting("llm.llamacpp_model_path")
         if not model_path:
             logger.error("llamacpp_model_path not set in settings")
             raise ValueError("llamacpp_model_path not set in settings")
 
         # Get additional LlamaCpp parameters
-        n_gpu_layers = settings.llm.get("llamacpp_n_gpu_layers", 1)
-        n_gpu_layers = get_db_setting("llm.llamacpp_n_gpu_layers", n_gpu_layers)
-        n_batch = settings.llm.get("llamacpp_n_batch", 512)
-        n_batch = get_db_setting("llm.llamacpp_n_batch", n_batch)
-        f16_kv = settings.llm.get("llamacpp_f16_kv", True)
-        f16_kv = get_db_setting("llm.llamacpp_f16_kv", f16_kv)
+        n_gpu_layers = get_db_setting("llm.llamacpp_n_gpu_layers", 1)
+        n_batch = get_db_setting("llm.llamacpp_n_batch", 512)
+        f16_kv = get_db_setting("llm.llamacpp_f16_kv", True)
 
         # Create LlamaCpp instance
         llm = LlamaCpp(
             model_path=model_path,
             temperature=temperature,
-            max_tokens=get_db_setting("llm.max_tokens", settings.llm.max_tokens),
+            max_tokens=get_db_setting("llm.max_tokens", 30000),
             n_gpu_layers=n_gpu_layers,
             n_batch=n_batch,
             f16_kv=f16_kv,
@@ -354,9 +323,7 @@ def get_available_provider_types():
 def is_openai_available():
     """Check if OpenAI is available"""
     try:
-        api_key = settings.get("OPENAI_API_KEY", "")
-        if not api_key:
-            api_key = os.getenv("OPENAI_API_KEY")
+        api_key = get_db_setting("llm.openai.api_key")
         return bool(api_key)
     except Exception:
         return False
@@ -365,9 +332,7 @@ def is_openai_available():
 def is_anthropic_available():
     """Check if Anthropic is available"""
     try:
-        api_key = settings.get("ANTHROPIC_API_KEY", "")
-        if not api_key:
-            api_key = os.getenv("ANTHROPIC_API_KEY")
+        api_key = get_db_setting("llm.anthropic.api_key")
         return bool(api_key)
     except Exception:
         return False
@@ -376,9 +341,7 @@ def is_anthropic_available():
 def is_openai_endpoint_available():
     """Check if OpenAI endpoint is available"""
     try:
-        api_key = settings.get("OPENAI_ENDPOINT_API_KEY", "")
-        if not api_key:
-            api_key = os.getenv("OPENAI_ENDPOINT_API_KEY")
+        api_key = get_db_setting("llm.openai_endpoint.api_key")
         return bool(api_key)
     except Exception:
         return False
@@ -389,10 +352,7 @@ def is_ollama_available():
     try:
         import requests
 
-        base_url = os.getenv(
-            "OLLAMA_BASE_URL",
-            settings.llm.get("ollama_base_url", "http://localhost:11434"),
-        )
+        base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
         logger.info(f"Checking Ollama availability at {base_url}/api/tags")
 
         try:
@@ -434,8 +394,7 @@ def is_lmstudio_available():
     try:
         import requests
 
-        lmstudio_url = settings.llm.get("lmstudio_url", "http://localhost:1234")
-        lmstudio_url = get_db_setting("llm.lmstudio_url", lmstudio_url)
+        lmstudio_url = get_db_setting("llm.lmstudio.url", "http://localhost:1234")
         # LM Studio typically uses OpenAI-compatible endpoints
         response = requests.get(f"{lmstudio_url}/v1/models", timeout=1.0)
         return response.status_code == 200
@@ -448,8 +407,7 @@ def is_llamacpp_available():
     try:
         from langchain_community.llms import LlamaCpp  # noqa: F401
 
-        model_path = settings.llm.get("llamacpp_model_path", "")
-        model_path = get_db_setting("llm.llamacpp_model_path", model_path)
+        model_path = get_db_setting("llm.llamacpp_model_path")
         return bool(model_path) and os.path.exists(model_path)
     except Exception:
         return False
@@ -460,9 +418,8 @@ def get_available_providers():
     return get_available_provider_types()
 
 
-secrets_file = Path(SECRETS_FILE)
 AVAILABLE_PROVIDERS = get_available_providers()
-selected_provider = get_db_setting("llm.provider", settings.llm.provider).lower()
+selected_provider = get_db_setting("llm.provider", "ollama").lower()
 
 # Log which providers are available
 logger.info(f"Available providers: {list(AVAILABLE_PROVIDERS.keys())}")

local_deep_research/config/search_config.py

@@ -3,7 +3,6 @@ import logging
 
 from ..utilities.db_utils import get_db_setting
 from ..web_search_engines.search_engine_factory import get_search as factory_get_search
-from .config_files import settings
 from .llm_config import get_llm
 
 # Setup logging
@@ -13,9 +12,7 @@ logger = logging.getLogger(__name__)
 # Whether to check the quality search results using the LLM.
 QUALITY_CHECK_DDG_URLS = True
 # Whether to only retrieve snippets instead of full search results.
-SEARCH_SNIPPETS_ONLY = get_db_setting(
-    "search.snippets_only", settings.search.snippets_only
-)
+SEARCH_SNIPPETS_ONLY = get_db_setting("search.snippets_only", True)
 
 
 # Expose get_search function
@@ -29,7 +26,7 @@ def get_search(search_tool=None, llm_instance=None):
     """
 
     # Use specified tool or default from settings
-    tool = search_tool or get_db_setting("search.tool", settings.search.tool)
+    tool = search_tool or get_db_setting("search.tool", "auto")
     logger.info(f"Creating search engine with tool: {tool}")
 
     # Get LLM instance (use provided or get fresh one)
@@ -39,23 +36,13 @@ def get_search(search_tool=None, llm_instance=None):
     params = {
         "search_tool": tool,
         "llm_instance": llm,
-        "max_results": get_db_setting(
-            "search.max_results", settings.search.max_results
-        ),
-        "region": get_db_setting("search.region", settings.search.region),
-        "time_period": get_db_setting(
-            "search.time_period", settings.search.time_period
-        ),
-        "safe_search": get_db_setting(
-            "search.safe_search", settings.search.safe_search
-        ),
+        "max_results": get_db_setting("search.max_results", 10),
+        "region": get_db_setting("search.region", "wt-wt"),
+        "time_period": get_db_setting("search.time_period", "all"),
+        "safe_search": get_db_setting("search.safe_search", True),
         "search_snippets_only": SEARCH_SNIPPETS_ONLY,
-        "search_language": get_db_setting(
-            "search.search_language", settings.search.search_language
-        ),
-        "max_filtered_results": get_db_setting(
-            "search.max_filtered_results", settings.search.max_filtered_results
-        ),
+        "search_language": get_db_setting("search.search_language", "English"),
+        "max_filtered_results": get_db_setting("search.max_filtered_results", 5),
     }
 
     # Log NULL parameters for debugging