Dont embed into openvino namespace (#164)

Don't embed into openvino namespace

Ticket 134085

@sovrasov, this requires updating Geti Python part

Author: Wovchena

.github/workflows/test_precommit.yml

@@ -12,8 +12,7 @@ jobs:
       run: git --no-pager diff --check $(git hash-object -t tree /dev/null)
     - name: Prohibit non ASCII chars in file names
       run: test $(git diff --name-only --diff-filter=A -z $(git hash-object -t tree /dev/null) | LC_ALL=C tr -d '[ -~]\0' | wc -c) == 0
-    - name: "! git grep -n '[^ -~]' -- ':(exclude)model_api/python/openvino/model_api/README.md'"
-      run: "! git grep -n '[^ -~]' -- ':(exclude)model_api/python/openvino/model_api/README.md'"
+    - run: "! git grep -n '[^ -~]' -- ':(exclude)model_api/python/README.md'"
     - uses: actions/setup-python@v4
       with:
         python-version: 3.8
@@ -30,7 +29,7 @@ jobs:
     - name: Check style with black
       run: |
         source venv/bin/activate
-        black --extend-exclude model_api/python/openvino/__init__.py --check .
+        black --check .
     - name: Check style with isort
       run: |
         source venv/bin/activate
@@ -173,7 +172,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install model_api/python/[ovms,tests]
-        python -c "from openvino.model_api.models import DetectionModel; DetectionModel.create_model('ssd_mobilenet_v1_fpn_coco').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')"
+        python -c "from model_api.models import DetectionModel; DetectionModel.create_model('ssd_mobilenet_v1_fpn_coco').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')"
         docker run -d --rm -v $GITHUB_WORKSPACE/ovms_models/:/models -p 9000:9000 -p 8000:8000 openvino/model_server:latest --model_path /models/ssd_mobilenet_v1_fpn_coco/ --model_name ssd_mobilenet_v1_fpn_coco --port 9000 --rest_port 8000 --log_level DEBUG --target_device CPU
         python tests/cpp/precommit/prepare_data.py -d data -p tests/cpp/precommit/public_scope.json
         python examples/python/serving_api/run.py data/coco128/images/train2017/000000000009.jpg  # detects 4 objects

README.md

@@ -18,7 +18,7 @@
 import sys
 
 import cv2
-from openvino.model_api.models import DetectionModel
+from model_api.models import DetectionModel
 
 
 def main():

examples/cpp/synchronous_api/README.md

@@ -18,7 +18,7 @@
 import sys
 
 import cv2
-from openvino.model_api.models import DetectionModel
+from model_api.models import DetectionModel
 
 
 def main():

examples/python/asynchronous_api/run.py

@@ -18,11 +18,7 @@
 import sys
 
 import cv2
-from openvino.model_api.models import (
-    ClassificationModel,
-    DetectionModel,
-    SegmentationModel,
-)
+from model_api.models import ClassificationModel, DetectionModel, SegmentationModel
 from PIL import Image
 
 

examples/python/serving_api/README.md

@@ -15,7 +15,7 @@
 """
 
 import numpy as np
-from openvino.model_api.adapters.utils import resize_image_ocv
+from model_api.adapters.utils import resize_image_ocv
 from scipy.optimize import linear_sum_assignment
 
 from .image_model import ImageModel

examples/python/serving_api/run.py

@@ -14,7 +14,7 @@
  limitations under the License.
 """
 
-from openvino.model_api.adapters.utils import RESIZE_TYPES, InputTransform
+from model_api.adapters.utils import RESIZE_TYPES, InputTransform
 
 from .model import Model
 from .types import BooleanValue, ListValue, NumericalValue, StringValue

examples/python/synchronous_api/run.py

@@ -17,14 +17,14 @@
 import logging as log
 import re
 
-from openvino.model_api.adapters.inference_adapter import InferenceAdapter
-from openvino.model_api.adapters.onnx_adapter import ONNXRuntimeAdapter
-from openvino.model_api.adapters.openvino_adapter import (
+from model_api.adapters.inference_adapter import InferenceAdapter
+from model_api.adapters.onnx_adapter import ONNXRuntimeAdapter
+from model_api.adapters.openvino_adapter import (
     OpenvinoAdapter,
     create_core,
     get_user_config,
 )
-from openvino.model_api.adapters.ovms_adapter import OVMSAdapter
+from model_api.adapters.ovms_adapter import OVMSAdapter
 
 
 class WrapperError(Exception):

model_api/python/openvino/model_api/README.md model_api/python/README.md

@@ -14,7 +14,7 @@
 from collections import namedtuple
 
 import numpy as np
-from openvino.model_api.adapters.utils import INTERPOLATION_TYPES, resize_image_ocv
+from model_api.adapters.utils import INTERPOLATION_TYPES, resize_image_ocv
 
 from .detection_model import DetectionModel
 from .types import BooleanValue, ListValue, NumericalValue

model_api/python/openvino/model_api/__init__.py model_api/python/model_api/__init__.py

@@ -16,8 +16,8 @@
 
 import cv2 as cv
 import numpy as np
-from openvino.model_api.models.types import NumericalValue
-from openvino.model_api.models.utils import Detection, DetectionResult, multiclass_nms
+from model_api.models.types import NumericalValue
+from model_api.models.utils import Detection, DetectionResult, multiclass_nms
 
 from .tiler import Tiler
 

model_api/python/openvino/model_api/adapters/__init__.py model_api/python/model_api/adapters/__init__.py

@@ -18,11 +18,8 @@
 
 import cv2 as cv
 import numpy as np
-from openvino.model_api.models.instance_segmentation import (
-    MaskRCNNModel,
-    _segm_postprocess,
-)
-from openvino.model_api.models.utils import (
+from model_api.models.instance_segmentation import MaskRCNNModel, _segm_postprocess
+from model_api.models.utils import (
     InstanceSegmentationResult,
     SegmentedObject,
     multiclass_nms,

model_api/python/openvino/model_api/adapters/inference_adapter.py model_api/python/model_api/adapters/inference_adapter.py

@@ -18,8 +18,8 @@
 import logging as log
 from itertools import product
 
-from openvino.model_api.models.types import NumericalValue
-from openvino.model_api.pipelines import AsyncPipeline
+from model_api.models.types import NumericalValue
+from model_api.pipelines import AsyncPipeline
 
 
 class Tiler(metaclass=abc.ABCMeta):

model_api/python/openvino/model_api/adapters/onnx_adapter.md model_api/python/model_api/adapters/onnx_adapter.md

@@ -28,7 +28,6 @@
     author="Intel(R) Corporation",
     url="https://github.com/openvinotoolkit/model_api",
     packages=find_packages(SETUP_DIR),
-    package_dir={"openvino": str(SETUP_DIR / "openvino")},
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",

model_api/python/openvino/model_api/adapters/onnx_adapter.py model_api/python/model_api/adapters/onnx_adapter.py

@@ -22,11 +22,7 @@ def prepare_model(
     data_dir="./data",
     public_scope=Path(__file__).resolve().parent / "public_scope.json",
 ):
-    from openvino.model_api.models import (
-        ClassificationModel,
-        DetectionModel,
-        SegmentationModel,
-    )
+    from model_api.models import ClassificationModel, DetectionModel, SegmentationModel
 
     with open(public_scope, "r") as f:
         public_scope = json.load(f)

model_api/python/openvino/model_api/adapters/openvino_adapter.py model_api/python/model_api/adapters/openvino_adapter.py

@@ -9,7 +9,7 @@
 import pytest
 import torch
 import ultralytics
-from openvino.model_api.models import YOLOv5
+from model_api.models import YOLOv5
 from ultralytics.data import utils
 from ultralytics.models import yolo
 

model_api/python/openvino/model_api/adapters/ovms_adapter.md model_api/python/model_api/adapters/ovms_adapter.md

@@ -5,10 +5,10 @@
 import cv2
 import onnx
 import pytest
-from openvino.model_api.adapters.onnx_adapter import ONNXRuntimeAdapter
-from openvino.model_api.adapters.openvino_adapter import OpenvinoAdapter, create_core
-from openvino.model_api.adapters.utils import load_parameters_from_onnx
-from openvino.model_api.models import (
+from model_api.adapters.onnx_adapter import ONNXRuntimeAdapter
+from model_api.adapters.openvino_adapter import OpenvinoAdapter, create_core
+from model_api.adapters.utils import load_parameters_from_onnx
+from model_api.models import (
     AnomalyDetection,
     AnomalyResult,
     ClassificationModel,
@@ -23,7 +23,7 @@
     add_rotated_rects,
     get_contours,
 )
-from openvino.model_api.tilers import DetectionTiler, InstanceSegmentationTiler
+from model_api.tilers import DetectionTiler, InstanceSegmentationTiler
 
 
 def read_config(path: Path):

model_api/python/openvino/model_api/adapters/ovms_adapter.py model_api/python/model_api/adapters/ovms_adapter.py

@@ -1,4 +1,4 @@
-from openvino.model_api.models import Model
+from model_api.models import Model
 
 
 def test_model_with_unnamed_output_load():

model_api/python/openvino/model_api/adapters/utils.py model_api/python/model_api/adapters/utils.py

@@ -1,4 +1,4 @@
-from openvino.model_api.models import Model
+from model_api.models import Model
 
 
 def test_detector_save(tmp_path):