local-deep-research 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

local_deep_research/__version__.py

@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.3"

local_deep_research/config/llm_config.py

@@ -79,7 +79,7 @@ def get_llm(model_name=None, temperature=None, provider=None, openai_endpoint_ur
     if get_db_setting("llm.supports_max_tokens", True):
         # Use 80% of context window to leave room for prompts
         max_tokens = min(
-            get_db_setting("llm.max_tokens", 30000), int(context_window_size * 0.8)
+            int(get_db_setting("llm.max_tokens", 30000)), int(context_window_size * 0.8)
         )
         common_params["max_tokens"] = max_tokens
 

local_deep_research/defaults/default_settings.json

@@ -342,7 +342,7 @@
         "options": null,
         "step": 0.05,
         "type": "LLM",
-        "ui_element": "slider",
+        "ui_element": "range",
         "value": 0.7,
         "visible": true
     },

local_deep_research/web/services/settings_manager.py

@@ -1,10 +1,10 @@
 import importlib.resources as pkg_resources
 import json
 import os
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional, Type, Union
 
 from loguru import logger
-from sqlalchemy import func
+from sqlalchemy import func, or_
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
@@ -45,6 +45,15 @@ class SettingsManager:
     Provides methods to get and set settings, with the ability to override settings in memory.
     """
 
+    _UI_ELEMENT_TO_SETTING_TYPE = {
+        "text": str,
+        "password": str,
+        "select": str,
+        "number": float,
+        "range": float,
+        "checkbox": bool,
+    }
+
     def __init__(self, db_session: Session):
         """
         Initialize the settings manager
@@ -59,6 +68,57 @@ class SettingsManager:
         default_settings = pkg_resources.read_text(defaults, "default_settings.json")
         self.default_settings = json.loads(default_settings)
 
+    def __get_typed_setting_value(
+        self, setting: Type[Setting], default: Any = None, check_env: bool = True
+    ) -> str | float | bool | None:
+        """
+        Extracts the value for a particular setting, ensuring that it has the
+        correct type.
+
+        Args:
+            setting: The setting to get the value for.
+            default: Default value to return if the value of the setting is
+                invalid.
+            check_env: If true, it will check the environment variable for
+                this setting before reading from the DB.
+
+        Returns:
+            The value of the setting.
+
+        """
+        setting_type = self._UI_ELEMENT_TO_SETTING_TYPE.get(setting.ui_element, None)
+        if setting_type is None:
+            logger.warning(
+                "Got unknown type {} for setting {}, returning default value.",
+                setting.ui_element,
+                setting.key,
+            )
+            return default
+
+        # Check environment variable first, then database.
+        if check_env:
+            env_value = check_env_setting(setting.key)
+            if env_value is not None:
+                try:
+                    return setting_type(env_value)
+                except ValueError:
+                    logger.warning(
+                        "Setting {} has invalid value {}. Falling back to DB.",
+                        setting.key,
+                        env_value,
+                    )
+
+        # If environment variable does not exist, read from the database.
+        try:
+            return setting_type(setting.value)
+        except ValueError:
+            logger.warning(
+                "Setting {} has invalid value {}. Returning default.",
+                setting.key,
+                setting.value,
+            )
+            return default
+
     def get_setting(self, key: str, default: Any = None, check_env: bool = True) -> Any:
         """
         Get a setting value
@@ -72,37 +132,29 @@ class SettingsManager:
         Returns:
             Setting value or default if not found
         """
-        if check_env:
-            env_value = check_env_setting(key)
-            if env_value is not None:
-                return env_value
-
         # If using database first approach and session available, check database
         if self.db_first and self.db_session:
             try:
                 settings = (
                     self.db_session.query(Setting)
                     # This will find exact matches and any subkeys.
-                    .filter(Setting.key.startswith(key)).all()
+                    .filter(
+                        or_(Setting.key == key, Setting.key.startswith(f"{key}."))
+                    ).all()
                 )
                 if len(settings) == 1:
                     # This is a bottom-level key.
