[pre-commit.ci] pre-commit autoupdate (#768)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0)
- [github.com/psf/black: 24.1.1 → 24.4.2](psf/black@24.1.1...24.4.2)
- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](codespell-project/codespell@v2.2.6...v2.3.0)
- [github.com/astral-sh/ruff-pre-commit: v0.1.14 → v0.4.8](astral-sh/ruff-pre-commit@v0.1.14...v0.4.8)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -21,7 +21,7 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.4.2
     hooks:
       - id: black
         additional_dependencies: [".[jupyter]"]
@@ -31,13 +31,13 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.1.14'
+    rev: 'v0.4.8'
     hooks:
       - id: ruff
         args: ['--fix']

tests/integration/function_wrapper/test_single_function.py

@@ -24,18 +24,20 @@ def test_example_func(proj_path):
 
 def test_example_func_dry_run(proj_path):
     script = example_func(dry_run=True)
-    assert " ".join(script) == " ".join([
-        "stage",
-        "add",
-        "-n",
-        "example_func",
-        "--force",
-        "--params",
-        "params.yaml:example_func",
-        "--outs",
-        "test.txt",
-        "zntrack run test_single_function.example_func",
-    ])
+    assert " ".join(script) == " ".join(
+        [
+            "stage",
+            "add",
+            "-n",
+            "example_func",
+            "--force",
+            "--params",
+            "params.yaml:example_func",
+            "--outs",
+            "test.txt",
+            "zntrack run test_single_function.example_func",
+        ]
+    )
 
 
 @zntrack.nodify(outs=[pathlib.Path("test.txt")], params={"text": "Lorem Ipsum"})

tests/integration/test_cli.py

@@ -141,16 +141,18 @@ def test_list_groups(proj_path, runner):
             "ParamsToOuts",
             "ParamsToOuts_1",
         ],
-        "nested": [{
-            "GRP1": [
-                "ParamsToOuts -> nested_GRP1_ParamsToOuts",
-                "ParamsToOuts_1 -> nested_GRP1_ParamsToOuts_1",
-            ],
-            "GRP2": [
-                "ParamsToOuts -> nested_GRP2_ParamsToOuts",
-                "ParamsToOuts_1 -> nested_GRP2_ParamsToOuts_1",
-            ],
-        }],
+        "nested": [
+            {
+                "GRP1": [
+                    "ParamsToOuts -> nested_GRP1_ParamsToOuts",
+                    "ParamsToOuts_1 -> nested_GRP1_ParamsToOuts_1",
+                ],
+                "GRP2": [
+                    "ParamsToOuts -> nested_GRP2_ParamsToOuts",
+                    "ParamsToOuts_1 -> nested_GRP2_ParamsToOuts_1",
+                ],
+            }
+        ],
     }
 
     groups, _ = utils.cli.get_groups(remote=proj_path, rev=None)

zntrack/cli/__init__.py

