Update app.py

app.py

@@ -9,6 +9,7 @@ import re
 from huggingface_hub import hf_hub_download
 import tempfile
 import numpy as np
+# IMPORTANT: Importing necessary types for MCP definitions
 from typing import List, Tuple, Dict, Any
 
 # --- 1. CONFIGURATION & SECRETS ---
@@ -20,6 +21,8 @@ MODEL_FILENAME = "best.pt"
 JSON_DB_PATH = "gardiner_codes.json"
 
 os.environ["YOLO_CONFIG_DIR"] = "/tmp/Ultralytics"
+# Ensure temp directory exists for plot saving
+os.makedirs("/tmp/gradio_results", exist_ok=True)
 
 # --- 2. DATA LOADING ---
 
@@ -164,7 +167,7 @@ except Exception as e:
     model = None
 
 # --- 5. MAIN UI PIPELINE (Orchestrator) ---
-# Used for the Web Interface (Returns complex Objects)
+# Used *only* by the Web Interface (Returns complex Objects like gr.Plot)
 
 def process_pipeline(image, conf_threshold):
     if image is None: return None, "", "", None, "", None, []
@@ -187,51 +190,66 @@ def process_pipeline(image, conf_threshold):
         return None, f"System Failure: {str(e)}", "", None, str(e), None, []
 
 # --- 6. MCP API FUNCTIONS (Optimized for Claude) ---
-# Changes: Short Names, File Path Returns (No Base64)
+# These functions are explicitly defined as MCP tools at the bottom of the script.
+# They use TYPE HINTS so Claude knows what arguments to provide.
+# They return FILE PATHS (strings) for images, not base64 objects.
 
-def api_detect(image: Image.Image, conf: float = 0.25) -> Tuple[str, Dict[str, Any]]:
+def detect_hieroglyphs(image: Image.Image, conf: float = 0.25) -> Tuple[str, Dict[str, Any]]:
     """
-    detect: Scans image for hieroglyphs. 
-    Returns: 1. File path to the annotated image. 2. JSON summary of findings.
+    Scans an image for Egyptian hieroglyphs.
+    Returns a tuple containing:
+    1. The file path to the annotated image result.
+    2. A JSON summary of detected codes and their bounding boxes.
     """
     ann_img, dets, _ = core_detect(image, conf)
     
-    # SAVE to temp file and return PATH string
-    with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as t:
+    # Save to a temp file and return the PATH string
+    # Using a fixed temp dir ensures the path is accessible
+    with tempfile.NamedTemporaryFile(dir="/tmp/gradio_results", suffix=".jpg", delete=False) as t:
         ann_img.save(t.name)
         path = t.name
         
     return path, {"count": len(dets), "detections": dets}
 
-def api_translate(keywords_text: str) -> Tuple[str, str]:
+def translate_codes(keywords_text: str) -> Tuple[str, str]:
     """
-    translate: Takes comma-separated codes (e.g. 'G43, X1'). Returns Mystical & Academic text.
+    Takes a comma-separated string of Gardiner codes (e.g., 'G43, X1, N5').
+    Returns two translations: a mystical interpretation and an academic translation.
     """
     if isinstance(keywords_text, str):
         keywords = [k.strip() for k in keywords_text.split(',')]
     else:
         keywords = ["Unknown"]
     mystical, academic = core_translate(keywords)
+    # Strip HTML tags for clean text return to Claude
     clean_mystical = re.sub('<[^<]+?>', '', mystical) 
     return clean_mystical, academic
 
-def api_analytics(json_data: Dict[str, Any]) -> str:
+def get_analytics_chart(json_data: Dict[str, Any]) -> str:
     """
-    analytics: Takes JSON detection data. 
-    Returns: File path to the generated statistical chart image.
+    Generates statistical charts based on detection data.
+    Input: The JSON output from the 'detect_hieroglyphs' tool.
+    Returns: The file path to the generated chart image.
     """
     dets = json_data.get("detections", [])
-    fig = core_analytics(dets, 1000, 1000)
+    # Use fixed dimensions for consistency
+    fig = core_analytics(dets, 640, 640) 
     
-    # SAVE to temp file and return PATH string
-    with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as t:
+    if fig is None:
+        return "No data to plot."
+
+    # Save to a temp file and return the PATH string
+    with tempfile.NamedTemporaryFile(dir="/tmp/gradio_results", suffix=".png", delete=False) as t:
         fig.savefig(t.name, format='png', facecolor='#0f0f23')
         path = t.name
     plt.close(fig)
     return path
 
-def api_list_codes() -> Dict[str, Any]:
-    """list_codes: Returns the full supported Gardiner code database."""
+def list_all_codes() -> Dict[str, Any]:
+    """
+    Returns the complete database of supported Gardiner codes and their descriptions.
+    Useful for looking up specific symbol meanings.
+    """
     return gardiner_data
 
 # --- 7. HTML GENERATORS ---
@@ -398,7 +416,30 @@ guide_html = """
 </div>
 """
 
