Fix.

Author: tobiasraabe

src/_pytask/delayed.py

@@ -1,17 +1,20 @@
 """Contains hook implementations for provisional nodes and task generators."""
+
 from __future__ import annotations
 
 import inspect
 import sys
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
 from typing import Mapping
-from typing import TYPE_CHECKING
+
+from pytask import TaskOutcome
 
 from _pytask.config import hookimpl
+from _pytask.delayed_utils import TASKS_WITH_PROVISIONAL_NODES
 from _pytask.delayed_utils import collect_provisional_nodes
 from _pytask.delayed_utils import recreate_dag
-from _pytask.delayed_utils import TASKS_WITH_PROVISIONAL_NODES
 from _pytask.exceptions import NodeLoadError
 from _pytask.node_protocols import PNode
 from _pytask.node_protocols import PProvisionalNode
@@ -24,7 +27,6 @@
 from _pytask.tree_util import tree_map
 from _pytask.tree_util import tree_map_with_path
 from _pytask.typing import is_task_generator
-from pytask import TaskOutcome
 
 if TYPE_CHECKING:
     from _pytask.session import Session

src/_pytask/delayed_utils.py

@@ -2,11 +2,16 @@
 
 import sys
 from pathlib import Path
-from typing import Any
 from typing import TYPE_CHECKING
+from typing import Any
 
 from _pytask.collect_utils import collect_dependency
+from _pytask.dag import _check_if_dag_has_cycles
+from _pytask.dag import _check_if_tasks_have_the_same_products
+from _pytask.dag import _create_dag
+from _pytask.dag import _modify_dag
 from _pytask.dag_utils import TopologicalSorter
+from _pytask.mark import select_tasks_by_marks_and_expressions
 from _pytask.models import NodeInfo
 from _pytask.node_protocols import PNode
 from _pytask.node_protocols import PProvisionalNode
@@ -69,10 +74,12 @@ def collect_provisional_nodes(
 def recreate_dag(session: Session, task: PTask) -> None:
     """Recreate the DAG."""
     try:
-        session.dag = session.hook.pytask_dag_create_dag(
-            session=session, tasks=session.tasks
-        )
-        session.hook.pytask_dag_modify_dag(session=session, dag=session.dag)
+        dag = _create_dag(tasks=session.tasks)
+        _check_if_dag_has_cycles(dag)
+        _check_if_tasks_have_the_same_products(dag, session.config["paths"])
+        _modify_dag(session=session, dag=dag)
+        select_tasks_by_marks_and_expressions(session=session, dag=dag)
+        session.dag = dag
         session.scheduler = TopologicalSorter.from_dag_and_sorter(
             session.dag, session.scheduler
         )

tests/conftest.py

@@ -29,7 +29,7 @@ def _remove_variable_info_from_output(data: str, path: Any) -> str:  # noqa: ARG
 
     # Remove dynamic versions.
     index_root = next(i for i, line in enumerate(lines) if line.startswith("Root:"))
-    new_info_line = "".join(lines[1:index_root])
+    new_info_line = " ".join(lines[1:index_root])
     for platform in ("linux", "win32", "darwin"):
         new_info_line = new_info_line.replace(platform, "<platform>")
     pattern = re.compile(version.VERSION_PATTERN, flags=re.IGNORECASE | re.VERBOSE)

tests/test_jupyter/test_task_generator.ipynb

@@ -3,7 +3,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "12bc75b1",
+   "id": "0",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -20,7 +20,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "29ac7311",
+   "id": "1",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -46,7 +46,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "738c9418",
+   "id": "2",
    "metadata": {},
    "outputs": [],
    "source": [

tests/test_task_utils.py

@@ -6,10 +6,10 @@
 from typing import NamedTuple
 
 import pytest
+from _pytask.task_utils import COLLECTED_TASKS
 from _pytask.task_utils import _arg_value_to_id_component
 from _pytask.task_utils import _parse_name
 from _pytask.task_utils import _parse_task_kwargs
-from _pytask.task_utils import COLLECTED_TASKS
 from attrs import define
 from pytask import Mark
 from pytask import task
@@ -67,8 +67,7 @@ def test_parse_task_kwargs(kwargs, expectation, expected):
 @pytest.mark.integration()
 def test_default_values_of_pytask_meta():
     @task()
-    def task_example():
-        ...
+    def task_example(): ...
 
     assert task_example.pytask_meta.after == []
     assert not task_example.pytask_meta.is_generator