From b2faf542b0f7b25853b0b6bac9a1bbf7e9b798f4 Mon Sep 17 00:00:00 2001 From: klemen1999 Date: Wed, 16 Oct 2024 14:41:02 +0200 Subject: [PATCH 1/3] rolled back config version to 1.0 --- luxonis_ml/nn_archive/config.py | 4 +++- tests/test_nn_archive/test_nn_archive.py | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/luxonis_ml/nn_archive/config.py b/luxonis_ml/nn_archive/config.py index 7362dea6..e3f408f8 100644 --- a/luxonis_ml/nn_archive/config.py +++ b/luxonis_ml/nn_archive/config.py @@ -6,7 +6,9 @@ from .model import Model -CONFIG_VERSION = Literal["1.0", "1.1"] +# NOTE: Change in CONFIG_VERSION is a breaking change and should be communicated +# to all other packages that relly on it before pushed to release +CONFIG_VERSION = Literal["1.0"] class Config(BaseModelExtraForbid): diff --git a/tests/test_nn_archive/test_nn_archive.py b/tests/test_nn_archive/test_nn_archive.py index 7cff6f6f..d4385190 100644 --- a/tests/test_nn_archive/test_nn_archive.py +++ b/tests/test_nn_archive/test_nn_archive.py @@ -20,7 +20,7 @@ from pydantic import ValidationError from luxonis_ml.nn_archive import ArchiveGenerator, is_nn_archive -from luxonis_ml.nn_archive.model import Input, Output +from luxonis_ml.nn_archive.model import HeadType, Input, Output DATA_DIR = Path("tests/data/test_nn_archive") @@ -91,7 +91,7 @@ def test_archive_generator( archive_name=archive_name, save_path="tests/data/test_nn_archive", cfg_dict={ - "config_version": "1.1", + "config_version": "1.0", "model": { "metadata": { "name": "test_model", @@ -132,6 +132,22 @@ def test_archive_generator( assert "config.json" in tar.getnames() +def test_optional_head_name(): + from luxonis_ml.nn_archive.config_building_blocks.base_models.head_metadata import ( + HeadMetadata, + ) + + # without head name + HeadType(parser="Parser", metadata=HeadMetadata(), outputs=["output"]) + # with head name + HeadType( + parser="Parser", + name="HeadName", + metadata=HeadMetadata(), + outputs=["output"], + ) + + def test_layout(): default = { "name": "input", From a151dc514194380d34174f3d1545e6560b6dcece Mon Sep 17 00:00:00 2001 From: klemen1999 Date: Wed, 16 Oct 2024 14:42:08 +0200 Subject: [PATCH 2/3] added ignores --- tests/test_nn_archive/test_nn_archive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_nn_archive/test_nn_archive.py b/tests/test_nn_archive/test_nn_archive.py index d4385190..d407d681 100644 --- a/tests/test_nn_archive/test_nn_archive.py +++ b/tests/test_nn_archive/test_nn_archive.py @@ -138,12 +138,12 @@ def test_optional_head_name(): ) # without head name - HeadType(parser="Parser", metadata=HeadMetadata(), outputs=["output"]) + HeadType(parser="Parser", metadata=HeadMetadata(), outputs=["output"]) # type: ignore # with head name HeadType( parser="Parser", name="HeadName", - metadata=HeadMetadata(), + metadata=HeadMetadata(), # type: ignore outputs=["output"], ) From 1c5d8840b81aa62003a7d55fc8c6d4d93cf9c73c Mon Sep 17 00:00:00 2001 From: klemen1999 Date: Wed, 16 Oct 2024 17:43:59 +0200 Subject: [PATCH 3/3] updated version to 0.4.1 --- luxonis_ml/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luxonis_ml/__init__.py b/luxonis_ml/__init__.py index 6a9beea8..3d26edf7 100644 --- a/luxonis_ml/__init__.py +++ b/luxonis_ml/__init__.py @@ -1 +1 @@ -__version__ = "0.4.0" +__version__ = "0.4.1"