griptape-nodes 0.70.1__py3-none-any.whl → 0.72.0__py3-none-any.whl

griptape_nodes/retained_mode/managers/project_manager.py

@@ -63,6 +63,7 @@ from griptape_nodes.retained_mode.events.project_events import (
     SetCurrentProjectResultSuccess,
 )
 from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
+from griptape_nodes.utils.path_utils import resolve_workspace_path
 
 if TYPE_CHECKING:
     from griptape_nodes.retained_mode.managers.config_manager import ConfigManager
@@ -522,10 +523,7 @@ class ProjectManager:
         resolved_path = Path(resolved_string)
 
         # Make absolute path by resolving against project base directory
-        if resolved_path.is_absolute():
-            absolute_path = resolved_path
-        else:
-            absolute_path = project_info.project_base_dir / resolved_path
+        absolute_path = resolve_workspace_path(resolved_path, project_info.project_base_dir)
 
         return GetPathForMacroResultSuccess(
             resolved_path=resolved_path,
@@ -964,9 +962,7 @@ class ProjectManager:
                 raise RuntimeError(msg) from e
 
             # Make absolute (resolve relative paths against project base directory)
-            resolved_dir_path = Path(resolved_path_str)
-            if not resolved_dir_path.is_absolute():
-                resolved_dir_path = project_base_dir / resolved_dir_path
+            resolved_dir_path = resolve_workspace_path(Path(resolved_path_str), project_base_dir)
             # Normalize for consistent cross-platform comparison
             resolved_dir_path = os_manager.resolve_path_safely(resolved_dir_path)
 

griptape_nodes/retained_mode/managers/session_manager.py

@@ -175,6 +175,7 @@ class SessionManager:
         session_state_file = self._get_session_state_file(engine_id)
         if session_state_file.exists():
             try:
+                # TODO: Replace with DeleteFileRequest https://github.com/griptape-ai/griptape-nodes/issues/3765
                 session_state_file.unlink()
                 logger.info("Cleared all saved session data for engine: %s", engine_id)
             except OSError:

griptape_nodes/retained_mode/managers/settings.py

@@ -225,6 +225,11 @@ class Settings(BaseModel):
         description="Maximum number of nodes executing at a time for parallel execution.",
     )
     storage_backend: Literal["local", "gtc"] = Field(category=STORAGE, default="local")