@@ -64,6 +64,7 @@ def run(
         Save only the metadata.
     method : str, default 'run'
         The method to run on the node.
+
     """
     env_file = pathlib.Path("env.yaml")
     if env_file.exists():

zntrack/core/load.py

@@ -58,6 +58,7 @@ def _import_from_tempfile(package_and_module: str, remote, rev):
         If the module could not be found.
     FileNotFoundError
         If the file could not be found.
+
     """
     file = pathlib.Path(*package_and_module.split(".")).with_suffix(".py")
     fs = dvc.api.DVCFileSystem(url=remote, rev=rev)
@@ -93,6 +94,7 @@ def from_rev(name, remote=".", rev=None, **kwargs) -> T:
     -------
     Node
         The loaded node.
+
     """
     if isinstance(name, Node):
         name = name.name

zntrack/core/node.py

@@ -59,6 +59,7 @@ class NodeStatus:
         The temporary path used for loading the data.
         This is only set within the context manager 'use_tmp_path'.
         If neither 'remote' nor 'rev' are set, tmp_path will not be used.
+
     """
 
     loaded: bool
@@ -202,6 +203,7 @@ class Node(zninit.ZnInit, znflow.Node):
         information about the state of the Node.
     nwd : pathlib.Path
         the node working directory.
+
     """
 
     _state: NodeStatus = None
@@ -235,6 +237,7 @@ def convert_notebook(cls, nb_name: str = None):
         ----------
         nb_name: str
             Notebook name when not using config.nb_name (this is not recommended)
+
         """
         # TODO this should not be a class method, but a function.
         jupyter_class_to_file(nb_name=nb_name, module_name=cls.__name__)
@@ -324,6 +327,7 @@ def load(self, lazy: bool = None, results: bool = True) -> None:
             Whether to load the node lazily. If None, the value from the config is used.
         results : bool, default = True
             Whether to load the results. If False, only the parameters are loaded.
+
         """
         from zntrack.fields.field import Field, FieldGroup
 

zntrack/core/nodify.py

@@ -35,6 +35,7 @@ class DVCRunOptions:
     References
     ----------
     https://dvc.org/doc/command-reference/run#options.
+
     """
 
     no_commit: bool
@@ -51,6 +52,7 @@ def dvc_args(self) -> list:
         -------
         list: A list of strings for the subprocess call, e.g.:
             ["--no-commit", "--external"].
+
         """
         out = []
         for datacls_field in dataclasses.fields(self):
@@ -97,6 +99,7 @@ def prepare_dvc_script(
     -------
     list[str]
         The list to be passed to the subprocess call.
+
     """
     script = ["stage", "add", "-n", node_name]
     script += dvc_run_option.dvc_args
@@ -134,6 +137,7 @@ def check_type(
         accept None even if not in types.
     allow_dict:
         allow for {key: types}
+
     """
     if isinstance(obj, (list, tuple, set)) and allow_iterable:
         for value in obj:
@@ -254,6 +258,7 @@ def save_node_config_to_files(cfg: NodeConfig, node_name: str):
         The NodeConfig object which should be serialized to zntrack.json / params.yaml
     node_name: str
         The name of the node, usually func.__name__.
+
     """
     for value_name, value in dataclasses.asdict(cfg).items():
         if value_name == "params":
@@ -339,6 +344,7 @@ def nodify(
     References
     ----------
     https://dvc.org/doc/command-reference/run#options
+
     """
     cfg_ = NodeConfig(
         outs=outs,

zntrack/exceptions/__init__.py

@@ -11,6 +11,7 @@ def __init__(self, arg):
         ----------
         arg : str|Node
             Custom Error message or Node that is not available.
+
         """
         if isinstance(arg, str):
             super().__init__(arg)
@@ -33,6 +34,7 @@ def __init__(self, node, field, instance):
             The 'zn.nodes' field
         instance : Node
             The node that contains the 'zn.nodes' field
+
         """
         msg = (
             f"Can not set '{field.name}' of Node<'{instance.name}'> to"
@@ -59,6 +61,7 @@ def __init__(self, node):
         ----------
         node: Node
             The node that is already on the graph.
+
         """
         msg = (
             f"Node name '{node.name}' is already used in the graph. Please use"

zntrack/fields/dependency.py

@@ -96,6 +96,7 @@ def _get_nodes_on_off_graph(self, instance) -> t.Tuple[list, list]:
             The nodes that are on the graph.
         off_graph : list
             The nodes that are off the graph.
+
         """
         values = getattr(instance, self.name)
         # TODO use IterableHandler?

zntrack/fields/dvc/options.py

@@ -111,6 +111,7 @@ def get_data(self, instance: "Node") -> any:
         -------
         any
             The value of the field from the configuration file.
+
         """
         zntrack_dict = json.loads(
             instance.state.fs.read_text("zntrack.json"),

zntrack/fields/field.py

@@ -36,6 +36,7 @@ class Field(zninit.Descriptor, abc.ABC):
     ----------
     dvc_option : str
         The dvc command option for this field.
+
     """
 
     dvc_option: str = None
@@ -49,6 +50,7 @@ def save(self, instance: "Node"):
         ----------
         instance : Node
             The Node instance to save the field for.
+
         """
         raise NotImplementedError
 
@@ -70,6 +72,7 @@ def get_files(self, instance: "Node") -> list:
         -------
         list
             The affected files.
+
         """
         raise NotImplementedError
 
@@ -83,6 +86,7 @@ def load(self, instance: "Node", lazy: bool = None):
         lazy : bool, optional
             Whether to load the field lazily.
             This only applies to 'LazyField' classes.
+
         """
         try:
             instance.__dict__[self.name] = self.get_data(instance)
@@ -103,6 +107,7 @@ def get_stage_add_argument(self, instance: "Node") -> typing.List[tuple]:
         -------
         typing.List[tuple]
             The stage add argument for this field.
+
         """
         return [
             (f"--{self.dvc_option}", pathlib.Path(x).as_posix())
@@ -127,6 +132,7 @@ def get_optional_dvc_cmd(
         -------
         typing.List[str]
             The optional dvc commands.
+
         """
         return []
 
@@ -173,6 +179,7 @@ def get_value_except_lazy(self, instance):
         ------
         DataIsLazyError
             If the value is lazy.
+
         """
         with contextlib.suppress(KeyError):
             if instance.__dict__[self.name] is LazyOption:
@@ -198,6 +205,7 @@ def load(self, instance: "Node", lazy: bool = None):
             The Node instance to load the field for.
         lazy : bool, optional
             Whether to load the field lazily, by default 'zntrack.config.lazy'.
+
         """
         if lazy in {None, True} and config.lazy:
             instance.__dict__[self.name] = LazyOption
@@ -226,6 +234,7 @@ def __init__(
         ----------
         use_global_plots : bool
             Save the plots config not in 'stages' but in 'plots' in the dvc.yaml file.
+
         """
         super().__init__(*args, **kwargs)
         self.plots_options = {}

zntrack/fields/fields.py

@@ -17,6 +17,7 @@ def outs():
             The object is serialized and deserialized by ZnTrack
             and stored in the node working directory.
             see https://dvc.org/doc/command-reference/stage/add#-o
+
     """
     return Output(dvc_option="outs", use_repr=False)
 
@@ -49,6 +50,7 @@ def params(*args, **kwargs):
         see https://dvc.org/doc/command-reference/stage/add#-p
     kwargs: dict
         Additional keyword arguments.
+
     """
     return Params(*args, **kwargs)
 
@@ -63,6 +65,7 @@ def deps(*data):
         This can either be a Node or an attribute of a Node.
         It can not be an object that is not part of the Node graph.
         see https://dvc.org/doc/command-reference/stage/add#-d
+
     """
     return Dependency(*data)
 
@@ -132,6 +135,7 @@ def params_path(*args, **kwargs):
         see https://dvc.org/doc/command-reference/stage/add#-p
     kwargs: dict
         Additional keyword arguments.
+
     """
     return DVCOption(*args, dvc_option="params", **kwargs)
 
@@ -163,5 +167,6 @@ def plots_path(*args, dvc_option="plots", **kwargs):
         The DVC option to use for this field.
     kwargs: dict
         Additional keyword arguments that are used for plotting.
+
     """
     return PlotsOption(*args, dvc_option=dvc_option, **kwargs)