Revert change turning Node.state() into a hook. (#370)

Author: tobiasraabe

docs/source/changes.md

@@ -19,6 +19,7 @@ releases are available on [PyPI](https://pypi.org/project/pytask) and
 - {pull}`366` adds light and dark logos and fixes some warnings when building the
   documentation.
 - {pull}`368` fixes an error in `update_plugin_list.py` introduced by {pull}`364`.
+- {pull}`369` reverts the changes that turn `Node.state()` into a hook.
 
 ## 0.3.1 - 2023-12-25
 

src/_pytask/capture.py

@@ -43,7 +43,7 @@
 from _pytask.click import EnumChoice
 from _pytask.config import hookimpl
 from _pytask.enums import ShowCapture
-from _pytask.nodes_utils import Task
+from _pytask.nodes import Task
 
 
 if sys.version_info >= (3, 8):

src/_pytask/clean.py

@@ -21,7 +21,7 @@
 from _pytask.git import get_all_files
 from _pytask.git import get_root
 from _pytask.git import is_git_installed
-from _pytask.nodes_utils import Task
+from _pytask.nodes import Task
 from _pytask.outcomes import ExitCode
 from _pytask.path import find_common_ancestor
 from _pytask.path import relative_to

src/_pytask/collect.py

@@ -22,8 +22,8 @@
 from _pytask.console import format_task_id
 from _pytask.exceptions import CollectionError
 from _pytask.mark_utils import has_mark
-from _pytask.nodes_utils import FilePathNode
-from _pytask.nodes_utils import Task
+from _pytask.nodes import FilePathNode
+from _pytask.nodes import Task
 from _pytask.outcomes import CollectionOutcome
 from _pytask.outcomes import count_outcomes
 from _pytask.path import find_case_sensitive_path

src/_pytask/collect_command.py

@@ -32,7 +32,7 @@
 
 if TYPE_CHECKING:
     from typing import NoReturn
-    from _pytask.nodes_utils import Task
+    from _pytask.nodes import Task
 
 
 @hookimpl(tryfirst=True)

src/_pytask/collect_utils.py

@@ -20,7 +20,7 @@
 
 if TYPE_CHECKING:
     from _pytask.session import Session
-    from _pytask.nodes_utils import Node
+    from _pytask.nodes import Node
 
 
 __all__ = ["depends_on", "parse_nodes", "produces"]

src/_pytask/console.py

@@ -26,7 +26,7 @@
 
 
 if TYPE_CHECKING:
-    from _pytask.nodes_utils import Task
+    from _pytask.nodes import Task
     from _pytask.outcomes import CollectionOutcome
     from _pytask.outcomes import TaskOutcome
 

src/_pytask/dag.py

@@ -21,9 +21,9 @@
 from _pytask.mark import Mark
 from _pytask.mark_utils import get_marks
 from _pytask.mark_utils import has_mark
-from _pytask.nodes_utils import FilePathNode
-from _pytask.nodes_utils import Node
-from _pytask.nodes_utils import Task
+from _pytask.nodes import FilePathNode
+from _pytask.nodes import Node
+from _pytask.nodes import Task
 from _pytask.path import find_common_ancestor_of_nodes
 from _pytask.report import DagReport
 from _pytask.session import Session
@@ -105,9 +105,9 @@ def pytask_dag_select_execution_dag(session: Session, dag: nx.DiGraph) -> None:
 
 
 @hookimpl
-def pytask_dag_validate_dag(session: Session, dag: nx.DiGraph) -> None:
+def pytask_dag_validate_dag(dag: nx.DiGraph) -> None:
     """Validate the DAG."""
-    _check_if_root_nodes_are_available(session, dag)
+    _check_if_root_nodes_are_available(dag)
     _check_if_tasks_have_the_same_products(dag)
 
 
@@ -128,11 +128,11 @@ def _have_task_or_neighbors_changed(
 
 @orm.db_session
 @hookimpl(trylast=True)
-def pytask_dag_has_node_changed(session: Session, node: Node, task_name: str) -> bool:
+def pytask_dag_has_node_changed(node: Node, task_name: str) -> bool:
     """Indicate whether a single dependency or product has changed."""
     if isinstance(node, (FilePathNode, Task)):
         # If node does not exist, we receive None.
-        file_state = session.hook.pytask_node_state(node=node)
+        file_state = node.state()
         if file_state is None:
             return True
 
@@ -155,7 +155,7 @@ def pytask_dag_has_node_changed(session: Session, node: Node, task_name: str) ->
         # to avoid unnecessary and expensive reexecutions of tasks.
         file_hash = hashlib.sha256(node.path.read_bytes()).hexdigest()
         return file_hash != db_state.file_hash
-    return None
+    return node.state()
 
 
 def _check_if_dag_has_cycles(dag: nx.DiGraph) -> None:
@@ -194,7 +194,7 @@ def _format_cycles(cycles: list[tuple[str, ...]]) -> str:
     _TEMPLATE_ERROR += "\n\n(Hint: Sometimes case sensitivity is at fault.)"
 
 
-def _check_if_root_nodes_are_available(session: Session, dag: nx.DiGraph) -> None:
+def _check_if_root_nodes_are_available(dag: nx.DiGraph) -> None:
     missing_root_nodes = []
     is_task_skipped: dict[str, bool] = {}
 
@@ -206,9 +206,7 @@ def _check_if_root_nodes_are_available(session: Session, dag: nx.DiGraph) -> Non
                 node, dag, is_task_skipped
             )
             if not are_all_tasks_skipped:
-                node_exists = session.hook.pytask_node_state(
-                    node=dag.nodes[node]["node"]
-                )
+                node_exists = dag.nodes[node]["node"].state()
                 if not node_exists:
                     missing_root_nodes.append(node)
 

src/_pytask/dag_utils.py

@@ -9,7 +9,7 @@
 from _pytask.console import format_strings_as_flat_tree
 from _pytask.console import TASK_ICON
 from _pytask.mark_utils import has_mark
-from _pytask.nodes_utils import Task
+from _pytask.nodes import Task
 from attrs import define
 from attrs import field
 

src/_pytask/database_utils.py

@@ -4,7 +4,7 @@
 import hashlib
 
 from _pytask.dag_utils import node_and_neighbors
-from _pytask.nodes_utils import Task
+from _pytask.nodes import Task
 from _pytask.session import Session
 from pony import orm
 
@@ -61,11 +61,11 @@ def update_states_in_database(session: Session, task_name: str) -> None:
     for name in node_and_neighbors(session.dag, task_name):
         node = session.dag.nodes[name].get("task") or session.dag.nodes[name]["node"]
 
-        modification_time = session.hook.pytask_node_state(node=node)
+        state = node.state()
 
         if isinstance(node, Task):
             hash_ = hashlib.sha256(node.path.read_bytes()).hexdigest()
         else:
             hash_ = ""
 
-        _create_or_update_state(task_name, node.name, modification_time, hash_)
+        _create_or_update_state(task_name, node.name, state, hash_)