From be138c524cce7ed545a6ab2a534685c1b04bc962 Mon Sep 17 00:00:00 2001
From: Stephan Heunis <s.heunis@fz-juelich.de>
Date: Wed, 12 Jun 2024 10:32:04 +0200
Subject: [PATCH] Fix error caused by argument name 'type' confusion

This changes the argument name from 'type' to 'mode' in order
to prevent any confusion (on the part of the python interpreter)
between the argparse argument 'type' and some possibly protected
variable 'type'.
---
 datalad_catalog/workflow.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/datalad_catalog/workflow.py b/datalad_catalog/workflow.py
index e10011a1..ba859e22 100644
--- a/datalad_catalog/workflow.py
+++ b/datalad_catalog/workflow.py
@@ -117,7 +117,7 @@ class Workflow(ValidatedInterface):
         ),
         mode=Parameter(
             # cmdline argument definitions, incl aliases
-            args=("-t", "--type"),
+            args=("-m", "--mode"),
             # documentation
             doc="""Which type of workflow to run: one of ['new', 'update']""",
         ),
@@ -193,7 +193,7 @@ class Workflow(ValidatedInterface):
                 "dataset='path/to/superdataset', extractor='metalad_core')"
             ),
             code_cmd=(
-                "datalad catalog-workflow -t new -c /tmp/my-cat "
+                "datalad catalog-workflow -m new -c /tmp/my-cat "
                 "-d path/to/superdataset -e metalad_core"
             ),
         ),
@@ -208,7 +208,7 @@ class Workflow(ValidatedInterface):
                 "extractor='metalad_core')"
             ),
             code_cmd=(
-                "datalad catalog-workflow -t new -c /tmp/my-cat "
+                "datalad catalog-workflow -m update -c /tmp/my-cat "
                 "-d path/to/superdataset -s path/to/subdataset -e metalad_core"
             ),
         ),
@@ -244,7 +244,7 @@ def __call__(
         )
         if mode == "new":
             yield from super_workflow(
-                ds=dataset,
+                ds=dataset.ds,
                 cat=catalog,
                 extractors=extractor,
                 config_file=config_file,
@@ -253,8 +253,8 @@ def __call__(
             )
         if mode == "update":
             yield from update_workflow(
-                superds=dataset,
-                subds=subdataset,
+                superds=dataset.ds,
+                subds=subdataset.ds,
                 catalog=catalog,
                 extractors=extractor,
                 **res_kwargs,