fixed up import locations in tutorials

Author: tclose

docs/source/tutorial/1-getting-started.ipynb

@@ -303,7 +303,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pydra.utils import default_run_cache_dir\n",
+    "from pydra.utils.general import default_run_cache_dir\n",
     "\n",
     "my_cache_dir = Path(\"~/new-pydra-cache\").expanduser()\n",
     "my_cache_dir.mkdir(exist_ok=True)\n",

docs/source/tutorial/2-advanced-execution.ipynb

@@ -146,12 +146,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pydra.engine.workers import ConcurrentFuturesWorker\n",
+    "from pydra.workers import cf\n",
     "\n",
     "ten_to_the_power = TenToThePower().split(p=[6, 7, 8, 9, 10])\n",
     "\n",
     "# Run the 5 tasks in parallel split across 3 processes\n",
-    "outputs = ten_to_the_power(worker=ConcurrentFuturesWorker(n_procs=3))\n",
+    "outputs = ten_to_the_power(worker=cf.Worker(n_procs=3))\n",
     "\n",
     "p6, p7, p8, p9, p10 = outputs.out\n",
     "\n",
@@ -415,7 +415,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wf12",
+   "display_name": "wf13",
    "language": "python",
    "name": "python3"
   },
@@ -429,7 +429,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.13.1"
   }
  },
  "nbformat": 4,

docs/source/tutorial/3-troubleshooting.ipynb

@@ -152,7 +152,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pydra.utils import default_run_cache_dir\n",
+    "from pydra.utils.general import default_run_cache_dir\n",
     "import cloudpickle as cp\n",
     "from pprint import pprint\n",
     "from pydra.tasks.testing import Divide\n",
@@ -241,7 +241,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wf12",
+   "display_name": "wf13",
    "language": "python",
    "name": "python3"
   },
@@ -255,7 +255,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.13.1"
   }
  },
  "nbformat": 4,

docs/source/tutorial/4-python.ipynb

@@ -164,7 +164,7 @@
    "outputs": [],
    "source": [
     "from pprint import pprint\n",
-    "from pydra.engine.helpers import fields_dict\n",
+    "from pydra.utils import fields_dict\n",
     "\n",
     "\n",
     "@python.define(outputs=[\"c\", \"d\"])\n",
@@ -242,7 +242,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wf12",
+   "display_name": "wf13",
    "language": "python",
    "name": "python3"
   },
@@ -256,7 +256,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.13.1"
   }
  },
  "nbformat": 4,

docs/source/tutorial/5-shell.ipynb

@@ -135,7 +135,7 @@
    "outputs": [],
    "source": [
     "from pprint import pprint\n",
-    "from pydra.engine.helpers import fields_dict\n",
+    "from pydra.utils import fields_dict\n",
     "\n",
     "Cp = shell.define(\n",
     "    \"cp <in_fs_objects:fs-object+> <out|out_dir:directory> \"\n",
@@ -390,7 +390,7 @@
    "outputs": [],
    "source": [
     "from fileformats.generic import File\n",
-    "from pydra.engine.helpers import list_fields\n",
+    "from pydra.utils import task_fields\n",
     "\n",
     "ACommand = shell.define(\n",
     "    \"a-command\",\n",
@@ -408,8 +408,8 @@
     ")\n",
     "\n",
     "\n",
-    "print(f\"ACommand input fields: {list_fields(ACommand)}\")\n",
-    "print(f\"ACommand input fields: {list_fields(ACommand.Outputs)}\")"
+    "print(f\"ACommand input fields: {task_fields(ACommand)}\")\n",
+    "print(f\"ACommand input fields: {task_fields(ACommand.Outputs)}\")"
    ]
   },
   {
@@ -420,7 +420,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wf12",
+   "display_name": "wf13",
    "language": "python",
    "name": "python3"
   },
@@ -434,7 +434,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.13.1"
   }
  },
  "nbformat": 4,

docs/source/tutorial/6-workflow.ipynb

@@ -446,7 +446,7 @@
     "import numpy as np\n",
     "from fileformats.medimage import Nifti1\n",
     "import fileformats.medimage_mrtrix3 as mrtrix3\n",
-    "from pydra.engine.environments import Docker\n",
+    "from pydra.environments import docker\n",
     "from pydra.compose import workflow, python\n",
     "from pydra.tasks.mrtrix3.v3_0 import MrConvert, MrThreshold\n",
     "\n",
@@ -483,7 +483,7 @@
     "    input_conversion = workflow.add(\n",
     "        MrConvert(in_file=in_image, out_file=\"out_file.mih\"),\n",
     "        name=\"input_conversion\",\n",
-    "        environment=Docker(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
+    "        environment=docker.Environment(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
     "    )\n",
     "\n",
     "    @python.define\n",
@@ -502,13 +502,13 @@
     "\n",
     "    threshold = workflow.add(\n",
     "        MrThreshold(in_file=in_image, out_file=\"binary.mif\", abs=median.out),\n",
-    "        environment=Docker(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
+    "        environment=docker.Environment(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
     "    )\n",
     "\n",
     "    output_conversion = workflow.add(\n",
     "        MrConvert(in_file=threshold.out_file, out_file=\"out_image.mif\"),\n",
     "        name=\"output_conversion\",\n",
-    "        environment=Docker(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
+    "        environment=docker.Environment(\"mrtrix3/mrtrix3\", tag=\"latest\"),\n",
     "    )\n",
     "\n",
     "    return output_conversion.out_file\n",
@@ -541,7 +541,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wf12",
+   "display_name": "wf13",
    "language": "python",
    "name": "python3"
   },
@@ -555,7 +555,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.13.1"
   }
  },
  "nbformat": 4,

pydra/utils/__init__.py

@@ -1,8 +1,9 @@
 from .general import (
     task_fields,
+    fields_dict,
     plot_workflow,
     print_help,
 )
 from ._version import __version__
 
-__all__ = ["__version__", "task_fields", "plot_workflow", "print_help"]
+__all__ = ["__version__", "task_fields", "plot_workflow", "print_help", "fields_dict"]