Update app.py

app.py

@@ -2,12 +2,12 @@ import gradio as gr
 import sqlite3
 import pandas as pd
 from huggingface_hub import hf_hub_download, HfApi
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI
 from fastapi.responses import JSONResponse
 import os
 import time
 import json
-from typing import Optional, List, Dict
+from typing import Optional
 
 # ===== CONFIGURATION =====
 TARGET_LANGUAGES = ['de', 'en', 'es', 'fr', 'it', 'ja', 'nl', 'pl', 'pt', 'ru', 'zh']
@@ -57,7 +57,6 @@ def get_db_connection():
     conn.execute("PRAGMA mmap_size = 4294967296")
     return conn
 
-# Define relations with full URLs
 RELATIONS = [
     ("IsA", f"{CONCEPTNET_BASE}/r/IsA"),
     ("PartOf", f"{CONCEPTNET_BASE}/r/PartOf"),
@@ -73,8 +72,8 @@ RELATIONS = [
     ("DerivedFrom", f"{CONCEPTNET_BASE}/r/DerivedFrom"),
 ]
 
-def get_semantic_profile_json(word: str, lang: str = 'en', max_per_relation: int = 10) -> Dict:
-    """Get semantic profile as JSON - for API"""
+def get_semantic_profile_json(word: str, lang: str = 'en', max_per_relation: int = 10):
+    """Get semantic profile as JSON"""
     if not word or lang not in TARGET_LANGUAGES:
         return {"error": "Invalid input"}
     
@@ -93,19 +92,16 @@ def get_semantic_profile_json(word: str, lang: str = 'en', max_per_relation: int
         with get_db_connection() as conn:
             cursor = conn.cursor()
             
-            # Find nodes
             cursor.execute("SELECT id, label FROM node WHERE id LIKE ? LIMIT 5", (like_path,))
             result["nodes"] = [{"id": nid, "label": label} for nid, label in cursor.fetchall()]
             
             if not result["nodes"]:
                 return {"error": "Word not found"}
             
-            # Get relations
             for rel_name, rel_url in RELATIONS:
                 outgoing = []
                 incoming = []
                 
-                # Outgoing
                 cursor.execute("""
                     SELECT en.label, e.weight, en.id
                     FROM edge e
@@ -118,7 +114,6 @@ def get_semantic_profile_json(word: str, lang: str = 'en', max_per_relation: int
                 outgoing = [{"target": label, "weight": weight, "target_id": eid} 
                            for label, weight, eid in cursor.fetchall()]
                 
-                # Incoming
                 cursor.execute("""
                     SELECT s.label, e.weight, s.id
                     FROM edge e
@@ -145,14 +140,13 @@ def get_semantic_profile_json(word: str, lang: str = 'en', max_per_relation: int
         return {"error": str(e)}
 
 def get_semantic_profile(word, lang='en', progress=gr.Progress()):
-    """Get semantic profile - for Gradio UI with better progress"""
+    """Get semantic profile with progress"""
     log_progress(f"Profile: {word} ({lang})", "INFO")
     
     if not word or lang not in TARGET_LANGUAGES:
         return "⚠️ Invalid input"
     
-    # Update progress immediately
-    progress(0, desc="🔍 Starting search...")
+    progress(0, desc="🔍 Starting...")
     
     word = word.strip().lower().replace(' ', '_')
     like_path = f"{CONCEPTNET_BASE}/c/{lang}/{word}%"
@@ -165,7 +159,6 @@ def get_semantic_profile(word, lang='en', progress=gr.Progress()):
             
             progress(0.05, desc="📍 Finding nodes...")
             
-            # Find nodes
             cursor.execute("SELECT id, label FROM node WHERE id LIKE ? LIMIT 5", (like_path,))
             nodes = cursor.fetchall()
             
@@ -182,13 +175,11 @@ def get_semantic_profile(word, lang='en', progress=gr.Progress()):
             num_relations = len(RELATIONS)
             
             for i, (rel_name, rel_url) in enumerate(RELATIONS):
-                # Update progress with relation name
                 progress((i + 0.1) / num_relations, desc=f"🔎 {rel_name}...")
                 
                 output_md += f"## {rel_name}\n\n"
                 found = False
                 
-                # Outgoing
                 start_time = time.time()
                 cursor.execute("""
                     SELECT en.label, e.weight
@@ -209,7 +200,6 @@ def get_semantic_profile(word, lang='en', progress=gr.Progress()):
                     found = True
                     total += 1
                 
-                # Incoming
                 cursor.execute("""
                     SELECT s.label, e.weight
                     FROM edge e
@@ -230,15 +220,12 @@ def get_semantic_profile(word, lang='en', progress=gr.Progress()):
                     output_md += "*No results*\n"
                 
                 output_md += "\n"
-                
-                # Update progress after each relation
-                progress((i + 1) / num_relations, desc=f"✓ {rel_name} done")
+                progress((i + 1) / num_relations, desc=f"✓ {rel_name}")
             
             progress(1.0, desc="✅ Complete!")
             
             output_md += f"---\n**Total relations:** {total}\n"
-            
-            log_progress(f"Profile complete: {total} relations", "SUCCESS")
+            log_progress(f"Complete: {total} relations", "SUCCESS")
             
             return output_md
             
@@ -251,8 +238,8 @@ def get_semantic_profile(word, lang='en', progress=gr.Progress()):
 def query_edges_json(start_node: Optional[str] = None, 
                     relation: Optional[str] = None,
                     end_node: Optional[str] = None,
-                    limit: int = 50) -> Dict:
-    """Query edges - JSON for API"""
+                    limit: int = 50):
+    """Query edges JSON"""
     query = """
         SELECT
             e.id, s.id, r.label, en.id, e.weight, s.label, en.label
@@ -267,7 +254,6 @@ def query_edges_json(start_node: Optional[str] = None,
     
     try:
         with get_db_connection() as conn:
-            # Start node
             if start_node:
                 if start_node.startswith('http://'):
                     pattern = f"{start_node}%"
@@ -276,7 +262,6 @@ def query_edges_json(start_node: Optional[str] = None,
                 query += " AND s.id LIKE ?"
                 params.append(pattern)
             
-            # Relation
             if relation:
                 if relation.startswith('http://'):
                     rel_value = relation
@@ -287,7 +272,6 @@ def query_edges_json(start_node: Optional[str] = None,
                 query += " AND r.id = ?"
                 params.append(rel_value)
             
-            # End node
             if end_node:
                 if end_node.startswith('http://'):
                     pattern = f"{end_node}%"
@@ -315,10 +299,10 @@ def query_edges_json(start_node: Optional[str] = None,
         return {"error": str(e)}
 
 def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
-    """Query builder - Gradio UI with progress"""
+    """Query builder"""
     log_progress(f"Query: start={start_node}, rel={relation}, end={end_node}", "INFO")
     
-    progress(0, desc="🔍 Building query...")
+    progress(0, desc="🔍 Building...")
     
     query = """
         SELECT
@@ -334,9 +318,8 @@ def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
     
     try:
         with get_db_connection() as conn:
-            progress(0.3, desc="📝 Adding filters...")
+            progress(0.3, desc="📝 Filters...")
             
-            # Start node
             if start_node and start_node.strip():
                 if start_node.startswith('http://'):
                     pattern = f"{start_node}%"
@@ -345,7 +328,6 @@ def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
                 query += " AND s.id LIKE ?"
                 params.append(pattern)
             
-            # Relation
             if relation and relation.strip():
                 if relation.startswith('http://'):
                     rel_value = relation
@@ -356,7 +338,6 @@ def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
                 query += " AND r.id = ?"
                 params.append(rel_value)
             
-            # End node
             if end_node and end_node.strip():
                 if end_node.startswith('http://'):
                     pattern = f"{end_node}%"
@@ -368,7 +349,7 @@ def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
             query += " ORDER BY e.weight DESC LIMIT ?"
             params.append(limit)
             
-            progress(0.6, desc="⚡ Executing...")
+            progress(0.6, desc="⚡ Running...")
             
             start_time = time.time()
             df = pd.read_sql_query(query, conn, params=params)
@@ -376,7 +357,7 @@ def run_query(start_node, relation, end_node, limit, progress=gr.Progress()):
             
             progress(1.0, desc="✅ Done!")
             
-            log_progress(f"Query done: {len(df)} rows in {elapsed:.2f}s", "SUCCESS")
+            log_progress(f"Done: {len(df)} rows in {elapsed:.2f}s", "SUCCESS")
             
             if df.empty:
                 return pd.DataFrame(), f"⚠️ No results ({elapsed:.2f}s)"
@@ -405,16 +386,12 @@ def run_raw_query(sql_query):
 def get_schema_info():
     md = f"# 📚 Schema\n\n"
     md += f"**Repo:** [{INDEXED_REPO_ID}](https://huggingface.co/datasets/{INDEXED_REPO_ID})\n\n"
-    md += "## Key Facts\n\n"
-    md += f"- **Base URL:** `{CONCEPTNET_BASE}`\n"
-    md += "- **Relations:** Use full URLs (e.g., `http://conceptnet.io/r/IsA`)\n"
-    md += "- **Nodes:** Use full URLs (e.g., `http://conceptnet.io/c/en/dog`)\n\n"
     
     try:
         with get_db_connection() as conn:
             cursor = conn.cursor()
             
-            md += "## Common Relations\n\n"
+            md += "## Relations\n\n"
             cursor.execute("SELECT id, label FROM relation ORDER BY label LIMIT 20")
             for rel_id, label in cursor.fetchall():
                 md += f"- **{label}:** `{rel_id}`\n"
@@ -430,12 +407,12 @@ def get_schema_info():
     
     return md
 
-# ===== FASTAPI FOR JSON API =====
+# ===== FASTAPI =====
 app = FastAPI(title="ConceptNet API", version="1.0")
 
 @app.get("/api/profile/{word}")
 def api_profile(word: str, lang: str = "en", limit: int = 10):
-    """Get semantic profile as JSON"""
+    """Get semantic profile"""
     return JSONResponse(get_semantic_profile_json(word, lang, limit))
 
 @app.get("/api/query")
@@ -443,30 +420,30 @@ def api_query(start: Optional[str] = None,
               relation: Optional[str] = None,
               end: Optional[str] = None,
               limit: int = 50):
-    """Query edges as JSON"""
+    """Query edges"""
     return JSONResponse(query_edges_json(start, relation, end, limit))
 
 @app.get("/api/relations")
 def api_relations():
-    """Get list of available relations"""
+    """List relations"""
     return JSONResponse({"relations": [{"name": name, "url": url} for name, url in RELATIONS]})
 
 @app.get("/api/languages")
 def api_languages():
-    """Get supported languages"""
+    """List languages"""
     return JSONResponse({"languages": TARGET_LANGUAGES})
 
 @app.get("/")
 def api_root():
-    """API documentation"""
+    """API docs"""
     return {
         "name": "ConceptNet API",
         "version": "1.0",
         "endpoints": {
-            "/api/profile/{word}": "Get semantic profile (params: lang, limit)",
+            "/api/profile/{word}": "Semantic profile (params: lang, limit)",
             "/api/query": "Query edges (params: start, relation, end, limit)",
-            "/api/relations": "List available relations",
-            "/api/languages": "List supported languages"
+            "/api/relations": "List relations",
+            "/api/languages": "List languages"
         },
         "examples": {
             "profile": "/api/profile/dog?lang=en&limit=10",
@@ -480,7 +457,7 @@ with gr.Blocks(title="ConceptNet Explorer", theme=gr.themes.Soft()) as demo:
     gr.Markdown(
         f"**Multi-language semantic network** | "
         f"**Languages:** {', '.join([l.upper() for l in TARGET_LANGUAGES])} | "
-        f"**API:** `/api/profile/{{word}}` `/api/query`"
+        f"**API:** RESTful JSON endpoints"
     )
     
     with gr.Tabs():
@@ -526,18 +503,27 @@ with gr.Blocks(title="ConceptNet Explorer", theme=gr.themes.Soft()) as demo:
             schema_output = gr.Markdown()
         
         with gr.TabItem("🔌 API"):
-            gr.Markdown("## JSON API Endpoints\n\n")
-            gr.Markdown("### Get Semantic Profile\n```\nGET /api/profile/{word}?lang=en&limit=10\n```")
-            gr.Markdown("### Query Edges\n```\nGET /api/query?start=dog&relation=IsA&limit=50\n```")
-            gr.Markdown("### List Relations\n```\nGET /api/relations\n```")
-            gr.Markdown("### Examples\n")
-            gr.Code("curl http://localhost:7860/api/profile/dog?lang=en", language="bash")
-            gr.Code("curl 'http://localhost:7860/api/query?start=dog&relation=IsA&limit=10'", language="bash")
+            gr.Markdown("## JSON API Endpoints\n")
+            gr.Markdown("### Get Semantic Profile")
+            gr.Markdown("```\nGET /api/profile/{word}?lang=en&limit=10\n```")
+            gr.Markdown("**Example:**")
+            gr.Markdown("```\ncurl http://localhost:7860/api/profile/dog?lang=en\n```\n")
+            
+            gr.Markdown("### Query Edges")
+            gr.Markdown("```\nGET /api/query?start=dog&relation=IsA&limit=50\n```")
+            gr.Markdown("**Example:**")
+            gr.Markdown("```\ncurl 'http://localhost:7860/api/query?start=dog&relation=IsA&limit=10'\n```\n")
+            
+            gr.Markdown("### List Relations")
+            gr.Markdown("```\nGET /api/relations\n```\n")
+            
+            gr.Markdown("### List Languages")
+            gr.Markdown("```\nGET /api/languages\n```")
     
     gr.Markdown(
         "---\n"
-        "**Performance:** Using exact match on rel_id for fast queries | "
-        "**API:** RESTful JSON endpoints available"
+        "**Performance:** Exact match on rel_id for fast queries | "
+        "**API:** Full REST API with JSON responses"
     )
     
     semantic_btn.click(get_semantic_profile, [word_input, lang_input], semantic_output)
@@ -545,14 +531,14 @@ with gr.Blocks(title="ConceptNet Explorer", theme=gr.themes.Soft()) as demo:
     raw_btn.click(run_raw_query, raw_sql_input, [raw_results, raw_status])
     schema_btn.click(get_schema_info, None, schema_output)
 
-# Mount Gradio app to FastAPI
+# Mount Gradio to FastAPI
 app = gr.mount_gradio_app(app, demo, path="/")
 
 if __name__ == "__main__":
     log_progress("="*60, "SUCCESS")
-    log_progress("APP READY WITH JSON API!", "SUCCESS")
+    log_progress("🚀 APP READY WITH JSON API!", "SUCCESS")
     log_progress("="*60, "SUCCESS")
-    log_progress("UI: http://localhost:7860", "INFO")
+    log_progress("UI:  http://localhost:7860", "INFO")
     log_progress("API: http://localhost:7860/api/profile/dog", "INFO")
     log_progress("="*60, "SUCCESS")