-                    value = settings[0].value
-                    return value
+                    return self.__get_typed_setting_value(
+                        settings[0], default, check_env
+                    )
                 elif len(settings) > 1:
                     # This is a higher-level key.
                     settings_map = {}
                     for setting in settings:
                         output_key = setting.key.removeprefix(f"{key}.")
-                        value = setting.value
-
-                        if check_env:
-                            # Handle possible replacements from environment variables.
-                            env_value = check_env_setting(setting.key)
-                            if env_value is not None:
-                                value = env_value
-
-                        settings_map[output_key] = value
+                        settings_map[output_key] = self.__get_typed_setting_value(
+                            setting, default, check_env
+                        )
                     return settings_map
             except SQLAlchemyError as e:
                 logger.error(f"Error retrieving setting {key} from database: {e}")
@@ -149,6 +201,7 @@ class SettingsManager:
                         value=value,
                         type=setting_type,
                         name=key.split(".")[-1].replace("_", " ").title(),
+                        ui_element="text",
                         description=f"Setting for {key}",
                     )
                     self.db_session.add(new_setting)

local_deep_research/web_search_engines/engines/search_engine_searxng.py

@@ -98,7 +98,7 @@ class SearXNGSearchEngine(BaseSearchEngine):
         self.language = language
         try:
             self.safe_search = SafeSearchSetting[safe_search]
