griptape-nodes 0.42.0__py3-none-any.whl → 0.43.0__py3-none-any.whl

griptape_nodes/retained_mode/managers/library_manager.py

@@ -9,7 +9,6 @@ import subprocess
 import sys
 import sysconfig
 from dataclasses import dataclass, field
-from enum import StrEnum
 from importlib.resources import files
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
@@ -17,6 +16,7 @@ from typing import TYPE_CHECKING, cast
 import uv
 from packaging.requirements import InvalidRequirement, Requirement
 from pydantic import ValidationError
+from rich.align import Align
 from rich.box import HEAVY_EDGE
 from rich.console import Console
 from rich.panel import Panel
@@ -90,6 +90,11 @@ 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.payload_registry import PayloadRegistry
 from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
+from griptape_nodes.retained_mode.managers.library_lifecycle.library_directory import LibraryDirectory
+from griptape_nodes.retained_mode.managers.library_lifecycle.library_provenance.local_file import (
+    LibraryProvenanceLocalFile,
+)
+from griptape_nodes.retained_mode.managers.library_lifecycle.library_status import LibraryStatus
 from griptape_nodes.retained_mode.managers.os_manager import OSManager
 
 if TYPE_CHECKING:
@@ -101,6 +106,7 @@ if TYPE_CHECKING:
     from griptape_nodes.retained_mode.managers.event_manager import EventManager
 
 logger = logging.getLogger("griptape_nodes")
+console = Console()
 
 
 def _find_griptape_uv_bin() -> str:
@@ -121,14 +127,6 @@ def _find_griptape_uv_bin() -> str:
 class LibraryManager:
     SANDBOX_LIBRARY_NAME = "Sandbox Library"
 
-    class LibraryStatus(StrEnum):
-        """Status of the library that was attempted to be loaded."""
-
-        GOOD = "GOOD"  # No errors detected during loading. Registered.
-        FLAWED = "FLAWED"  # Some errors detected, but recoverable. Registered.
-        UNUSABLE = "UNUSABLE"  # Errors detected and not recoverable. Not registered.
-        MISSING = "MISSING"  # File not found. Not registered.
-
     @dataclass
     class LibraryInfo:
         """Information about a library that was attempted to be loaded.
@@ -136,7 +134,7 @@ class LibraryManager:
         Includes the status of the library, the file path, and any problems encountered during loading.
         """
 
-        status: LibraryManager.LibraryStatus
+        status: LibraryStatus
         library_path: str
         library_name: str | None = None
         library_version: str | None = None
@@ -176,6 +174,8 @@ class LibraryManager:
         self._stable_to_dynamic_module_mapping = {}
         self._library_to_stable_modules = {}
         self._library_event_handler_mappings: dict[type[Payload], dict[str, LibraryManager.RegisteredEventHandler]] = {}
+        # LibraryDirectory owns the FSMs and manages library lifecycle
+        self._library_directory = LibraryDirectory()
 
         event_manager.assign_manager_to_request_type(
             ListRegisteredLibrariesRequest, self.on_list_registered_libraries_request
@@ -254,10 +254,10 @@ class LibraryManager:
 
         # Status emojis mapping
         status_emoji = {
-            LibraryManager.LibraryStatus.GOOD: "✅",
-            LibraryManager.LibraryStatus.FLAWED: "🟡",
-            LibraryManager.LibraryStatus.UNUSABLE: "❌",
-            LibraryManager.LibraryStatus.MISSING: "❓",
+            LibraryStatus.GOOD: "✅",
+            LibraryStatus.FLAWED: "🟡",
+            LibraryStatus.UNUSABLE: "❌",
+            LibraryStatus.MISSING: "❓",
         }
 
         # Add rows for each library info
@@ -408,7 +408,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=file_path,
                 library_name=None,
-                status=LibraryManager.LibraryStatus.MISSING,
+                status=LibraryStatus.MISSING,
                 problems=[
                     "Library could not be found at the file path specified. It will be removed from the configuration."
                 ],
@@ -424,7 +424,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=file_path,
                 library_name=None,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=["Library file not formatted as proper JSON."],
             )
         except Exception as err:
