local-deep-research 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

local_deep_research/api/research_functions.py

@@ -9,78 +9,100 @@ from typing import Any, Callable, Dict, Optional
 
 import toml
 
-from .. import get_report_generator  # Use the lazy import function
 from ..config.llm_config import get_llm
 from ..config.search_config import get_search
+from ..report_generator import IntegratedReportGenerator
 from ..search_system import AdvancedSearchSystem
 from ..utilities.search_utilities import remove_think_tags
 
 logger = logging.getLogger(__name__)
 
 
-def quick_summary(
-    query: str,
+def _init_search_system(
+    model_name: str | None = None,
+    temperature: float = 0.7,
+    provider: str | None = None,
+    openai_endpoint_url: str | None = None,
+    progress_callback: Callable[[str, int, dict], None] | None = None,
     search_tool: Optional[str] = None,
     iterations: int = 1,
     questions_per_iteration: int = 1,
-    max_results: int = 20,
-    max_filtered_results: int = 5,
-    region: str = "us",
-    time_period: str = "y",
-    safe_search: bool = True,
-    temperature: float = 0.7,
-    progress_callback: Optional[Callable] = None,
-) -> Dict[str, Any]:
+) -> AdvancedSearchSystem:
     """
-    Generate a quick research summary for a given query.
+    Initializes the advanced search system with specified parameters. This function sets up
+    and returns an instance of the AdvancedSearchSystem using the provided configuration
+    options such as model name, temperature for randomness in responses, provider service
+    details, endpoint URL, and an optional search tool.
 
     Args:
-        query: The research query to analyze
+        model_name: Name of the model to use (if None, uses database setting)
+        temperature: LLM temperature for generation
+        provider: Provider to use (if None, uses database setting)
+        openai_endpoint_url: Custom endpoint URL to use (if None, uses database
+            setting)
+        progress_callback: Optional callback function to receive progress updates
         search_tool: Search engine to use (auto, wikipedia, arxiv, etc.). If None, uses default
         iterations: Number of research cycles to perform
         questions_per_iteration: Number of questions to generate per cycle
-        max_results: Maximum number of search results to consider
-        max_filtered_results: Maximum results after relevance filtering
-        region: Search region/locale
-        time_period: Time period for search results (d=day, w=week, m=month, y=year)
-        safe_search: Whether to enable safe search
-        temperature: LLM temperature for generation
-        progress_callback: Optional callback function to receive progress updates
 
     Returns:
-        Dictionary containing the research results with keys:
-        - 'summary': The generated summary text
-        - 'findings': List of detailed findings from each search
-        - 'iterations': Number of iterations performed
-        - 'questions': Questions generated during research
-    """
-    logger.info("Generating quick summary for query: %s", query)
+        AdvancedSearchSystem: An instance of the configured AdvancedSearchSystem.
 
+    """
     # Get language model with custom temperature
-    llm = get_llm(temperature=temperature)
-
-    # Create search system with custom parameters
-    system = AdvancedSearchSystem()
-
-    # Override default settings with user-provided values
-    system.max_iterations = iterations
-    system.questions_per_iteration = questions_per_iteration
-    system.model = llm  # Ensure the model is directly attached to the system
+    llm = get_llm(
+        temperature=temperature,
+        openai_endpoint_url=openai_endpoint_url,
+        model_name=model_name,
+        provider=provider,
+    )
 
     # Set the search engine if specified
+    search_engine = None
     if search_tool:
-        search_engine = get_search(search_tool)
-        if search_engine:
-            system.search = search_engine
-        else:
+        search_engine = get_search(search_tool, llm_instance=llm)
+        if search_engine is None:
             logger.warning(
                 f"Could not create search engine '{search_tool}', using default."
             )
 
+    # Create search system with custom parameters
+    system = AdvancedSearchSystem(llm=llm, search=search_engine)
+
+    # Override default settings with user-provided values
+    system.max_iterations = iterations
+    system.questions_per_iteration = questions_per_iteration
+
     # Set progress callback if provided
     if progress_callback:
         system.set_progress_callback(progress_callback)
 
+    return system
+
+
+def quick_summary(
+    query: str,
+    **kwargs: Any,
+) -> Dict[str, Any]:
+    """
+    Generate a quick research summary for a given query.
+
+    Args:
+        query: The research query to analyze
+        **kwargs: Configuration for the search system. Will be forwarded to
+            `_init_search_system()`.
+
+    Returns:
+        Dictionary containing the research results with keys:
+        - 'summary': The generated summary text
+        - 'findings': List of detailed findings from each search
+        - 'iterations': Number of iterations performed
+        - 'questions': Questions generated during research
+    """
+    logger.info("Generating quick summary for query: %s", query)
+
+    system = _init_search_system(**kwargs)
+
     # Perform the search and analysis
     results = system.analyze_topic(query)
 
@@ -103,36 +125,20 @@ def quick_summary(
 
 def generate_report(
     query: str,
-    search_tool: Optional[str] = None,
-    iterations: int = 2,
-    questions_per_iteration: int = 2,
-    searches_per_section: int = 2,
-    max_results: int = 50,
-    max_filtered_results: int = 5,
-    region: str = "us",
-    time_period: str = "y",
-    safe_search: bool = True,
-    temperature: float = 0.7,
     output_file: Optional[str] = None,
     progress_callback: Optional[Callable] = None,
+    searches_per_section: int = 2,
+    **kwargs: Any,
 ) -> Dict[str, Any]:
     """
     Generate a comprehensive, structured research report for a given query.
 
     Args:
         query: The research query to analyze