-        except ValueError:
+        except KeyError:
             logger.error(
                 "'{}' is not a valid safe search setting. Disabling safe search",
                 safe_search,

local_deep_research/web_search_engines/search_engines_config.py

@@ -4,20 +4,12 @@ Loads search engine definitions from the user's configuration.
 """
 
 import json
-
-import logging
-from typing import Any, Dict, List
-
-from ..utilities.db_utils import get_db_setting
-from .default_search_engines import get_default_elasticsearch_config
-
-from functools import cache
 from typing import Any, Dict, List
 
 from loguru import logger
 
-
 from ..utilities.db_utils import get_db_setting
+from .default_search_engines import get_default_elasticsearch_config
 
 
 def _extract_per_engine_config(raw_config: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
@@ -69,7 +61,7 @@ def search_config() -> Dict[str, Any]:
     # Add alias for 'auto' if it exists
     if "auto" in search_engines and "meta" not in search_engines:
         search_engines["meta"] = search_engines["auto"]
-        
+
     # Add Elasticsearch search engine if not already present
     if "elasticsearch" not in search_engines:
         logger.info("Adding default Elasticsearch search engine configuration")
@@ -91,7 +83,7 @@ def search_config() -> Dict[str, Any]:
                 config["paths"] = json.loads(config["paths"])
             except json.decoder.JSONDecodeError:
                 logger.error(
-                    f"Invalid paths specified for local collection: "
+                    f"Path for local collection '{collection}' is not a valid JSON array: "
                     f"{config['paths']}"
                 )
                 config["paths"] = []

{local_deep_research-0.4.1.dist-info → local_deep_research-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: local-deep-research
-Version: 0.4.1
+Version: 0.4.3
 Summary: AI-powered research assistant with deep, iterative analysis using LLMs and web searches
 Author-Email: LearningCircuit <185559241+LearningCircuit@users.noreply.github.com>, HashedViking <6432677+HashedViking@users.noreply.github.com>
 License: MIT License

{local_deep_research-0.4.1.dist-info → local_deep_research-0.4.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-local_deep_research-0.4.1.dist-info/METADATA,sha256=qKbtKkvdX52q25NBq4-O4d7d74fjYmM5GyPxuB4TIRc,17352
-local_deep_research-0.4.1.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-local_deep_research-0.4.1.dist-info/entry_points.txt,sha256=GcXS501Rjh-P80S8db7hnrQ23mS_Jg27PwpVQVO77as,113
-local_deep_research-0.4.1.dist-info/licenses/LICENSE,sha256=Qg2CaTdu6SWnSqk1_JtgBPp_Da-LdqJDhT1Vt1MUc5s,1072
+local_deep_research-0.4.3.dist-info/METADATA,sha256=8xlBwQ1wxZeZkbPKoHikLxTfWk2fkRoGdkCgX4e50l8,17352
+local_deep_research-0.4.3.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+local_deep_research-0.4.3.dist-info/entry_points.txt,sha256=GcXS501Rjh-P80S8db7hnrQ23mS_Jg27PwpVQVO77as,113
+local_deep_research-0.4.3.dist-info/licenses/LICENSE,sha256=Qg2CaTdu6SWnSqk1_JtgBPp_Da-LdqJDhT1Vt1MUc5s,1072
 local_deep_research/__init__.py,sha256=BPWOE6L1vBgBshHlyzrrp0gYo6uR3ljiNBFDRK_3aIw,911
-local_deep_research/__version__.py,sha256=pMtTmSUht-XtbR_7Doz6bsQqopJJd8rZ8I8zy2HwwoA,22
+local_deep_research/__version__.py,sha256=Nyg0pmk5ea9-SLCAFEIF96ByFx4-TJFtrqYPN-Zn6g4,22
 local_deep_research/advanced_search_system/__init__.py,sha256=sGusMj4eFIrhXR6QbOM16UDKB6aI-iS4IFivKWpMlh0,234
 local_deep_research/advanced_search_system/filters/__init__.py,sha256=2dXrV4skcVHI2Lb3BSL2Ajq0rnLeSw7kc1MbIynMxa4,190
 local_deep_research/advanced_search_system/filters/base_filter.py,sha256=58Ux0ppXafL8Vy2qbWioUBMqGtK1dgtSF5A68BP8M8Y,1010
@@ -72,11 +72,11 @@ local_deep_research/benchmarks/runners.py,sha256=ktdEYgoVoQtToCJSKPMB7rF2fOzimFR
 local_deep_research/benchmarks/templates.py,sha256=ooRYTbFmSQCKxHVuXAYofTDTXAQ9yDaAUtKGqRaHy2E,2276
 local_deep_research/citation_handler.py,sha256=MZVd6xl7g3xrWauFBPuVIC36z8onc-zQb8xI4dQXxsU,4307
 local_deep_research/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-local_deep_research/config/llm_config.py,sha256=Y-56Bc05Kglh1jxTwa1xVLso7YBUGJqQHq3y_R-un34,16022
+local_deep_research/config/llm_config.py,sha256=31F-nlloP_N30HYZqnJ2sCNMZXlJVB9AMwz99UctHi4,16027
 local_deep_research/config/search_config.py,sha256=-m4BkHHMvzNkIuZmximmE3T5_H-JU4UZubEc_cDpWH0,2130
 local_deep_research/defaults/.env.template,sha256=_eVCy4d_XwpGXy8n50CG3wH9xx2oqJCFKS7IbqgInDk,491
 local_deep_research/defaults/__init__.py,sha256=C_0t0uZmtrVB4rM9NM9Wx8PJU5kFcT-qOHvws5W2iOg,1352
-local_deep_research/defaults/default_settings.json,sha256=k5H2pRXiOb0OeCfmgFKZqS9Rh3myjtHZDbnVNdDXxnQ,124257
+local_deep_research/defaults/default_settings.json,sha256=UTzWrOONlvR6UELT7remAN5qLLMLYvjnQXNMd0cH87w,124256
 local_deep_research/migrate_db.py,sha256=S1h6Bv0OJdRW4BaH7MIMrUXBRV_yqgH2T6LVOZKTQjI,4634
 local_deep_research/report_generator.py,sha256=-G3KDEbsuU3PdxDfuo5v28DIX7RE1yJCCBU2KgRbNzI,9084
 local_deep_research/search_system.py,sha256=DCBSLSUyLqPuHrgOuTlDizT_cnWRBICYKH-haMWWoDo,8412
@@ -108,7 +108,7 @@ local_deep_research/web/routes/research_routes.py,sha256=RkuT6VA5BlKzfeFzp3HvoEQ
 local_deep_research/web/routes/settings_routes.py,sha256=Yt4xVt6XcGPSEFuAkcQ4zlZ2r5dIbV3VNsWIXoGeflw,58606
 local_deep_research/web/services/research_service.py,sha256=kHdonXtGDTSU2_jBlCP_deqMdydhxA_p7EabsR5kBkE,38812
 local_deep_research/web/services/resource_service.py,sha256=yKgOC6GEOmHqRoGzwf52e19UaGCCS1DbDbOIXgWGvGc,4378
-local_deep_research/web/services/settings_manager.py,sha256=Emo_QRnjVwi8HHT8N79io3SOUxPf_VwwwOHTTvJ1C-c,17238
+local_deep_research/web/services/settings_manager.py,sha256=FKW8LKVsBGr_vgWHn1lZZRwiqRQ98ZrNicLOwf6vjPw,19058
 local_deep_research/web/services/settings_service.py,sha256=-ZG78JR14GuhsaXIF4OQOqfRfrw2QIqYEKwTOFhsuFo,3497
 local_deep_research/web/services/socket_service.py,sha256=jZGXk6kesBOf4bAdLiT3V4Ofod12pGKTsvxr3ml8ydY,7272
 local_deep_research/web/static/css/custom_dropdown.css,sha256=-pCx6oazWVgwqFAGq_eZ8OrTKMVQlgkKYCM6w-bACLs,7949
@@ -166,12 +166,12 @@ local_deep_research/web_search_engines/engines/search_engine_guardian.py,sha256=
 local_deep_research/web_search_engines/engines/search_engine_local.py,sha256=RJEXb6wTPgTfQoOyuLYLZwqx0JU7yukehHiu4C0Zel4,41221
 local_deep_research/web_search_engines/engines/search_engine_local_all.py,sha256=8hAYhacU15Vi13pjo0LRVt2tI5SqcONDwYwvdtg1HyY,5620
 local_deep_research/web_search_engines/engines/search_engine_pubmed.py,sha256=O99qfbSz7RHqinAP_C0iod-ZaEGE5tyBbh1DJi2-VhQ,38495
-local_deep_research/web_search_engines/engines/search_engine_searxng.py,sha256=amEK2ljX-6QtJPBUB9fS0bE48Q8SmYInO2LaSq_x-Rw,17867
+local_deep_research/web_search_engines/engines/search_engine_searxng.py,sha256=gS-GjjLzjZvlaQB-E0u-IADzJmLRGZaLmNQ7DpdqMw4,17865
 local_deep_research/web_search_engines/engines/search_engine_semantic_scholar.py,sha256=jYs_TRM0izMfldsZ8NkCQsP-o6vCPXUjyxt0nIsxOVI,22799
 local_deep_research/web_search_engines/engines/search_engine_serpapi.py,sha256=_afKJVFV0xpdrO3vL71aORMIGmbe0y8o7Ly0_xXryDQ,8920
 local_deep_research/web_search_engines/engines/search_engine_wayback.py,sha256=rfRs7WJxa-H1DXSyduFHBMfpFwWEVRXLd8s_78iU8gU,17894
 local_deep_research/web_search_engines/engines/search_engine_wikipedia.py,sha256=UxYBSGD-XZGQantq_AdgtBA8FCKV0C6mEr6GS_vleQQ,10092
 local_deep_research/web_search_engines/search_engine_base.py,sha256=TFmkIGgzIkXFsk9jhGn2PYyxveOWzKQLrhpZy5qaggE,10803
 local_deep_research/web_search_engines/search_engine_factory.py,sha256=73lwSenv7tK7eGIBOPh13hPdn0oZ9FC0EMjZx5YRPg4,11865
-local_deep_research/web_search_engines/search_engines_config.py,sha256=bRly8zsoXvlQIovbVChnkhj4AsGJMzFlEiArrmsblrE,5375
-local_deep_research-0.4.1.dist-info/RECORD,,
+local_deep_research/web_search_engines/search_engines_config.py,sha256=qfmrTZjjVeMfdZQ9WIAEWKdPPEtZhTAJ5KjCdgsz_ww,5259
+local_deep_research-0.4.3.dist-info/RECORD,,