Multi-query tables (#234)

Author: levkk

pgml-dashboard/app/apps.py

@@ -7,4 +7,4 @@ class AppConfig(AppConfig):
     name = "app"
 
     def ready(self):
-        register_serializer('yml', 'django.core.serializers.pyyaml')
+        register_serializer("yml", "django.core.serializers.pyyaml")

pgml-dashboard/app/static/css/base.css

@@ -606,8 +606,12 @@ main turbo-frame:first-of-type .notebook-cell {
   margin-top: 1rem;
 }
 
+.notebook-rendering .markdown-body {
+     margin-top: 1rem;
+}
+
 .notebook-rendering {
-    /* margin-top: 1rem; */
+    max-width: 80vw;
 }
 
 .markdown-body.notebook-contents {

pgml-dashboard/app/views/notebooks.py

@@ -7,7 +7,7 @@ def index(request):
         request,
         "notebooks.html",
         {
-            "notebooks": Notebook.objects.order_by('id').all(),
+            "notebooks": Notebook.objects.order_by("id").all(),
             "topic": "notebooks",
         },
     )

pgml-dashboard/notebooks/models.py

@@ -77,32 +77,38 @@ def render(self):
         if self.cell_type == NotebookCell.SQL:
             execution_start = timezone.now()
 
+            results = []
             with connection.cursor() as cursor:
-                try:
-                    cursor.execute(self.contents)
-
-                    if cursor.description:
-                        columns = [col[0] for col in cursor.description]
-                        rows = cursor.fetchall()
-
+                queries = self.contents.split(";\n")  # Eh.
+                for query in queries:
+                    try:
+                        cursor.execute(query)
+
+                        if cursor.description:
+                            columns = [col[0] for col in cursor.description]
+                            rows = cursor.fetchall()
+
+                            result = render_to_string(
+                                "notebooks/sql.html",
+                                {
+                                    "columns": columns,
+                                    "rows": rows,
+                                },
+                            )
+                            results.append(result)
+                        else:
+                            # Not an error, but the formatting is helpful.
+                            result = render_to_string("notebooks/sql_error.html", {"error": str(cursor.statusmessage)})
+                            results.append(result)
+                    except Exception as e:
                         result = render_to_string(
-                            "notebooks/sql.html",
+                            "notebooks/sql_error.html",
                             {
-                                "columns": columns,
-                                "rows": rows,
+                                "error": str(e),
                             },
                         )
-                    else:
-                        # Not an error, but the formatting is helpful.
-                        result = render_to_string("notebooks/sql_error.html", {"error": str(cursor.statusmessage)})
-                except Exception as e:
-                    result = render_to_string(
-                        "notebooks/sql_error.html",
-                        {
-                            "error": str(e),
-                        },
-                    )
-            self.rendering = result
+                        results.append(result)
+            self.rendering = "\n".join(results)
             self.execution_time = timezone.now() - execution_start
 
         elif self.cell_type == NotebookCell.MARKDOWN:

pgml-dashboard/notebooks/static/notebooks/js/cell.js

@@ -7,6 +7,7 @@ export default class extends Controller {
     'undo',
     'play',
     'type',
+    'cancelEdit',
   ];
 
   connect() {
@@ -85,6 +86,11 @@ export default class extends Controller {
       this.codeMirror.addKeyMap(disableKeyMap)
     }
   }
+
+  cancelEdit(event) {
+    event.preventDefault()
+    this.cancelEditTarget.requestSubmit()
+  }
 }
 
 const scrollToBottom = () => {

pgml-dashboard/notebooks/templates/notebooks/cell.html

@@ -18,9 +18,15 @@
             <button type="submit" class="button notebook-button" title="Execute cell" data-cell-target="play">
               <span class="material-symbols-outlined">play_arrow</span>
             </button>
+             <button class="button notebook-button" title="Cancel edit" data-action="cell#cancelEdit">
+              <span class="material-symbols-outlined">cancel</span>
+            </button>
           </div>
         </div>
       </form>
+      <!-- Cancel edit and refetch the cell -->
+      <form class="hidden" action="{% url 'notebooks/cell/get' notebook.pk cell.pk %}?bust_cache={{ bust_cache }}" method="get" data-cell-target="cancelEdit">
+      </form>
     </div>
     {% endif %}
 

pgml-dashboard/notebooks/views.py

@@ -30,6 +30,7 @@ def notebook(request, pk):
             "next_cell_number": next_cell_number,
             "title": f"{notebook.name} - PostgresML",
             "topic": "notebooks",
+            "bust_cache": time.time(),
         },
     )