lint(api): helper to get borders from request

ssube · Jan 16, 2023 · 604cdf3 · 604cdf3
1 parent 53fcc0b
commit 604cdf3
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/api/onnx_web/serve.py b/api/onnx_web/serve.py
@@ -173,6 +173,19 @@ def pipeline_from_request() -> Tuple[BaseParams, Size]:
     return (params, size)
 
 
+def border_from_request() -> Border:
+    left = get_and_clamp_int(request.args, 'left', 0,
+                             config_params.get('width').get('max'), 0)
+    right = get_and_clamp_int(request.args, 'right',
+                              0, config_params.get('width').get('max'), 0)
+    top = get_and_clamp_int(request.args, 'top', 0,
+                            config_params.get('height').get('max'), 0)
+    bottom = get_and_clamp_int(
+        request.args, 'bottom', 0, config_params.get('height').get('max'), 0)
+
+    return Border(left, right, top, bottom)
+
+
 def check_paths():
     if not path.exists(model_path):
         raise RuntimeError('model path must exist')
@@ -264,14 +277,14 @@ def img2img():
     source_file = request.files.get('source')
     source_image = Image.open(BytesIO(source_file.read())).convert('RGB')
 
+    params, size = pipeline_from_request()
+
     strength = get_and_clamp_float(
         request.args,
         'strength',
         config_params.get('strength').get('default'),
         config_params.get('strength').get('max'))
 
-    params, size = pipeline_from_request()
-
     output = make_output_name(
         'img2img',
         params,
@@ -320,16 +333,7 @@ def inpaint():
     mask_image = Image.open(BytesIO(mask_file.read())).convert('RGB')
 
     params, size = pipeline_from_request()
-
-    left = get_and_clamp_int(request.args, 'left', 0,
-                             config_params.get('width').get('max'), 0)
-    right = get_and_clamp_int(request.args, 'right',
-                              0, config_params.get('width').get('max'), 0)
-    top = get_and_clamp_int(request.args, 'top', 0,
-                            config_params.get('height').get('max'), 0)
-    bottom = get_and_clamp_int(
-        request.args, 'bottom', 0, config_params.get('height').get('max'), 0)
-    expand = Border(left, right, top, bottom)
+    expand = border_from_request()
 
     mask_filter = get_from_map(request.args, 'filter', mask_filters, 'none')
     noise_source = get_from_map(
@@ -341,10 +345,10 @@ def inpaint():
         params,
         size,
         extras=(
-            left,
-            right,
-            top,
-            bottom,
+            expand.left,
+            expand.right,
+            expand.top,
+            expand.bottom,
             mask_filter.__name__,
             noise_source.__name__,
         )