fix: Remove resource limits from graph downloads (#51)

Author: j6k4m8

motifstudio-web/src/app/GraphStats.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import useSWR from "swr";
 import { HostListing, bodiedFetcher, BASE_URL } from "./api";
 import { useClientOnly } from "./hooks/useClientOnly";
@@ -25,6 +25,7 @@ export function GraphStats({
     onAttributesLoaded?: (attributes: { [key: string]: string }) => void;
 }) {
     const isClient = useClientOnly();
+    const [downloadingFormat, setDownloadingFormat] = useState<string | null>(null);
 
     // Fetch graph statistics and attributes.
     // TODO: Perhaps these should all go in one combined query?
@@ -80,6 +81,9 @@ export function GraphStats({
      *     "graphml", "gml", "gexf", "json".
      */
     function downloadGraph(format: string = "graphml") {
+        // Set loading state
+        setDownloadingFormat(format);
+
         // POST to /api/queries/graph/download with the "host_id" and "format"
         // parameters in the body.
         fetch(`${BASE_URL}/queries/graph/download`, {
@@ -101,6 +105,14 @@ export function GraphStats({
                 a.href = url;
                 a.download = `${graph.name}.${format}`;
                 a.click();
+            })
+            .catch((error) => {
+                console.error("Download failed:", error);
+                // You could add error handling UI here if needed
+            })
+            .finally(() => {
+                // Clear loading state
+                setDownloadingFormat(null);
             });
     }
 
@@ -158,14 +170,36 @@ export function GraphStats({
                 <div className="flex gap-2">
                     <button
                         onClick={() => downloadGraph("graphml")}
-                        className="font-bold rounded text-white px-4 bg-blue-500 hover:bg-blue-700"
+                        disabled={downloadingFormat !== null}
+                        className={`font-bold rounded text-white px-4 py-2 flex items-center gap-2 ${
+                            downloadingFormat === "graphml"
+                                ? "bg-blue-400 cursor-not-allowed"
+                                : "bg-blue-500 hover:bg-blue-700"
+                        }`}
                     >
+                        {downloadingFormat === "graphml" && (
+                            <svg className="animate-spin h-4 w-4 text-white" fill="none" viewBox="0 0 24 24">
+                                <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
+                                <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
+                            </svg>
+                        )}
                         GraphML
                     </button>
                     <button
                         onClick={() => downloadGraph("gexf")}
-                        className="font-bold rounded text-white px-4 bg-blue-500 hover:bg-blue-700"
+                        disabled={downloadingFormat !== null}
+                        className={`font-bold rounded text-white px-4 py-2 flex items-center gap-2 ${
+                            downloadingFormat === "gexf"
+                                ? "bg-blue-400 cursor-not-allowed"
+                                : "bg-blue-500 hover:bg-blue-700"
+                        }`}
                     >
+                        {downloadingFormat === "gexf" && (
+                            <svg className="animate-spin h-4 w-4 text-white" fill="none" viewBox="0 0 24 24">
+                                <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
+                                <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
+                            </svg>
+                        )}
                         GEXF
                     </button>
                 </div>

server/src/server/commons.py

@@ -121,8 +121,10 @@ def run_with_limits(func, args=(), kwargs=None, max_ram_bytes=None, timeout_seco
         if proc.is_alive() and hasattr(proc, "kill"):
             proc.kill()
             proc.join(0)
+        print(f"Process terminated due to timeout after {timeout_seconds} seconds.")
         raise TimeoutError(f"Query exceeded time limit of {timeout_seconds} seconds")
     if queue.empty():
+        print(f"Process terminated unexpectedly, did not return a result, or exceeded {max_ram_bytes} bytes.")
         raise MemoryError(f"Query exceeded memory limit of {max_ram_bytes} bytes or terminated unexpectedly")
     success, payload = queue.get()
     if success:
@@ -166,7 +168,7 @@ def __init__(self, json_filepath_or_dict: str | dict | Path):
         ql = config.get("query_limits", {})
         self.max_ram_pct = ql.get("max_ram_pct", 0.5)
         self.max_ram_bytes = ql.get("max_ram_bytes")
-        self.max_duration_seconds = ql.get("max_duration_seconds", 120)
+        self.max_duration_seconds = ql.get("max_duration_seconds", 180)
 
     def get_uri_from_id(self, id: str) -> str | None:
         """Returns the URI of a host from its name.

server/src/server/routers/queries.py

@@ -81,19 +81,23 @@ def query_graph_download(
         )
 
     tic = time.time()
+
+    # For resource limits, see below.
+    nx_graph, error_msg = provider.maybe_get_networkx_graph(uri)
+
     # Enforce query resource limits
-    ram_limit = commons.max_ram_bytes if commons.max_ram_bytes is not None else int(get_total_ram_bytes() * commons.max_ram_pct)
-    try:
-        nx_graph, error_msg = run_with_limits(
-            provider.maybe_get_networkx_graph,
-            args=(uri,),
-            max_ram_bytes=ram_limit,
-            timeout_seconds=commons.max_duration_seconds,
-        )
-    except TimeoutError as e:
-        raise HTTPException(status_code=504, detail=str(e))
-    except MemoryError as e:
-        raise HTTPException(status_code=503, detail=str(e))
+    # ram_limit = commons.max_ram_bytes if commons.max_ram_bytes is not None else int(get_total_ram_bytes() * commons.max_ram_pct)
+    # try:
+    #     nx_graph, error_msg = run_with_limits(
+    #         provider.maybe_get_networkx_graph,
+    #         args=(uri,),
+    #         max_ram_bytes=ram_limit,
+    #         timeout_seconds=commons.max_duration_seconds,
+    #     )
+    # except TimeoutError as e:
+    #     raise HTTPException(status_code=504, detail=str(e))
+    # except MemoryError as e:
+    #     raise HTTPException(status_code=503, detail=str(e))
 
     def _get_bytes(graph, fmt: _GraphFormats):
         # We never prettyprint because we have to send it over the wire next