griptape-nodes 0.52.0__py3-none-any.whl → 0.53.0__py3-none-any.whl

griptape_nodes/machines/{node_resolution.py → sequential_resolution.py}

@@ -42,6 +42,14 @@ class ResolutionContext:
         self.focus_stack = []
         self.paused = False
 
+    @property
+    def current_node(self) -> BaseNode:
+        """Get the currently focused node from the focus stack."""
+        if not self.focus_stack:
+            msg = "No node is currently in focus - focus stack is empty"
+            raise RuntimeError(msg)
+        return self.focus_stack[-1].node
+
     def reset(self) -> None:
         if self.focus_stack:
             node = self.focus_stack[-1].node
@@ -55,7 +63,7 @@ class InitializeSpotlightState(State):
     @staticmethod
     async def on_enter(context: ResolutionContext) -> type[State] | None:
         # If the focus stack is empty
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
         GriptapeNodes.EventManager().put_event(
             ExecutionGriptapeNodeEvent(
                 wrapped_event=ExecutionEvent(payload=CurrentDataNodeEvent(node_name=current_node.name))
@@ -70,7 +78,7 @@ class InitializeSpotlightState(State):
         # If the focus stack is empty
         if not len(context.focus_stack):
             return CompleteState
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
         if current_node.state == NodeResolutionState.UNRESOLVED:
             # Mark all future nodes unresolved.
             # TODO: https://github.com/griptape-ai/griptape-nodes/issues/862
@@ -95,7 +103,7 @@ class InitializeSpotlightState(State):
 class EvaluateParameterState(State):
     @staticmethod
     async def on_enter(context: ResolutionContext) -> type[State] | None:
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
         current_parameter = current_node.get_current_parameter()
         if current_parameter is None:
             return ExecuteNodeState
@@ -116,7 +124,7 @@ class EvaluateParameterState(State):
 
     @staticmethod
     async def on_update(context: ResolutionContext) -> type[State] | None:
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
         current_parameter = current_node.get_current_parameter()
         from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 
@@ -143,48 +151,6 @@ class EvaluateParameterState(State):
 
 
 class ExecuteNodeState(State):
-    # TODO: https://github.com/griptape-ai/griptape-nodes/issues/864
-    @staticmethod
-    async def clear_parameter_output_values(context: ResolutionContext) -> None:
-        """Clears all parameter output values for the currently focused node in the resolution context.
-
-        This method iterates through each parameter output value stored in the current node,
-        removes it from the node's parameter_output_values dictionary, and publishes an event
-        to notify the system about the parameter value being set to None.
-
-        Args:
-            context (ResolutionContext): The resolution context containing the focus stack
-                with the current node being processed.
-
-        Raises:
-            ValueError: If a parameter name in parameter_output_values doesn't correspond
-                to an actual parameter in the node.
-
-        Note:
-            - Uses a copy of parameter_output_values to safely modify the dictionary during iteration
-            - For each parameter, publishes a ParameterValueUpdateEvent with value=None
-            - Events are wrapped in ExecutionGriptapeNodeEvent before publishing
-        """
-        current_node = context.focus_stack[-1].node
-        for parameter_name in current_node.parameter_output_values.copy():
-            parameter = current_node.get_parameter_by_name(parameter_name)
-            if parameter is None:
-                err = f"Attempted to execute node '{current_node.name}' but could not find parameter '{parameter_name}' that was indicated as having a value."
-                raise ValueError(err)
-            parameter_type = parameter.type
-            if parameter_type is None:
-                parameter_type = ParameterTypeBuiltin.NONE.value
-            payload = ParameterValueUpdateEvent(
-                node_name=current_node.name,
-                parameter_name=parameter_name,
-                data_type=parameter_type,
-                value=None,
-            )
-            GriptapeNodes.EventManager().put_event(
-                ExecutionGriptapeNodeEvent(wrapped_event=ExecutionEvent(payload=payload))
-            )
-        current_node.parameter_output_values.clear()
-
     @staticmethod
     async def collect_values_from_upstream_nodes(context: ResolutionContext) -> None:
         """Collect output values from resolved upstream nodes and pass them to the current node.
@@ -199,7 +165,7 @@ class ExecuteNodeState(State):
         """
         from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
         connections = GriptapeNodes.FlowManager().get_connections()
 
         for parameter in current_node.parameters:
@@ -237,14 +203,18 @@ class ExecuteNodeState(State):
 
     @staticmethod
     async def on_enter(context: ResolutionContext) -> type[State] | None:
-        current_node = context.focus_stack[-1].node
+        current_node = context.current_node
 
         # Clear all of the current output values
         # if node is locked, don't clear anything. skip all of this.
         if current_node.lock:
             return ExecuteNodeState
         await ExecuteNodeState.collect_values_from_upstream_nodes(context)
-        await ExecuteNodeState.clear_parameter_output_values(context)
+
+        # Clear all of the current output values but don't broadcast the clearing.
+        # to avoid any flickering in subscribers (UI).
+        context.current_node.parameter_output_values.silent_clear()
+
         for parameter in current_node.parameters:
             if ParameterTypeBuiltin.CONTROL_TYPE.value.lower() == parameter.output_type:
                 continue
@@ -398,7 +368,7 @@ class CompleteState(State):
         return None
 
 
-class NodeResolutionMachine(FSM[ResolutionContext]):
+class SequentialResolutionMachine(FSM[ResolutionContext]):
     """State machine for resolving node dependencies."""
 
     def __init__(self) -> None:
@@ -418,6 +388,7 @@ class NodeResolutionMachine(FSM[ResolutionContext]):
     def is_started(self) -> bool:
         return self._current_state is not None
 
-    def reset_machine(self) -> None:
+    # Unused argument but necessary for parallel_resolution because of futures ending during cancel but not reset.
+    def reset_machine(self, *, cancel: bool = False) -> None:  # noqa: ARG002
         self._context.reset()
         self._current_state = None

griptape_nodes/mcp_server/server.py

@@ -69,7 +69,7 @@ mcp_server_logger.addHandler(RichHandler(show_time=True, show_path=False, markup
 mcp_server_logger.setLevel(logging.INFO)
 
 
-def main_sync(api_key: str) -> None:
+def start_mcp_server(api_key: str) -> None:
     """Synchronous version of main entry point for the Griptape Nodes MCP server."""
     mcp_server_logger.debug("Starting MCP GTN server...")
     # Give these a session ID

griptape_nodes/retained_mode/events/base_events.py

@@ -135,7 +135,7 @@ class SkipTheLineMixin:
 class ResultPayloadSuccess(ResultPayload, ABC):
     """Abstract base class for success result payloads."""
 
-    result_details: ResultDetails | str = "Success"
+    result_details: ResultDetails | str
 
     def __post_init__(self) -> None:
         """Initialize success result with INFO level default for strings."""
@@ -156,7 +156,7 @@ class ResultPayloadSuccess(ResultPayload, ABC):
 class ResultPayloadFailure(ResultPayload, ABC):
     """Abstract base class for failure result payloads."""
 
-    result_details: ResultDetails | str = "Failure"
+    result_details: ResultDetails | str
     exception: Exception | None = None
 
     def __post_init__(self) -> None:

griptape_nodes/retained_mode/events/node_events.py

@@ -3,6 +3,7 @@ from enum import Enum, auto
 from typing import Any, NamedTuple, NewType
 from uuid import uuid4
 
+from griptape_nodes.exe_types.core_types import NodeMessagePayload
 from griptape_nodes.exe_types.node_types import NodeResolutionState
 from griptape_nodes.node_library.library_registry import LibraryNameAndVersion
 from griptape_nodes.retained_mode.events.base_events import (
@@ -744,7 +745,7 @@ class SendNodeMessageRequest(RequestPayload):
     """
 
     message_type: str
-    message: Any
+    message: NodeMessagePayload | None
     node_name: str | None = None
     optional_element_name: str | None = None
 
@@ -758,7 +759,7 @@ class SendNodeMessageResultSuccess(ResultPayloadSuccess):
         response: Optional response data from the node's message handler
     """
 
-    response: Any = None
+    response: NodeMessagePayload | None = None
 
 
 @dataclass
@@ -773,7 +774,7 @@ class SendNodeMessageResultFailure(ResultPayloadFailure):
         response: Optional response data from the node's message handler (even on failure)
     """
 
-    response: Any = None
+    response: NodeMessagePayload | None = None
 
 
 @dataclass

griptape_nodes/retained_mode/griptape_nodes.py

@@ -37,6 +37,7 @@ from griptape_nodes.retained_mode.events.app_events import (
 )
 from griptape_nodes.retained_mode.events.base_events import (
     GriptapeNodeEvent,
+    ResultDetails,
     ResultPayloadFailure,
 )
 from griptape_nodes.retained_mode.events.flow_events import (
@@ -252,7 +253,9 @@ class GriptapeNodes(metaclass=SingletonMeta):
                 type(request).__name__,
                 request,
             )
-            return ResultPayloadFailure(exception=e)
+            return ResultPayloadFailure(
+                exception=e, result_details=f"Unhandled exception while processing {type(request).__name__}: {e}"
+            )
         else:
             return result_event.result
 
@@ -276,7 +279,9 @@ class GriptapeNodes(metaclass=SingletonMeta):
                 type(request).__name__,
                 request,
             )
-            return ResultPayloadFailure(exception=e)
+            return ResultPayloadFailure(
+                exception=e, result_details=f"Unhandled exception while processing async {type(request).__name__}: {e}"
+            )
         else:
             return result_event.result
 
@@ -421,6 +426,7 @@ class GriptapeNodes(metaclass=SingletonMeta):
                     major=engine_ver.major,
                     minor=engine_ver.minor,
                     patch=engine_ver.patch,
+                    result_details="Engine version retrieved successfully.",
                 )
             details = f"Attempted to get engine version. Failed because version string '{engine_ver}' wasn't in expected major.minor.patch format."
             logger.error(details)
@@ -447,7 +453,7 @@ class GriptapeNodes(metaclass=SingletonMeta):
         await subscribe_to_topic(topic)
         logger.info("Subscribed to new session topic: %s", topic)
 
-        return AppStartSessionResultSuccess(current_session_id)
+        return AppStartSessionResultSuccess(current_session_id, result_details="Session started successfully.")
 
     async def handle_session_end_request(self, _: AppEndSessionRequest) -> ResultPayload:
         from griptape_nodes.app.app import unsubscribe_from_topic
@@ -465,14 +471,19 @@ class GriptapeNodes(metaclass=SingletonMeta):
             unsubscribe_topic = f"sessions/{previous_session_id}/request"
             await unsubscribe_from_topic(unsubscribe_topic)
 
-            return AppEndSessionResultSuccess(session_id=previous_session_id)
+            return AppEndSessionResultSuccess(
+                session_id=previous_session_id, result_details="Session ended successfully."
+            )
         except Exception as err:
             details = f"Failed to end session due to '{err}'."
             logger.error(details)
             return AppEndSessionResultFailure(result_details=details)
 
     def handle_get_session_request(self, _: AppGetSessionRequest) -> ResultPayload:
-        return AppGetSessionResultSuccess(session_id=GriptapeNodes.SessionManager().get_active_session_id())
+        return AppGetSessionResultSuccess(
+            session_id=GriptapeNodes.SessionManager().get_active_session_id(),
+            result_details="Session ID retrieved successfully.",
+        )
 
     def handle_session_heartbeat_request(self, request: SessionHeartbeatRequest) -> ResultPayload:  # noqa: ARG002
         """Handle session heartbeat requests.
@@ -487,8 +498,7 @@ class GriptapeNodes(metaclass=SingletonMeta):
                 return SessionHeartbeatResultFailure(result_details=details)
 
             details = f"Session heartbeat successful for session: {active_session_id}"
-            logger.debug(details)
-            return SessionHeartbeatResultSuccess()
+            return SessionHeartbeatResultSuccess(result_details=details)
         except Exception as err:
             details = f"Failed to handle session heartbeat: {err}"
             logger.error(details)
@@ -509,7 +519,6 @@ class GriptapeNodes(metaclass=SingletonMeta):
             # Get engine name
             engine_name = GriptapeNodes.EngineIdentityManager().get_engine_name()
 
-            logger.debug("Engine heartbeat successful")
             return EngineHeartbeatResultSuccess(
                 heartbeat_id=request.heartbeat_id,
                 engine_version=engine_version,
@@ -517,6 +526,7 @@ class GriptapeNodes(metaclass=SingletonMeta):
                 engine_id=GriptapeNodes.EngineIdentityManager().get_active_engine_id(),
                 session_id=GriptapeNodes.SessionManager().get_active_session_id(),
                 timestamp=datetime.now(tz=UTC).isoformat(),
+                result_details="Engine heartbeat successful",
                 **instance_info,
                 **workflow_info,
             )
@@ -529,8 +539,9 @@ class GriptapeNodes(metaclass=SingletonMeta):
         """Handle requests to get the current engine name."""
         try:
             engine_name = GriptapeNodes.EngineIdentityManager().get_engine_name()
-            logger.debug("Retrieved engine name: %s", engine_name)
-            return GetEngineNameResultSuccess(engine_name=engine_name)
+            return GetEngineNameResultSuccess(
+                engine_name=engine_name, result_details="Engine name retrieved successfully."
+            )
         except Exception as err:
             error_message = f"Failed to get engine name: {err}"
             logger.error(error_message)
@@ -547,8 +558,10 @@ class GriptapeNodes(metaclass=SingletonMeta):
 
             # Set the new engine name
             GriptapeNodes.EngineIdentityManager().set_engine_name(request.engine_name.strip())
-            logger.info("Engine name set to: %s", request.engine_name.strip())
-            return SetEngineNameResultSuccess(engine_name=request.engine_name.strip())
+            details = f"Engine name set to: {request.engine_name.strip()}"
+            return SetEngineNameResultSuccess(
+                engine_name=request.engine_name.strip(), result_details=ResultDetails(message=details, level="INFO")
+            )
 
         except Exception as err:
             error_message = f"Failed to set engine name: {err}"

griptape_nodes/retained_mode/managers/agent_manager.py

@@ -137,7 +137,7 @@ class AgentManager:
         if self.mcp_tool is None:
             self.mcp_tool = self._initialize_mcp_tool()
         await asyncio.to_thread(self._on_handle_run_agent_request, request)
-        return RunAgentResultStarted()
+        return RunAgentResultStarted(result_details="Agent execution started successfully.")
 
     def _create_agent(self) -> Agent:
         output_schema = Schema(
@@ -207,7 +207,9 @@ class AgentManager:
                         error=last_event.task_output.to_dict(), result_details=last_event.task_output.to_json()
                     )
                 if isinstance(last_event.task_output, JsonArtifact):
-                    return RunAgentResultSuccess(last_event.task_output.to_dict())
+                    return RunAgentResultSuccess(
+                        last_event.task_output.to_dict(), result_details="Agent execution completed successfully."
+                    )
             err_msg = f"Unexpected final event: {last_event}"
             logger.error(err_msg)
             return RunAgentResultFailure(error=ErrorArtifact(last_event).to_dict(), result_details=err_msg)
@@ -226,7 +228,7 @@ class AgentManager:
             details = f"Error configuring agent: {e}"
             logger.error(details)
             return ConfigureAgentResultFailure(result_details=details)
-        return ConfigureAgentResultSuccess()
+        return ConfigureAgentResultSuccess(result_details="Agent configured successfully.")
 
     def on_handle_reset_agent_conversation_memory_request(
         self, _: ResetAgentConversationMemoryRequest
@@ -237,7 +239,7 @@ class AgentManager:
             details = f"Error resetting agent conversation memory: {e}"
             logger.error(details)
             return ResetAgentConversationMemoryResultFailure(result_details=details)
-        return ResetAgentConversationMemoryResultSuccess()
+        return ResetAgentConversationMemoryResultSuccess(result_details="Agent conversation memory reset successfully.")
 
     def on_handle_get_conversation_memory_request(self, _: GetConversationMemoryRequest) -> ResultPayload:
         try:
@@ -246,4 +248,6 @@ class AgentManager:
             details = f"Error getting conversation memory: {e}"
             logger.error(details)
             return GetConversationMemoryResultFailure(result_details=details)
-        return GetConversationMemoryResultSuccess(runs=conversation_memory)
+        return GetConversationMemoryResultSuccess(
+            runs=conversation_memory, result_details="Conversation memory retrieved successfully."
+        )

griptape_nodes/retained_mode/managers/arbitrary_code_exec_manager.py

@@ -43,7 +43,9 @@ class ArbitraryCodeExecManager:
                 python_output = exec(request.python_string)  # noqa: S102
 
             captured_output = strip_ansi_codes(string_buffer.getvalue())
-            result = RunArbitraryPythonStringResultSuccess(python_output=captured_output)
+            result = RunArbitraryPythonStringResultSuccess(
+                python_output=captured_output, result_details="Successfully executed Python string"
+            )
         except Exception as e:
             python_output = f"ERROR: {e}"
             result = RunArbitraryPythonStringResultFailure(python_output=python_output, result_details=python_output)

griptape_nodes/retained_mode/managers/context_manager.py

@@ -279,19 +279,20 @@ class ContextManager:
         # As of today, we only allow a single Workflow context at a time. This may change in the future.
         if self.has_current_workflow():
             msg = f"Attempted to set the Workflow '{request.workflow_name}' as the Current Context. Failed because an existing workflow, '{self.get_current_workflow_name()}', is already in the Current Context. In order to clear the existing workflow and remove all objects and references to it, issue a ClearAllObjectState request."
-            logger.error(msg)
-            return SetWorkflowContextFailure()
+            return SetWorkflowContextFailure(result_details=msg)
 
         self.push_workflow(request.workflow_name)
         msg = f"Successfully set the Workflow '{request.workflow_name}' as the Current Context."
-        logger.debug(msg)
-        return SetWorkflowContextSuccess()
+        return SetWorkflowContextSuccess(result_details=msg)
 
     def on_get_workflow_context_request(self, request: GetWorkflowContextRequest) -> ResultPayload:  # noqa: ARG002
         workflow_name = None
         if self.has_current_workflow():
             workflow_name = self.get_current_workflow_name()
-        return GetWorkflowContextSuccess(workflow_name=workflow_name)
+        return GetWorkflowContextSuccess(
+            workflow_name=workflow_name,
+            result_details=f"Successfully retrieved workflow context: {workflow_name or 'None'}",
+        )
 
     def workflow(self, workflow_name: str) -> ContextManager.WorkflowContext:
         """Create a context manager for a Workflow context.