Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes 404 deadlock #40

Merged
merged 3 commits into from
Oct 23, 2023
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
4 changes: 3 additions & 1 deletion potassium/potassium.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def __init__(self, name):
self._gpu_lock = Lock()
self._background_task_cv = Condition()
self._sequence_number = 0
self._sequence_number_lock = Lock()
self._idle_start_time = 0
self._last_inference_start_time = None
self._flask_app = self._create_flask_app()
Expand Down Expand Up @@ -140,7 +141,6 @@ def _handle_generic(self, endpoint, flask_request):
# potassium rejects if lock already in use
try:
self._gpu_lock.acquire(blocking=False)
self._sequence_number += 1
except:
res = make_response()
res.status_code = 423
Expand Down Expand Up @@ -223,6 +223,8 @@ def _create_flask_app(self):
@flask_app.route('/', defaults={'path': ''}, methods=["POST"])
@flask_app.route('/<path:path>', methods=["POST"])
def handle(path):
with self._sequence_number_lock:
self._sequence_number += 1
route = "/" + path
if route not in self._endpoints:
abort(404)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
setup(
name='potassium',
packages=['potassium'],
version='0.3.0',
version='0.3.1',
license='Apache License 2.0',
# Give a short description about your library
description='The potassium package is a flask-like HTTP server for serving large AI models',
Expand Down
9 changes: 9 additions & 0 deletions tests/test_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,15 @@ def background(context: dict, request: potassium.Request):
assert res.json["idle_time"] > 0
assert res.json["inference_time"] == 0

res = client.post("/this_path_does_not_exist", json={})
assert res.status_code == 404
res = client.get("/__status__", json={})
assert res.status_code == 200
assert res.json is not None
assert res.json["gpu_available"] == True
assert res.json["sequence_number"] == 2


def test_wait_for_background_task():
app = potassium.Potassium("my_app")

Expand Down
Loading