sync with upstream

setup.py

@@ -46,9 +46,9 @@ def parse_requirements(filename=CORE_REQUIREMENTS_FILE):
 
 CORE_REQUIREMENTS = parse_requirements(CORE_REQUIREMENTS_FILE)
 if strtobool(os.getenv("DATUMARO_HEADLESS", "0").lower()):
-    CORE_REQUIREMENTS.append("opencv-python-headless")
+    CORE_REQUIREMENTS.append("opencv-python-headless<4.11")
 else:
-    CORE_REQUIREMENTS.append("opencv-python")
+    CORE_REQUIREMENTS.append("opencv-python<4.11")
 
 DEFAULT_REQUIREMENTS = parse_requirements(DEFAULT_REQUIREMENTS_FILE)
 

src/datumaro/__init__.py

@@ -37,21 +37,15 @@
 from .components.dataset_base import CategoriesInfo, DatasetBase, DatasetItem, SubsetBase
 from .components.dataset_item_storage import ItemStatus
 from .components.dataset_storage import DatasetPatch
-from .components.environment import Environment, PluginRegistry
+from .components.environment import Environment
 from .components.exporter import Exporter, ExportErrorPolicy, FailingExportErrorPolicy
-from .components.hl_ops import (  # pylint: disable=redefined-builtin
-    export,
-    filter,
-    merge,
-    run_model,
-    transform,
-    validate,
-)
+from .components.hl_ops import HLOps
 from .components.importer import Importer
 from .components.launcher import Launcher
-from .components.media import ByteImage, Image, MediaElement, PointCloud, Video, VideoFrame
+from .components.media import Image, MediaElement, PointCloud, Video, VideoFrame
 from .components.media_manager import MediaManager
 from .components.progress_reporting import NullProgressReporter, ProgressReporter
+from .components.registry import PluginRegistry
 from .components.transformer import ItemTransform, ModelTransform, Transform
 from .components.validator import Validator
 from .util.definitions import DEFAULT_SUBSET_NAME

src/datumaro/cli/commands/convert.py

@@ -19,7 +19,7 @@
 
 def build_parser(parser_ctor=argparse.ArgumentParser):
     builtin_readers = sorted(set(Environment().importers) | set(Environment().extractors))
-    builtin_writers = sorted(Environment().converters)
+    builtin_writers = sorted(Environment().exporters)
 
     parser = parser_ctor(
         help="Convert an existing dataset to another format",
@@ -102,7 +102,7 @@ def convert_command(args):
     env = Environment()
 
     try:
-        converter = env.converters[args.output_format]
+        converter = env.exporters[args.output_format]
     except KeyError:
         raise CliException("Converter for format '%s' is not found" % args.output_format)
     extra_args = converter.parse_cmdline(args.extra_args)

src/datumaro/cli/commands/diff.py

@@ -8,13 +8,13 @@
 import os.path as osp
 from enum import Enum, auto
 
+from datumaro.cli.util.compare import DistanceCompareVisualizer
 from datumaro.components.comparator import DistanceComparator, EqualityComparator
 from datumaro.components.errors import ProjectNotFoundError
 from datumaro.util import dump_json_file
 from datumaro.util.os_util import rmtree
 from datumaro.util.scope import on_error_do, scope_add, scoped
 
-from ..contexts.project.diff import DiffVisualizer
 from ..util import MultilineFormatter
 from ..util.errors import CliException
 from ..util.project import generate_next_file_name, load_project, parse_full_revpath
@@ -78,12 +78,12 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
         formatter_class=MultilineFormatter,
     )
 
-    formats = ", ".join(f.name for f in DiffVisualizer.OutputFormat)
+    formats = ", ".join(f.name for f in DistanceCompareVisualizer.OutputFormat)
     comp_methods = ", ".join(m.name for m in ComparisonMethod)
 
     def _parse_output_format(s):
         try:
-            return DiffVisualizer.OutputFormat[s.lower()]
+            return DistanceCompareVisualizer.OutputFormat[s.lower()]
         except KeyError:
             raise argparse.ArgumentError(
                 "format",
@@ -140,7 +140,7 @@ def _parse_comparison_method(s):
         "-f",
         "--format",
         type=_parse_output_format,
-        default=DiffVisualizer.DEFAULT_FORMAT.name,
+        default=DistanceCompareVisualizer.DEFAULT_FORMAT.name,
         help="Output format, one of {} (default: %(default)s)".format(formats),
     )
 
@@ -239,7 +239,7 @@ def diff_command(args):
     elif args.method is ComparisonMethod.distance:
         comparator = DistanceComparator(iou_threshold=args.iou_thresh)
 
-        with DiffVisualizer(
+        with DistanceCompareVisualizer(
             save_dir=dst_dir, comparator=comparator, output_format=args.format
         ) as visualizer:
             log.info("Saving diff to '%s'" % dst_dir)

src/datumaro/cli/commands/download.py

@@ -17,7 +17,7 @@
 
 
 def build_parser(parser_ctor=argparse.ArgumentParser):
-    builtin_writers = sorted(Environment().converters)
+    builtin_writers = sorted(Environment().exporters)
     if TFDS_EXTRACTOR_AVAILABLE:
         available_datasets = ", ".join(f"tfds:{name}" for name in AVAILABLE_TFDS_DATASETS)
     else:
@@ -110,7 +110,7 @@ def download_command(args):
     output_format = args.output_format or default_output_format
 
     try:
-        converter = env.converters[output_format]
+        converter = env.exporters[output_format]
     except KeyError:
         raise CliException("Converter for format '%s' is not found" % output_format)
     extra_args = converter.parse_cmdline(args.extra_args)

src/datumaro/cli/commands/merge.py

@@ -203,7 +203,7 @@ def merge_command(args):
         env = Environment()
 
     try:
-        converter = env.converters[args.format]
+        converter = env.exporters[args.format]
     except KeyError:
         raise CliException("Converter for format '%s' is not found" % args.format)
 

src/datumaro/cli/commands/patch.py

@@ -138,7 +138,7 @@ def patch_command(args):
         scope_add(_project)
 
     try:
-        converter = env.converters[target_dataset.format]
+        converter = env.exporters[target_dataset.format]
     except KeyError:
         raise CliException("Converter for format '%s' is not found" % args.format)
 

src/datumaro/cli/contexts/project/__init__.py

@@ -62,7 +62,7 @@ def list_options(cls):
 
 
 def build_export_parser(parser_ctor=argparse.ArgumentParser):
-    builtins = sorted(Environment().converters)
+    builtins = sorted(Environment().exporters)
 
     parser = parser_ctor(
         help="Export project",
@@ -184,7 +184,7 @@ def export_command(args):
         env = Environment()
 
     try:
-        converter = env.converters[args.format]
+        converter = env.exporters[args.format]
     except KeyError:
         raise CliException("Converter for format '%s' is not found" % args.format)
 
@@ -798,7 +798,7 @@ def info_command(args):
     print("  location:", project._root_dir)
     print("Plugins:")
     print("  extractors:", ", ".join(sorted(set(env.extractors) | set(env.importers))))
-    print("  converters:", ", ".join(env.converters))
+    print("  converters:", ", ".join(env.exporters))
     print("  launchers:", ", ".join(env.launchers))
 
     print("Models:")

src/datumaro/cli/contexts/project/diff.py → src/datumaro/cli/util/compare.py

@@ -26,7 +26,7 @@
 from datumaro.util.image import save_image
 
 
-class DiffVisualizer:
+class DistanceCompareVisualizer:
     class OutputFormat(Enum):
         simple = auto()
         tensorboard = auto()