Update app.py

app.py

@@ -9,6 +9,7 @@ import re
 from huggingface_hub import hf_hub_download
 import tempfile
 import numpy as np
+from typing import List, Tuple, Dict, Any # REQUIRED FOR MCP
 
 # --- 1. CONFIGURATION & SECRETS ---
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY")
@@ -197,33 +198,40 @@ def process_pipeline(image, conf_threshold):
     except Exception as e:
         return None, f"System Failure: {str(e)}", "", None, str(e), None, []
 
-# --- 6. MCP API FUNCTIONS (Granular) ---
-# These wrappers are exposed as API endpoints for Claude/MCP to use independently.
+# --- 6. MCP API FUNCTIONS (Granular & Typed) ---
+# IMPORTANT: These functions use Type Hints so Gradio knows how to define the MCP Tool.
 
-def api_detect_only(image, conf):
+def api_detect_only(image: Image.Image, conf: float = 0.25) -> Tuple[Image.Image, Any]:
     """API: Returns JSON detection data and annotated image."""
     ann_img, dets, _ = core_detect(image, conf)
     return ann_img, {"count": len(dets), "detections": dets}
 
-def api_translate_only(keywords_text):
+def api_translate_only(keywords_text: str) -> Tuple[str, str]:
     """API: Translates a comma-separated string of keywords."""
-    # Convert string input "sun, life" to list ["sun", "life"]
     if isinstance(keywords_text, str):
         keywords = [k.strip() for k in keywords_text.split(',')]
     else:
-        keywords = keywords_text
+        keywords = ["Unknown"]
     mystical, academic = core_translate(keywords)
-    return mystical, academic
+    # Strip HTML tags for clean API text
+    clean_mystical = re.sub('<[^<]+?>', '', mystical) 
+    return clean_mystical, academic
 
-def api_get_supported_codes():
+def api_get_supported_codes() -> Dict[str, Any]:
     """API: Returns the full Gardiner list."""
     return gardiner_data
 
-def api_get_analytics(json_data):
-    """API: Generates plots from JSON detection data."""
-    # Mock image size if not provided, mostly for heatmap relative positions
+def api_get_analytics(json_data: Dict[str, Any]) -> Image.Image:
+    """API: Generates a plot Image from JSON detection data."""
+    # MCP cannot display interactive plots, so we convert to Image
     dets = json_data.get("detections", [])
-    return core_analytics(dets, 1000, 1000)
+    fig = core_analytics(dets, 1000, 1000)
+    
+    # Save figure to buffer and reload as PIL Image
+    buf = tempfile.NamedTemporaryFile(suffix=".png", delete=False)
+    fig.savefig(buf.name, format='png', facecolor='#0f0f23')
+    plt.close(fig)
+    return Image.open(buf.name)
 
 # --- 7. HTML GENERATORS ---
 
@@ -401,28 +409,50 @@ with gr.Blocks(title="Rosetta Decoder Ultimate") as demo:
     
     # --- Hidden API Buttons for MCP (Granular Access) ---
     # These buttons are not visible in the UI but expose the API endpoints for Claude
+    # We call the TYPED functions here so Gradio registers the tool correctly.
     
-    # 1. Detect Only
-    btn_mcp_detect = gr.Button(visible=False)
-    api_detect_out_img = gr.Image(visible=False)
-    api_detect_out_json = gr.JSON(visible=False)
-    btn_mcp_detect.click(fn=api_detect_only, inputs=[gr.Image(visible=False), gr.Number(visible=False)], outputs=[api_detect_out_img, api_detect_out_json], api_name="detect_hieroglyphs")
-
-    # 2. Translate Only
-    btn_mcp_trans = gr.Button(visible=False)
-    api_trans_out_mystical = gr.Textbox(visible=False)
-    api_trans_out_academic = gr.Textbox(visible=False)
-    btn_mcp_trans.click(fn=api_translate_only, inputs=[gr.Textbox(visible=False)], outputs=[api_trans_out_mystical, api_trans_out_academic], api_name="translate_hieroglyphs")
-
-    # 3. Analytics Only
-    btn_mcp_analytics = gr.Button(visible=False)
-    api_analytics_out = gr.Plot(visible=False)
-    btn_mcp_analytics.click(fn=api_get_analytics, inputs=[gr.JSON(visible=False)], outputs=[api_analytics_out], api_name="get_analytics")
-
-    # 4. Get List
-    btn_mcp_list = gr.Button(visible=False)
-    api_list_out = gr.JSON(visible=False)
-    btn_mcp_list.click(fn=api_get_supported_codes, inputs=[], outputs=[api_list_out], api_name="get_supported_codes")
+    with gr.Column(visible=False):
+        # 1. Detect Only
+        btn_mcp_detect = gr.Button("MCP Detect")
+        api_detect_out_img = gr.Image()
+        api_detect_out_json = gr.JSON()
+        btn_mcp_detect.click(
+            fn=api_detect_only, 
+            inputs=[gr.Image(label="Input Image"), gr.Number(value=0.25, label="Conf")], 
+            outputs=[api_detect_out_img, api_detect_out_json], 
+            api_name="detect_hieroglyphs"
+        )
+
+        # 2. Translate Only
+        btn_mcp_trans = gr.Button("MCP Translate")
+        api_trans_out_mystical = gr.Textbox()
+        api_trans_out_academic = gr.Textbox()
+        btn_mcp_trans.click(
+            fn=api_translate_only, 
+            inputs=[gr.Textbox(label="Keywords")], 
+            outputs=[api_trans_out_mystical, api_trans_out_academic], 
+            api_name="translate_hieroglyphs"
+        )
+
+        # 3. Analytics Only (Returns IMAGE for MCP)
+        btn_mcp_analytics = gr.Button("MCP Analytics")
+        api_analytics_out = gr.Image() # Changed to Image for MCP
+        btn_mcp_analytics.click(
+            fn=api_get_analytics, 
+            inputs=[gr.JSON(label="Data")], 
+            outputs=[api_analytics_out], 
+            api_name="get_analytics"
+        )
+
+        # 4. Get List
+        btn_mcp_list = gr.Button("MCP List")
+        api_list_out = gr.JSON()
+        btn_mcp_list.click(
+            fn=api_get_supported_codes, 
+            inputs=[], 
+            outputs=[api_list_out], 
+            api_name="get_supported_codes"
+        )
 
     # --- Visible UI ---
     with gr.Row(elem_classes="header-row"):
@@ -466,7 +496,8 @@ with gr.Blocks(title="Rosetta Decoder Ultimate") as demo:
         # TAB 3: SETUP
         with gr.TabItem("🤖 SYSTEM SETUP"):
             gr.HTML(guide_html)
-            gr.Code(value=claude_json_content, language="json", label="claude_desktop_config.json", interactive=False, lines=25, container=True)
+            # Expanded code box as requested
+            gr.Code(value=claude_json_content, language="json", label="claude_desktop_config.json", interactive=False, lines=30)
 
         # TAB 4: GARDINER CODES
         with gr.TabItem("𓀀 GARDINER CODES"):