fix output directory handling

Author: kateforsberg13

publish_gizmo/nuke_gizmo_publisher.py

@@ -233,15 +233,15 @@ def _customize_project_yml(companion_base: Path) -> None:
             path_macro="griptape_outputs",
         )
 
-        workflow_name = companion_base.name
         template.situations["save_node_output"] = SituationTemplate(
             name="save_node_output",
             description="Node generates and saves output (Nuke gizmo)",
-            # Drop node_name and version-index suffixes so the artist's chosen
-            # filename is preserved exactly.  {sub_dirs?:/} passes through any
-            # relative subdirectory the artist typed (e.g. "renders/comp.exr"
-            # lands under griptape_outputs/<workflow>/renders/comp.exr).
-            macro=f"{{outputs}}/{workflow_name}/{{sub_dirs?:/}}{{file_name_base}}.{{file_extension}}",
+            # No workflow-name subdirectory: files land directly under {outputs}.
+            # When Output Directory is set at runtime, {outputs} is redirected there,
+            # so files go directly into the artist's chosen directory.
+            # {sub_dirs?:/} passes through any relative subdirectory the artist typed
+            # (e.g. "renders/comp.exr" lands under griptape_outputs/renders/comp.exr).
+            macro="{outputs}/{sub_dirs?:/}{file_name_base}.{file_extension}",
             policy=SituationPolicy(
                 on_collision=SituationFilePolicy.OVERWRITE,
                 create_dirs=True,

publish_gizmo/nuke_workflow_runner.py

@@ -26,10 +26,12 @@
 import re
 import subprocess
 import sys
+import tempfile
 from pathlib import Path
 
 from dotenv import load_dotenv
 from griptape_nodes.common.project_templates import load_project_template_from_yaml
+from griptape_nodes.common.project_templates.directory import DirectoryDefinition
 from griptape_nodes.common.project_templates.validation import ProjectValidationInfo, ProjectValidationStatus
 from output_protocol import emit_payload
 
@@ -254,16 +256,50 @@ def main() -> None:
         sys.exit(1)
 
     script_dir = Path(__file__).parent
-    project_file = script_dir / "project.yml"
+    bundle_project_file = script_dir / "project.yml"
+
+    # When an output directory is specified, build a per-run temp project.yml that
+    # redirects {outputs} to the requested directory.  The bundle's situation macro
+    # and OVERWRITE policy are kept exactly as authored — only the directory changes.
+    # This makes the engine's actual save path agree with the path we report to Nuke.
+    # The bundle file itself is never modified.
+    temp_project_file = None
+    project_file_path: str | None = str(bundle_project_file) if bundle_project_file.exists() else None
+
+    if args.output_dir and bundle_project_file.exists():
+        validation_info = ProjectValidationInfo(status=ProjectValidationStatus.GOOD)
+        template = load_project_template_from_yaml(bundle_project_file.read_text(encoding="utf-8"), validation_info)
+        if template is not None:
+            template.directories["outputs"] = DirectoryDefinition(
+                name="outputs",
+                path_macro=args.output_dir,
+            )
+            tmp = tempfile.NamedTemporaryFile(
+                mode="w",
+                suffix=".yml",
+                prefix="griptape_nuke_run_",
+                delete=False,
+                encoding="utf-8",
+            )
+            tmp.write(template.to_yaml())
+            tmp.close()
+            temp_project_file = tmp.name
+            project_file_path = temp_project_file
 
     try:
         output = module.execute_workflow(
             input=flow_input,
-            project_file_path=str(project_file) if project_file.exists() else None,
+            project_file_path=project_file_path,
         )
     except Exception as e:
         emit_payload({"error": f"Workflow execution failed: {e}"})
         sys.exit(1)
+    finally:
+        if temp_project_file is not None:
+            try:
+                Path(temp_project_file).unlink(missing_ok=True)
+            except OSError:
+                pass
 
     workspace_dir = Path(args.nk_script_dir) if args.nk_script_dir else None
     macro_map = _build_macro_map(Path(__file__).parent, workspace_dir=workspace_dir)

publish_gizmo/run_button.py

@@ -33,7 +33,6 @@
 import tempfile
 import threading
 import time
-from pathlib import Path
 
 # run_button.py is exec'd (not imported) by the gizmo bootstrap, so __file__'s
 # directory is not added to sys.path automatically. Insert it so that
@@ -306,19 +305,6 @@ def _uv_fallback_paths():
         else:
             print(f"[Griptape] knob '{_k}' -> NOT FOUND on node")
 
-    # -- Resolve bare filenames against output_dir --
-    # When the artist sets an Output Directory on the gizmo and a workflow input
-    # is a relative filename (e.g. output_file="julia_test.jpg"), combine them
-    # into an absolute path so SaveImage bypasses the project macro and writes
-    # exactly where the artist expects.  Already-absolute paths are left alone.
-    if output_dir:
-        _output_dir_path = Path(output_dir)
-        for _k in list(inputs.keys()):
-            _v = inputs[_k]
-            if isinstance(_v, str) and _v and not Path(_v).is_absolute():
-                inputs[_k] = str(_output_dir_path / _v)
-                print(f"[Griptape] resolved '{_k}' -> {inputs[_k]!r}")
-
     # -- Render media inputs from upstream Nuke connections to temp files --
 
     for _mk in _media_input_names: