refactor-directory-structure

docs/reference/core.rst

@@ -182,7 +182,7 @@ Workflows
    :members:
    :show-inheritance:
 
-.. automodule:: renku.core.workflow.concrete_execution_graph
+.. automodule:: renku.core.workflow.model.concrete_execution_graph
    :members:
    :show-inheritance:
 

renku/command/rerun.py

@@ -26,8 +26,8 @@
 from renku.core.interface.activity_gateway import IActivityGateway
 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
+from renku.core.workflow.model.concrete_execution_graph import ExecutionGraph
 from renku.domain_model.project_context import project_context
 
 

renku/command/update.py

@@ -32,8 +32,8 @@
     is_activity_valid,
     sort_activities,
 )
-from renku.core.workflow.concrete_execution_graph import ExecutionGraph
 from renku.core.workflow.execute import execute_workflow_graph
+from renku.core.workflow.model.concrete_execution_graph import ExecutionGraph
 from renku.domain_model.project_context import project_context
 
 

renku/command/view_model/workflow_file.py

@@ -23,7 +23,7 @@
 from datetime import datetime
 from typing import Any, List, Optional
 
-from renku.core.workflow.workflow_file import HiddenParameter, Input, Output, Parameter, Step, WorkflowFile
+from renku.core.workflow.model.workflow_file import HiddenParameter, Input, Output, Parameter, Step, WorkflowFile
 
 
 @dataclasses.dataclass

renku/core/interface/workflow_file_parser.py

@@ -24,7 +24,7 @@
 from typing import TYPE_CHECKING, Tuple, Union
 
 if TYPE_CHECKING:
-    from renku.core.workflow.workflow_file import WorkflowFile
+    from renku.core.workflow.model.workflow_file import WorkflowFile
 
 
 class IWorkflowFileParser(metaclass=ABCMeta):

renku/core/plugin/workflow_file_parser.py

@@ -26,7 +26,7 @@
 from renku.core.interface.workflow_file_parser import IWorkflowFileParser
 
 if TYPE_CHECKING:
-    from renku.core.workflow.workflow_file import WorkflowFile
+    from renku.core.workflow.model.workflow_file import WorkflowFile
 
 
 hookspec = pluggy.HookspecMarker("renku")

renku/core/workflow/converters/cwl.py

@@ -30,7 +30,7 @@
 from renku.core.plugin import hookimpl
 from renku.core.plugin.provider import RENKU_ENV_PREFIX
 from renku.core.util.yaml import dumps_yaml, write_yaml
-from renku.core.workflow.concrete_execution_graph import ExecutionGraph
+from renku.core.workflow.model.concrete_execution_graph import ExecutionGraph
 from renku.domain_model.workflow.composite_plan import CompositePlan
 from renku.domain_model.workflow.converters import IWorkflowConverter
 from renku.domain_model.workflow.parameter import DIRECTORY_MIME_TYPE, CommandInput, CommandOutput, CommandParameter

renku/core/workflow/execute.py

@@ -34,7 +34,7 @@
 from renku.core.util import communication
 from renku.core.util.datetime8601 import local_now
 from renku.core.util.os import is_subpath, safe_read_yaml
-from renku.core.workflow.concrete_execution_graph import ExecutionGraph
+from renku.core.workflow.model.concrete_execution_graph import ExecutionGraph
 from renku.core.workflow.plan import is_plan_removed
 from renku.core.workflow.plan_factory import delete_indirect_files_list
 from renku.core.workflow.value_resolution import ValueResolver

renku/core/workflow/model/__init__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2017-2022 - Swiss Data Science Center (SDSC)
+# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+# Eidgenössische Technische Hochschule Zürich (ETHZ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Renku workflow models."""