solve merge conflict

.github/workflows/code_scan.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install dependencies

.github/workflows/daily.yaml

@@ -32,7 +32,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox

.github/workflows/docs.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox

.github/workflows/docs_stable.yaml

@@ -18,7 +18,7 @@ jobs:
         with:
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox

.github/workflows/perf_benchmark.yaml

@@ -121,7 +121,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox

.github/workflows/pre_merge.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox
@@ -56,7 +56,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install tox
@@ -105,7 +105,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install tox

.github/workflows/publish.yaml

@@ -29,7 +29,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python 3.10
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install pypa/build

.github/workflows/publish_internal.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python 3.10
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install pypa/build
@@ -50,7 +50,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: "3.10"
       - name: Install dependencies

CHANGELOG.md

@@ -6,13 +6,137 @@ All notable changes to this project will be documented in this file.
 
 ### New features
 
-- Add zero-shot visual prompting (<https://github.com/openvinotoolkit/training_extensions/pull/2616>, <https://github.com/openvinotoolkit/training_extensions/pull/2706>, <https://github.com/openvinotoolkit/training_extensions/pull/2753>)
-- Add support for the training and validation on the XPU devices (https://github.com/openvinotoolkit/training_extensions/pull/3058)
+### Enhancements
+
+## \[1.6.0\]
+
+### New features
+
+- Changed supported Python version range (>=3.9, <=3.11)
+  (<https://github.com/openvinotoolkit/datumaro/pull/1269>)
+- Support MMDetection COCO format
+  (<https://github.com/openvinotoolkit/datumaro/pull/1213>)
+- Develop JsonSectionPageMapper in Rust API
+  (<https://github.com/openvinotoolkit/datumaro/pull/1224>)
+- Add Filtering via User-Provided Python Functions
+  (<https://github.com/openvinotoolkit/datumaro/pull/1230>, <https://github.com/openvinotoolkit/datumaro/pull/1233>)
+- Remove supporting MacOS platform
+  (<https://github.com/openvinotoolkit/datumaro/pull/1235>)
+- Support Kaggle image data (`KaggleImageCsvBase`, `KaggleImageTxtBase`, `KaggleImageMaskBase`, `KaggleVocBase`, `KaggleYoloBase`)
+  (<https://github.com/openvinotoolkit/datumaro/pull/1240>)
+- Add `__getitem__()` for random accessing with O(1) time complexity
+  (<https://github.com/openvinotoolkit/datumaro/pull/1247>)
+- Add Data-aware Anchor Generator
+  (<https://github.com/openvinotoolkit/datumaro/pull/1251>)
+- Support bounding box import within Kaggle extractors and add `KaggleCocoBase`
+  (<https://github.com/openvinotoolkit/datumaro/pull/1273>)
+
+### Enhancements
+
+- Optimize Python import to make CLI entrypoint faster
+  (<https://github.com/openvinotoolkit/datumaro/pull/1182>)
+- Add ImageColorScale context manager
+  (<https://github.com/openvinotoolkit/datumaro/pull/1194>)
+- Enhance visualizer to toggle plot title visibility
+  (<https://github.com/openvinotoolkit/datumaro/pull/1228>)
+- Enhance Datumaro data format detect() to be memory-bounded and performant
+  (<https://github.com/openvinotoolkit/datumaro/pull/1229>)
+- Change RoIImage and MosaicImage to have np.uint8 dtype as default
+  (<https://github.com/openvinotoolkit/datumaro/pull/1245>)
+- Enable image backend and color channel format to be selectable
+  (<https://github.com/openvinotoolkit/datumaro/pull/1246>)
+- Boost up `CityscapesBase` and `KaggleImageMaskBase` by dropping `np.unique`
+  (<https://github.com/openvinotoolkit/datumaro/pull/1261>)
+- Enhance RISE algortihm for explainable AI
+  (<https://github.com/openvinotoolkit/datumaro/pull/1263>)
+- Enhance explore unit test to use real dataset from ImageNet
+  (<https://github.com/openvinotoolkit/datumaro/pull/1266>)
+- Fix each method of the comparator to be used separately
+  (<https://github.com/openvinotoolkit/datumaro/pull/1290>)
+- Bump ONNX version to 1.16.0
+  (<https://github.com/openvinotoolkit/datumaro/pull/1376>)
+- Print the color channel format (RGB) for datum stats command
+  (<https://github.com/openvinotoolkit/datumaro/pull/1389>)
+- Add ignore_index argument to Mask.as_class_mask() and Mask.as_instance_mask()
+  (<https://github.com/openvinotoolkit/datumaro/pull/1409>)
+
+### Bug fixes
+
+- Fix wrong example of Datumaro dataset creation in document
+  (<https://github.com/openvinotoolkit/datumaro/pull/1195>)
+- Fix wrong command to install datumaro from github
+  (<https://github.com/openvinotoolkit/datumaro/pull/1202>, <https://github.com/openvinotoolkit/datumaro/pull/1207>)
+- Update document to correct wrong `datum project import` command and add filtering example to filter out items containing annotations.
+  (<https://github.com/openvinotoolkit/datumaro/pull/1210>)
+- Fix label compare of distance method
+  (<https://github.com/openvinotoolkit/datumaro/pull/1205>)
+- Fix Datumaro visualizer's import errors after introducing lazy import
+  (<https://github.com/openvinotoolkit/datumaro/pull/1220>)
+- Fix broken link to supported formats in readme
+  (<https://github.com/openvinotoolkit/datumaro/pull/1221>)
+- Fix Kinetics data format to have media data
+  (<https://github.com/openvinotoolkit/datumaro/pull/1223>)
+- Handling undefined labels at the annotation statistics
+  (<https://github.com/openvinotoolkit/datumaro/pull/1232>)
+- Add unit test for item rename
+  (<https://github.com/openvinotoolkit/datumaro/pull/1237>)
+- Fix a bug in the previous behavior when importing nested datasets in the project
+  (<https://github.com/openvinotoolkit/datumaro/pull/1243>)
+- Fix Kaggle importer when adding duplicated labels
+  (<https://github.com/openvinotoolkit/datumaro/pull/1244>)
+- Fix input tensor shape in model interpreter for OpenVINO 2023.3
+  (<https://github.com/openvinotoolkit/datumaro/pull/1251>)
+- Add default value for target in prune cli
+  (<https://github.com/openvinotoolkit/datumaro/pull/1253>)
+- Remove deprecated MediaManager
+  (<https://github.com/openvinotoolkit/datumaro/pull/1262>)
+- Fix explore command without project
+  (<https://github.com/openvinotoolkit/datumaro/pull/1271>)
+- Fix enable COCO to import only bboxes
+  (<https://github.com/openvinotoolkit/datumaro/pull/1360>)
+- Fix resize transform for RleMask annotation
+- (<https://github.com/openvinotoolkit/datumaro/pull/1361>)
+- Fix import YOLO variants from extractor when `urls` is not specified
+  (<https://github.com/openvinotoolkit/datumaro/pull/1362>)
+
+## \[1.5.2\]
 
 ### Enhancements
 
-- Upgrade OpenVINO to 2023.3 (<https://github.com/openvinotoolkit/training_extensions/pull/2879>)
-- Automate performance benchmark (<https://github.com/openvinotoolkit/training_extensions/pull/2742>)
+- Add memory bounded datumaro data format detect to release 1.5.1
+  (<https://github.com/openvinotoolkit/datumaro/pull/1241>)
+- Bump version string to 1.5.2
+  (<https://github.com/openvinotoolkit/datumaro/pull/1249>)
+- Remove Protobuf version limitation (<4)
+  (<https://github.com/openvinotoolkit/datumaro/pull/1248>)
+
+## \[1.5.1\]
+
+### Enhancements
+
+- Enhance Datumaro data format stream importer performance
+  (<https://github.com/openvinotoolkit/datumaro/pull/1153>)
+- Change image default dtype from float32 to uint8
+  (<https://github.com/openvinotoolkit/datumaro/pull/1175>)
+- Add comparison level-up doc
+  (<https://github.com/openvinotoolkit/datumaro/pull/1174>)
+- Add ImportError to catch GitPython import error
+  (<https://github.com/openvinotoolkit/datumaro/pull/1174>)
+
+### Bug fixes
+
+- Modify the draw function in the visualizer not to raise an error for unsupported annotation types.
+  (<https://github.com/openvinotoolkit/datumaro/pull/1180>)
+- Correct explore path in the related document.
+  (<https://github.com/openvinotoolkit/datumaro/pull/1176>)
+- Fix errata in the voc document. Color values in the labelmap.txt should be separated by commas, not colons.
+  (<https://github.com/openvinotoolkit/datumaro/pull/1162>)
+- Fix hyperlink errors in the document
+  (<https://github.com/openvinotoolkit/datumaro/pull/1159>, <https://github.com/openvinotoolkit/datumaro/pull/1161>)
+- Fix memory unbounded Arrow data format export/import
+  (<https://github.com/openvinotoolkit/datumaro/pull/1169>)
+- Update CVAT format doc to bypass warning
+  (<https://github.com/openvinotoolkit/datumaro/pull/1183>)
 
 ## \[v1.5.0\]
 

docs/source/guide/release_notes/index.rst

@@ -8,6 +8,79 @@ Releases
 v2.0.0 (1Q24)
 -------------
 
+v1.6.0 (2024.04)
+----------------
+
+New features
+^^^^^^^^^^^^
+- Changed supported Python version range (>=3.9, <=3.11)
+- Support MMDetection COCO format
+- Develop JsonSectionPageMapper in Rust API
+- Add Filtering via User-Provided Python Functions
+- Remove supporting MacOS platform
+- Support Kaggle image data (`KaggleImageCsvBase`, `KaggleImageTxtBase`, `KaggleImageMaskBase`, `KaggleVocBase`, `KaggleYoloBase`)
+- Add `__getitem__()` for random accessing with O(1) time complexity
+- Add Data-aware Anchor Generator
+- Support bounding box import within Kaggle extractors and add `KaggleCocoBase`
+
+Enhancements
+^^^^^^^^^^^^
+- Optimize Python import to make CLI entrypoint faster
+- Add ImageColorScale context manager
+- Enhance visualizer to toggle plot title visibility
+- Enhance Datumaro data format detect() to be memory-bounded and performant
+- Change RoIImage and MosaicImage to have np.uint8 dtype as default
+- Enable image backend and color channel format to be selectable
+- Boost up `CityscapesBase` and `KaggleImageMaskBase` by dropping `np.unique`
+- Enhance RISE algortihm for explainable AI
+- Enhance explore unit test to use real dataset from ImageNet
+- Fix each method of the comparator to be used separately
+
+Bug fixes
+^^^^^^^^^
+- Fix wrong example of Datumaro dataset creation in document
+- Fix wrong command to install datumaro from github
+- Update document to correct wrong `datum project import` command and add filtering example to filter out items containing annotations.
+- Fix label compare of distance method
+- Fix Datumaro visualizer's import errors after introducing lazy import
+- Fix broken link to supported formats in readme
+- Fix Kinetics data format to have media data
+- Handling undefined labels at the annotation statistics
+- Add unit test for item rename
+- Fix a bug in the previous behavior when importing nested datasets in the project
+- Fix Kaggle importer when adding duplicated labels
+- Fix input tensor shape in model interpreter for OpenVINO 2023.3
+- Add default value for target in prune cli
+- Remove deprecated MediaManager
+- Fix explore command without project
+
+v1.5.2 (2024.01)
+----------------
+
+Enhancements
+^^^^^^^^^^^^
+
+- Add memory bounded datumaro data format detect
+- Remove Protobuf version limitation (<4)
+
+v1.5.1 (2023.11)
+----------------
+
+Enhancements
+^^^^^^^^^^^^
+- Enhance Datumaro data format stream importer performance
+- Change image default dtype from float32 to uint8
+- Add comparison level-up doc
+- Add ImportError to catch GitPython import error
+
+Bug fixes
+^^^^^^^^^
+- Modify the draw function in the visualizer not to raise an error for unsupported annotation types.
+- Correct explore path in the related document.
+- Fix errata in the voc document. Color values in the labelmap.txt should be separated by commas, not colons.
+- Fix hyperlink errors in the document.
+- Fix memory unbounded Arrow data format export/import.
+- Update CVAT format doc to bypass warning.
 
 v1.5.0 (4Q23)
 -------------

for_developers/regression_test/requirements.txt

@@ -314,9 +314,9 @@ gunicorn==21.2.0 \
     --hash=sha256:3213aa5e8c24949e792bcacfc176fef362e7aac80b76c56f6b5122bf350722f0 \
     --hash=sha256:88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033
     # via mlflow
-idna==3.6 \
-    --hash=sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca \
-    --hash=sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f
+idna==3.7 \
+    --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
+    --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
     # via requests
 importlib-metadata==6.11.0 \
     --hash=sha256:1231cf92d825c9e03cfc4da076a16de6422c863558229ea0b22b675657463443 \
@@ -1023,9 +1023,9 @@ sqlalchemy==2.0.28 \
     # via
     #   alembic
     #   mlflow
-sqlparse==0.4.4 \
-    --hash=sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3 \
-    --hash=sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c
+sqlparse==0.5.0 \
+    --hash=sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93 \
+    --hash=sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663
     # via mlflow
 threadpoolctl==3.3.0 \
     --hash=sha256:5dac632b4fa2d43f42130267929af3ba01399ef4bd1882918e92dbc30365d30c \

pyproject.toml

@@ -288,6 +288,9 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 # minimum target version
 target-version = "py38"
 
+# Enumerate all fixed violations.
+show-fixes = true
+
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 20

src/otx/__init__.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "2.0.0"
+__version__ = "2.1.0rc0"
 
 from otx.core.types import *  # noqa: F403