@@ -433,7 +433,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=file_path,
                 library_name=None,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[f"Exception occurred when attempting to load the library: {err}."],
             )
 
@@ -457,7 +457,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=file_path,
                 library_name=library_name,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=problems,
             )
         except Exception as err:
@@ -466,7 +466,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=file_path,
                 library_name=library_name,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[f"Library file did not match the library schema specified due to: {err}"],
             )
 
@@ -540,7 +540,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=sandbox_library_dir_as_posix,
                 library_name=LibraryManager.SANDBOX_LIBRARY_NAME,
-                status=LibraryManager.LibraryStatus.MISSING,
+                status=LibraryStatus.MISSING,
                 problems=["Sandbox directory does not exist."],
             )
 
@@ -595,7 +595,7 @@ class LibraryManager:
             return LoadLibraryMetadataFromFileResultFailure(
                 library_path=sandbox_library_dir_as_posix,
                 library_name=LibraryManager.SANDBOX_LIBRARY_NAME,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=["Could not get engine version for sandbox library generation."],
             )
 
@@ -679,7 +679,7 @@ class LibraryManager:
             self._library_file_path_to_info[file_path] = LibraryManager.LibraryInfo(
                 library_path=file_path,
                 library_name=None,
-                status=LibraryManager.LibraryStatus.MISSING,
+                status=LibraryStatus.MISSING,
                 problems=[
                     "Library could not be found at the file path specified. It will be removed from the configuration."
                 ],
@@ -713,7 +713,7 @@ class LibraryManager:
             self._library_file_path_to_info[file_path] = LibraryManager.LibraryInfo(
                 library_path=file_path,
                 library_name=library_data.name,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[
                     f"Library's version string '{library_data.metadata.library_version}' wasn't valid. Must be in major.minor.patch format."
                 ],
@@ -740,7 +740,7 @@ class LibraryManager:
                     library_path=file_path,
                     library_name=library_data.name,
                     library_version=library_version,
-                    status=LibraryManager.LibraryStatus.UNUSABLE,
+                    status=LibraryStatus.UNUSABLE,
                     problems=[
                         f"Failed to load Advanced Library module from '{library_data.advanced_library_path}': {err}"
                     ],
@@ -764,7 +764,7 @@ class LibraryManager:
                 library_path=file_path,
                 library_name=library_data.name,
                 library_version=library_version,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[
                     "Failed because a library with this name was already registered. Check the Settings to ensure duplicate libraries are not being loaded."
                 ],
@@ -793,7 +793,7 @@ class LibraryManager:
                         library_path=file_path,
                         library_name=library_data.name,
                         library_version=library_version,
-                        status=LibraryManager.LibraryStatus.UNUSABLE,
+                        status=LibraryStatus.UNUSABLE,
                         problems=[str(e)],
                     )
                     details = f"Attempted to load Library JSON file from '{json_path}'. Failed when creating the virtual environment: {e}."
@@ -815,7 +815,7 @@ class LibraryManager:
                             library_path=file_path,
                             library_name=library_data.name,
                             library_version=library_version,
-                            status=LibraryManager.LibraryStatus.UNUSABLE,
+                            status=LibraryStatus.UNUSABLE,
                             problems=[
                                 f"Insufficient disk space for dependencies (requires {min_space_gb} GB): {error_msg}"
                             ],
@@ -856,7 +856,7 @@ class LibraryManager:
                 library_path=file_path,
                 library_name=library_data.name,
                 library_version=library_version,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[f"Dependency installation failed: {error_details}"],
             )
             details = f"Attempted to load Library JSON file from '{json_path}'. Failed when installing dependencies: {error_details}"
@@ -888,7 +888,9 @@ class LibraryManager:
                 else:
                     # We had an existing category. Union our changes into it (not replacing anything that matched).
                     existing_category_contents = get_category_result.contents
