Makes pgt_jsonbody return a JSON response. Corresponding endpoint in …

…graph_init needs to load the object as JSON
ICRAR · Sep 13, 2022 · 9c05412 · 9c05412
1 parent 41046b2
commit 9c05412
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/daliuge-translator/dlg/dropmake/web/graph_init.js b/daliuge-translator/dlg/dropmake/web/graph_init.js
@@ -26,6 +26,7 @@ function graphInit(graphType){
         success: function(data) {
             // get node count
             var nodeCount = 0;
+            data = JSON.parse(data);
             data.nodeDataArray.forEach(element => {
                 nodeCount++
             });

diff --git a/daliuge-translator/dlg/dropmake/web/translator_rest.py b/daliuge-translator/dlg/dropmake/web/translator_rest.py
@@ -163,7 +163,7 @@ def jsonbody_get_lg(
         raise HTTPException(status_code=404, detail="JSON graph {0} not found\n".format(lg_name))
 
 
-@app.get("/pgt_jsonbody", tags=["Original"])
+@app.get("/pgt_jsonbody", response_class=JSONResponse, tags=["Original"])
 def jsonbody_get_pgt(
         pgt_name: str = Query(description="The name of the pgt to load from file")
 ):
@@ -175,7 +175,7 @@ def jsonbody_get_pgt(
         pgt = pgt_path(pgt_dir, pgt_name)
         with open(pgt, "r") as f:
             data = f.read()
-        return data
+        return JSONResponse(data)
     else:
         raise HTTPException(status_code=404, detail="JSON graph {0} not found".format(pgt_name))