Update app.py

app.py

@@ -73,7 +73,7 @@ def get_schema_info():
                     schema_md += f"| `{name}` | `{dtype}` | {notnull} | {pk} |\n"
                 schema_md += "\n"
             
-            # --- FIX: Moved return statement outside the loop ---
+            # --- Moved return statement outside the loop ---
             return schema_md
             # --- End of Fix ---
 
@@ -84,39 +84,49 @@ def get_schema_info():
 
 def run_query(start_node, relation, end_node, limit):
     """
-    Runs a query against the ConceptNet database.
-    
-    *** ASSUMPTION ***:
-    This function *assumes* the main table is named 'edges' and has
-    columns 'start', 'rel', and 'end'.
-    
-    Use the 'Schema Explorer' tab to verify this. If the names are
-    different (e.g., 'conceptnet_edges'), you must edit this function.
+    Runs a query against the ConceptNet database by joining the
+    edge, node, and relation tables based on the schema.
     """
     print(f"Running query: start='{start_node}', rel='{relation}', end='{end_node}'")
     
-    # --- !! EDIT THESE IF SCHEMA IS DIFFERENT !! ---
-    TABLE_NAME = "edges" 
-    START_COL = "start"
-    REL_COL = "rel"
-    END_COL = "end"
-    # ---
+    # --- FIX: Use correct schema from Schema Explorer ---
     
-    query = f"SELECT * FROM {TABLE_NAME} WHERE 1=1"
+    # We will build a complex JOIN query to get human-readable labels
+    select_clause = """
+        SELECT
+            e.id AS edge_id,
+            s.label AS start_label,
+            r.label AS relation_label,
+            en.label AS end_label,
+            e.weight,
+            e.dataset,
+            e.license,
+            e.surface_text
+        FROM
+            edge AS e
+        JOIN
+            relation AS r ON e.rel_id = r.id
+        JOIN
+            node AS s ON e.start_id = s.id
+        JOIN
+            node AS en ON e.end_id = en.id
+    """
+    
+    where_clause = " WHERE 1=1"
     params = []
     
     try:
         if start_node:
-            query += f" AND {START_COL} LIKE ?"
+            where_clause += " AND s.label LIKE ?"
             params.append(start_node)
         if relation:
-            query += f" AND {REL_COL} LIKE ?"
+            where_clause += " AND r.label LIKE ?"
             params.append(relation)
         if end_node:
-            query += f" AND {END_COL} LIKE ?"
+            where_clause += " AND en.label LIKE ?"
             params.append(end_node)
             
-        query += " LIMIT ?"
+        query = select_clause + where_clause + " LIMIT ?"
         params.append(limit)
         
         print(f"Executing SQL: {query}")
@@ -133,8 +143,9 @@ def run_query(start_node, relation, end_node, limit):
     except Exception as e:
         print(f"Error in run_query: {e}")
         traceback.print_exc()
-        err_msg = f"**Query Failed!**\n\n`{e}`\n\n**Tip:** Did you check the 'Schema Explorer' tab? The table name might not be `{TABLE_NAME}` or the columns might be different."
+        err_msg = f"**Query Failed!**\n\n`{e}`"
         return pd.DataFrame(), err_msg
+    # --- End of Fix ---
 
 # --- 3. Build the Gradio UI ---
 
@@ -149,15 +160,17 @@ with gr.Blocks(title="ConceptNet SQLite Explorer") as demo:
             schema_output = gr.Markdown("Schema will appear here...")
             
         with gr.TabItem("Query Edges"):
+            # --- FIX: Updated description to be accurate ---
             gr.Markdown(
                 "**Run a query against the database.**\n"
-                f"This tab *assumes* the table is named `edges` and columns are `start`, `rel`, and `end`.\n"
-                "Use the 'Schema Explorer' to confirm. You can use SQL wildcards like `%` (e.g., `/c/en/dog%`)."
+                "This query joins the `edge`, `node`, and `relation` tables to find connections.\n"
+                "You can use SQL wildcards like `%` (e.g., `/c/en/dog%` or `/r/Is%`)."
             )
+            # --- End of Fix ---
             with gr.Row():
-                start_input = gr.Textbox(label="Start Node", placeholder="/c/en/dog")
-                rel_input = gr.Textbox(label="Relation", placeholder="/r/IsA")
-                end_input = gr.Textbox(label="End Node", placeholder="/c/en/animal")
+                start_input = gr.Textbox(label="Start Node Label", placeholder="/c/en/dog")
+                rel_input = gr.Textbox(label="Relation Label", placeholder="/r/IsA")
+                end_input = gr.Textbox(label="End Node Label", placeholder="/c/en/animal")
             
             limit_slider = gr.Slider(label="Limit", minimum=1, maximum=200, value=10, step=1)
             query_btn = gr.Button("Run Query", variant="primary")