searchfetch 3.3.0__tar.gz → 3.3.2__tar.gz

{searchfetch-3.3.0/searchfetch.egg-info → searchfetch-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: searchfetch
-Version: 3.3.0
+Version: 3.3.2
 Summary: A maximum fault-tolerant, stealth-enabled MCP server for web searching and fetching.
 Author: Max
 License-Expression: MIT
@@ -10,13 +10,13 @@ Keywords: mcp,search,fetch,llm,ai,agent,stealth
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp>=1.28.1
-Requires-Dist: cloakbrowser>=0.4.5
+Requires-Dist: mcp>=2.0.0
+Requires-Dist: cloakbrowser>=0.5.2
 Requires-Dist: beautifulsoup4>=4.15.0
-Requires-Dist: markdownify>=1.2.2
+Requires-Dist: markdownify>=1.2.3
 Provides-Extra: dev
 Requires-Dist: pytest>=9.1.1; extra == "dev"
-Requires-Dist: ruff>=0.15.20; extra == "dev"
+Requires-Dist: ruff>=0.16.0; extra == "dev"
 Dynamic: license-file
 
 # SearchFetch (MCP Server)

{searchfetch-3.3.0 → searchfetch-3.3.2}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools>=83.0.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "searchfetch"
-version = "3.3.0"
+version = "3.3.2"
 description = "A maximum fault-tolerant, stealth-enabled MCP server for web searching and fetching."
 readme = "README.md"
 license = "MIT"
@@ -14,16 +14,16 @@ authors =[
 ]
 keywords =["mcp", "search", "fetch", "llm", "ai", "agent", "stealth"]
 dependencies =[
-    "mcp>=1.28.1",
-    "cloakbrowser>=0.4.5",
+    "mcp>=2.0.0",
+    "cloakbrowser>=0.5.2",
     "beautifulsoup4>=4.15.0",
-    "markdownify>=1.2.2"
+    "markdownify>=1.2.3",
 ]
 
 [project.optional-dependencies]
 dev = [
     "pytest>=9.1.1",
-    "ruff>=0.15.20",
+    "ruff>=0.16.0",
 ]
 
 [project.urls]
@@ -38,18 +38,7 @@ searchfetch = "server:main"
 py-modules =["server"]
 
 [tool.setuptools.data-files]
-templates = [
-    "templates/github-repo.json",
-    "templates/github-issue.json",
-    "templates/npm-package.json",
-    "templates/pypi-package.json",
-    "templates/crates-package.json",
-    "templates/google-search.json",
-    "templates/duckduckgo-search.json",
-    "templates/docs-page.json",
-    "templates/docs-rs.json",
-    "templates/docker-hub.json",
-]
+templates = ["templates/*.json"]
 
 [tool.ruff]
 line-length = 100

{searchfetch-3.3.0 → searchfetch-3.3.2/searchfetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: searchfetch
-Version: 3.3.0
+Version: 3.3.2
 Summary: A maximum fault-tolerant, stealth-enabled MCP server for web searching and fetching.
 Author: Max
 License-Expression: MIT
@@ -10,13 +10,13 @@ Keywords: mcp,search,fetch,llm,ai,agent,stealth
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp>=1.28.1
-Requires-Dist: cloakbrowser>=0.4.5
+Requires-Dist: mcp>=2.0.0
+Requires-Dist: cloakbrowser>=0.5.2
 Requires-Dist: beautifulsoup4>=4.15.0
-Requires-Dist: markdownify>=1.2.2
+Requires-Dist: markdownify>=1.2.3
 Provides-Extra: dev
 Requires-Dist: pytest>=9.1.1; extra == "dev"
-Requires-Dist: ruff>=0.15.20; extra == "dev"
+Requires-Dist: ruff>=0.16.0; extra == "dev"
 Dynamic: license-file
 
 # SearchFetch (MCP Server)

searchfetch-3.3.2/searchfetch.egg-info/requires.txt

@@ -0,0 +1,8 @@
+mcp>=2.0.0
+cloakbrowser>=0.5.2
+beautifulsoup4>=4.15.0
+markdownify>=1.2.3
+
+[dev]
+pytest>=9.1.1
+ruff>=0.16.0

{searchfetch-3.3.0 → searchfetch-3.3.2}/server.py

@@ -8,12 +8,12 @@ from pathlib import Path
 from bs4 import BeautifulSoup, Tag
 from cloakbrowser import launch_async
 from markdownify import markdownify as md
-from mcp.server.fastmcp import FastMCP
+from mcp.server import MCPServer
 from playwright.async_api import TimeoutError as PlaywrightTimeoutError
 
-__version__ = "3.3.0"
+__version__ = "3.3.2"
 
-mcp = FastMCP("searchfetch")
+mcp = MCPServer("searchfetch", version=__version__)
 
 # ---------------------------------------------------------------------------
 # Browser Manager — single shared browser instance, stealth by default
@@ -448,13 +448,16 @@ ACCESS_DENIED_TITLE_PATTERNS = [
 ]
 
 ACCESS_DENIED_BODY_TRIGGERS = [
-    "captcha",
     "verify you are human",
     "are you a robot",
-    "unusual traffic",
     "access denied",
+]
+
+ACCESS_DENIED_STRONG_BODY_TRIGGERS = [
+    "our systems have detected unusual traffic",
     "sorry, you have been blocked",
     "to continue, please type the characters",
+    "bots use duckduckgo too",
 ]
 
 _ACCESS_DENIED_RE = re.compile("|".join(ACCESS_DENIED_TITLE_PATTERNS), re.IGNORECASE)
@@ -473,8 +476,10 @@ def _detect_access_failure(http_status: int | None, soup: BeautifulSoup) -> bool
     body = soup.find("body")
     if body:
         body_text = body.get_text(" ", strip=True)
+        lowered = body_text.lower()
+        if any(trigger in lowered for trigger in ACCESS_DENIED_STRONG_BODY_TRIGGERS):
+            return True
         if len(body_text) < 800:
-            lowered = body_text.lower()
             if any(trigger in lowered for trigger in ACCESS_DENIED_BODY_TRIGGERS):
                 return True
 
@@ -606,6 +611,7 @@ async def fetch_html(url: str, template: dict | None, block_media: bool, retry:
                 or "econnreset" in exc_msg
                 or "enotfound" in exc_msg
                 or "navigation" in exc_msg
+                or "navigating" in exc_msg
             )
             if attempt < attempts - 1 and is_network:
                 await asyncio.sleep(0.5)
@@ -1033,30 +1039,10 @@ def generic_fallback(html_content: str, _url: str = "") -> str:
 # ---------------------------------------------------------------------------
 
 
-@mcp.tool()
-async def websearch(
-    query: str,
-    engine: str = "duckduckgo",
-    region: str | None = None,
-    safe_search: bool | None = None,
-    max_results: int = 10,
-    block_media: bool = True,
-) -> str:
-    """
-    Search the web using template-driven search engines (Google, DuckDuckGo, or custom).
-
-    Args:
-        query: The search query string.
-        engine: Search engine: 'duckduckgo' or 'google'. Also accepts custom template names.
-        region: Region code. DDG: 'us-en', 'de-de', etc. Google: 'de-de' maps to hl=de, gl=de.
-        safe_search: Enable safe search. Maps to engine-specific params.
-        max_results: Max results to extract. Default: 10.
-        block_media: Block images/media/fonts. Default: True.
-    """
-    # 1. Resolve engine → template name
+def _resolve_search_candidate(
+    engine: str, query: str, region: str | None, safe_search: bool | None
+) -> tuple[str, dict, str]:
     template_name = resolve_search_template(engine)
-
-    # 2. Resolve the template object
     if template_name.startswith("{"):
         try:
             template = json.loads(template_name)
@@ -1070,33 +1056,116 @@ async def websearch(
             )
         template = BUILTIN_TEMPLATES[template_name]
 
-    # Validate url_template exists
     if not template.get("url_template"):
         raise ValueError(
             f"Template '{template.get('name', template_name)}' is not a search "
             "template (no url_template). Use webfetch for page templates."
         )
 
-    # 3. Map universal params to engine-specific url_params
     engine_key = engine if engine in ("duckduckgo", "google") else "custom"
-    url_params = map_search_params(query, engine_key, region, safe_search)
-
-    # 4. Resolve URL template
-    resolved_url = resolve_url_template(template, url_params)
-
-    # Google safe_search: append &safe=active after URL resolution
+    params = map_search_params(query, engine_key, region, safe_search)
+    resolved_url = resolve_url_template(template, params)
     if engine_key == "google" and safe_search is True:
         resolved_url += "&safe=active"
+    return engine, template, resolved_url
+
+
+def _resolve_duckduckgo_lite_candidate(
+    query: str, region: str | None, safe_search: bool | None
+) -> tuple[str, dict, str]:
+    template = dict(BUILTIN_TEMPLATES["duckduckgo-search"])
+    template.update(
+        {
+            "name": "duckduckgo-lite-search",
+            "url_template": "https://lite.duckduckgo.com/lite/?q={query}&kl={kl}&kp={kp}",
+            "sections": [
+                {
+                    "name": "Results",
+                    "selector": "a.result-link",
+                    "multiple": True,
+                    "max_items": 10,
+                    "children": [
+                        {"name": "Title", "selector": "", "format": "text"},
+                        {
+                            "name": "URL",
+                            "selector": "",
+                            "format": "attribute",
+                            "attribute": "href",
+                            "transform": "decode_ddg_url",
+                        },
+                    ],
+                }
+            ],
+        }
+    )
+    params = map_search_params(query, "duckduckgo", region, safe_search)
+    return "duckduckgo-lite", template, resolve_url_template(template, params)
 
-    # 5. Fetch
-    html = await fetch_html(resolved_url, template, block_media, retry=True)
 
-    # 6. Parse and extract
-    soup = BeautifulSoup(html, "html.parser")
-    sections_data = extract_template(soup, template, origin="", max_results_override=max_results)
+def _resolve_search_candidates(
+    engine: str, query: str, region: str | None, safe_search: bool | None
+) -> list[tuple[str, dict, str]]:
+    primary = _resolve_search_candidate(engine, query, region, safe_search)
+    if engine == "google":
+        return [
+            primary,
+            _resolve_search_candidate("duckduckgo", query, region, safe_search),
+            _resolve_duckduckgo_lite_candidate(query, region, safe_search),
+        ]
+    if engine == "duckduckgo":
+        return [primary, _resolve_duckduckgo_lite_candidate(query, region, safe_search)]
+    return [primary]
+
+
+@mcp.tool()
+async def websearch(
+    query: str,
+    engine: str = "duckduckgo",
+    region: str | None = None,
+    safe_search: bool | None = None,
+    max_results: int = 10,
+    block_media: bool = True,
+) -> str:
+    """
+    Search the web using template-driven search engines (Google, DuckDuckGo, or custom).
+
+    Args:
+        query: The search query string.
+        engine: Search engine: 'duckduckgo' or 'google'. Also accepts custom template names.
+        region: Region code. DDG: 'us-en', 'de-de', etc. Google: 'de-de' maps to hl=de, gl=de.
+        safe_search: Enable safe search. Maps to engine-specific params.
+        max_results: Max results to extract. Default: 10.
+        block_media: Block images/media/fonts. Default: True.
+    """
+    candidates = _resolve_search_candidates(engine, query, region, safe_search)
+    last_exc = None
+
+    for selected_engine, template, resolved_url in candidates:
+        try:
+            html = await fetch_html(resolved_url, template, block_media, retry=True)
+            soup = BeautifulSoup(html, "html.parser")
+            sections_data = extract_template(
+                soup, template, origin="", max_results_override=max_results
+            )
+            result_section = next(
+                (section for section in sections_data if section.get("type") == "search_results"),
+                None,
+            )
+            if result_section and result_section.get("items"):
+                result = compose_search_results(
+                    sections_data, template.get("name", selected_engine)
+                )
+                if selected_engine != engine:
+                    result = (
+                        f"[websearch: {engine} was unavailable; results are from "
+                        f"{selected_engine}.]\n\n{result}"
+                    )
+                return result
+            last_exc = RuntimeError(f"No results extracted from {selected_engine}.")
+        except Exception as exc:
+            last_exc = exc
 
-    # 7. Compose output
-    return compose_search_results(sections_data, template.get("name", template_name))
+    raise last_exc or RuntimeError("No search results found.")
 
 
 @mcp.tool()

searchfetch-3.3.0/searchfetch.egg-info/requires.txt

@@ -1,8 +0,0 @@
-mcp>=1.28.1
-cloakbrowser>=0.4.5
-beautifulsoup4>=4.15.0
-markdownify>=1.2.2
-
-[dev]
-pytest>=9.1.1
-ruff>=0.15.20