From 8d7cea2e784a4c100df681c481e359d70e34b727 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 18:04:47 +0000 Subject: [PATCH 1/7] Update ipython requirement from ==8.9.* to ==8.10.* in /requirements Updates the requirements on [ipython](https://github.com/ipython/ipython) to permit the latest version. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/8.9.0...8.10.0) --- updated-dependencies: - dependency-name: ipython dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 261cf14e..276c19a8 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,7 +9,7 @@ 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 From 47fdbabfe8e9d25fe7d466e19c3e8450ec53f7a8 Mon Sep 17 00:00:00 2001 From: ljcornel Date: Mon, 20 Feb 2023 13:57:37 +0100 Subject: [PATCH 2/7] Add performance hint to the ovms config --- geti_sdk/deployment/deployment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geti_sdk/deployment/deployment.py b/geti_sdk/deployment/deployment.py index a6642149..9f49c118 100644 --- a/geti_sdk/deployment/deployment.py +++ b/geti_sdk/deployment/deployment.py @@ -410,7 +410,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}) From a764f990ba98a61e1e2488764ca665d839bc6f09 Mon Sep 17 00:00:00 2001 From: ljcornel Date: Thu, 23 Feb 2023 16:28:25 +0100 Subject: [PATCH 3/7] Fix deployment resource clean up method --- geti_sdk/deployment/deployment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/geti_sdk/deployment/deployment.py b/geti_sdk/deployment/deployment.py index a6642149..7dca6186 100644 --- 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( From 12dcb6f355a03236b92e2f78d8e61992a2881842 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 18:11:22 +0000 Subject: [PATCH 4/7] Update python-dotenv requirement in /requirements Updates the requirements on [python-dotenv](https://github.com/theskumar/python-dotenv) to permit the latest version. - [Release notes](https://github.com/theskumar/python-dotenv/releases) - [Changelog](https://github.com/theskumar/python-dotenv/blob/main/CHANGELOG.md) - [Commits](https://github.com/theskumar/python-dotenv/compare/v0.21.0...v1.0.0) --- updated-dependencies: - dependency-name: python-dotenv dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 276c19a8..c7285ddb 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,7 +4,7 @@ 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 From 2ceb002255d1ceeae198401d1f1dc31f2fc7ced2 Mon Sep 17 00:00:00 2001 From: ljcornel Date: Tue, 28 Feb 2023 13:29:46 +0100 Subject: [PATCH 5/7] Add a short sleep in `Geti.upload_project` to make sure all media is processed --- geti_sdk/geti.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/geti_sdk/geti.py b/geti_sdk/geti.py index 76595e5c..d188209c 100644 --- 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"), From 1b0e4ce4d96b6117cc73fcb6f29129f2fd5f4271 Mon Sep 17 00:00:00 2001 From: ljcornel Date: Tue, 28 Feb 2023 13:53:52 +0100 Subject: [PATCH 6/7] Add OVMS deployment resources to manifest --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 8dfb4f6b..10d924a9 100644 --- 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 From fc6c3036827d9cb52a6804bba9cbda8df3fa2719 Mon Sep 17 00:00:00 2001 From: ljcornel Date: Tue, 28 Feb 2023 14:39:53 +0100 Subject: [PATCH 7/7] Bump version to v1.2.2 and update changelog --- CHANGELOG.md | 14 ++++++++++++++ geti_sdk/__init__.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca50a75d..8ab7165c 100644 --- 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/geti_sdk/__init__.py b/geti_sdk/__init__.py index cc90d7fd..0416ea85 100644 --- 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"]