-                    existing_category_contents.update(library_data_setting.contents)
+                    existing_category_contents |= {
+                        k: v for k, v in library_data_setting.contents.items() if k not in existing_category_contents
+                    }
                     set_category_request = SetConfigCategoryRequest(
                         category=library_data_setting.category, contents=existing_category_contents
                     )
@@ -911,15 +913,15 @@ class LibraryManager:
         self._library_file_path_to_info[file_path] = library_load_results
 
         match library_load_results.status:
-            case LibraryManager.LibraryStatus.GOOD:
+            case LibraryStatus.GOOD:
                 details = f"Successfully loaded Library '{library_data.name}' from JSON file at {json_path}"
                 logger.info(details)
                 return RegisterLibraryFromFileResultSuccess(library_name=library_data.name)
-            case LibraryManager.LibraryStatus.FLAWED:
+            case LibraryStatus.FLAWED:
                 details = f"Successfully loaded Library JSON file from '{json_path}', but one or more nodes failed to load. Check the log for more details."
                 logger.warning(details)
                 return RegisterLibraryFromFileResultSuccess(library_name=library_data.name)
-            case LibraryManager.LibraryStatus.UNUSABLE:
+            case LibraryStatus.UNUSABLE:
                 details = f"Attempted to load Library JSON file from '{json_path}'. Failed because no nodes were loaded. Check the log for more details."
                 logger.error(details)
                 return RegisterLibraryFromFileResultFailure()
@@ -1501,6 +1503,8 @@ class LibraryManager:
         return node_class
 
     def load_all_libraries_from_config(self) -> None:
+        # Comment out lines 1503-1545 and call the _load libraries from provenance system to test the other functionality.
+
         # Load metadata for all libraries to determine which ones can be safely loaded
         metadata_request = LoadMetadataForAllLibrariesRequest()
         metadata_result = self.load_metadata_for_all_libraries_request(metadata_request)
@@ -1589,6 +1593,107 @@ class LibraryManager:
         # Go tell the Workflow Manager that it's turn is now.
         GriptapeNodes.WorkflowManager().on_libraries_initialization_complete()
 
