Merge pull request #445 from openvinotoolkit/zm/test-scoped-with-vcs

Use Scope for VCS

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Annotation-related classes were moved into a new module,
   `datumaro.components.annotation`
   (<https://github.com/openvinotoolkit/datumaro/pull/439>)
+- Rollback utilities replaced with Scope utilities
+  (<https://github.com/openvinotoolkit/datumaro/pull/444>)
 
 ### Deprecated
 - TBD

datumaro/cli/commands/checkout.py

@@ -4,6 +4,8 @@
 
 import argparse
 
+from datumaro.util.scope import scope_add, scoped
+
 from ..util import MultilineFormatter
 from ..util.project import load_project
 
@@ -45,6 +47,7 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def checkout_command(args):
     has_sep = '--' in args._positionals
     if has_sep:
@@ -60,7 +63,7 @@ def checkout_command(args):
         raise argparse.ArgumentError('sources', message="When '--' is used, "
             "at least 1 source name must be specified")
 
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     project.checkout(rev=args.rev, sources=args.sources, force=args.force)
 

datumaro/cli/commands/commit.py

@@ -4,6 +4,8 @@
 
 import argparse
 
+from datumaro.util.scope import scope_add, scoped
+
 from ..util import MultilineFormatter
 from ..util.project import load_project
 
@@ -32,8 +34,9 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def commit_command(args):
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     old_tree = project.head
 

datumaro/cli/commands/diff.py

@@ -11,8 +11,8 @@
 
 from datumaro.components.errors import ProjectNotFoundError
 from datumaro.components.operations import DistanceComparator, ExactComparator
-from datumaro.util import error_rollback, on_error_do
 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
@@ -132,7 +132,7 @@ def _parse_comparison_method(s):
 
     return parser
 
-@error_rollback
+@scoped
 def diff_command(args):
     dst_dir = args.dst_dir
     if dst_dir:
@@ -149,22 +149,31 @@ def diff_command(args):
 
     project = None
     try:
-        project = load_project(args.project_dir)
+        project = scope_add(load_project(args.project_dir))
     except ProjectNotFoundError:
         if args.project_dir:
             raise
 
     try:
         if not args.second_target:
             first_dataset = project.working_tree.make_dataset()
-            second_dataset = parse_full_revpath(args.first_target, project)
+            second_dataset, target_project = \
+                parse_full_revpath(args.first_target, project)
+            if target_project:
+                scope_add(target_project)
         else:
-            first_dataset = parse_full_revpath(args.first_target, project)
-            second_dataset = parse_full_revpath(args.second_target, project)
+            first_dataset, target_project = \
+                parse_full_revpath(args.first_target, project)
+            if target_project:
+                scope_add(target_project)
+
+            second_dataset, target_project = \
+                parse_full_revpath(args.second_target, project)
+            if target_project:
+                scope_add(target_project)
     except Exception as e:
         raise CliException(str(e))
 
-
     if args.method is ComparisonMethod.equality:
         if args.ignore_field:
             args.ignore_field = eq_default_if

datumaro/cli/commands/explain.py

@@ -8,6 +8,7 @@
 import os.path as osp
 
 from datumaro.util.image import is_image, load_image, save_image
+from datumaro.util.scope import scope_add, scoped
 
 from ..util import MultilineFormatter
 from ..util.project import load_project, parse_full_revpath
@@ -110,11 +111,12 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def explain_command(args):
     from matplotlib import cm
     import cv2
 
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     model = project.working_tree.models.make_executable_model(args.model)
 
@@ -168,7 +170,11 @@ def explain_command(args):
             cv2.waitKey(0)
 
     else:
-        dataset = parse_full_revpath(args.target or 'project', project)
+        dataset, target_project = \
+            parse_full_revpath(args.target or 'project', project)
+        if target_project:
+            scope_add(target_project)
+
         log.info("Running inference explanation for '%s'" % args.target)
 
         for item in dataset:

datumaro/cli/commands/info.py

@@ -8,6 +8,7 @@
     DatasetMergeError, MissingObjectError, ProjectNotFoundError,
 )
 from datumaro.components.extractor import AnnotationType
+from datumaro.util.scope import scope_add, scoped
 
 from ..util import MultilineFormatter
 from ..util.project import load_project, parse_full_revpath
@@ -55,17 +56,20 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def info_command(args):
     project = None
     try:
-        project = load_project(args.project_dir)
+        project = scope_add(load_project(args.project_dir))
     except ProjectNotFoundError:
         if args.project_dir:
             raise
 
     try:
         # TODO: avoid computing working tree hashes
-        dataset = parse_full_revpath(args.target, project)
+        dataset, target_project = parse_full_revpath(args.target, project)
+        if target_project:
+            scope_add(target_project)
     except DatasetMergeError as e:
         dataset = None
         dataset_problem = "Can't merge project sources automatically: %s " \

datumaro/cli/commands/log.py

@@ -4,6 +4,8 @@
 
 import argparse
 
+from datumaro.util.scope import scope_add, scoped
+
 from ..util.project import load_project
 
 
@@ -18,8 +20,9 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def log_command(args):
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     revisions = project.history(args.max_count)
     if revisions:

datumaro/cli/commands/merge.py

@@ -14,6 +14,7 @@
     DatasetMergeError, DatasetQualityError, ProjectNotFoundError,
 )
 from datumaro.components.operations import IntersectMerge
