Merge branch 'main' of https://github.com/paularamo/geti-sdk

openvinotoolkit · Feb 28, 2023 · 6f1af06 · 6f1af06
2 parents 77a0d12 + fc6c303
commit 6f1af06
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v1.2.2 Intel® Geti™ SDK (28-02-2023)
+## What's Changed
+* Enable OVMS deployment by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/148
+* Minor fixes for notebook 010 by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/149
+* Update ipython requirement from ==8.9.* to ==8.10.* in /requirements by @dependabot in https://github.com/openvinotoolkit/geti-sdk/pull/151
+* Add performance hint to the ovms config by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/152
+* Fix bug in deployment resource clean up method by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/153
+* Update python-dotenv requirement from ==0.21.* to ==1.0.* in /requirements by @dependabot in https://github.com/openvinotoolkit/geti-sdk/pull/156
+* Add a short sleep in `Geti.upload_project` after media upload by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/157
+* Add OVMS deployment resources to manifest by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/158
+
+
+**Full Changelog**: https://github.com/openvinotoolkit/geti-sdk/compare/v1.2.1...v1.2.2
+
 # v1.2.1 Intel® Geti™ SDK (02-02-2023)
 ## What's Changed
 * Fix issue with deployment for anomaly classification models by @ljcornel in https://github.com/openvinotoolkit/geti-sdk/pull/144

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,4 @@
 graft requirements*
 include geti_sdk/demos/data/example/dogs.png
+include geti_sdk/deployment/resources/OVMS_README.md
+include geti_sdk/deployment/resources/requirements-ovms.txt
diff --git a/geti_sdk/__init__.py b/geti_sdk/__init__.py
@@ -78,6 +78,6 @@
 
 from .geti import Geti
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 __all__ = ["Geti"]
diff --git a/geti_sdk/deployment/deployment.py b/geti_sdk/deployment/deployment.py
@@ -369,7 +369,9 @@ def _remove_temporary_resources(self) -> None:
         """
         If necessary, clean up any temporary resources associated with the deployment.
         """
-        if os.path.isdir(self._path_to_temp_resources):
+        if self._path_to_temp_resources is not None and os.path.isdir(
+            self._path_to_temp_resources
+        ):
             shutil.rmtree(self._path_to_temp_resources)
         else:
             logging.debug(
@@ -410,7 +412,7 @@ def generate_ovms_config(self, output_folder: Union[str, os.PathLike]) -> None:
             config = {
                 "name": model_name,
                 "base_path": f"/models/{model_name}",
-                "shape": "auto",
+                "plugin_config": {"PERFORMANCE_HINT": "LATENCY"},
             }
             model_configs.append({"config": config})
 

diff --git a/geti_sdk/geti.py b/geti_sdk/geti.py
@@ -457,6 +457,9 @@ def upload_project(
         if len(videos) > 0:
             media_lists.append(videos)
 
+        # Short sleep to make sure all uploaded media is processed server side
+        time.sleep(5)
+
         # Upload annotations
         annotation_reader = GetiAnnotationReader(
             base_data_folder=os.path.join(target_folder, "annotations"),

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -4,12 +4,12 @@ requests==2.28.*
 numpy==1.22.*
 omegaconf==2.1.*
 opencv-python==4.5.*
-python-dotenv==0.21.*
+python-dotenv==1.0.*
 tqdm==4.64.*
 Pillow==9.4.*
 pathvalidate>=2.5.0
 simplejson==3.18.*
-ipython==8.9.*
+ipython==8.10.*
 ote-sdk @ git+https://github.com/openvinotoolkit/training_extensions/@releases/v0.4.0-geti1.1.0#egg=ote-sdk&subdirectory=ote_sdk
 openvino==2022.3.0
 openmodelzoo-modelapi @ git+https://github.com/openvinotoolkit/open_model_zoo/@releases/2022/2#egg=openmodelzoo-modelapi&subdirectory=demos/common/python