use --name instead of 'Node^name=..'

tests/integration_tests/test_single_node.py

@@ -92,7 +92,7 @@ def test_run_dry():
                       'params.yaml:MyCustomNode',
                       '--outs',
                       'nodes/MyCustomNode/outs.json',
-                      'zntrack run test_single_node.ExampleNode01^name=MyCustomNode']
+                      'zntrack run test_single_node.ExampleNode01 --name=MyCustomNode']
 
 
 def test_run_no_exec(proj_path):

tests/unit_tests/core/test_core_base.py

@@ -319,15 +319,7 @@ def test_matmul_not_supported():
 
 def test_write_graph():
     example = ExampleDVCOutsNode()
-
-    with patch.object(ExampleDVCOutsNode, "save") as save_mock, patch(
-        "zntrack.core.base._handle_nodes_as_methods",
-    ) as handle_znnodes_mock:
-        # Patch the methods that write to disk
-        script = example.write_graph(dry_run=True)
-
-    assert save_mock.called
-    assert handle_znnodes_mock.called
+    script = example.write_graph(dry_run=True)
 
     expected_script = [
         "stage",
@@ -337,13 +329,11 @@ def test_write_graph():
         "--force",
         "--outs",
         "example.dat",
-        (
-            f'{utils.config.interpreter} -c "from test_core_base import'
-            " ExampleDVCOutsNode;"
-            " ExampleDVCOutsNode.load(name='ExampleDVCOutsNode').run_and_save()\" "
-        ),
+        'zntrack run test_core_base.ExampleDVCOutsNode --name=ExampleDVCOutsNode'
     ]
 
+    assert script == expected_script
+
 
 def test__handle_nodes_as_methods():
     example = ExampleDVCOutsNode()
@@ -352,7 +342,7 @@ def test__handle_nodes_as_methods():
         _handle_nodes_as_methods({"example": example})
 
     write_graph_mock.assert_called_with(
-        run=True, call_args=f".load(name='{example.node_name}').save(hash_only=True)"
+        run=True, call_args=f"--name={example.node_name} --hash-only"
     )
 
     with patch.object(ExampleDVCOutsNode, "write_graph") as write_graph_mock:

tests/unit_tests/core/test_dvcgraph.py

@@ -170,7 +170,7 @@ def test_prepare_dvc_script():
         nb_name=None,
         module="src.file",
         func_or_cls="MyNode",
-        call_args="^name=MyNode",
+        call_args="--name=MyNode",
     )
 
     assert script == [
@@ -183,7 +183,7 @@ def test_prepare_dvc_script():
         "--force",
         "--deps",
         "file.txt",
-        'zntrack run src.file.MyNode^name=MyNode',
+        'zntrack run src.file.MyNode --name=MyNode',
     ]
 
     script = prepare_dvc_script(
@@ -193,7 +193,7 @@ def test_prepare_dvc_script():
         nb_name="notebook.ipynb",
         module="src.file",
         func_or_cls="MyNode",
-        call_args="^name=MyNode",
+        call_args="--name=MyNode",
     )
 
     assert script == [
@@ -208,7 +208,7 @@ def test_prepare_dvc_script():
         "file.txt",
         "--deps",
         "src/file.py",
-        'zntrack run src.file.MyNode^name=MyNode',
+        'zntrack run src.file.MyNode --name=MyNode',
     ]
 
 

zntrack/cli/__init__.py

@@ -16,37 +16,33 @@ def version_callback(value: bool) -> None:
 
 @app.callback()
 def main(
-    version: bool = typer.Option(
-        None, "--version", callback=version_callback, is_eager=True
-    ),
+        version: bool = typer.Option(
+            None, "--version", callback=version_callback, is_eager=True
+        ),
 ) -> None:
     """ZnTrack CLI callback."""
     _ = version  # this would be greyed out otherwise
 
 
 @app.command()
-def run(cmd: str) -> None:
+def run(node: str, name: str = None, hash_only: bool = False) -> None:
     """Execute a ZnTrack Node.
 
-    Use as `zntrack run module.Node^name=nodename` or in `zntrack run module.nodified`.
+    Use as `zntrack run module.Node --name node_name`.
     """
     sys.path.append(pathlib.Path.cwd().as_posix())
 
-    cmd, *kwargs = cmd.split("^")
-    hash_only = "hash_only" in kwargs
-    if hash_only:
-        kwargs.remove("hash_only")
-    kwargs = [tuple(arg.split("=")) for arg in kwargs]
-    package_and_module, cls = cmd.split(".", 1)
+    package_and_module, cls = node.split(".", 1)
     module = importlib.import_module(package_and_module)
 
     cls = getattr(module, cls)
 
     try:
-        node = cls.load(**dict(kwargs))
+        node = cls.load(name=name)
         if hash_only:
             node.save(hash_only=True)
         else:
             node.run_and_save()
     except AttributeError:
-        cls(exec_func=True, **dict(kwargs))
+        # @nodify function
+        cls(exec_func=True)

zntrack/core/base.py

@@ -94,7 +94,7 @@ def _handle_nodes_as_methods(nodes: dict):
         if node is not None:
             node.write_graph(
                 run=True,
-                call_args=f"^name={node.node_name}^hash_only"
+                call_args=f"--name={node.node_name} --hash-only"
             )
 
 
@@ -651,7 +651,7 @@ def write_graph(  # noqa: C901
             custom_args += pair
 
         if call_args is None:
-            call_args = f"^name={self.node_name}"
+            call_args = f"--name={self.node_name}"
 
         script = prepare_dvc_script(
             node_name=self.node_name,

zntrack/core/dvcgraph.py

@@ -139,7 +139,7 @@ def prepare_dvc_script(
     nb_name,
     module,
     func_or_cls,
-    call_args="",
+    call_args=None,
 ) -> list:
     """Prepare the dvc cmd to be called by subprocess.
 
@@ -172,7 +172,9 @@ def prepare_dvc_script(
     if nb_name is not None:
         script += ["--deps", utils.module_to_path(module).as_posix()]
 
-    import_str = f"""zntrack run {module}.{func_or_cls}{call_args}"""
+    import_str = f"zntrack run {module}.{func_or_cls}"
+    if call_args is not None:
+        import_str += f" {call_args}"
 
     script += [import_str]
     log.debug(f"dvc script: {' '.join([str(x) for x in script])}")