move to /

history.json

@@ -1,6 +1,4 @@
 {"id": "01HWDNFA8QB96PV3RQCEPSG3C2", "q": "SELECT 42 AS answer", "alias": "example1", "template": "SELECT {x} AS {colname}", "definitions": "# Define variables: one '=' per line\nx=42\ncolname='answer'", "kwargs": {"x": 42, "colname": "answer"}, "rows": 1, "cols": 1, "source_id": null, "start": "2024-04-26 16:58:09.479", "end": "2024-04-26 16:58:09.479"}
 {"id": "01HWDNFA8QTEA1Y1V229501RMF", "q": "SELECT\n    Symbol,\n    Number,\n    Mass,\n    Abundance\nFROM 'https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv'", "alias": "example2", "template": "SELECT\n    Symbol,\n    Number,\n    Mass,\n    Abundance\nFROM '{url}'", "definitions": "url = https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv", "kwargs": {"url": "https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv"}, "rows": 354, "cols": 4, "source_id": null, "start": "2024-04-26 16:58:13.425", "end": "2024-04-26 16:58:13.725"}
 {"id": "01HWE3CN3BPK6S4XT9B7H3GMSA", "q": "SELECT *\nFROM 'history.json'\nORDER BY id DESC", "alias": "example3", "template": "SELECT *\nFROM 'history.json'\nORDER BY id DESC", "kwargs": {}, "definitions": "", "rows": 2, "cols": 11, "source_id": null, "start": "2024-04-26 21:01:13.707", "end": "2024-04-26 21:01:13.709"}
-{"id": "01HWENFDHB146M2F5EBJ63J3RT", "q": "SELECT 42 AS answer", "alias": null, "template": "SELECT {x} AS {colname}", "kwargs": {"x": 42, "colname": "answer"}, "definitions": "x = 42\ncolname = 'answer'", "rows": 1, "cols": 1, "source_id": "01HWDNFA8QB96PV3RQCEPSG3C2", "start": "2024-04-27 02:17:18.635", "end": "2024-04-27 02:17:18.635"}
-{"id": "01HWENFH1770F6BHMT8AQ5T5P6", "q": "SELECT\n    Symbol,\n    Number,\n    Mass,\n    Abundance\nFROM 'https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv'", "alias": null, "template": "SELECT\n    Symbol,\n    Number,\n    Mass,\n    Abundance\nFROM '{url}'", "kwargs": {"url": "https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv"}, "definitions": "url = 'https://raw.githubusercontent.com/ekwan/cctk/master/cctk/data/isotopes.csv'", "rows": 354, "cols": 4, "source_id": "01HWDNFA8QTEA1Y1V229501RMF", "start": "2024-04-27 02:17:22.215", "end": "2024-04-27 02:17:22.597"}
-{"id": "01HWENFK7DG526WTNYNJ7VWW1Q", "q": "SELECT *\nFROM 'history.json'\nORDER BY id DESC", "alias": null, "template": "SELECT *\nFROM 'history.json'\nORDER BY id DESC", "kwargs": {}, "definitions": "", "rows": 5, "cols": 11, "source_id": "01HWE3CN3BPK6S4XT9B7H3GMSA", "start": "2024-04-27 02:17:24.462", "end": "2024-04-27 02:17:24.470"}
+{"id": "01HWK493FKWHNGN8PTZJ4JCVZT", "q": "SELECT nothing", "alias": "bad_example", "template": "SELECT nothing", "kwargs": {}, "definitions": "", "rows": null, "cols": null, "source_id": null, "start": "2024-04-28 19:53:11.444", "end": "2024-04-28 19:53:11.444"}

main.py

@@ -95,6 +95,8 @@ def query_from_request(sql_input, definitions, request: gr.Request):
         url_query_params = dict(request.query_params)
         query_id = url_query_params.get("q")
         alias = url_query_params.get("alias")
+        if not query_id and not alias:
+            alias = "example1"
         q = Q.from_history(query_id=query_id, alias=alias)
         iframe_src = f"/q?query_id={q.source_id}"
     else:
@@ -118,7 +120,7 @@ def query_from_request(sql_input, definitions, request: gr.Request):
     sql_input = q.template
     definitions = f"{q.definitions}"
     editor_url = "".join([
-        f"http://{host}/sql?",
+        f"http://{host}/?",
         f"q={query_id}" if query_id else "",
         f"&alias={alias}" if alias else "",
     ])
@@ -135,9 +137,10 @@ with gr.Blocks(
         with gr.Column(scale=2, min_width=450):
             caption1 = gr.Markdown("# SQL Editor\nClick buttons below to see examples")
             with gr.Row():
-                ex1_button = gr.Button("Variables", link="/sql?alias=example1")
-                ex2_button = gr.Button("URL", link="/sql?alias=example2")
-                ex3_button = gr.Button("Local File", link="/sql?alias=example3")
+                ex1_button = gr.Button("Variables", link="/?alias=example1")
+                ex2_button = gr.Button("URL", link="/?alias=example2")
+                ex3_button = gr.Button("Local File", link="/?alias=example3")
+                ex4_button = gr.Button("Bad Query", link="/?alias=bad_example")
             definitions = gr.Code(label="Definitions", lines=2, interactive=True)
             sql_input = gr.Code(label="SQL Query", language="sql", lines=25, interactive=True)
             run_button = gr.Button("run", variant="primary")
@@ -167,18 +170,18 @@ def change_hf_host(request: gr.Request):
     return host
 
 
-app = gr.mount_gradio_app(app, gradio_sql_interface, path="/sql")
+app = gr.mount_gradio_app(app, gradio_sql_interface, path="/")
 
-@app.get("/")
-# def redirect_hack():
-#     return RedirectResponse("/redirecting")
+# @app.get("/")
+# # def redirect_hack():
+# #     return RedirectResponse("/redirecting")
 
-# @app.get("/redirecting")
-def redirect_to_example():
-    hf_space_host = getenv("SPACE_HOST")
-    if hf_space_host:
-        return RedirectResponse(f"https://{hf_space_host}/sql?alias=example1")
-    else:
-        return RedirectResponse("/sql?alias=example1")
+# # @app.get("/redirecting")
+# def redirect_to_example():
+#     hf_space_host = getenv("SPACE_HOST")
+#     if hf_space_host:
+#         return RedirectResponse(f"https://{hf_space_host}/sql?alias=example1")
+#     else:
+#         return RedirectResponse("/sql?alias=example1")
 
     # return RedirectResponse("/sql?alias=example1")

sql.py

@@ -174,9 +174,11 @@ EX2 = Q(
 
 EX3 = Q(
     """
-    SELECT /
+    SELECT *
     FROM 'history.json'
     ORDER BY id DESC
     """,
     alias="example3",
 )
+
+EX4 = Q("SELECT nothing", alias="bad_example")