fix(api): correctly disable source filtering when none is selected

ssube · Apr 22, 2023 · eeaba37 · eeaba37
1 parent 348421d
commit eeaba37
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/api/onnx_web/image/__init__.py b/api/onnx_web/image/__init__.py
@@ -23,6 +23,7 @@
     source_filter_hed,
     source_filter_mlsd,
     source_filter_noise,
+    source_filter_none,
     source_filter_normal,
     source_filter_openpose,
     source_filter_scribble,

diff --git a/api/onnx_web/image/source_filter.py b/api/onnx_web/image/source_filter.py
@@ -27,6 +27,13 @@ def filter_model_path(server: ServerContext, filter_name: str) -> str:
     return path.join(server.model_path, "filter", filter_name)
 
 
+def source_filter_none(
+    server: ServerContext,
+    source: Image.Image,
+):
+    return source
+
+
 def source_filter_gaussian(
     server: ServerContext,
     source: Image.Image,

diff --git a/api/onnx_web/server/load.py b/api/onnx_web/server/load.py
@@ -26,6 +26,7 @@
     source_filter_hed,
     source_filter_mlsd,
     source_filter_noise,
+    source_filter_none,
     source_filter_normal,
     source_filter_openpose,
     source_filter_scribble,
@@ -68,17 +69,18 @@
     "rocm": "ROCMExecutionProvider",
 }
 source_filters = {
-    "gaussian": source_filter_gaussian,
-    "noise": source_filter_noise,
+    "canny": source_filter_canny,
+    "depth": source_filter_depth,
     "face": source_filter_face,
-    "segment": source_filter_segment,
+    "gaussian": source_filter_gaussian,
+    "hed": source_filter_hed,
     "mlsd": source_filter_mlsd,
+    "noise": source_filter_noise,
+    "none": source_filter_none,
     "normal": source_filter_normal,
-    "hed": source_filter_hed,
-    "scribble": source_filter_scribble,
-    "depth": source_filter_depth,
-    "canny": source_filter_canny,
     "openpose": source_filter_openpose,
+    "segment": source_filter_segment,
+    "scribble": source_filter_scribble,
 }
 
 # Available ORT providers