Update app.py

app.py

@@ -1,12 +1,11 @@
 # Purpose: One Space that offers up to seven tools/tabs (all exposed as MCP tools):
 #   1) Fetch — convert webpages to clean Markdown format
-#   2) DuckDuckGo Search — compact JSONL search output (short keys to minimize tokens)
-#   3) Python Code Executor — run Python code and capture stdout/errors
-#   4) Kokoro TTS — synthesize speech from text using Kokoro-82M with 54 voice options
+#   2) Web Search — compact JSONL search output (DuckDuckGo backend)
+#   3) Code Interpreter — execute Python code and capture stdout/errors
+#   4) Generate Speech — synthesize speech from text using Kokoro-82M with 54 voice options
 #   5) Memory Manager — lightweight JSON-based local memory store
-#   6) Image Generation - HF serverless inference providers (requires HF_READ_TOKEN)
-#   7) Video Generation - HF serverless inference providers (requires HF_READ_TOKEN)
-#   8) Deep Research
+#   6) Generate Image - HF serverless inference providers (requires HF_READ_TOKEN)
+#   7) Generate Video - HF serverless inference providers (requires HF_READ_TOKEN)
 
 from __future__ import annotations
 
@@ -349,7 +348,7 @@ def _truncate_markdown(markdown: str, max_chars: int) -> Tuple[str, Dict[str, an
     return truncated + truncation_notice, metadata
 
 
-def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
+def Web_Fetch(  # <-- MCP tool #1 (Fetch)
     url: Annotated[str, "The absolute URL to fetch (must return HTML)."],
     max_chars: Annotated[int, "Maximum characters to return (0 = no limit, full page content)."] = 3000,
     strip_selectors: Annotated[str, "CSS selectors to remove (comma-separated, e.g., '.header, .footer, nav')."] = "",
@@ -375,10 +374,10 @@ def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
              depending on the url_scraper setting. Content is length-limited by max_chars
              and includes detailed truncation metadata when content is truncated.
     """
-    _log_call_start("Fetch_Webpage", url=url, max_chars=max_chars, strip_selectors=strip_selectors, url_scraper=url_scraper, offset=offset)
+    _log_call_start("Web_Fetch", url=url, max_chars=max_chars, strip_selectors=strip_selectors, url_scraper=url_scraper, offset=offset)
     if not url or not url.strip():
         result = "Please enter a valid URL."
-        _log_call_end("Fetch_Webpage", _truncate_for_log(result))
+        _log_call_end("Web_Fetch", _truncate_for_log(result))
         return result
 
     try:
@@ -386,14 +385,14 @@ def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
         resp.raise_for_status()
     except requests.exceptions.RequestException as e:
         result = f"An error occurred: {e}"
-        _log_call_end("Fetch_Webpage", _truncate_for_log(result))
+        _log_call_end("Web_Fetch", _truncate_for_log(result))
         return result
 
     final_url = str(resp.url)
     ctype = resp.headers.get("Content-Type", "")
     if "html" not in ctype.lower():
         result = f"Unsupported content type for extraction: {ctype or 'unknown'}"
-        _log_call_end("Fetch_Webpage", _truncate_for_log(result))
+        _log_call_end("Web_Fetch", _truncate_for_log(result))
         return result
 
     # Decode to text
@@ -419,7 +418,7 @@ def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
         if offset > 0:
             if offset >= len(full_result):
                 result = f"Offset {offset} exceeds content length ({len(full_result)} characters). Content ends at position {len(full_result)}."
-                _log_call_end("Fetch_Webpage", _truncate_for_log(result))
+                _log_call_end("Web_Fetch", _truncate_for_log(result))
                 return result
             result = full_result[offset:]
         else:
@@ -433,12 +432,12 @@ def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
                 metadata["total_chars_estimate"] = len(full_result)
                 metadata["next_cursor"] = offset + metadata["next_cursor"] if metadata["next_cursor"] else None
     
-    _log_call_end("Fetch_Webpage", f"chars={len(result)}, url_scraper={url_scraper}, offset={offset}")
+    _log_call_end("Web_Fetch", f"chars={len(result)}, url_scraper={url_scraper}, offset={offset}")
     return result
 
 
 # ============================================
-# DuckDuckGo Search: Enhanced with error handling & rate limiting
+# Web Search (DuckDuckGo backend): Enhanced with error handling & rate limiting
 # ============================================
 
 import asyncio
@@ -527,7 +526,7 @@ class SlowHost(Exception):
 def _fetch_page_markdown_fast(url: str, max_chars: int = 3000, timeout: float = 10.0) -> str:
     """Fetch a single URL quickly; raise SlowHost on timeout.
 
-    Uses a shorter HTTP timeout to detect slow hosts, then reuses Fetch_Webpage
+    Uses a shorter HTTP timeout to detect slow hosts, then reuses Web_Fetch
     logic for conversion to Markdown. Returns empty string on non-timeout errors.
     """
     try:
@@ -545,7 +544,7 @@ def _fetch_page_markdown_fast(url: str, max_chars: int = 3000, timeout: float =
     if "html" not in ctype.lower():
         return ""
 
-    # Decode to text and convert similar to Fetch_Webpage (lean path)
+    # Decode to text and convert similar to Web_Fetch (lean path)
     resp.encoding = resp.encoding or resp.apparent_encoding
     html = resp.text
     soup = BeautifulSoup(html, "lxml")
@@ -672,7 +671,7 @@ def _format_search_result(result: dict, search_type: str, index: int) -> list[st
     return lines
 
 
-def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
+def Web_Search(  # <-- MCP tool #2 (Web Search)
     query: Annotated[str, "The search query (supports operators like site:, quotes, OR)."],
     max_results: Annotated[int, "Number of results to return (1–20)."] = 5,
     page: Annotated[int, "Page number for pagination (1-based, each page contains max_results items)."] = 1,
@@ -680,7 +679,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
     offset: Annotated[int, "Result offset to start from (overrides page if > 0, for precise continuation)."] = 0,
 ) -> str:
     """
-    Run a DuckDuckGo search and return formatted results with support for multiple content types.
+    Run a web search (DuckDuckGo backend) and return formatted results with support for multiple content types.
     
     Features smart fallback: if 'news' search returns no results, automatically retries with 'text' 
     search to catch sources like Hacker News that might not appear in news-specific results.
@@ -709,10 +708,10 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
              If 'news' search fails, results include a note about automatic fallback to 'text' search.
              Includes next_offset information for easy continuation.
     """
-    _log_call_start("Search_DuckDuckGo", query=query, max_results=max_results, page=page, search_type=search_type, offset=offset)
+    _log_call_start("Web_Search", query=query, max_results=max_results, page=page, search_type=search_type, offset=offset)
     if not query or not query.strip():
         result = "No search query provided. Please enter a search term."
-        _log_call_end("Search_DuckDuckGo", _truncate_for_log(result))
+        _log_call_end("Web_Search", _truncate_for_log(result))
         return result
 
     # Validate parameters
@@ -784,7 +783,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
         raw = _perform_search(search_type)
     except Exception as e:
         result = f"Error: {str(e)}"
-        _log_call_end("Search_DuckDuckGo", _truncate_for_log(result))
+        _log_call_end("Web_Search", _truncate_for_log(result))
         return result
 
     # Smart fallback: if news search returns empty and we haven't tried text yet, try text search
@@ -801,7 +800,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
     if not raw:
         fallback_note = " (also tried 'text' search as fallback)" if original_search_type == "news" and used_fallback else ""
         result = f"No {original_search_type} results found for query: {query}{fallback_note}"
-        _log_call_end("Search_DuckDuckGo", _truncate_for_log(result))
+        _log_call_end("Web_Search", _truncate_for_log(result))
         return result
 
     # Apply pagination by slicing the results
@@ -812,7 +811,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
             result = f"Offset {actual_offset} exceeds available results ({len(raw)} total). Try offset=0 to start from beginning."
         else:
             result = f"No {original_search_type} results found on page {calculated_page} for query: {query}. Try page 1 or reduce page number."
-        _log_call_end("Search_DuckDuckGo", _truncate_for_log(result))
+        _log_call_end("Web_Search", _truncate_for_log(result))
         return result
 
     # Format results based on search type
@@ -854,7 +853,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
     search_info = f"type={original_search_type}"
     if used_fallback:
         search_info += "→text"
-    _log_call_end("Search_DuckDuckGo", f"{search_info} page={calculated_page} offset={actual_offset} results={len(paginated_results)} chars={len(result)}")
+    _log_call_end("Web_Search", f"{search_info} page={calculated_page} offset={actual_offset} results={len(paginated_results)} chars={len(result)}")
     return result
 
 
@@ -862,7 +861,7 @@ def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
 # Code Execution: Python (MCP tool #3)
 # ======================================
 
-def Execute_Python(code: Annotated[str, "Python source code to run; stdout is captured and returned."]) -> str:
+def Code_Interpreter(code: Annotated[str, "Python source code to run; stdout is captured and returned."]) -> str:
     """
     Execute arbitrary Python code and return captured stdout or an error message.
 
@@ -873,10 +872,10 @@ def Execute_Python(code: Annotated[str, "Python source code to run; stdout is ca
         str: Combined stdout produced by the code, or the exception text if
         execution failed.
     """
-    _log_call_start("Execute_Python", code=_truncate_for_log(code or "", 300))
+    _log_call_start("Code_Interpreter", code=_truncate_for_log(code or "", 300))
     if code is None:
         result = "No code provided."
-        _log_call_end("Execute_Python", result)
+        _log_call_end("Code_Interpreter", result)
         return result
 
     old_stdout = sys.stdout
@@ -888,12 +887,12 @@ def Execute_Python(code: Annotated[str, "Python source code to run; stdout is ca
         result = str(e)
     finally:
         sys.stdout = old_stdout
-    _log_call_end("Execute_Python", _truncate_for_log(result))
+    _log_call_end("Code_Interpreter", _truncate_for_log(result))
     return result
 
 
 # ==========================
-# Kokoro TTS (MCP tool #4)
+# Generate Speech (MCP tool #4)
 # ==========================
 
 _KOKORO_STATE = {
@@ -1451,7 +1450,7 @@ def _mem_delete(
 
 # --- Fetch tab (compact controllable extraction) ---
 fetch_interface = gr.Interface(
-    fn=Fetch_Webpage,
+    fn=Web_Fetch,
     inputs=[
         gr.Textbox(label="URL", placeholder="https://example.com/article"),
         gr.Slider(
@@ -1483,7 +1482,7 @@ fetch_interface = gr.Interface(
         ),
     ],
     outputs=gr.Markdown(label="Extracted Content"),
-    title="Fetch Webpage",
+    title="Web Fetch",
     description=(
         "<div style=\"text-align:center\">Convert any webpage to clean Markdown format with precision controls, or extract all links. Supports custom element removal, length limits, and pagination with offset.</div>"
     ),
@@ -1500,9 +1499,9 @@ fetch_interface = gr.Interface(
     flagging_mode="never",
 )
 
-# --- Simplified DDG tab (readable output only) ---
+# --- Web Search tab (readable output only) ---
 concise_interface = gr.Interface(
-    fn=Search_DuckDuckGo,
+    fn=Web_Search,
     inputs=[
         gr.Textbox(label="Query", placeholder="topic OR site:example.com"),
         gr.Slider(minimum=1, maximum=20, value=5, step=1, label="Max results"),
@@ -1523,12 +1522,12 @@ concise_interface = gr.Interface(
         ),
     ],
     outputs=gr.Textbox(label="Search Results", interactive=False),
-    title="DuckDuckGo Search",
+    title="Web Search",
     description=(
         "<div style=\"text-align:center\">Multi-type web search with readable output format, date detection, and flexible pagination. Supports text, news, images, videos, and books. Features smart fallback for news searches and precise offset control.</div>"
     ),
     api_description=(
-        "Run a DuckDuckGo search with support for multiple content types and return formatted results. "
+        "Run a web search (DuckDuckGo backend) with support for multiple content types and return formatted results. "
         "Features smart fallback: if 'news' search returns no results, automatically retries with 'text' search "
         "to catch sources like Hacker News that might not appear in news-specific results. "
         "Supports advanced search operators: site: for specific domains, quotes for exact phrases, "
@@ -1545,12 +1544,12 @@ concise_interface = gr.Interface(
 
 ##
 
-# --- Execute Python tab (simple code interpreter) ---
+# --- Code Interpreter tab (Python) ---
 code_interface = gr.Interface(
-    fn=Execute_Python,
+    fn=Code_Interpreter,
     inputs=gr.Code(label="Python Code", language="python"),
     outputs=gr.Textbox(label="Output"),
-    title="Python Code Executor",
+    title="Code Interpreter",
     description=(
         "<div style=\"text-align:center\">Execute Python code and see the output.</div>"
     ),
@@ -1575,7 +1574,7 @@ CSS_STYLES = """
     /* Place bold tools list on line 2, normal auth note on line 3 (below title) */
     .app-title::before {
         grid-row: 2;
-        content: "Fetch Webpage | Search DuckDuckGo | Python Interpreter | Memory Manager | Kokoro TTS | Image Generation | Video Generation | Deep Research";
+    content: "Web Fetch | Web Search | Code Interpreter | Memory Manager | Generate Speech | Generate Image | Generate Video | Deep Research";
         display: block;
         font-size: 1rem;
         font-weight: 700;
@@ -1753,7 +1752,7 @@ CSS_STYLES = """
     }
 """
 
-# --- Kokoro TTS tab (text to speech) ---
+# --- Generate Speech tab (text to speech) ---
 available_voices = get_kokoro_voices()
 kokoro_interface = gr.Interface(
     fn=Generate_Speech,
@@ -1768,7 +1767,7 @@ kokoro_interface = gr.Interface(
         ),
     ],
     outputs=gr.Audio(label="Audio", type="numpy", format="wav", show_download_button=True),
-    title="Kokoro TTS",
+    title="Generate Speech",
     description=(
         "<div style=\"text-align:center\">Generate speech with Kokoro-82M. Supports multiple languages and accents. Runs on CPU or CUDA if available.</div>"
     ),
@@ -1893,7 +1892,7 @@ memory_interface = gr.Interface(
 )
 
 # ==========================
-# Image Generation (Serverless)
+# Generate Image (Serverless)
 # ==========================
 
 HF_API_TOKEN = os.getenv("HF_READ_TOKEN")
@@ -2005,7 +2004,7 @@ image_generation_interface = gr.Interface(
         gr.Slider(minimum=64, maximum=1216, value=1024, step=32, label="Height"),
     ],
     outputs=gr.Image(label="Generated Image"),
-    title="Image Generation",
+    title="Generate Image",
     description=(
         "<div style=\"text-align:center\">Generate images via Hugging Face serverless inference. "
         "Default model is FLUX.1-Krea-dev.</div>"
@@ -2024,7 +2023,7 @@ image_generation_interface = gr.Interface(
 )
 
 # ==========================
-# Video Generation (Serverless)
+# Generate Video (Serverless)
 # ==========================
 
 def _write_video_tmp(data_iter_or_bytes: object, suffix: str = ".mp4") -> str:
@@ -2201,7 +2200,7 @@ video_generation_interface = gr.Interface(
         gr.Slider(minimum=1.0, maximum=10.0, value=4.0, step=0.5, label="Duration (s)"),
     ],
     outputs=gr.Video(label="Generated Video", show_download_button=True, format="mp4"),
-    title="Video Generation",
+    title="Generate Video",
     description=(
     "<div style=\"text-align:center\">Generate short videos via Hugging Face serverless inference. "
     "Default model is Wan2.2-T2V-A14B.</div>"
@@ -2279,13 +2278,13 @@ def _search_urls_only(query: str, max_results: int) -> list[str]:
 
 
 def _fetch_page_markdown(url: str, max_chars: int = 3000) -> str:
-    """Fetch a single URL and return cleaned Markdown using existing Fetch_Webpage.
+    """Fetch a single URL and return cleaned Markdown using existing Web_Fetch.
 
     Returns empty string on error.
     """
     try:
         # Intentionally skip global fetch rate limiting for Deep Research speed.
-        return Fetch_Webpage(url=url, max_chars=max_chars, strip_selectors="", url_scraper=False, offset=0)  # type: ignore[misc]
+        return Web_Fetch(url=url, max_chars=max_chars, strip_selectors="", url_scraper=False, offset=0)  # type: ignore[misc]
     except Exception:
         return ""
 
@@ -2753,13 +2752,13 @@ _interfaces = [
     deep_research_interface,
 ]
 _tab_names = [
-    "Fetch Webpage",
-    "DuckDuckGo Search",
-    "Python Code Executor",
+    "Web Fetch",
+    "Web Search",
+    "Code Interpreter",
     "Memory Manager",
-    "Kokoro TTS",
-    "Image Generation",
-    "Video Generation",
+    "Generate Speech",
+    "Generate Image",
+    "Generate Video",
     "Deep Research",
 ]
 
@@ -2831,10 +2830,10 @@ with gr.Blocks(title="Nymbo/Tools MCP", theme="Nymbo/Nymbo_Theme", css=CSS_STYLE
                         <div class="info-card__body">
                             <h3>Tool Notes &amp; Kokoro Voice Legend</h3>
                             <p>
-                                No authentication required for: <code>Fetch_Webpage</code>, <code>Search_DuckDuckGo</code>,
-                                <code>Execute_Python</code>, and <code>Generate_Speech</code>.
+                                No authentication required for: <code>Web_Fetch</code>, <code>Web_Search</code>,
+                                <code>Code_Interpreter</code>, and <code>Generate_Speech</code>.
                             </p>
-                            <p><strong>Kokoro TTS voice prefixes</strong></p>
+                            <p><strong>Kokoro voice prefixes</strong></p>
                             <ul class="info-list" style="display:grid;grid-template-columns:repeat(2,minmax(160px,1fr));gap:6px 16px;">
                                 <li><code>af</code> — American female</li>
                                 <li><code>am</code> — American male</li>