Skip to content

Commit ce3c3fe

Browse files
Improved exceptions, get to post for no file option
1 parent 124d029 commit ce3c3fe

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

bibigrid/core/startup_rest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ async def validate_configuration(configurations_json: ConfigurationsModel, clust
101101
content={"message": "Validation successful", "cluster_id": cluster_id, "success": not bool(exit_state)},
102102
status_code=200)
103103
except Exception as exc: # pylint: disable=broad-except
104-
return JSONResponse(content={"error": str(exc)}, status_code=400)
104+
return JSONResponse(content={"error": type(exc).__name__, "message": str(exc)}, status_code=400)
105105

106106

107107
@app.post("/bibigrid/create", response_model=CreateResponseModel)
@@ -162,10 +162,10 @@ async def terminate_async():
162162

163163
return JSONResponse(content={"message": "Termination successfully requested."}, status_code=202)
164164
except Exception as exc: # pylint: disable=broad-except
165-
return JSONResponse(content={"error": str(exc)}, status_code=400)
165+
return JSONResponse(content={"error": type(exc).__name__, "message":str(exc)}, status_code=400)
166166

167167

168-
@app.get("/bibigrid/info/", response_model=InfoResponseModel)
168+
@app.post("/bibigrid/info/", response_model=InfoResponseModel)
169169
async def info(cluster_id: str, configurations_json: MinimalConfigurationsModel):
170170
"""
171171
Expects a cluster id and a
@@ -189,7 +189,7 @@ async def info(cluster_id: str, configurations_json: MinimalConfigurationsModel)
189189
return JSONResponse(content=cluster_dict, status_code=200)
190190
return JSONResponse(content={"message": "Cluster not found.", "ready": False}, status_code=404)
191191
except Exception as exc: # pylint: disable=broad-except
192-
return JSONResponse(content={"error": str(exc)}, status_code=400)
192+
return JSONResponse(content={"error": type(exc).__name__, "message": str(exc)}, status_code=400)
193193

194194

195195
@app.get("/bibigrid/log/", response_model=LogResponseModel)
@@ -215,7 +215,7 @@ async def get_log(cluster_id: str, lines: int = None):
215215
return JSONResponse(content={"message": "Log found", "log": response}, status_code=200)
216216
return JSONResponse(content={"message": "Log not found.", "log": None}, status_code=404)
217217
except Exception as exc: # pylint: disable=broad-except
218-
return JSONResponse(content={"error": str(exc)}, status_code=400)
218+
return JSONResponse(content={"error": type(exc).__name__, "message": str(exc)}, status_code=400)
219219

220220

221221
@app.get("/bibigrid/state/", response_model=ClusterStateResponseModel)
@@ -246,7 +246,7 @@ async def state(cluster_id: str):
246246
return JSONResponse(content={"message": "Cluster not found.", "cluster_id": None, "floating_ip": None,
247247
"ssh_user":None}, status_code=404)
248248
except Exception as exc: # pylint: disable=broad-except
249-
return JSONResponse(content={"error": str(exc)}, status_code=400)
249+
return JSONResponse(content={"error": type(exc).__name__, "message": str(exc)}, status_code=400)
250250

251251

252252
# outdated tests

0 commit comments

Comments
 (0)