local-deep-research 0.3.11__tar.gz → 0.3.12__tar.gz

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: local-deep-research
-Version: 0.3.11
+Version: 0.3.12
 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
@@ -106,7 +106,24 @@ Local Deep Research combines the power of large language models with intelligent
 
 ## ⚡ Quick Start
 
-### Option 1: Docker (Recommended)
+### Option 1: Docker (Quickstart no MAC/ARM)
+
+```bash
+# Step 1: Pull and run SearXNG for optimal search results
+docker pull searxng/searxng
+docker run -d -p 8080:8080 --name searxng searxng/searxng
+
+# Step 2: Pull and run Local Deep Research (Please build your own docker on ARM)
+docker pull localdeepresearch/local-deep-research
+docker run -d -p 5000:5000 --network host --name local-deep-research localdeepresearch/local-deep-research
+
+# Start containers - Required after each reboot (can be automated with this flag in run command --restart unless-stopped)
+docker start searxng
+docker start local-deep-research
+
+```
+
+### Option 2: Docker Compose (Recommended)
 
 LDR uses Docker compose to bundle the web app and all it's dependencies so
 you can get up and running quickly.
@@ -145,7 +162,7 @@ Then visit `http://127.0.0.1:5000` to start researching!
 See [here](https://github.com/LearningCircuit/local-deep-research/wiki/Installation#docker-installation-recommended) for more information about
 using Docker.
 
-### Option 2: Python Package (mostly for programmatic access)
+### Option 3: Python Package (mostly for programmatic access)
 
 ```bash
 # Install the package

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/README.md

@@ -35,7 +35,24 @@ Local Deep Research combines the power of large language models with intelligent
 
 ## ⚡ Quick Start
 
-### Option 1: Docker (Recommended)
+### Option 1: Docker (Quickstart no MAC/ARM)
+
+```bash
+# Step 1: Pull and run SearXNG for optimal search results
+docker pull searxng/searxng
+docker run -d -p 8080:8080 --name searxng searxng/searxng
+
+# Step 2: Pull and run Local Deep Research (Please build your own docker on ARM)
+docker pull localdeepresearch/local-deep-research
+docker run -d -p 5000:5000 --network host --name local-deep-research localdeepresearch/local-deep-research
+
+# Start containers - Required after each reboot (can be automated with this flag in run command --restart unless-stopped)
+docker start searxng
+docker start local-deep-research
+
+```
+
+### Option 2: Docker Compose (Recommended)
 
 LDR uses Docker compose to bundle the web app and all it's dependencies so
 you can get up and running quickly.
@@ -74,7 +91,7 @@ Then visit `http://127.0.0.1:5000` to start researching!
 See [here](https://github.com/LearningCircuit/local-deep-research/wiki/Installation#docker-installation-recommended) for more information about
 using Docker.
 
-### Option 2: Python Package (mostly for programmatic access)
+### Option 3: Python Package (mostly for programmatic access)
 
 ```bash
 # Install the package

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/pyproject.toml

@@ -57,7 +57,7 @@ dependencies = [
     "setuptools>=78.1.0",
     "flask-wtf>=1.2.2",
 ]
-version = "0.3.11"
+version = "0.3.12"
 
 [project.license]
 file = "LICENSE"

local_deep_research-0.3.12/src/local_deep_research/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.3.12"

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/config/llm_config.py

@@ -9,6 +9,7 @@ from langchain_openai import ChatOpenAI
 
 from ..utilities.db_utils import get_db_setting
 from ..utilities.search_utilities import remove_think_tags
+from ..utilities.url_utils import normalize_url
 
 # Setup logging
 logger = logging.getLogger(__name__)
@@ -141,7 +142,12 @@ 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 = get_db_setting("llm.ollama.url", "http://localhost:11434")
+            raw_base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
+            base_url = (
+                normalize_url(raw_base_url)
+                if raw_base_url
+                else "http://localhost:11434"
+            )
 
             # Check if Ollama is available before trying to use it
             if not is_ollama_available():
@@ -371,7 +377,10 @@ def is_ollama_available():
     try:
         import requests
 
-        base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
+        raw_base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
+        base_url = (
+            normalize_url(raw_base_url) if raw_base_url else "http://localhost:11434"
+        )
         logger.info(f"Checking Ollama availability at {base_url}/api/tags")
 
         try:

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/config/search_config.py

@@ -26,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", "auto")
+    tool = search_tool or get_db_setting("search.tool", "searxng")
     logger.info(f"Creating search engine with tool: {tool}")
 
     # Get LLM instance (use provided or get fresh one)

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/defaults/default_settings.json

@@ -733,7 +733,7 @@
         "step": null,
         "type": "SEARCH",
         "ui_element": "select",
-        "value": "auto",
+        "value": "searxng",
         "visible": true
     },
     "search.engine.web.arxiv.display_name": {

local_deep_research-0.3.12/src/local_deep_research/utilities/url_utils.py

@@ -0,0 +1,57 @@
+"""URL utility functions for the local deep research application."""
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def normalize_url(raw_url: str) -> str:
+    """
+    Normalize a URL to ensure it has a proper scheme and format.
+
+    Args:
+        raw_url: The raw URL string to normalize
+
+    Returns:
+        A properly formatted URL string
+
+    Examples:
+        >>> normalize_url("localhost:11434")
+        'http://localhost:11434'
+        >>> normalize_url("https://example.com:11434")
+        'https://example.com:11434'
+        >>> normalize_url("http:example.com")
+        'http://example.com'
+    """
+    if not raw_url:
+        raise ValueError("URL cannot be empty")
+
+    # Clean up the URL
+    raw_url = raw_url.strip()
+
+    # First check if the URL already has a proper scheme
+    if raw_url.startswith(("http://", "https://")):
+        return raw_url
+
+    # Handle case where URL is malformed like "http:hostname" (missing //)
+    if raw_url.startswith(("http:", "https:")) and not raw_url.startswith(
+        ("http://", "https://")
+    ):
+        scheme = raw_url.split(":", 1)[0]
+        rest = raw_url.split(":", 1)[1]
+        return f"{scheme}://{rest}"
+
+    # Handle URLs that start with //
+    if raw_url.startswith("//"):
+        # Remove the // and process
+        raw_url = raw_url[2:]
+
+    # At this point, we should have hostname:port or just hostname
+    # Determine if this is localhost or an external host
+    hostname = raw_url.split(":")[0].split("/")[0]
+    is_localhost = hostname in ("localhost", "127.0.0.1", "[::1]", "0.0.0.0")
+
+    # Use http for localhost, https for external hosts
+    scheme = "http" if is_localhost else "https"
+
+    return f"{scheme}://{raw_url}"

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/web/routes/api_routes.py

@@ -1,10 +1,10 @@
 import json
 import logging
-import os
 
 import requests
 from flask import Blueprint, current_app, jsonify, request
 
+from ...utilities.url_utils import normalize_url
 from ..models.database import get_db_connection
 from ..routes.research_routes import active_research, termination_flags
 from ..services.research_service import (
@@ -49,7 +49,7 @@ def api_start_research():
         research_settings = {
             "model_provider": "OLLAMA",  # Default
             "model": "llama2",  # Default
-            "search_engine": "auto",  # Default
+            "search_engine": "searxng",  # Default
         }
 
         cursor.execute(
@@ -255,10 +255,14 @@ def check_ollama_status():
                 {"running": True, "message": f"Using provider: {provider}, not Ollama"}
             )
 
-        # Get Ollama API URL
-        ollama_base_url = os.getenv(
-            "OLLAMA_BASE_URL",
-            llm_config.get("ollama_base_url", "http://localhost:11434"),
+        # Get Ollama API URL from LLM config
+        raw_ollama_base_url = llm_config.get(
+            "ollama_base_url", "http://localhost:11434"
+        )
+        ollama_base_url = (
+            normalize_url(raw_ollama_base_url)
+            if raw_ollama_base_url
+            else "http://localhost:11434"
         )
 
         logger.info(f"Checking Ollama status at: {ollama_base_url}")
@@ -380,9 +384,14 @@ def check_ollama_model():
         # Log which model we're checking for debugging
         logger.info(f"Checking availability of Ollama model: {model_name}")
 
-        ollama_base_url = os.getenv(
-            "OLLAMA_BASE_URL",
-            llm_config.get("ollama_base_url", "http://localhost:11434"),
+        # Get Ollama API URL from LLM config
+        raw_ollama_base_url = llm_config.get(
+            "ollama_base_url", "http://localhost:11434"
+        )
+        ollama_base_url = (
+            normalize_url(raw_ollama_base_url)
+            if raw_ollama_base_url
+            else "http://localhost:11434"
         )
 
         # Check if the model is available

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/web/routes/settings_routes.py

@@ -19,6 +19,7 @@ from flask_wtf.csrf import generate_csrf
 from sqlalchemy.orm import Session
 
 from ...utilities.db_utils import get_db_setting
+from ...utilities.url_utils import normalize_url
 from ..database.models import Setting, SettingType
 from ..services.settings_service import (
     create_or_update_setting,
@@ -667,7 +668,15 @@ def api_get_available_models():
             try:
                 current_app.logger.info("Attempting to connect to Ollama API")
 
-                base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
+                raw_base_url = get_db_setting(
+                    "llm.ollama.url", "http://localhost:11434"
+                )
+                base_url = (
+                    normalize_url(raw_base_url)
+                    if raw_base_url
+                    else "http://localhost:11434"
+                )
+
                 ollama_response = requests.get(f"{base_url}/api/tags", timeout=5)
 
                 current_app.logger.debug(
@@ -1269,11 +1278,12 @@ def fix_corrupted_settings():
 def check_ollama_status():
     """Check if Ollama is running and available"""
     try:
-        # Set a shorter timeout for the request
-        base_url = os.getenv(
-            "OLLAMA_BASE_URL",
-            "http://localhost:11434",
+        # Get Ollama URL from settings
+        raw_base_url = get_db_setting("llm.ollama.url", "http://localhost:11434")
+        base_url = (
+            normalize_url(raw_base_url) if raw_base_url else "http://localhost:11434"
         )
+
         response = requests.get(f"{base_url}/api/version", timeout=2.0)
 
         if response.status_code == 200:

{local_deep_research-0.3.11 → local_deep_research-0.3.12}/src/local_deep_research/web_search_engines/engines/search_engine_local.py

@@ -32,6 +32,7 @@ from langchain_text_splitters import RecursiveCharacterTextSplitter
 
 from ...config import search_config
 from ...utilities.db_utils import get_db_setting
+from ...utilities.url_utils import normalize_url
 from ..search_engine_base import BaseSearchEngine
 
 # Setup logging
@@ -169,12 +170,20 @@ class LocalEmbeddingManager:
             if self.embedding_model_type == "ollama":
                 # Use Ollama for embeddings
                 if not self.ollama_base_url:
-                    self.ollama_base_url = get_db_setting(
+                    raw_ollama_base_url = get_db_setting(
                         "llm.ollama.url", "http://localhost:11434"
                     )
+                    self.ollama_base_url = (
+                        normalize_url(raw_ollama_base_url)
+                        if raw_ollama_base_url
+                        else "http://localhost:11434"
+                    )
+                else:
+                    # Ensure scheme is present if ollama_base_url was passed in constructor
+                    self.ollama_base_url = normalize_url(self.ollama_base_url)
 
                 logger.info(
-                    f"Initializing Ollama embeddings with model {self.embedding_model}"
+                    f"Initializing Ollama embeddings with model {self.embedding_model} and base_url {self.ollama_base_url}"
                 )
                 return OllamaEmbeddings(
                     model=self.embedding_model, base_url=self.ollama_base_url
@@ -563,7 +572,7 @@ class LocalEmbeddingManager:
                         str(index_path),
                         self.embeddings,
                         allow_dangerous_deserialization=True,
-                        nomalize_L2=True,
+                        normalize_L2=True,
                     )
                 except Exception as e:
                     logger.error(f"Error loading index for {folder_path}: {e}")

local_deep_research-0.3.12/tests/test_url_utils.py

@@ -0,0 +1,55 @@
+"""Test URL utility functions."""
+
+import pytest
+
+from local_deep_research.utilities.url_utils import normalize_url
+
+
+class TestNormalizeUrl:
+    """Test cases for the normalize_url function."""
+
+    def test_localhost_without_scheme(self):
+        """Test that localhost addresses get http:// prefix."""
+        assert normalize_url("localhost:11434") == "http://localhost:11434"
+        assert normalize_url("127.0.0.1:11434") == "http://127.0.0.1:11434"
+        assert normalize_url("[::1]:11434") == "http://[::1]:11434"
+        assert normalize_url("0.0.0.0:11434") == "http://0.0.0.0:11434"
+
+    def test_external_host_without_scheme(self):
+        """Test that external hosts get https:// prefix."""
+        assert normalize_url("example.com:11434") == "https://example.com:11434"
+        assert normalize_url("api.example.com") == "https://api.example.com"
+
+    def test_malformed_url_with_scheme(self):
+        """Test correction of malformed URLs like 'http:hostname'."""
+        assert normalize_url("http:localhost:11434") == "http://localhost:11434"
+        assert normalize_url("https:example.com:11434") == "https://example.com:11434"
+
+    def test_well_formed_urls(self):
+        """Test that well-formed URLs are unchanged."""
+        assert normalize_url("http://localhost:11434") == "http://localhost:11434"
+        assert normalize_url("https://example.com:11434") == "https://example.com:11434"
+        assert (
+            normalize_url("http://192.168.1.100:11434") == "http://192.168.1.100:11434"
+        )
+
+    def test_urls_with_double_slash_prefix(self):
+        """Test URLs that start with //."""
+        assert normalize_url("//localhost:11434") == "http://localhost:11434"
+        assert normalize_url("//example.com:11434") == "https://example.com:11434"
+
+    def test_empty_or_none_url(self):
+        """Test handling of empty or None URLs."""
+        with pytest.raises(ValueError):
+            normalize_url("")
+        with pytest.raises(ValueError):
+            normalize_url(None)
+
+    def test_url_with_path(self):
+        """Test URLs with paths."""
+        assert normalize_url("localhost:11434/api") == "http://localhost:11434/api"
+        assert normalize_url("example.com/api/v1") == "https://example.com/api/v1"
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])

local_deep_research-0.3.12/tests/test_url_utils_debug.py

@@ -0,0 +1,33 @@
+"""Debug test for URL utility functions."""
+
+from local_deep_research.utilities.url_utils import normalize_ollama_url
+
+
+def test_url_normalization():
+    """Test the normalize_ollama_url function."""
+
+    test_cases = [
+        ("localhost:11434", "http://localhost:11434"),
+        ("127.0.0.1:11434", "http://127.0.0.1:11434"),
+        ("example.com:11434", "https://example.com:11434"),
+        ("http:localhost:11434", "http://localhost:11434"),
+        ("https:example.com:11434", "https://example.com:11434"),
+        ("http://localhost:11434", "http://localhost:11434"),
+        ("https://example.com:11434", "https://example.com:11434"),
+        ("//localhost:11434", "http://localhost:11434"),
+        ("//example.com:11434", "https://example.com:11434"),
+        ("", "http://localhost:11434"),
+    ]
+
+    for input_url, expected in test_cases:
+        result = normalize_ollama_url(input_url)
+        if result != expected:
+            print(f"FAIL: Input: {input_url!r}")
+            print(f"  Expected: {expected!r}")
+            print(f"  Got:      {result!r}")
+        else:
+            print(f"PASS: {input_url!r} -> {result!r}")
+
+
+if __name__ == "__main__":
+    test_url_normalization()

local_deep_research-0.3.12/tests/test_url_utils_simple.py

@@ -0,0 +1,39 @@
+"""Simple test for URL utility functions without pytest."""
+
+from local_deep_research.utilities.url_utils import normalize_url
+
+
+def test_url_normalization():
+    """Test the normalize_url function."""
+
+    # Test localhost without scheme
+    assert normalize_url("localhost:11434") == "http://localhost:11434"
+    assert normalize_url("127.0.0.1:11434") == "http://127.0.0.1:11434"
+
+    # Test external host without scheme
+    assert normalize_url("example.com:11434") == "https://example.com:11434"
+
+    # Test malformed URL with scheme
+    assert normalize_url("http:localhost:11434") == "http://localhost:11434"
+    assert normalize_url("https:example.com:11434") == "https://example.com:11434"
+
+    # Test well-formed URLs
+    assert normalize_url("http://localhost:11434") == "http://localhost:11434"
+    assert normalize_url("https://example.com:11434") == "https://example.com:11434"
+
+    # Test URLs with double slash prefix
+    assert normalize_url("//localhost:11434") == "http://localhost:11434"
+    assert normalize_url("//example.com:11434") == "https://example.com:11434"
+
+    # Test empty URL (should raise ValueError)
+    try:
+        normalize_url("")
+        print("FAIL: Expected ValueError for empty URL")
+    except ValueError:
+        pass  # Expected
+
+    print("All tests passed!")
+
+
+if __name__ == "__main__":
+    test_url_normalization()

local_deep_research-0.3.11/src/local_deep_research/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.3.11"