gvfa: mproved error reporting

faustedition · Aug 19, 2020 · 684bb14 · 684bb14
1 parent d68859a
commit 684bb14
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/graphviewer/gvfa.py b/src/graphviewer/gvfa.py
@@ -187,8 +187,10 @@ def agraph(nodeinfo: NodeInput = Depends(),
             reduction = nx.transitive_reduction(g)
             g = g.edge_subgraph([(u, v, k) for u, v, k, _ in expand_edges(g, reduction.edges)])
         else:
-            raise ValueError(
-                    'Cannot produce transitive reduction – the subgraph is not acyclic after removing conflict edges!')
+            raise HTTPException(500, dict(
+                    error="not-acyclic",
+                    msg='Cannot produce transitive reduction – the subgraph is not acyclic after removing conflict edges!',
+                    dot=write_dot(g, target=None, highlight=nodes).to_string()))
 
     g = simplify_timeline(g)
 

diff --git a/src/graphviewer/templates/form.html b/src/graphviewer/templates/form.html
@@ -207,8 +207,21 @@
                 })
             //.then(() => message())
             .catch(reason => {
-                addLongMessage(`<pre>${reason}</pre>`, "danger")
-                console.error(reason)
+                try {
+                    const details = JSON.parse(reason).detail;
+                    console.error(details);
+                    if (details.msg) {
+                        addLongMessage(details.msg, 'danger')
+                    } else {
+                        addLongMessage(`<pre>${details}</pre>`, "danger")
+                    }
+                    if (details.dot) {
+                        graphviz.transition(transitionFactory).renderDot(details.dot);
+                    }
+                } catch (e) {
+                    addLongMessage(`<pre>${reason}</pre>`, "danger")
+                    console.error(reason)
+                }
             });
             updateURLs(formdata);
             if (formdata.get('dir').includes('B')) { // vertical layout