-        search_tool: Search engine to use (auto, wikipedia, arxiv, etc.). If None, uses default
-        iterations: Number of research cycles to perform
-        questions_per_iteration: Number of questions to generate per cycle
-        searches_per_section: Number of searches to perform per report section
-        max_results: Maximum number of search results to consider
-        max_filtered_results: Maximum results after relevance filtering
-        region: Search region/locale
-        time_period: Time period for search results (d=day, w=week, m=month, y=year)
-        safe_search: Whether to enable safe search
-        temperature: LLM temperature for generation
         output_file: Optional path to save report markdown file
         progress_callback: Optional callback function to receive progress updates
+        searches_per_section: The number of searches to perform for each
+            section in the report.
 
     Returns:
         Dictionary containing the research report with keys:
@@ -141,34 +147,7 @@ def generate_report(
     """
     logger.info("Generating comprehensive research report for query: %s", query)
 
-    # Get language model with custom temperature
-    llm = get_llm(temperature=temperature)
-
-    # Create search system with custom parameters
-    system = AdvancedSearchSystem()
-
-    # Override default settings with user-provided values
-    system.max_iterations = iterations
-    system.questions_per_iteration = questions_per_iteration
-    system.model = llm  # Ensure the model is directly attached to the system
-
-    # Set the search engine if specified
-    if search_tool:
-        search_engine = get_search(
-            search_tool,
-            llm_instance=llm,
-            max_results=max_results,
-            max_filtered_results=max_filtered_results,
-            region=region,
-            time_period=time_period,
-            safe_search=safe_search,
-        )
-        if search_engine:
-            system.search = search_engine
-        else:
-            logger.warning(
-                f"Could not create search engine '{search_tool}', using default."
-            )
+    system = _init_search_system(**kwargs)
 
     # Set progress callback if provided
     if progress_callback:
@@ -178,8 +157,11 @@ def generate_report(
     initial_findings = system.analyze_topic(query)
 
     # Generate the structured report
-    report_generator = get_report_generator(searches_per_section=searches_per_section)
-    report_generator.model = llm  # Ensure the model is set on the report generator too
+    report_generator = IntegratedReportGenerator(
+        search_system=system,
+        llm=system.model,
+        searches_per_section=searches_per_section,
+    )
     report = report_generator.generate_report(initial_findings, query)
 
     # Save report to file if path is provided

local_deep_research/defaults/search_engines.toml

@@ -98,7 +98,7 @@ search_language = "English"
 [searxng]
 module_path = ".engines.search_engine_searxng"
 class_name = "SearXNGSearchEngine"
-requires_api_key = true
+requires_api_key = false
 api_key_env = "SEARXNG_INSTANCE"
 reliability = 0.9
 strengths = [

local_deep_research/report_generator.py

@@ -1,11 +1,11 @@
 import importlib
 from typing import Dict, List
 
+from langchain_core.language_models import BaseChatModel
+
 # Fix circular import by importing directly from source modules
 from .config.llm_config import get_llm
 from .search_system import AdvancedSearchSystem
-
-# from . import utilities
 from .utilities import search_utilities
 
 
@@ -19,10 +19,24 @@ def get_report_generator(search_system=None):
 
 
 class IntegratedReportGenerator:
-    def __init__(self, searches_per_section: int = 2, search_system=None):
-        self.model = get_llm()
+    def __init__(
+        self,
+        searches_per_section: int = 2,
+        search_system=None,
+        llm: BaseChatModel | None = None,
+    ):
+        """
+        Args:
+            searches_per_section: Number of searches to perform for each
+                section in the report.
+            search_system: Custom search system to use, otherwise just uses
+                the default.
+            llm: Custom LLM to use, otherwise just uses the default.
+
+        """
+        self.model = llm or get_llm()
         # Use provided search_system or create a new one
-        self.search_system = search_system or AdvancedSearchSystem()
+        self.search_system = search_system or AdvancedSearchSystem(llm=self.model)
         self.searches_per_section = (
             searches_per_section  # Control search depth per section
         )

local_deep_research/search_system.py

@@ -19,6 +19,7 @@ from .config.config_files import settings
 from .config.llm_config import get_llm
 from .config.search_config import get_search
 from .utilities.db_utils import get_db_setting
+from .web_search_engines.search_engine_base import BaseSearchEngine
 
 logger = logging.getLogger(__name__)
 
@@ -34,6 +35,7 @@ class AdvancedSearchSystem:
         include_text_content: bool = True,
         use_cross_engine_filter: bool = True,
         llm: BaseChatModel | None = None,
+        search: BaseSearchEngine | None = None,
     ):
         """Initialize the advanced search system.
 
@@ -43,12 +45,16 @@ class AdvancedSearchSystem:
             use_cross_engine_filter: Whether to filter results across search
                 engines.
             llm: LLM to use. If not provided, it will use the default one.
+            search: Search engine to use. If not provided, it will use the
+                default one.
         """
         # Get configuration
-        self.search = get_search()
         self.model = llm
         if llm is None:
             self.model = get_llm()
+        self.search = search
+        if search is None:
+            self.search = get_search(llm_instance=self.model)
         self.max_iterations = get_db_setting(
             "search.iterations", settings.search.iterations
         )
@@ -90,7 +96,7 @@ class AdvancedSearchSystem:
 
         # For backward compatibility
         self.questions_by_iteration = {}
-        self.progress_callback = None
+        self.progress_callback = lambda _1, _2, _3: None
         self.all_links_of_system = list()
 
         # Configure the strategy with our attributes

local_deep_research/web/routes/settings_routes.py

@@ -349,10 +349,6 @@ def save_all_settings():
                 400,
             )
 
-        # Export settings to file for each type
-        for setting_type in settings_by_type:
-            get_settings_manager(db_session).export_to_file(setting_type)
-
         # Get all settings to return to the client for proper state update
         all_settings = []
         for setting in db_session.query(Setting).all():
@@ -525,11 +521,6 @@ def reset_to_defaults():
 
             setup_settings(db_session)
 
-        # Also export the settings to file for consistency
-        settings_mgr = get_settings_manager(db_session)
-        for setting_type in SettingType:
-            settings_mgr.export_to_file(setting_type)
-
         # Return success
         return jsonify(
             {

local_deep_research/web_search_engines/engines/search_engine_searxng.py

@@ -65,7 +65,7 @@ class SearXNGSearchEngine(BaseSearchEngine):
         # 2. SEARXNG_INSTANCE environment variable
         # 3. instance_url parameter
         # 4. Default to None, which will disable the engine
-        self.instance_url = api_key or os.getenv("SEARXNG_INSTANCE") or instance_url
+        self.instance_url = api_key or os.getenv("SEARXNG_INSTANCE") or instance_url or "http://localhost:8080"
 
         # Add debug logging for instance URL
         logger.info(

{local_deep_research-0.2.0.dist-info → local_deep_research-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: local-deep-research
-Version: 0.2.0
+Version: 0.2.2
 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
@@ -124,7 +124,7 @@ A powerful AI-powered research assistant that performs deep, iterative analysis
 
 ## Windows Installation
 
- Download the [Windows Installer](https://github.com/LearningCircuit/local-deep-research/releases/download/v0.2.0/LocalDeepResearch_Setup.exe) for easy one-click installation.
+ Download the [Windows Installer](https://github.com/LearningCircuit/local-deep-research/releases/download/v0.1.0/LocalDeepResearch_Setup.exe) for easy one-click installation.
 
  **Requires Ollama (or other model provider configured in .env).**
  Download from https://ollama.ai and then pull a model

{local_deep_research-0.2.0.dist-info → local_deep_research-0.2.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-local_deep_research-0.2.0.dist-info/METADATA,sha256=kFKHbDKTK3D_vPU1ze1w61L0om3M2Sn1oRYeXukG5ag,19797
-local_deep_research-0.2.0.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-local_deep_research-0.2.0.dist-info/entry_points.txt,sha256=GcXS501Rjh-P80S8db7hnrQ23mS_Jg27PwpVQVO77as,113
-local_deep_research-0.2.0.dist-info/licenses/LICENSE,sha256=Qg2CaTdu6SWnSqk1_JtgBPp_Da-LdqJDhT1Vt1MUc5s,1072
+local_deep_research-0.2.2.dist-info/METADATA,sha256=MgFc30qd-f-kk07M_jDRZ7HAq8MzL92pDLxQ34YYQMU,19797
+local_deep_research-0.2.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+local_deep_research-0.2.2.dist-info/entry_points.txt,sha256=GcXS501Rjh-P80S8db7hnrQ23mS_Jg27PwpVQVO77as,113
+local_deep_research-0.2.2.dist-info/licenses/LICENSE,sha256=Qg2CaTdu6SWnSqk1_JtgBPp_Da-LdqJDhT1Vt1MUc5s,1072
 local_deep_research/__init__.py,sha256=tczbsYNZQqfPAuVtz6OFyo-uUqjNQLelEIT2G7mPTwA,870
 local_deep_research/__main__.py,sha256=LIxK5iS6aLAKMFBDpUS3V-jDcxchqi3eSUsI2jAZUXk,371
 local_deep_research/advanced_search_system/__init__.py,sha256=sGusMj4eFIrhXR6QbOM16UDKB6aI-iS4IFivKWpMlh0,234
@@ -30,7 +30,7 @@ local_deep_research/advanced_search_system/tools/knowledge_tools/__init__.py,sha
 local_deep_research/advanced_search_system/tools/question_tools/__init__.py,sha256=73jLuCKigwc9lJQ0uD3_F16dgCg4pL-F2cwC6tk9-oc,30
 local_deep_research/advanced_search_system/tools/search_tools/__init__.py,sha256=73jLuCKigwc9lJQ0uD3_F16dgCg4pL-F2cwC6tk9-oc,30
 local_deep_research/api/__init__.py,sha256=-tJQp7Qm1aPg6fgfuw-w9dfNo8GzrJLOy2i3dG8Drl8,441
-local_deep_research/api/research_functions.py,sha256=OLY_xW_voAxRo7GH6nABrsSAI2YoU59PfHuJ-Yldm2M,11994
+local_deep_research/api/research_functions.py,sha256=8Q_Rzfc0Qj2oLxzvFJIA4ms10uQC0a5SBHkIkSoPcw4,10908
 local_deep_research/app.py,sha256=U_92UX0dpVAQoaXciVNy_By_AyDEWGlXSeTwFpohALQ,155
 local_deep_research/citation_handler.py,sha256=KdfwHqSewPyP2OrxEGu9o15pJtFDYLUsLwOTHkQe8I8,4564
 local_deep_research/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,11 +41,11 @@ local_deep_research/defaults/.env.template,sha256=_eVCy4d_XwpGXy8n50CG3wH9xx2oqJ
 local_deep_research/defaults/__init__.py,sha256=C_0t0uZmtrVB4rM9NM9Wx8PJU5kFcT-qOHvws5W2iOg,1352
 local_deep_research/defaults/local_collections.toml,sha256=zNa03PVnFrZ757JdZOuW6QDxkOc6ep5tG8baGBrMmXM,1778
 local_deep_research/defaults/main.toml,sha256=4PfSKHXzPjesdh7IzLprJ_oaCxqum9PvuKEaxr_-iJI,1940
-local_deep_research/defaults/search_engines.toml,sha256=NE2QuUyuiF7i2J9fBkzBgp17yeB0mfoXSxFa_PKIwHA,8284
+local_deep_research/defaults/search_engines.toml,sha256=XBnqCxzFvXa1HoKLcb_Jg4EGXMlgYOw1sm_CicSdYDM,8285
 local_deep_research/main.py,sha256=umGmaQmW7bpx27wUAgSNjNr4oSHV6mDX5hoyfb22HEY,7033
 local_deep_research/migrate_db.py,sha256=S1h6Bv0OJdRW4BaH7MIMrUXBRV_yqgH2T6LVOZKTQjI,4634
-local_deep_research/report_generator.py,sha256=lXVnXuv43t6IU1WM_wTTYEjAYcFjKzoSg6DBR74HbXk,8634
-local_deep_research/search_system.py,sha256=ktwf70lAcaMEUYG8e5X8USQVsLwFLKAX8udfMBsUTLY,6786
+local_deep_research/report_generator.py,sha256=-G3KDEbsuU3PdxDfuo5v28DIX7RE1yJCCBU2KgRbNzI,9084
+local_deep_research/search_system.py,sha256=MqaG435RzllyHlVuT7eCc_wC8_rCA4RLW7F5NDp9kxE,7108
 local_deep_research/setup_data_dir.py,sha256=7MJa2MMdDUnktJVHwMpyNL2079-qylpIyyLpVbF5AUY,1134
 local_deep_research/test_migration.py,sha256=cXY9WbpxLslNEa1vFwLMvcvKBbUe7Wosm--AqmPIPYM,6459
 local_deep_research/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,7 +67,7 @@ local_deep_research/web/models/settings.py,sha256=rXBI9vY5k3ndR8dPd3fZJy-6HwYltQ
 local_deep_research/web/routes/api_routes.py,sha256=S0UdCmfm0v1GEM4UiSbI0PE3xUOxiGaYFR2ZOE0256U,19075
 local_deep_research/web/routes/history_routes.py,sha256=6a_8nX349viuvi1zP5S7BaPPpAh133eTi1NVWO545A8,12622
 local_deep_research/web/routes/research_routes.py,sha256=JlzaP1z-7XAP3E0nkEjLIfYj_NKf5qDcrjxBmUouAhM,23492
-local_deep_research/web/routes/settings_routes.py,sha256=vXiwo5CBJYUIrSQpaKKX5akIIEmhFijko3NCCLdKI2s,60392
+local_deep_research/web/routes/settings_routes.py,sha256=rEvvFCVWJ80zchnzXBv9SAnDXMvDPLGDjSUfLRlCCi0,60012
 local_deep_research/web/services/research_service.py,sha256=sxvW4oNLiiKgQ8w0SblefzMmk8EEaNNOGd8oC96j85E,39556
 local_deep_research/web/services/resource_service.py,sha256=yKgOC6GEOmHqRoGzwf52e19UaGCCS1DbDbOIXgWGvGc,4378
 local_deep_research/web/services/settings_manager.py,sha256=ybnhSlByuKA2oJPElN2WI8bh-ZzC6lP08x0Gsz8Ycbk,24310
@@ -124,7 +124,7 @@ local_deep_research/web_search_engines/engines/search_engine_guardian.py,sha256=
 local_deep_research/web_search_engines/engines/search_engine_local.py,sha256=7s2qcyslMNiwXQynYjm_9t8nL_MDfue8wuDrBhfpcEg,40506
 local_deep_research/web_search_engines/engines/search_engine_local_all.py,sha256=zg963qnwg8XwUqc9DeBrFaDSEHVr-j7Bv76WhaEuyi8,5785
 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=cP0_M56zWnlolnqHMk4d8pe3AOAPmd7C5qkCPFYeURc,18026
+local_deep_research/web_search_engines/engines/search_engine_searxng.py,sha256=wPYIl22SgXjIDYzcq62glGH2JZywCnZR31he1i7U1cE,18053
 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=OnoYL89WX1qWC6mOosSdgbJ-rXcIFmCVdrd6-qg7xes,8711
 local_deep_research/web_search_engines/engines/search_engine_wayback.py,sha256=rfRs7WJxa-H1DXSyduFHBMfpFwWEVRXLd8s_78iU8gU,17894
@@ -132,4 +132,4 @@ local_deep_research/web_search_engines/engines/search_engine_wikipedia.py,sha256
 local_deep_research/web_search_engines/search_engine_base.py,sha256=PLU_sAWhWKTOQWcv32GINuhLdIwB0sEQy-pp9oG9Ggo,9835
 local_deep_research/web_search_engines/search_engine_factory.py,sha256=mkIf6F-8-aooS47iqb8SanJ9shnl0UOVia8hr2xX0b0,12751
 local_deep_research/web_search_engines/search_engines_config.py,sha256=GmwpCT6vfeq1wrdr1R-zu6WRQ5XxyE7921HPsgGm3gI,2771
-local_deep_research-0.2.0.dist-info/RECORD,,
+local_deep_research-0.2.2.dist-info/RECORD,,