From f77c4f716cd85ecf891037d744e3bee7db84dd34 Mon Sep 17 00:00:00 2001 From: ErikKaumk Date: Thu, 14 Sep 2023 12:25:43 +0300 Subject: [PATCH] changed var name and set to None (instead of zero) if not set --- potassium/potassium.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/potassium/potassium.py b/potassium/potassium.py index e16d92d..3d13f15 100644 --- a/potassium/potassium.py +++ b/potassium/potassium.py @@ -49,7 +49,7 @@ def __init__(self, name): self._background_task_cv = Condition() self._sequence_number = 0 self._idle_start_time = 0 - self._inference_start_time = 0 + self._last_inference_start_time = None self._flask_app = self._create_flask_app() # @@ -148,7 +148,7 @@ def _handle_generic(self, endpoint, flask_request): return res res = None - self._inference_start_time = time.time() + self._last_inference_start_time = time.time() if endpoint.type == "handler": req = Request( @@ -167,7 +167,7 @@ def _handle_generic(self, endpoint, flask_request): res.status_code = 500 res.headers['X-Endpoint-Type'] = endpoint.type self._idle_start_time = time.time() - self._inference_start_time = 0 + self._last_inference_start_time = None self._gpu_lock.release() elif endpoint.type == "background": req = Request( @@ -186,7 +186,7 @@ def task(endpoint, lock, req): self._background_task_cv.notify_all() self._idle_start_time = time.time() - self._inference_start_time = 0 + self._last_inference_start_time = None lock.release() thread = Thread(target=task, args=(endpoint, self._gpu_lock, req)) @@ -228,13 +228,12 @@ def handle(path): @flask_app.route('/__status__', methods=["GET"]) def status(): idle_time = 0 + inference_time = 0 gpu_available = not self._gpu_lock.locked() - if self._inference_start_time != 0: - inference_time = int((time.time() - self._inference_start_time)*1000) - else: - inference_time = 0 - + if self._last_inference_start_time != None: + inference_time = int((time.time() - self._last_inference_start_time)*1000) + if gpu_available: idle_time = int((time.time() - self._idle_start_time)*1000) @@ -258,5 +257,4 @@ def serve(self, host="0.0.0.0", port=8000): server = make_server(host, port, self._flask_app, threaded=True) print(colored(f"Serving at http://{host}:{port}\n------", 'green')) self._idle_start_time = time.time() - self._inference_start_time = time.time() server.serve_forever()