+from datumaro.util.scope import scope_add, scoped
 
 from ..util import MultilineFormatter
 from ..util.errors import CliException
@@ -102,6 +103,7 @@ def _group(s):
 
     return parser
 
+@scoped
 def merge_command(args):
     dst_dir = args.dst_dir
     if dst_dir:
@@ -114,7 +116,7 @@ def merge_command(args):
 
     project = None
     try:
-        project = load_project(args.project_dir)
+        project = scope_add(load_project(args.project_dir))
     except ProjectNotFoundError:
         if args.project_dir:
             raise
@@ -125,7 +127,10 @@ def merge_command(args):
             source_datasets.append(project.working_tree.make_dataset())
 
         for t in args.targets:
-            source_datasets.append(parse_full_revpath(t, project))
+            target_dataset, target_project = parse_full_revpath(t, project)
+            if target_project:
+                scope_add(target_project)
+            source_datasets.append(target_dataset)
     except Exception as e:
         raise CliException(str(e))
 

datumaro/cli/commands/status.py

@@ -5,6 +5,7 @@
 import argparse
 
 from datumaro.cli.util import MultilineFormatter
+from datumaro.util.scope import scope_add, scoped
 
 from ..util.project import load_project
 
@@ -24,8 +25,9 @@ def build_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def status_command(args):
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     statuses = project.status()
 

datumaro/cli/contexts/model.py

@@ -9,8 +9,8 @@
 
 from datumaro.components.errors import ProjectNotFoundError
 from datumaro.components.project import Environment
-from datumaro.util import error_rollback, on_error_do
 from datumaro.util.os_util import rmtree
+from datumaro.util.scope import on_error_do, scope_add, scoped
 
 from ..util import MultilineFormatter, add_subparser
 from ..util.errors import CliException
@@ -53,13 +53,13 @@ def build_add_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
-@error_rollback
+@scoped
 def add_command(args):
     show_plugin_help = '-h' in args.extra_args or '--help' in args.extra_args
 
     project = None
     try:
-        project = load_project(args.project_dir)
+        project = scope_add(load_project(args.project_dir))
     except ProjectNotFoundError:
         if not show_plugin_help and args.project_dir:
             raise
@@ -125,8 +125,9 @@ def build_remove_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def remove_command(args):
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     project.remove_model(args.name)
     project.save()
@@ -165,6 +166,7 @@ def build_run_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def run_command(args):
     dst_dir = args.dst_dir
     if dst_dir:
@@ -175,8 +177,12 @@ def run_command(args):
         dst_dir = generate_next_file_name('%s-inference' % args.model_name)
     dst_dir = osp.abspath(dst_dir)
 
-    project = load_project(args.project_dir)
-    dataset = parse_full_revpath(args.target, project)
+    project = scope_add(load_project(args.project_dir))
+
+    dataset, target_project = parse_full_revpath(args.target, project)
+    if target_project:
+        scope_add(target_project)
+
     model = project.make_model(args.model_name)
     inference = dataset.run_model(model)
     inference.save(dst_dir)
@@ -198,8 +204,9 @@ def build_info_parser(parser_ctor=argparse.ArgumentParser):
 
     return parser
 
+@scoped
 def info_command(args):
-    project = load_project(args.project_dir)
+    project = scope_add(load_project(args.project_dir))
 
     if args.name:
         print(project.models[args.name])