From 19cc7c61b5052d72bfcf7822b234fd0fc7db1369 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 6 Apr 2022 11:13:27 +0200 Subject: [PATCH 1/6] Update restapi.py --- utils/flask_rest_api/restapi.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index 62adb4bbf716..e7a088d1a6d5 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -7,8 +7,8 @@ import io import torch -from flask import Flask, request from PIL import Image +from flask import Flask, request app = Flask(__name__) @@ -23,10 +23,8 @@ def predict(): if request.files.get("image"): image_file = request.files["image"] image_bytes = image_file.read() - - img = Image.open(io.BytesIO(image_bytes)) - - results = model(img, size=640) # reduce size=320 for faster inference + with Image.open(io.BytesIO(image_bytes)) as im: + results = model(im, size=640) # reduce size=320 for faster inference return results.pandas().xyxy[0].to_json(orient="records") From 1a24716d82a4b6d8e862df682b51c1e3f764d008 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 09:14:02 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- utils/flask_rest_api/restapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index e7a088d1a6d5..a71a52e5f34f 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -7,8 +7,8 @@ import io import torch -from PIL import Image from flask import Flask, request +from PIL import Image app = Flask(__name__) From 8ea81dd772a4fab11a9580cfa288285563425800 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 6 Apr 2022 11:20:38 +0200 Subject: [PATCH 3/6] Update restapi.py --- utils/flask_rest_api/restapi.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index a71a52e5f34f..4ac24910992a 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -21,10 +21,9 @@ def predict(): return if request.files.get("image"): - image_file = request.files["image"] - image_bytes = image_file.read() - with Image.open(io.BytesIO(image_bytes)) as im: - results = model(im, size=640) # reduce size=320 for faster inference + with request.files["image"] as f: + im = Image.open(io.BytesIO(f.read())) + results = model(im, size=640) # reduce size=320 for faster inference return results.pandas().xyxy[0].to_json(orient="records") From 67e87fee53f8c8a15910be85fd216a43c95b4d5e Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 22 Apr 2022 16:11:26 -0700 Subject: [PATCH 4/6] Update restapi.py --- utils/flask_rest_api/restapi.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index 4ac24910992a..be966bec1ea6 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -21,8 +21,13 @@ def predict(): return if request.files.get("image"): - with request.files["image"] as f: - im = Image.open(io.BytesIO(f.read())) + # with request.files["image"] as f: + # im = Image.open(io.BytesIO(f.read())) + + im_file = request.files["image"] + im_bytes = im_file.read() + im = Image.open(io.BytesIO(im_bytes)) + results = model(im, size=640) # reduce size=320 for faster inference return results.pandas().xyxy[0].to_json(orient="records") From 19801d7c69ac777de3aaf05693f1759f184d07e8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 23:11:51 +0000 Subject: [PATCH 5/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- utils/flask_rest_api/restapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index be966bec1ea6..1c7f2e28472f 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -23,11 +23,11 @@ def predict(): if request.files.get("image"): # with request.files["image"] as f: # im = Image.open(io.BytesIO(f.read())) - + im_file = request.files["image"] im_bytes = im_file.read() im = Image.open(io.BytesIO(im_bytes)) - + results = model(im, size=640) # reduce size=320 for faster inference return results.pandas().xyxy[0].to_json(orient="records") From 968312857e8e53025179e29d43d87c7d229bb755 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 22 Apr 2022 16:12:34 -0700 Subject: [PATCH 6/6] Update restapi.py --- utils/flask_rest_api/restapi.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/flask_rest_api/restapi.py b/utils/flask_rest_api/restapi.py index 1c7f2e28472f..7e7b900107b5 100644 --- a/utils/flask_rest_api/restapi.py +++ b/utils/flask_rest_api/restapi.py @@ -21,9 +21,11 @@ def predict(): return if request.files.get("image"): + # Method 1 # with request.files["image"] as f: # im = Image.open(io.BytesIO(f.read())) + # Method 2 im_file = request.files["image"] im_bytes = im_file.read() im = Image.open(io.BytesIO(im_bytes))