Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions python/cuopt_server/cuopt_server/proxy_webserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -922,14 +922,13 @@ def deleterequest(
_not_implemented(
"DELETE /cuopt/request flags running/queued/cached"
)
_require_uuid(id)
meta = _get_job(id)
counts = {"queued": 0, "running": 0, "cached": 0}
if meta is not None and meta.get("validation_only"):
return encode(counts, accept)
status = get_grpc_client().status(id)
if _is_status(status, "NOT_FOUND"):
raise HTTPException(status_code=404, detail=f"id {id} not found")
return encode(counts, accept)
Comment thread
tmckayus marked this conversation as resolved.
Resolved
if _is_status(status, "QUEUED"):
counts["queued"] = 1
elif _is_status(status, "PROCESSING"):
Expand Down
12 changes: 12 additions & 0 deletions python/cuopt_server/cuopt_server/tests/test_grpc_http_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
from cuopt_server.utils.linear_programming import conversion as lp_conversion
from cuopt_server.utils.routing import conversion as routing_conversion

_JSON_ACCEPT = {"Accept": mime_json}


class _Uvicorn(uvicorn.Server):
def install_signal_handlers(self):
Expand Down Expand Up @@ -1190,6 +1192,16 @@ def test_zlib_accept(proxy):
assert decoded["response"]["solver_response"]["status"] == "Optimal"


def test_delete_unknown_request_is_200(proxy):
url, _ = proxy
missing = str(uuid.uuid4())
res = requests.delete(
url + f"/cuopt/request/{missing}", headers=_JSON_ACCEPT
)
Comment thread
tmckayus marked this conversation as resolved.
Resolved
assert res.status_code == 200
assert res.json() == {"queued": 0, "running": 0, "cached": 0}


def test_unknown_id_is_404(proxy):
url, _ = proxy
missing = str(uuid.uuid4())
Expand Down
Loading