Update app.py

app.py

@@ -1,10 +1,9 @@
 # File: main/app.py
-# Purpose: One Space that offers five tools/tabs:
+# Purpose: One Space that offers four tools/tabs:
 #   1) Fetch — extract relevant page content (title, metadata, clean text, hyperlinks)
-#   2) DDG (Concise) — ultra-succinct DuckDuckGo search that emits JSONL with short keys to minimize tokens
-#   3) Websearch — structured DuckDuckGo search via LangChain tool (JSON)
-#   4) Unstructured DDG — raw DuckDuckGo list[dict] rendered into a Textbox
-#   5) Generate Sitemap — LIMITED: grouped internal/external links with an optional per-domain cap (and a .md download)
+#   2) DuckDuckGo Search — compact JSONL search output (short keys to minimize tokens)
+#   3) Generate Sitemap — grouped internal/external links with an optional per-domain cap
+#   4) Python Code Executor — run Python code and capture stdout/errors
 
 from __future__ import annotations
 
@@ -12,14 +11,13 @@ import re
 import json
 import sys
 from io import StringIO
-from typing import List, Dict, Literal, Tuple
+from typing import List, Dict, Tuple
 
 import gradio as gr
 import requests
 from bs4 import BeautifulSoup
 from readability import Document
 from urllib.parse import urljoin, urldefrag, urlparse
-from langchain_community.tools import DuckDuckGoSearchResults
 from duckduckgo_search import DDGS
 
 
@@ -320,53 +318,16 @@ def Fetch_Webpage(  # <-- MCP tool #1 (Fetch)
     return md or "No content could be extracted."
 
 
-# ==========================
-# Websearch: DuckDuckGo tool
-# ==========================
-
-def Search_Structured(  # <-- MCP tool #3 (Structured DDG)
-    input_query: str,
-    max_results: int = 5,
-) -> List[Dict[Literal["snippet", "title", "link"], str]]:
-    """
-    Run a DuckDuckGo search and return structured results as a list of dictionaries.
-    (Layman's terms: search DDG and get clean JSON objects.)
-    """
-    if not input_query or not input_query.strip():
-        return []
-
-    # Create the search tool (LangChain community wrapper)
-    search = DuckDuckGoSearchResults(output_format="list", num_results=max_results)
-
-    # Run the search and return results as a list of dicts
-    results = search.invoke(input_query)
-    return results
-
-
-# ========================================
-# Unstructured DDG: raw list into Textbox
-# ========================================
-
-def Search_Raw(  # <-- MCP tool #4 (Unstructured DDG)
-    query: str,
-) -> list[dict]:
-    """
-    Run a DuckDuckGo search using the native `duckduckgo_search` client and return the
-    raw Python list of dictionaries from the library.
-    (Layman's terms: search DDG and show exactly what the library returns.)
-    """
-    if not query or not query.strip():
-        return []
-    with DDGS() as ddgs:
-        results = ddgs.text(query, max_results=5)
-    return results
+# ===============================
+# DuckDuckGo Search (JSONL lines)
+# ===============================
 
 
 # ============================================
 # Concise DDG: ultra-succinct JSONL for tokens
 # ============================================
 
-def Search_Concise(  # <-- MCP tool #2 (Concise DDG)
+def Search_DuckDuckGo(  # <-- MCP tool #2 (DDG Search)
     query: str,
     max_results: int = 5,
     include_snippets: bool = False,
@@ -595,7 +556,7 @@ fetch_interface = gr.Interface(
 
 # --- Concise DDG tab (JSONL with short keys, minimal tokens) ---
 concise_interface = gr.Interface(
-    fn=Search_Concise,
+    fn=Search_DuckDuckGo,
     inputs=[
         gr.Textbox(label="Query", placeholder="topic OR site:example.com"),
         gr.Slider(minimum=1, maximum=20, value=5, step=1, label="Max results"),
@@ -605,7 +566,7 @@ concise_interface = gr.Interface(
         gr.Slider(minimum=20, maximum=120, value=80, step=5, label="Max title chars"),
     ],
     outputs=gr.Textbox(label="Results (JSONL)", interactive=False),
-    title="DuckDuckGo Search (Concise)",
+    title="DuckDuckGo Search",
     description="Emits JSONL with short keys (t,u[,s]). Defaults avoid snippets and duplicate domains.",
     api_description=(
         "Run a DuckDuckGo search and return newline-delimited JSON with short keys: "
@@ -617,39 +578,7 @@ concise_interface = gr.Interface(
     submit_btn="Search",
 )
 
-# --- Websearch tab (structured DDG via LangChain) ---
-websearch_interface = gr.Interface(
-    fn=Search_Structured,  # connect the function to the UI
-    inputs=[
-        gr.Textbox(value="", label="Search query", placeholder="site:example.com interesting topic"),
-        gr.Slider(minimum=1, maximum=20, value=5, step=1, label="Max results"),
-    ],
-    outputs=gr.JSON(label="Search results"),
-    title="DuckDuckGo Search (Structured)",
-    description="Search the web using DuckDuckGo; returns snippet, title, and link.",
-    api_description=(
-        "Run a DuckDuckGo web search and return a list of objects with keys: "
-        "snippet, title, and link. Configure the number of results."
-    ),
-    allow_flagging="never",
-    theme="Nymbo/Nymbo_Theme",
-)
-
-# --- Unstructured DDG tab (matches your separate app���s output) ---
-unstructured_interface = gr.Interface(
-    fn=Search_Raw,
-    inputs=gr.Textbox(label="Enter Search Query"),
-    outputs=gr.Textbox(label="Results", interactive=False),
-    title="DuckDuckGo Search (Raw)",
-    description="Returns the raw list of results (list[dict]) shown as text.",
-    api_description=(
-        "Run DuckDuckGo via the native client and return the raw list[dict] as "
-        "provided by duckduckgo_search (fields like title, href/link, body/snippet)."
-    ),
-    allow_flagging="never",
-    theme="Nymbo/Nymbo_Theme",
-    submit_btn="Search",
-)
+## Removed Structured and Raw tabs
 
 # --- Generate Sitemap tab (LIMITED, grouped + optional per-domain cap) ---
 sitemap_interface = gr.Interface(
@@ -692,12 +621,10 @@ code_interface = gr.Interface(
 
 # --- Combine all into a single app with tabs ---
 demo = gr.TabbedInterface(
-    interface_list=[fetch_interface, concise_interface, websearch_interface, unstructured_interface, sitemap_interface, code_interface],
+    interface_list=[fetch_interface, concise_interface, sitemap_interface, code_interface],
     tab_names=[
         "Fetch Webpage",
-        "DuckDuckGo Search (Concise)",
-        "DuckDuckGo Search (Structured)",
-        "DuckDuckGo Search (Raw)",
+        "DuckDuckGo Search",
         "Generate Sitemap",
         "Python Code Executor",
     ],