+        # Print the engine ready message
+        engine_version_request = GetEngineVersionRequest()
+        engine_version_result = GriptapeNodes.get_instance().handle_engine_version_request(engine_version_request)
+        if isinstance(engine_version_result, GetEngineVersionResultSuccess):
+            engine_version = (
+                f"v{engine_version_result.major}.{engine_version_result.minor}.{engine_version_result.patch}"
+            )
+        else:
+            engine_version = "<UNKNOWN ENGINE VERSION>"
+
+        # Get current session ID
+        session_id = GriptapeNodes.get_session_id()
+        session_info = f" | Session: {session_id[:8]}..." if session_id else " | No Session"
+
+        nodes_app_url = os.getenv("GRIPTAPE_NODES_UI_BASE_URL", "https://nodes.griptape.ai")
+        message = Panel(
+            Align.center(
+                f"[bold green]Engine is ready to receive events[/bold green]\n"
+                f"[bold blue]Return to: [link={nodes_app_url}]{nodes_app_url}[/link] to access the Workflow Editor[/bold blue]",
+                vertical="middle",
+            ),
+            title="🚀 Griptape Nodes Engine Started",
+            subtitle=f"[green]{engine_version}{session_info}[/green]",
+            border_style="green",
+            padding=(1, 4),
+        )
+        console.print(message)
+
+    def _load_libraries_from_provenance_system(self) -> None:
+        """Load libraries using the new provenance-based system with FSM.
+
+        This method converts libraries_to_register entries into LibraryProvenanceLocalFile
+        objects and processes them through the LibraryDirectory and LibraryLifecycleFSM systems.
+        """
+        # Get config manager
+        config_mgr = GriptapeNodes.ConfigManager()
+
+        # Get the current libraries_to_register list
+        user_libraries_section = "app_events.on_app_initialization_complete.libraries_to_register"
+        libraries_to_register: list[str] = config_mgr.get_config_value(user_libraries_section)
+
+        if not libraries_to_register:
+            logger.info("No libraries to register from config")
+            return
+
+        # Convert string paths to LibraryProvenanceLocalFile objects
+        for library_path in libraries_to_register:
+            # Skip non-JSON files for now (requirement specifiers will need different handling)
+            if not library_path.endswith(".json"):
+                logger.debug("Skipping non-JSON library path: %s", library_path)
+                continue
+
+            # Create provenance object
+            provenance = LibraryProvenanceLocalFile(file_path=library_path)
+
+            # Add to directory as user candidate (defaults to active=True)
+            # This automatically creates FSM and runs evaluation
+            self._library_directory.add_user_candidate(provenance)
+
+            logger.debug("Added library provenance: %s", provenance.get_display_name())
+
+        # Get all candidates for evaluation
+        all_candidates = self._library_directory.get_all_candidates()
+
+        logger.info("Evaluated %d library candidates through FSM lifecycle", len(all_candidates))
+
+        # Report on conflicts found
+        self._report_library_name_conflicts()
+
+        # Get candidates that are ready for installation
+        installable_candidates = self._library_directory.get_installable_candidates()
+
+        # Log any skipped libraries
+        active_candidates = self._library_directory.get_active_candidates()
+        for candidate in active_candidates:
+            if candidate not in installable_candidates:
+                blockers = self._library_directory.get_installation_blockers(candidate.provenance)
+                if blockers:
+                    blocker_messages = [blocker.message for blocker in blockers]
+                    combined_message = "; ".join(blocker_messages)
+                    logger.info("Skipping library '%s' - %s", candidate.provenance.get_display_name(), combined_message)
+
+        logger.info("Installing and loading %d installable library candidates", len(installable_candidates))
+
+        # Process installable candidates through installation and loading
+        for candidate in installable_candidates:
+            if self._library_directory.install_library(candidate.provenance):
+                self._library_directory.load_library(candidate.provenance)
+
+    def _report_library_name_conflicts(self) -> None:
+        """Report on library name conflicts found during evaluation."""
+        conflicting_names = self._library_directory.get_all_conflicting_library_names()
+        for library_name in conflicting_names:
+            conflicting_provenances = self._library_directory.get_conflicting_provenances(library_name)
+            logger.warning(
+                "Library name conflict detected for '%s' across %d libraries: %s",
+                library_name,
+                len(conflicting_provenances),
+                [p.get_display_name() for p in conflicting_provenances],
+            )
+
     def _load_advanced_library_module(
         self,
         library_data: LibrarySchema,
@@ -1671,7 +1776,7 @@ class LibraryManager:
         has_disqualifying_issues = False
         for issue in version_issues:
             problems.append(issue.message)
-            if issue.severity == LibraryManager.LibraryStatus.UNUSABLE:
+            if issue.severity == LibraryStatus.UNUSABLE:
                 has_disqualifying_issues = True
 
         # Early exit if any version issues are disqualifying
@@ -1680,7 +1785,7 @@ class LibraryManager:
                 library_path=library_file_path,
                 library_name=library_data.name,
                 library_version=library_version,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=problems,
             )
 
@@ -1747,13 +1852,13 @@ class LibraryManager:
 
         # Create a LibraryInfo object based on load successes and problem count.
         if not any_nodes_loaded_successfully:
-            status = LibraryManager.LibraryStatus.UNUSABLE
+            status = LibraryStatus.UNUSABLE
         elif problems:
             # Success, but errors.
-            status = LibraryManager.LibraryStatus.FLAWED
+            status = LibraryStatus.FLAWED
         else:
             # Flawless victory.
