From aab04a22adb107026e85d16993def32b2360a01d Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sat, 4 Aug 2018 23:55:21 +0300 Subject: [PATCH] repro: introduce --prompt Fixes #894 Signed-off-by: Ruslan Kuprieiev --- dvc/cli.py | 7 +++++++ dvc/command/repro.py | 3 ++- dvc/project.py | 28 +++++++++++++++++++++------- dvc/stage.py | 7 ++++++- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dvc/cli.py b/dvc/cli.py index 48598f664..32e07712b 100644 --- a/dvc/cli.py +++ b/dvc/cli.py @@ -330,6 +330,13 @@ def parse_args(argv=None): default=False, help='Only print the commands that would be executed ' 'without actually executing.') + repro_parser.add_argument( + '-i', + '--interactive', + action='store_true', + default=False, + help='Ask for confirmation before reproducing each ' + 'stage.') repro_parser.set_defaults(func=CmdRepro) # Remove diff --git a/dvc/command/repro.py b/dvc/command/repro.py index 1844e4ddd..c9ef91839 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -18,7 +18,8 @@ class CmdRepro(CmdBase): self.project.reproduce(target, recursive=recursive, force=self.args.force, - dry=self.args.dry) + dry=self.args.dry, + interactive=self.args.interactive) if self.args.metrics: self.project.metrics_show() except ReproductionError as ex: diff --git a/dvc/project.py b/dvc/project.py index 4f07eb926..b2976f31c 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -235,7 +235,7 @@ class Project(object): stage.dump() return stage - def _reproduce_stage(self, stages, node, force, dry): + def _reproduce_stage(self, stages, node, force, dry, interactive): stage = stages[node] if stage.locked: @@ -243,7 +243,7 @@ class Project(object): 'going to be reproduced.' self.logger.warn(msg.format(stage.relpath)) - stage = stage.reproduce(force=force, dry=dry) + stage = stage.reproduce(force=force, dry=dry, interactive=interactive) if not stage: return [] @@ -252,7 +252,12 @@ class Project(object): return [stage] - def reproduce(self, target, recursive=True, force=False, dry=False): + def reproduce(self, + target, + recursive=True, + force=False, + dry=False, + interactive=False): import networkx as nx G = self.graph()[1] @@ -262,17 +267,26 @@ class Project(object): raise NotDvcFileError(target) if recursive: - return self._reproduce_stages(G, stages, node, force, dry) + return self._reproduce_stages(G, + stages, + node, + force, + dry, + interactive) - return self._reproduce_stage(stages, node, force, dry) + return self._reproduce_stage(stages, node, force, dry, interactive) - def _reproduce_stages(self, G, stages, node, force, dry): + def _reproduce_stages(self, G, stages, node, force, dry, interactive): import networkx as nx result = [] for n in nx.dfs_postorder_nodes(G, node): try: - result += self._reproduce_stage(stages, n, force, dry) + result += self._reproduce_stage(stages, + n, + force, + dry, + interactive) except Exception as ex: raise ReproductionError(stages[n].relpath, ex) return result diff --git a/dvc/stage.py b/dvc/stage.py index f3b19816e..41de32cbe 100644 --- a/dvc/stage.py +++ b/dvc/stage.py @@ -150,7 +150,7 @@ class Stage(object): self.remove_outs(ignore_remove=True) os.unlink(self.path) - def reproduce(self, force=False, dry=False): + def reproduce(self, force=False, dry=False, interactive=False): if not self.changed() and not force: return None @@ -158,6 +158,11 @@ class Stage(object): # Removing outputs only if we actually have command to reproduce self.remove_outs(ignore_remove=False) + msg = "Going to reproduce '{}'. Are you sure you want to continue?" + msg = msg.format(self.relpath) + if interactive and not prompt(msg): + raise DvcException('Reproduction aborted by the user') + self.project.logger.info(u'Reproducing \'{}\''.format(self.relpath)) self.run(dry=dry)