fix: Fixed an error in the parameters that are not necessary.

kerlomz · Dec 6, 2018 · 46ded4c · 46ded4c
1 parent b5aeb8d
commit 46ded4c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/flask_server.py b/flask_server.py
@@ -99,7 +99,7 @@ def auth_request():
 
     if not bytes_batch:
         logger.error('Type[{}] - Site[{}] - Response[{}] - {} ms'.format(
-            request.json['model_type'], request.json['model_site'], response,
+            request.json.get('model_type'), request.json.get('model_site'), response,
             (time.time() - start_time) * 1000)
         )
         return json.dumps(response), 200
@@ -108,7 +108,9 @@ def auth_request():
     image_size = ImageUtils.size_of_image(image_sample)
     size_string = "{}x{}".format(image_size[0], image_size[1])
 
-    if 'model_type' in request.json:
+    if 'model_site' in request.json:
+        interface = interface_manager.get_by_sites(request.json['model_site'], size_string)
+    elif 'model_type' in request.json:
         interface = interface_manager.get_by_type_size(size_string, request.json['model_type'])
     elif 'model_name' in request.json:
         interface = interface_manager.get_by_name(size_string, request.json['model_name'])
@@ -121,7 +123,7 @@ def auth_request():
 
     if not image_batch:
         logger.error('[{}] - Size[{}] - Type[{}] - Site[{}] - Response[{}] - {} ms'.format(
-            interface.name, size_string, request.json['model_type'], request.json['model_site'], response,
+            interface.name, size_string, request.json.get('model_type'), request.json.get('model_site'), response,
             (time.time() - start_time) * 1000)
         )
         return json.dumps(response), 200
@@ -153,7 +155,7 @@ def common_request():
 
     if not bytes_batch:
         logger.error('Type[{}] - Site[{}] - Response[{}] - {} ms'.format(
-            request.json['model_type'], request.json['model_site'], response,
+            request.json.get('model_type'), request.json.get('model_site'), response,
             (time.time() - start_time) * 1000)
         )
         return json.dumps(response), 200
@@ -177,7 +179,7 @@ def common_request():
 
     if not image_batch:
         logger.error('[{}] - Size[{}] - Type[{}] - Site[{}] - Response[{}] - {} ms'.format(
-            interface.name, size_string, request.json['model_type'], request.json['model_site'], response,
+            interface.name, size_string, request.json.get('model_type'), request.json.get('model_site'), response,
             (time.time() - start_time) * 1000)
         )
         return json.dumps(response), 200

diff --git a/tornado_server.py b/tornado_server.py
@@ -90,7 +90,9 @@ def post(self):
         image_sample = bytes_batch[0]
         image_size = ImageUtils.size_of_image(image_sample)
         size_string = "{}x{}".format(image_size[0], image_size[1])
-        if 'model_type' in data:
+        if 'model_site' in data:
+            interface = interface_manager.get_by_sites(model_site, size_string)
+        elif 'model_type' in data:
             interface = interface_manager.get_by_type_size(size_string, model_type)
         elif 'model_name' in data:
             interface = interface_manager.get_by_name(model_name)