fix: prevent removed plans from being used in workflow commands (#2998)

SwissDataScienceCenter · Jul 12, 2022 · 493f4c5 · 493f4c5
1 parent 753d037
commit 493f4c5
Show file tree

Hide file tree

Showing 11 changed files with 1,025 additions and 867 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -349,6 +349,8 @@
 nitpick_ignore = [
     ("py:class", "CommandResult"),
     ("py:class", "CommunicationCallback"),
+    ("py:class", "datetime"),
+    ("py:class", "DiGraph"),
     ("py:class", "DynamicProxy"),
     ("py:class", "IActivityGateway"),
     ("py:class", "IClientDispatcher"),

diff --git a/docs/reference/core.rst b/docs/reference/core.rst
@@ -158,6 +158,14 @@ Workflows
    :members:
    :show-inheritance:
 
+.. automodule:: renku.core.workflow.plan
+   :members:
+   :show-inheritance:
+
+.. automodule:: renku.core.workflow.execute
+   :members:
+   :show-inheritance:
+
 .. automodule:: renku.core.workflow.concrete_execution_graph
    :members:
    :show-inheritance:

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -209,6 +209,7 @@ Subclass
 subclasses
 Subclasses
 subcommand
+subcommands
 subdirectories
 subdirectory
 subfolder
@@ -218,6 +219,7 @@ Subgraph
 submodule
 submodules
 subpath
+subprocesses
 substep
 substeps
 substring

diff --git a/renku/command/rerun.py b/renku/command/rerun.py
@@ -20,13 +20,13 @@
 from typing import List, Optional
 
 from renku.command.command_builder.command import Command, inject
-from renku.command.workflow import execute_workflow
 from renku.core import errors
 from renku.core.interface.activity_gateway import IActivityGateway
 from renku.core.interface.client_dispatcher import IClientDispatcher
 from renku.core.util.os import get_relative_paths
 from renku.core.workflow.activity import get_activities_until_paths, sort_activities
 from renku.core.workflow.concrete_execution_graph import ExecutionGraph
+from renku.core.workflow.execute import execute_workflow_graph
 
 
 def rerun_command():
@@ -77,4 +77,4 @@ def _rerun(
         return activities, set(sources)
 
     graph = ExecutionGraph([a.plan_with_values for a in activities], virtual_links=True)
-    execute_workflow(dag=graph.workflow_graph, provider=provider, config=config)
+    execute_workflow_graph(dag=graph.workflow_graph, provider=provider, config=config)
diff --git a/renku/command/update.py b/renku/command/update.py
@@ -22,7 +22,6 @@
 
 from renku.command.command_builder import inject
 from renku.command.command_builder.command import Command
-from renku.command.workflow import execute_workflow
 from renku.core import errors
 from renku.core.errors import ParameterError
 from renku.core.interface.client_dispatcher import IClientDispatcher
@@ -34,6 +33,7 @@
     sort_activities,
 )
 from renku.core.workflow.concrete_execution_graph import ExecutionGraph
+from renku.core.workflow.execute import execute_workflow_graph
 
 
 def update_command():
@@ -81,4 +81,4 @@ def _update(
         return activities, modified_paths
 
     graph = ExecutionGraph([a.plan_with_values for a in activities], virtual_links=True)
-    execute_workflow(dag=graph.workflow_graph, provider=provider, config=config)
+    execute_workflow_graph(dag=graph.workflow_graph, provider=provider, config=config)