-            status = LibraryManager.LibraryStatus.GOOD
+            status = LibraryStatus.GOOD
 
         # Create a LibraryInfo object based on load successes and problem count.
         return LibraryManager.LibraryInfo(
@@ -1845,7 +1950,7 @@ class LibraryManager:
                 library_path=sandbox_library_dir_as_posix,
                 library_name=library_data.name,
                 library_version=library_data.metadata.library_version,
-                status=LibraryManager.LibraryStatus.UNUSABLE,
+                status=LibraryStatus.UNUSABLE,
                 problems=[
                     "Failed because a library with this name was already registered. Check the Settings to ensure duplicate libraries are not being loaded."
                 ],
@@ -1900,7 +2005,7 @@ class LibraryManager:
 
         paths_to_remove = set()
         for library_path, library_info in self._library_file_path_to_info.items():
-            if library_info.status == LibraryManager.LibraryStatus.MISSING:
+            if library_info.status == LibraryStatus.MISSING:
                 # Remove this file path from the config.
                 paths_to_remove.add(library_path.lower())
 

griptape_nodes/retained_mode/managers/node_manager.py

@@ -218,7 +218,7 @@ class NodeManager:
             if parent_flow_name == old_name:
                 self._name_to_parent_flow_name[node_name] = new_name
 
-    def on_create_node_request(self, request: CreateNodeRequest) -> ResultPayload:  # noqa: C901, PLR0911, PLR0912, PLR0915
+    def on_create_node_request(self, request: CreateNodeRequest) -> ResultPayload:  # noqa: C901, PLR0912, PLR0915
         # Validate as much as possible before we actually create one.
         parent_flow_name = request.override_parent_flow_name
         parent_flow = None
@@ -320,6 +320,7 @@ class NodeManager:
 
         logger.log(level=log_level, msg=details)
 
+        # Special handling for paired classes (e.g., create a Start node and it automatically creates a corresponding End node already connected).
         if isinstance(node, StartLoopNode) and not request.initial_setup:
             # If it's StartLoop, create an EndLoop and connect it to the StartLoop.
             # Get the class name of the node
@@ -332,43 +333,42 @@ class NodeManager:
             # Check and see if the class exists
             libraries_with_node_type = LibraryRegistry.get_libraries_with_node_type(end_class_name)
             if not libraries_with_node_type:
-                msg = f"End class '{end_class_name}' does not exist for start class '{node_class_name}'"
-                logger.error(msg)
-                return CreateNodeResultFailure()
-
-            # Create the EndNode
-            end_loop = GriptapeNodes.handle_request(
-                CreateNodeRequest(
-                    node_type=end_class_name,
-                    metadata={
-                        "position": {"x": node.metadata["position"]["x"] + 650, "y": node.metadata["position"]["y"]}
-                    },
-                    override_parent_flow_name=parent_flow_name,
-                )
-            )
-            if not isinstance(end_loop, CreateNodeResultSuccess):
-                msg = f"Failed to create EndLoop node for StartLoop node '{node.name}'"
-                logger.error(msg)
-                return CreateNodeResultFailure()
-
-            # Create Loop between output and input to the start node.
-            GriptapeNodes.handle_request(
-                CreateConnectionRequest(
-                    source_node_name=node.name,
-                    source_parameter_name="loop",
-                    target_node_name=end_loop.node_name,
-                    target_parameter_name="from_start",
+                msg = f"Attempted to create a paried set of nodes for Node '{final_node_name}'. Failed because paired class '{end_class_name}' does not exist for start class '{node_class_name}'. The corresponding node will have to be created by hand and attached manually."
+                logger.error(msg)  # while this is bad, it's not unsalvageable, so we'll consider this a success.
+            else:
+                # Create the EndNode
+                end_loop = GriptapeNodes.handle_request(
+                    CreateNodeRequest(
+                        node_type=end_class_name,
+                        metadata={
+                            "position": {"x": node.metadata["position"]["x"] + 650, "y": node.metadata["position"]["y"]}
+                        },
+                        override_parent_flow_name=parent_flow_name,
+                    )
                 )
-            )
-            end_node = self.get_node_by_name(end_loop.node_name)
-            if not isinstance(end_node, EndLoopNode):
-                msg = f"End node '{end_loop.node_name}' is not a valid EndLoopNode"
-                logger.error(msg)
-                return CreateNodeResultFailure()
-
-            # create the connection
-            node.end_node = end_node
-            end_node.start_node = node
+                if not isinstance(end_loop, CreateNodeResultSuccess):
+                    msg = f"Attempted to create a paried set of nodes for Node '{final_node_name}'. Failed because paired class '{end_class_name}' failed to get created. The corresponding node will have to be created by hand and attached manually."
+                    logger.error(msg)  # while this is bad, it's not unsalvageable, so we'll consider this a success.
+                else:
+                    # Create Loop between output and input to the start node.
+                    GriptapeNodes.handle_request(
+                        CreateConnectionRequest(
+                            source_node_name=node.name,
+                            source_parameter_name="loop",
+                            target_node_name=end_loop.node_name,
+                            target_parameter_name="from_start",
+                        )
+                    )
+                    end_node = self.get_node_by_name(end_loop.node_name)
+                    if not isinstance(end_node, EndLoopNode):
+                        msg = f"Attempted to create a paried set of nodes for Node '{final_node_name}'. Failed because paired node '{end_loop.node_name}' was not a proper EndLoop instance. The corresponding node will have to be created by hand and attached manually."
+                        logger.error(
+                            msg
+                        )  # while this is bad, it's not unsalvageable, so we'll consider this a success.
+                    else:
+                        # create the connection - only when we've confirmed correct types
+                        node.end_node = end_node
+                        end_node.start_node = node
 
         return CreateNodeResultSuccess(
             node_name=node.name, node_type=node.__class__.__name__, specific_library_name=request.specific_library_name
@@ -428,7 +428,7 @@ class NodeManager:
             parent_flow.clear_execution_queue()
         return None
 
-    def on_delete_node_request(self, request: DeleteNodeRequest) -> ResultPayload:  # noqa: C901, PLR0911 (complex logic, lots of edge cases)
+    def on_delete_node_request(self, request: DeleteNodeRequest) -> ResultPayload:  # noqa: C901, PLR0911, PLR0912, PLR0915 (complex logic, lots of edge cases)
         node_name = request.node_name
         node = None
         if node_name is None:
@@ -461,41 +461,55 @@ class NodeManager:
             cancel_result = self.cancel_conditionally(parent_flow, parent_flow_name, node)
             if cancel_result is not None:
                 return cancel_result
-            # Remove all connections from this Node.
-            list_node_connections_request = ListConnectionsForNodeRequest(node_name=node_name)
-            list_connections_result = GriptapeNodes.handle_request(request=list_node_connections_request)
-            if not isinstance(list_connections_result, ListConnectionsForNodeResultSuccess):
-                details = f"Attempted to delete a Node '{node_name}'. Failed because it could not gather Connections to the Node."
-                logger.error(details)
-                return DeleteNodeResultFailure()
-
-            # Destroy all the incoming Connections
-            for incoming_connection in list_connections_result.incoming_connections:
-                delete_request = DeleteConnectionRequest(
-                    source_node_name=incoming_connection.source_node_name,
-                    source_parameter_name=incoming_connection.source_parameter_name,
-                    target_node_name=node_name,
-                    target_parameter_name=incoming_connection.target_parameter_name,
-                )
-                delete_result = GriptapeNodes.handle_request(delete_request)
-                if isinstance(delete_result, ResultPayloadFailure):
-                    details = f"Attempted to delete a Node '{node_name}'. Failed when attempting to delete Connection."
+            # Remove all connections from this Node using a loop to handle cascading deletions
+            any_connections_remain = True
+            while any_connections_remain:
+                # Assume we're done
+                any_connections_remain = False
+
+                list_node_connections_request = ListConnectionsForNodeRequest(node_name=node_name)
+                list_connections_result = GriptapeNodes.handle_request(request=list_node_connections_request)
+                if not isinstance(list_connections_result, ListConnectionsForNodeResultSuccess):
+                    details = f"Attempted to delete a Node '{node_name}'. Failed because it could not gather Connections to the Node."
                     logger.error(details)
                     return DeleteNodeResultFailure()
 
-            # Destroy all the outgoing Connections
-            for outgoing_connection in list_connections_result.outgoing_connections:
-                delete_request = DeleteConnectionRequest(
-                    source_node_name=node_name,
-                    source_parameter_name=outgoing_connection.source_parameter_name,
-                    target_node_name=outgoing_connection.target_node_name,
-                    target_parameter_name=outgoing_connection.target_parameter_name,
-                )
-                delete_result = GriptapeNodes.handle_request(delete_request)
-                if isinstance(delete_result, ResultPayloadFailure):
-                    details = f"Attempted to delete a Node '{node_name}'. Failed when attempting to delete Connection."
-                    logger.error(details)
-                    return DeleteNodeResultFailure()
+                # Check incoming connections
+                if list_connections_result.incoming_connections:
+                    any_connections_remain = True
+                    connection = list_connections_result.incoming_connections[0]
+                    delete_request = DeleteConnectionRequest(
+                        source_node_name=connection.source_node_name,
+                        source_parameter_name=connection.source_parameter_name,
+                        target_node_name=node_name,
+                        target_parameter_name=connection.target_parameter_name,
+                    )
+                    delete_result = GriptapeNodes.handle_request(delete_request)
+                    if isinstance(delete_result, ResultPayloadFailure):
+                        details = (
+                            f"Attempted to delete a Node '{node_name}'. Failed when attempting to delete Connection."
+                        )
+                        logger.error(details)
+                        return DeleteNodeResultFailure()
+                    continue  # Refresh connection list after cascading deletions
+
+                # Check outgoing connections
+                if list_connections_result.outgoing_connections:
+                    any_connections_remain = True
+                    connection = list_connections_result.outgoing_connections[0]
+                    delete_request = DeleteConnectionRequest(
+                        source_node_name=node_name,
+                        source_parameter_name=connection.source_parameter_name,
+                        target_node_name=connection.target_node_name,
+                        target_parameter_name=connection.target_parameter_name,
+                    )
+                    delete_result = GriptapeNodes.handle_request(delete_request)
+                    if isinstance(delete_result, ResultPayloadFailure):
+                        details = (
+                            f"Attempted to delete a Node '{node_name}'. Failed when attempting to delete Connection."
+                        )
+                        logger.error(details)
+                        return DeleteNodeResultFailure()
 
         # Remove from the owning Flow
         parent_flow.remove_node(node.name)
@@ -2355,7 +2369,7 @@ class NodeManager:
                 node_name=node.name,
             )
             if internal_command is None:
-                details = f"Attempted to serialize set value for parameter'{parameter.name}' on node '{node.name}'. The set value will not be restored in anything that attempts to deserialize or save this node. The value for this parameter was not serialized because it did not match Griptape Nodes' criteria for serializability. To remedy, either update the value's type to support serializaibilty or mark the parameter as not serializable."
+                details = f"Attempted to serialize set value for parameter '{parameter.name}' on node '{node.name}'. The set value will not be restored in anything that attempts to deserialize or save this node. The value for this parameter was not serialized because it did not match Griptape Nodes' criteria for serializability. To remedy, either update the value's type to support serializability or mark the parameter as not serializable."
                 logger.warning(details)
             else:
                 commands.append(internal_command)
@@ -2369,7 +2383,7 @@ class NodeManager:
                 node_name=node.name,
             )
             if output_command is None:
-                details = f"Attempted to serialize output value for parameter '{parameter.name}' on node '{node.name}'. The output value will not be restored in anything that attempts to deserialize or save this node. The value for this parameter was not serialized because it did not match Griptape Nodes' criteria for serializability. To remedy, either update the value's type to support serializaibilty or mark the parameter as not serializable."
+                details = f"Attempted to serialize output value for parameter '{parameter.name}' on node '{node.name}'. The output value will not be restored in anything that attempts to deserialize or save this node. The value for this parameter was not serialized because it did not match Griptape Nodes' criteria for serializability. To remedy, either update the value's type to support serializability or mark the parameter as not serializable."
                 logger.warning(details)
             else:
                 commands.append(output_command)