+    auto_inject_workflow_metadata: bool = Field(
+        category=STORAGE,
+        default=True,
+        description="Automatically inject workflow metadata into saved images (JPEG, PNG, TIFF, MPO)",
+    )
     minimum_disk_space_gb_libraries: float = Field(
         category=SYSTEM_REQUIREMENTS,
         default=10.0,

griptape_nodes/retained_mode/managers/static_files_manager.py

@@ -10,9 +10,11 @@ from xdg_base_dirs import xdg_config_home
 from griptape_nodes.drivers.storage import StorageBackend
 from griptape_nodes.drivers.storage.griptape_cloud_storage_driver import GriptapeCloudStorageDriver
 from griptape_nodes.drivers.storage.local_storage_driver import LocalStorageDriver
+from griptape_nodes.node_library.workflow_registry import WorkflowRegistry
 from griptape_nodes.retained_mode.events.app_events import AppInitializationComplete
 from griptape_nodes.retained_mode.events.os_events import ExistingFilePolicy
 from griptape_nodes.retained_mode.events.static_file_events import (
+    CreateStaticFileDownloadUrlFromPathRequest,
     CreateStaticFileDownloadUrlRequest,
     CreateStaticFileDownloadUrlResultFailure,
     CreateStaticFileDownloadUrlResultSuccess,
@@ -23,10 +25,13 @@ from griptape_nodes.retained_mode.events.static_file_events import (
     CreateStaticFileUploadUrlResultFailure,
     CreateStaticFileUploadUrlResultSuccess,
 )
+from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 from griptape_nodes.retained_mode.managers.config_manager import ConfigManager
 from griptape_nodes.retained_mode.managers.event_manager import EventManager
+from griptape_nodes.retained_mode.managers.image_metadata_injector import inject_workflow_metadata_if_image
 from griptape_nodes.retained_mode.managers.secrets_manager import SecretsManager
-from griptape_nodes.servers.static import start_static_server
+from griptape_nodes.servers.static import STATIC_SERVER_URL, start_static_server
+from griptape_nodes.utils.url_utils import uri_to_path
 
 logger = logging.getLogger("griptape_nodes")
 
@@ -55,8 +60,6 @@ class StaticFilesManager:
         workspace_directory = Path(config_manager.get_config_value("workspace_directory"))
 
         # Build base URL for LocalStorageDriver from configured base URL
-        from griptape_nodes.servers.static import STATIC_SERVER_URL
-
         base_url_config = config_manager.get_config_value("static_server_base_url")
         base_url = f"{base_url_config}{STATIC_SERVER_URL}"
 
@@ -95,6 +98,10 @@ class StaticFilesManager:
             event_manager.assign_manager_to_request_type(
                 CreateStaticFileDownloadUrlRequest, self.on_handle_create_static_file_download_url_request
             )
+            event_manager.assign_manager_to_request_type(
+                CreateStaticFileDownloadUrlFromPathRequest,
+                self.on_handle_create_static_file_download_url_from_path_request,
+            )
             event_manager.add_listener_to_app_event(
                 AppInitializationComplete,
                 self.on_app_initialization_complete,
@@ -148,6 +155,7 @@ class StaticFilesManager:
             url=response["url"],
             headers=response["headers"],
             method=response["method"],
+            file_url=self.storage_driver.get_asset_url(Path(response["file_path"])),
             result_details="Successfully created static file upload URL",
         )
 
@@ -155,7 +163,7 @@ class StaticFilesManager:
         self,
         request: CreateStaticFileDownloadUrlRequest,
     ) -> CreateStaticFileDownloadUrlResultSuccess | CreateStaticFileDownloadUrlResultFailure:
-        """Handle the request to create a presigned URL for downloading a static file.
+        """Handle the request to create a presigned URL for downloading a static file from the staticfiles directory.
 
         Args:
             request: The request object containing the file name.
@@ -163,19 +171,46 @@ class StaticFilesManager:
         Returns:
             A result object indicating success or failure.
         """
-        file_name = request.file_name
-
         resolved_directory = self._get_static_files_directory()
-        full_file_path = Path(resolved_directory) / file_name
+        full_file_path = Path(resolved_directory) / request.file_name
 
         try:
             url = self.storage_driver.create_signed_download_url(full_file_path)
         except Exception as e:
-            msg = f"Failed to create presigned URL for file {file_name}: {e}"
+            msg = f"Failed to create presigned URL for file {request.file_name}: {e}"
             return CreateStaticFileDownloadUrlResultFailure(error=msg, result_details=msg)
 
         return CreateStaticFileDownloadUrlResultSuccess(
-            url=url, result_details="Successfully created static file download URL"
+            url=url,
+            file_url=self.storage_driver.get_asset_url(full_file_path),
+            result_details="Successfully created static file download URL",
+        )
+
+    def on_handle_create_static_file_download_url_from_path_request(
+        self,
+        request: CreateStaticFileDownloadUrlFromPathRequest,
+    ) -> CreateStaticFileDownloadUrlResultSuccess | CreateStaticFileDownloadUrlResultFailure:
+        """Handle request to create download URL from arbitrary file path.
+
+        Args:
+            request: Request containing file_path parameter.
+
+        Returns:
+            Result with download URL or failure message.
+        """
+        full_file_path = Path(uri_to_path(request.file_path))
+
+        try:
+            # TODO: use the driver appropriate for the file format. i.e. If local path use LocalStorageDriver, if GTC path use GriptapeCloudStorageDriver https://github.com/griptape-ai/griptape-nodes/issues/3739
+            url = self.storage_driver.create_signed_download_url(full_file_path)
+        except Exception as e:
+            msg = f"Failed to create presigned URL for file {request.file_path}: {e}"
+            return CreateStaticFileDownloadUrlResultFailure(error=msg, result_details=msg)
+
+        return CreateStaticFileDownloadUrlResultSuccess(
+            url=url,
+            file_url=self.storage_driver.get_asset_url(full_file_path),
+            result_details="Successfully created static file download URL",
         )
 
     def on_app_initialization_complete(self, _payload: AppInitializationComplete) -> None:
@@ -184,7 +219,13 @@ class StaticFilesManager:
             threading.Thread(target=start_static_server, daemon=True, name="static-server").start()
 
     def save_static_file(
-        self, data: bytes, file_name: str, existing_file_policy: ExistingFilePolicy = ExistingFilePolicy.OVERWRITE
+        self,
+        data: bytes,
+        file_name: str,
+        existing_file_policy: ExistingFilePolicy = ExistingFilePolicy.OVERWRITE,
+        *,
+        use_direct_save: bool = False,
+        skip_metadata_injection: bool = False,
     ) -> str:
         """Saves a static file to the workspace directory.
 
@@ -197,20 +238,48 @@ class StaticFilesManager:
                 - OVERWRITE: Replace existing file content (default)
                 - CREATE_NEW: Auto-generate unique filename (e.g., file_1.txt, file_2.txt)
                 - FAIL: Raise FileExistsError if file exists
+            use_direct_save: If True, use direct storage driver save (new behavior).
+                If False, use presigned URL upload (legacy behavior). Defaults to False for backward compatibility.
+            skip_metadata_injection: If True, skip automatic workflow metadata injection.
+                Defaults to False. Used by nodes that handle metadata explicitly (e.g., WriteImageMetadataNode).
 
         Returns:
-            The URL of the saved file. Note: the actual filename may differ from the requested
-            file_name when using CREATE_NEW policy.
+            The URL of the saved file for UI display (with cache-busting). Note: the actual filename
+            may differ from the requested file_name when using CREATE_NEW policy.
 
         Raises:
             FileExistsError: When existing_file_policy is FAIL and file already exists.
+            RuntimeError: If file write fails (new behavior).
+            ValueError: If file upload fails (legacy behavior).
         """
         resolved_directory = self._get_static_files_directory()
         file_path = Path(resolved_directory) / file_name
 
-        # Pass the existing_file_policy to the storage driver
-        response = self.storage_driver.create_signed_upload_url(file_path, existing_file_policy)
+        # Inject workflow metadata if enabled (only when not using direct save)
+        if (
+            not use_direct_save
+            and self.config_manager.get_config_value("auto_inject_workflow_metadata", default=True)
+            and not skip_metadata_injection
+        ):
+            try:
+                data = inject_workflow_metadata_if_image(data, file_name)
+            except Exception as e:
+                logger.warning("Failed to inject workflow metadata into %s: %s", file_name, e)
 
+        # NEW BEHAVIOR: Direct save via storage driver
+        if use_direct_save:
+            try:
+                saved_path = self.storage_driver.save_file(file_path, data, existing_file_policy)
+            except FileExistsError:
+                raise
+            except Exception as e:
+                msg = f"Failed to save static file {file_name}: {e}"
+                logger.error(msg)
+                raise RuntimeError(msg) from e
+            return saved_path
+
+        # OLD BEHAVIOR: Presigned URL upload
+        response = self.storage_driver.create_signed_upload_url(file_path, existing_file_policy)
         resolved_file_path = Path(response["file_path"])
 
         try:
@@ -235,9 +304,6 @@ class StaticFilesManager:
             workflow's directory relative to workspace. Otherwise, returns the staticfiles
             subdirectory relative to workspace.
         """
-        from griptape_nodes.node_library.workflow_registry import WorkflowRegistry
-        from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
-
         workspace_path = self.config_manager.workspace_path
         static_files_subdir = self.config_manager.get_config_value("static_files_directory", default="staticfiles")
 

griptape_nodes/retained_mode/managers/workflow_manager.py

@@ -60,6 +60,9 @@ from griptape_nodes.retained_mode.events.library_events import (
 )
 from griptape_nodes.retained_mode.events.object_events import ClearAllObjectStateRequest
 from griptape_nodes.retained_mode.events.os_events import (
+    DeleteFileRequest,
+    DeleteFileResultFailure,
+    DeletionBehavior,
     ExistingFilePolicy,
     FileIOFailureReason,
     WriteFileRequest,
@@ -150,6 +153,7 @@ from griptape_nodes.retained_mode.managers.fitness_problems.workflows import (
     WorkflowNotFoundProblem,
 )
 from griptape_nodes.retained_mode.managers.os_manager import OSManager
+from griptape_nodes.utils.path_utils import resolve_workspace_path
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Sequence
@@ -392,7 +396,7 @@ class WorkflowManager:
         """
         return self._referenced_workflow_stack[-1]
 
-    def on_libraries_initialization_complete(self) -> None:
+    def on_libraries_initialization_complete(self, workflows_to_register: list[str] | None = None) -> None:
         # All of the libraries have loaded, and any workflows they came with have been registered.
         # Discover workflows from both config and workspace.
         self._workflows_loading_complete.clear()
@@ -401,15 +405,16 @@ class WorkflowManager:
             default_workflow_section = "app_events.on_app_initialization_complete.workflows_to_register"
             config_mgr = GriptapeNodes.ConfigManager()
 
-            workflows_to_register = []
+            if workflows_to_register is None:
+                workflows_to_register = []
 
-            # Add from config
-            config_workflows = config_mgr.get_config_value(default_workflow_section, default=[])
-            workflows_to_register.extend(config_workflows)
+                # Add from config
+                config_workflows = config_mgr.get_config_value(default_workflow_section, default=[])
+                workflows_to_register.extend(config_workflows)
 
-            # Add from workspace (avoiding duplicates)
-            workspace_path = config_mgr.workspace_path
-            workflows_to_register.extend([workspace_path])
+                # Add from workspace (avoiding duplicates)
+                workspace_path = config_mgr.workspace_path
+                workflows_to_register.extend([str(workspace_path)])
 
             # Register all discovered workflows at once if any were found
             self._process_workflows_for_registration(workflows_to_register)
@@ -631,11 +636,9 @@ class WorkflowManager:
                 raise RuntimeError(error_message)
 
     async def run_workflow(self, relative_file_path: str) -> WorkflowExecutionResult:
-        relative_file_path_obj = Path(relative_file_path)
-        if relative_file_path_obj.is_absolute():
-            complete_file_path = relative_file_path_obj
-        else:
-            complete_file_path = WorkflowRegistry.get_complete_file_path(relative_file_path=relative_file_path)
+        # Resolve path using utility function
+        workspace_path = GriptapeNodes.ConfigManager().workspace_path
+        complete_file_path = resolve_workspace_path(Path(relative_file_path), workspace_path)
         try:
             # Libraries are now loaded only on app initialization and explicit reload requests
             # Now execute the workflow.
@@ -820,7 +823,7 @@ class WorkflowManager:
             workflows=workflows, result_details=f"Successfully retrieved {len(workflows)} workflows."
         )
 
-    def on_delete_workflows_request(self, request: DeleteWorkflowRequest) -> ResultPayload:
+    async def on_delete_workflows_request(self, request: DeleteWorkflowRequest) -> ResultPayload:
         try:
             workflow = WorkflowRegistry.delete_workflow_by_name(request.name)
         except Exception as e:
@@ -834,10 +837,15 @@ class WorkflowManager:
             return DeleteWorkflowResultFailure(result_details=details)
         # delete the actual file
         full_path = config_manager.workspace_path.joinpath(workflow.file_path)
-        try:
-            full_path.unlink()
-        except Exception as e:
-            details = f"Failed to delete workflow file with path '{workflow.file_path}'. Exception: {e}"
+
+        delete_request = DeleteFileRequest(
+            path=str(full_path),
+            workspace_only=False,
+            deletion_behavior=DeletionBehavior.PREFER_RECYCLE_BIN,
+        )
+        delete_result = await GriptapeNodes.ahandle_request(delete_request)
+        if isinstance(delete_result, DeleteFileResultFailure):
+            details = f"Failed to delete workflow file with path '{workflow.file_path}'. {delete_result.result_details}"
             return DeleteWorkflowResultFailure(result_details=details)
         return DeleteWorkflowResultSuccess(
             result_details=ResultDetails(message=f"Successfully deleted workflow: {request.name}", level=logging.INFO)
@@ -1826,8 +1834,11 @@ class WorkflowManager:
 
         ast_container = ASTContainer()
 
+        # Extract library names from workflow metadata
+        library_names = [lib.library_name for lib in workflow_metadata.node_libraries_referenced]
+
         prereq_code = self._generate_workflow_run_prerequisite_code(
-            workflow_name=workflow_metadata.name, import_recorder=import_recorder
+            workflow_name=workflow_metadata.name, import_recorder=import_recorder, library_names=library_names
         )
         for node in prereq_code:
             ast_container.add_node(node)
@@ -2145,7 +2156,8 @@ class WorkflowManager:
             ),
         )
 
-        # Create conditional logic: workflow_executor = workflow_executor or LocalWorkflowExecutor(storage_backend=storage_backend_enum)
+        # Create conditional logic: workflow_executor = workflow_executor or LocalWorkflowExecutor(storage_backend=storage_backend_enum, skip_library_loading=True, workflows_to_register=[__file__])
+        # TODO: https://github.com/griptape-ai/griptape-nodes/issues/3771 Update for workflows that call other workflows - need to include referenced workflows in the list
         executor_assign = ast.Assign(
             targets=[ast.Name(id="workflow_executor", ctx=ast.Store())],
             value=ast.BoolOp(
@@ -2159,6 +2171,11 @@ class WorkflowManager:
                             ast.keyword(
                                 arg="storage_backend", value=ast.Name(id="storage_backend_enum", ctx=ast.Load())
                             ),
+                            ast.keyword(arg="skip_library_loading", value=ast.Constant(value=True)),
+                            ast.keyword(
+                                arg="workflows_to_register",
+                                value=ast.List(elts=[ast.Name(id="__file__", ctx=ast.Load())], ctx=ast.Load()),
+                            ),
                         ],
                     ),
                 ],
@@ -2750,32 +2767,44 @@ class WorkflowManager:
         self,
         workflow_name: str,
         import_recorder: ImportRecorder,
+        library_names: list[str],
     ) -> list[ast.AST]:
-        import_recorder.add_from_import("griptape_nodes.retained_mode.events.library_events", "LoadLibrariesRequest")
+        import_recorder.add_from_import(
+            "griptape_nodes.retained_mode.events.library_events", "RegisterLibraryFromFileRequest"
+        )
 
         code_blocks: list[ast.AST] = []
 
-        # Generate load libraries request call
-        # TODO (https://github.com/griptape-ai/griptape-nodes/issues/1615): Generate requests to load ONLY the libraries used in this workflow
-        load_call = ast.Expr(
-            value=ast.Call(
-                func=ast.Attribute(
-                    value=ast.Name(id="GriptapeNodes", ctx=ast.Load()),
-                    attr="handle_request",
-                    ctx=ast.Load(),
-                ),
-                args=[
-                    ast.Call(
-                        func=ast.Name(id="LoadLibrariesRequest", ctx=ast.Load()),
-                        args=[],
-                        keywords=[],
-                    )
-                ],
-                keywords=[],
+        # Generate one RegisterLibraryFromFileRequest call per library
+        for library_name in library_names:
+            register_call = ast.Expr(
+                value=ast.Call(
+                    func=ast.Attribute(
+                        value=ast.Name(id="GriptapeNodes", ctx=ast.Load()),
+                        attr="handle_request",
+                        ctx=ast.Load(),
+                    ),
+                    args=[
+                        ast.Call(
+                            func=ast.Name(id="RegisterLibraryFromFileRequest", ctx=ast.Load()),
+                            args=[],
+                            keywords=[
+                                ast.keyword(
+                                    arg="library_name",
+                                    value=ast.Constant(value=library_name),
+                                ),
+                                ast.keyword(
+                                    arg="perform_discovery_if_not_found",
+                                    value=ast.Constant(value=True),
+                                ),
+                            ],
+                        )
+                    ],
+                    keywords=[],
+                )
             )
-        )
-        ast.fix_missing_locations(load_call)
-        code_blocks.append(load_call)
+            ast.fix_missing_locations(register_call)
+            code_blocks.append(register_call)
 
         # Generate context manager assignment
         assign_context_manager = ast.Assign(
@@ -4100,6 +4129,7 @@ class WorkflowManager:
             result_messages = []
             try:
                 WorkflowRegistry.delete_workflow_by_name(request.workflow_name)
+                # TODO: Replace with DeleteFileRequest https://github.com/griptape-ai/griptape-nodes/issues/3765
                 Path(branch_content_file_path).unlink()
                 cleanup_message = f"Deleted branch workflow file and registry entry for '{request.workflow_name}'"
                 result_messages.append(ResultDetail(message=cleanup_message, level=logging.INFO))

griptape_nodes/servers/static.py

@@ -9,6 +9,7 @@ from urllib.parse import urljoin
 import uvicorn
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 from rich.logging import RichHandler
 
@@ -122,6 +123,7 @@ async def _delete_static_file(file_path: str) -> dict:
         raise HTTPException(status_code=400, detail=msg)
 
     try:
+        # TODO: Replace with DeleteFileRequest https://github.com/griptape-ai/griptape-nodes/issues/3765
         file_full_path.unlink()
     except (OSError, PermissionError) as e:
         msg = f"Failed to delete file {file_path}: {e}"
@@ -132,6 +134,34 @@ async def _delete_static_file(file_path: str) -> dict:
         return {"message": f"File {file_path} deleted successfully"}
 
 
+async def _serve_external_file(file_path: str) -> FileResponse:
+    """Serve a file from outside the workspace.
+
+    Args:
+        file_path: The file path without leading slash (e.g., "tmp/video.mp4" for "/tmp/video.mp4")
+    """
+    if not STATIC_SERVER_ENABLED:
+        msg = "Static server is not enabled. Please set STATIC_SERVER_ENABLED to True."
+        raise HTTPException(status_code=500, detail=msg)
+
+    # Reconstruct absolute path by adding leading slash
+    absolute_path = Path(f"/{file_path}")
+
+    # Check if file exists
+    if not absolute_path.exists():
+        logger.warning("External file not found: %s", absolute_path)
+        raise HTTPException(status_code=404, detail=f"File {absolute_path} not found")
+
+    # Check if it's actually a file (not a directory)
+    if not absolute_path.is_file():
+        msg = f"Path {absolute_path} is not a file"
+        logger.error(msg)
+        raise HTTPException(status_code=400, detail=msg)
+
+    # Serve the file
+    return FileResponse(absolute_path)
+
+
 def start_static_server() -> None:
     """Run uvicorn server synchronously using uvicorn.run."""
     logger.debug("Starting static server...")
@@ -145,6 +175,7 @@ def start_static_server() -> None:
     app.add_api_route("/static-uploads/{file_path_prefix:path}", _list_static_files, methods=["GET"])
     app.add_api_route("/static-uploads/", _list_static_files, methods=["GET"])
     app.add_api_route("/static-files/{file_path:path}", _delete_static_file, methods=["DELETE"])
+    app.add_api_route("/external/{file_path:path}", _serve_external_file, methods=["GET"])
 
     # Build CORS allowed origins list
     allowed_origins = [

griptape_nodes/utils/__init__.py

@@ -1,5 +1,13 @@
 """Various utility functions."""
 
 from griptape_nodes.utils.async_utils import call_function
+from griptape_nodes.utils.http_file_patch import install_file_url_support
+from griptape_nodes.utils.path_utils import resolve_workspace_path
+from griptape_nodes.utils.url_utils import get_content_type_from_extension
 
-__all__ = ["call_function"]
+__all__ = [
+    "call_function",
+    "get_content_type_from_extension",
+    "install_file_url_support",
+    "resolve_workspace_path",
+]