Merge pull request #2927 from Wovchena/demos/common/python/openvino/model_zoo/model_api-let-openvino-decide-what-it-supports

demos/common/python/openvino/model_zoo/model_api: let openvino decide what it supports

Author: Wovchena

demos/common/python/openvino/model_zoo/model_api/adapters/openvino_adapter.py

@@ -40,7 +40,7 @@ def create_core():
 
 class OpenvinoAdapter(ModelAdapter):
     """
-    Class that allows working with Inference Engine model, its input and output blobs
+    Works with OpenVINO model
     """
 
     def __init__(self, ie, model_path, weights_path=None, device='CPU', plugin_config=None, max_num_requests=1):
@@ -51,18 +51,9 @@ def __init__(self, ie, model_path, weights_path=None, device='CPU', plugin_confi
         self.max_num_requests = max_num_requests
 
         if isinstance(model_path, (str, Path)):
-            model_path_suffix = Path(model_path).suffix
-            if model_path_suffix == ".onnx":
-                if weights_path:
-                    log.warning('For model in ONNX format should set only "model_path" parameter.'
-                                'The "weights_path" will be omitted')
-                    weights_path = None
-            elif model_path_suffix == ".xml":
-                weights_path_suffix = Path(weights_path).suffix if weights_path else None
-                if weights_path_suffix and weights_path_suffix != ".bin":
-                    raise ValueError(f"Unsupported weights file extension: {weights_path_suffix}")
-            else:
-                raise ValueError(f"Unsupported model file extension: {model_path_suffix}")
+            if Path(model_path).suffix == ".onnx" and weights_path:
+                log.warning('For model in ONNX format should set only "model_path" parameter.'
+                            'The "weights_path" will be omitted')
 
         self.model_from_buffer = isinstance(model_path, bytes) and isinstance(weights_path, bytes)
         log.info('Reading model {}'.format('from buffer' if self.model_from_buffer else model_path))

demos/common/python/openvino/model_zoo/model_api/models/detection_model.py

@@ -18,9 +18,9 @@
 
 
 class DetectionModel(ImageModel):
-    '''A abstract detection model class
+    '''An abstract detection model class
 
-    This class supports the detection models. The Detection Model should have single image input.
+    This class supports detection models. The Detection Model must have single image input.
 
     Attributes:
         labels(List[str]): list of labels for classes (could be None)

demos/common/python/openvino/model_zoo/model_api/models/image_model.py

@@ -19,10 +19,10 @@
 
 
 class ImageModel(Model):
-    '''An abstract wrapper for image-based model
+    '''An abstract wrapper for an image-based model
 
-    An image-based model is model which has one or more inputs with image - 4D tensors with NWHC or NCHW layout.
-    Also it may have support additional inputs - 2D tensor.
+    An image-based model is a model which has one or more inputs with image - 4D tensors with NHWC or NCHW layout.
+    Also it may support additional inputs - 2D tensor.
     Implements basic preprocessing for image: resizing and aligning to model input.
 
     Attributes:

demos/common/python/openvino/model_zoo/model_api/models/model.py

@@ -21,15 +21,15 @@ class Model:
     '''An abstract model wrapper
 
     An abstract model wrapper can only load model from the disk.
-    The ``preprocess`` and ``postprocess`` method should be implemented in concrete class
+    The ``preprocess`` and ``postprocess`` methods should be implemented in a concrete class
 
     Attributes:
         model_adapter(ModelAdapter): allows working with the specified executor
         logger(Logger): instance of the logger
     '''
 
     def __init__(self, model_adapter):
-        '''Abstract model constructor
+        '''Model constructor
 
         Args:
             model_adapter(ModelAdapter): allows working with the specified executor