-claude_json_content = """{ "mcpServers": { "gradio": { "command": "npx", "args": [ "mcp-remote", "https://youkii-xr-hieroglyph-mcp-server.hf.space/gradio_api/mcp/", "--transport", "streamable-http" ] }, "upload_helper": { "command": "C:\\\\Python313\\\\python.exe", "args": [ "-m", "gradio", "upload-mcp", "https://youkii-xr-hieroglyph-mcp-server.hf.space/", "C:\\\\Claude_Work" ] } } }"""
+# FIX 1: Reformatted JSON string with multiline triple-quotes so it displays expanded.
+claude_json_content = """{
+  "mcpServers": {
+    "gradio": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "https://youkii-xr-hieroglyph-mcp-server.hf.space/gradio_api/mcp/",
+        "--transport",
+        "streamable-http"
+      ]
+    },
+    "upload_helper": {
+      "command": "C:\\\\Python313\\\\python.exe",
+      "args": [
+        "-m",
+        "gradio",
+        "upload-mcp",
+        "https://youkii-xr-hieroglyph-mcp-server.hf.space/",
+        "C:\\\\Claude_Work"
+      ]
+    }
+  }
+}"""
 
 trail_script = """<script>document.addEventListener('DOMContentLoaded', () => { document.addEventListener('mousemove', (e) => { if (Math.random() > 0.7) return; const dust = document.createElement('div'); dust.classList.add('gold-dust'); dust.style.left = e.clientX + 'px'; dust.style.top = e.clientY + 'px'; document.body.appendChild(dust); setTimeout(() => dust.remove(), 600); }); });</script>"""
 
@@ -408,52 +449,7 @@ with gr.Blocks(title="Rosetta Decoder Ultimate") as demo:
     gr.HTML(f"<style>{custom_css}</style>")
     gr.HTML(trail_script)
     
-    # --- Hidden API Buttons for MCP (Granular Access) ---
-    # These buttons define the TOOLS for Claude.
-    # Note: We output 'gr.Textbox' for images now, so it returns the FILE PATH string.
-    
-    with gr.Column(visible=False):
-        # 1. Detect (Returns Path & JSON)
-        btn_mcp_detect = gr.Button("Detect")
-        api_detect_out_path = gr.Textbox()
-        api_detect_out_json = gr.JSON()
-        btn_mcp_detect.click(
-            fn=api_detect, 
-            inputs=[gr.Image(label="Input Image"), gr.Number(value=0.25, label="Conf")], 
-            outputs=[api_detect_out_path, api_detect_out_json], 
-            api_name="detect" # Short name
-        )
-
-        # 2. Translate
-        btn_mcp_trans = gr.Button("Translate")
-        api_trans_out_mystical = gr.Textbox()
-        api_trans_out_academic = gr.Textbox()
-        btn_mcp_trans.click(
-            fn=api_translate, 
-            inputs=[gr.Textbox(label="Keywords")], 
-            outputs=[api_trans_out_mystical, api_trans_out_academic], 
-            api_name="translate" # Short name
-        )
-
-        # 3. Analytics (Returns Path)
-        btn_mcp_analytics = gr.Button("Analytics")
-        api_analytics_out_path = gr.Textbox() 
-        btn_mcp_analytics.click(
-            fn=api_analytics, 
-            inputs=[gr.JSON(label="Data")], 
-            outputs=[api_analytics_out_path], 
-            api_name="analytics" # Short name
-        )
-
-        # 4. Get List
-        btn_mcp_list = gr.Button("List")
-        api_list_out = gr.JSON()
-        btn_mcp_list.click(
-            fn=api_list_codes, 
-            inputs=[], 
-            outputs=[api_list_out], 
-            api_name="list_codes"
-        )
+    # (Removed hidden buttons - tools are now defined explicitly in launch())
 
     # --- Visible UI ---
     with gr.Row(elem_classes="header-row"):
@@ -497,7 +493,7 @@ with gr.Blocks(title="Rosetta Decoder Ultimate") as demo:
         # TAB 3: SETUP
         with gr.TabItem("🤖 SYSTEM SETUP"):
             gr.HTML(guide_html)
-            # Expanded Code Box
+            # JSON box will now be expanded due to multiline string above
             gr.Code(value=claude_json_content, language="json", label="claude_desktop_config.json", interactive=False, lines=30)
 
         # TAB 4: GARDINER CODES
@@ -513,4 +509,12 @@ with gr.Blocks(title="Rosetta Decoder Ultimate") as demo:
     btn_cam.click(fn=process_pipeline, inputs=[img_cam, slider_conf_cam], outputs=outputs)
 
 if __name__ == "__main__":
-    demo.launch(mcp_server=True, ssr_mode=False, allowed_paths=["/tmp", "."])
+    # FIX 2 & 3: Explicitly define short tool names and ensure images are handled correctly.
+    # By passing the functions directly to mcp_tools, Gradio uses the function name as the tool name.
+    # The /tmp/gradio_results path ensures Claude can read the generated image files.
+    demo.launch(
+        mcp_server=True, 
+        mcp_tools=[detect_hieroglyphs, translate_codes, get_analytics_chart, list_all_codes],
+        ssr_mode=False, 
+        allowed_paths=["/tmp", "/tmp/gradio_results", "."]
+    )