griptape-nodes 0.63.10__py3-none-any.whl → 0.64.1__py3-none-any.whl

griptape_nodes/retained_mode/events/node_events.py

@@ -441,7 +441,7 @@ class SerializedNodeCommands:
         set_parameter_value_command: SetParameterValueRequest
         unique_value_uuid: SerializedNodeCommands.UniqueParameterValueUUID
 
-    create_node_command: CreateNodeRequest
+    create_node_command: CreateNodeRequest | CreateNodeGroupRequest
     element_modification_commands: list[RequestPayload]
     node_dependencies: NodeDependencies
     lock_node_command: SetLockNodeStateRequest | None = None
@@ -908,3 +908,153 @@ class ResetNodeToDefaultsResultFailure(ResultPayloadFailure):
     Common causes: node not found, no current context, failed to create new node,
     failed to delete old node, failed to rename new node.
     """
+
+
+@dataclass
+@PayloadRegistry.register
+class AddNodesToNodeGroupRequest(RequestPayload):
+    """Adds nodes to a NodeGroup.
+
+    Use when: Need to add nodes to an existing NodeGroup, building node groups programmatically,
+    organizing nodes into logical groups.
+
+    Args:
+        node_name: Name of the node to add to the group
+        node_group_name: Name of the NodeGroup to add the node to
+        flow_name: Optional flow name to search in (None for current context flow)
+
+    Results: AddNodesToNodeGroupResultSuccess | AddNodeToNodeGroupResultFailure (node not found, group not found, add failed)
+    """
+
+    node_names: list[str]
+    node_group_name: str
+    flow_name: str | None = None
+
+
+@dataclass
+@PayloadRegistry.register
+class AddNodesToNodeGroupResultSuccess(WorkflowAlteredMixin, ResultPayloadSuccess):
+    """Node added to NodeGroup successfully."""
+
+
+@dataclass
+@PayloadRegistry.register
+class AddNodesToNodeGroupResultFailure(ResultPayloadFailure):
+    """Adding node to NodeGroup failed.
+
+    Common causes: node not found, NodeGroup not found, node already in group,
+    flow not found, no current context.
+    """
+
+
+@dataclass
+@PayloadRegistry.register
+class RemoveNodeFromNodeGroupRequest(RequestPayload):
+    """Remove nodes from a NodeGroup.
+
+    Use when: Need to remove nodes from a NodeGroup, reorganizing workflow structure,
+    implementing undo operations.
+
+    Args:
+        node_names: Names of the nodes to remove from the group
+        node_group_name: Name of the NodeGroup to remove the nodes from
+        flow_name: Optional flow name to search in (None for current context flow)
+
+    Results: RemoveNodeFromNodeGroupResultSuccess | RemoveNodeFromNodeGroupResultFailure (node not found, group not found, node not in group)
+    """
+
+    node_names: list[str]
+    node_group_name: str
+    flow_name: str | None = None
+
+
+@dataclass
+@PayloadRegistry.register
+class RemoveNodeFromNodeGroupResultSuccess(WorkflowAlteredMixin, ResultPayloadSuccess):
+    """Nodes removed from NodeGroup successfully."""
+
+
+@dataclass
+@PayloadRegistry.register
+class RemoveNodeFromNodeGroupResultFailure(ResultPayloadFailure):
+    """Removing node from NodeGroup failed.
+
+    Common causes: node not found, NodeGroup not found, node not in group,
+    flow not found, no current context.
+    """
+
+
+@dataclass
+@PayloadRegistry.register
+class CreateNodeGroupRequest(RequestPayload):
+    """Create a new NodeGroup node.
+
+    Use when: Need to create a new NodeGroup for organizing nodes, building workflows
+    with grouped nodes programmatically.
+
+    Args:
+        node_group_name: Desired name for the NodeGroup node (None for auto-generated)
+        flow_name: Optional flow name to create the NodeGroup in (None for current context flow)
+        metadata: Initial metadata for the NodeGroup (position, display properties)
+
+    Results: CreateNodeGroupResultSuccess (with assigned name) | CreateNodeGroupResultFailure (creation failed)
+    """
+
+    node_group_name: str | None = None
+    flow_name: str | None = None
+    metadata: dict | None = None
+    node_names_to_add: list[str] = field(default_factory=list)
+
+
+@dataclass
+@PayloadRegistry.register
+class CreateNodeGroupResultSuccess(WorkflowAlteredMixin, ResultPayloadSuccess):
+    """NodeGroup created successfully. NodeGroup is now available for adding nodes.
+
+    Args:
+        node_group_name: Final assigned name (may differ from requested)
+    """
+
+    node_group_name: str
+
+
+@dataclass
+@PayloadRegistry.register
+class CreateNodeGroupResultFailure(ResultPayloadFailure):
+    """NodeGroup creation failed.
+
+    Common causes: flow not found, no current context, instantiation errors,
+    NodeGroup node type not available.
+    """
+
+
+@dataclass
+@PayloadRegistry.register
+class DeleteNodeGroupRequest(RequestPayload):
+    """Delete a NodeGroup node.
+
+    Use when: Removing obsolete NodeGroups, cleaning up workflow structure,
+    implementing undo. Handles cascading cleanup of the NodeGroup node.
+
+    Args:
+        node_group_name: Name of the NodeGroup node to delete
+
+    Results: DeleteNodeGroupResultSuccess | DeleteNodeGroupResultFailure (NodeGroup not found, deletion failed)
+    """
+
+    node_group_name: str
+
+
+@dataclass
+@PayloadRegistry.register
+class DeleteNodeGroupResultSuccess(WorkflowAlteredMixin, ResultPayloadSuccess):
+    """NodeGroup deleted successfully. NodeGroup node removed from workflow."""
+
+
+@dataclass
+@PayloadRegistry.register
+class DeleteNodeGroupResultFailure(ResultPayloadFailure):
+    """NodeGroup deletion failed.
+
+    Common causes: NodeGroup not found, deletion cleanup failed, node is not a NodeGroup.
+    """

griptape_nodes/retained_mode/events/workflow_events.py

@@ -376,6 +376,16 @@ class LoadWorkflowMetadataResultFailure(WorkflowNotAlteredMixin, ResultPayloadFa
     """Workflow metadata load failed. Common causes: file not found, invalid format, parse error."""
 
 
+@dataclass
+class PublishWorkflowRegisteredEventData:
+    """Data specific to registering a PublishWorkflowRequest event handler."""
+
+    start_flow_node_type: str
+    start_flow_node_library_name: str
+    end_flow_node_type: str
+    end_flow_node_library_name: str
+
+
 @dataclass
 @PayloadRegistry.register
 class PublishWorkflowRequest(RequestPayload):

griptape_nodes/retained_mode/managers/agent_manager.py

@@ -180,6 +180,11 @@ class AgentManager:
                 self.prompt_driver = self._initialize_prompt_driver()
             for key, value in request.prompt_driver.items():
                 setattr(self.prompt_driver, key, value)
+
+            if self.image_tool is None:
+                self.image_tool = self._initialize_image_tool()
+            for key, value in request.image_generation_driver.items():
+                setattr(self.image_tool.image_generation_driver, key, value)
         except Exception as e:
             details = f"Error configuring agent: {e}"
             logger.error(details)
@@ -397,6 +402,33 @@ class AgentManager:
                         Rule("Only set generated_image_urls with images generated with your tools."),
                     ],
                 ),
+                # Note: Griptape's MCPTool automatically wraps arguments in a 'values' key, but our MCP server
+                # expects arguments directly. This ruleset instructs the agent to provide arguments without
+                # the 'values' wrapper to avoid validation errors. If MCPTool behavior changes in the future,
+                # this ruleset may need to be updated or removed.
+                Ruleset(
+                    name="mcp_tool_usage",
+                    rules=[
+                        Rule(
+                            "When calling MCP tools (mcpGriptapeNodes), provide arguments directly without wrapping them in a 'values' key. "
+                            "For example, use {'node_type': 'FluxImageGeneration', 'node_name': 'MyNode'} not {'values': {'node_type': 'FluxImageGeneration'}}."
+                        ),
+                    ],
+                ),
+                Ruleset(
+                    name="node_rulesets",
+                    rules=[
+                        Rule(
+                            "When asked to create a node, use ListNodeTypesInLibraryRequest or GetAllInfoForAllLibrariesRequest to check available node types and find the appropriate node."
+                        ),
+                        Rule(
+                            "When matching user requests to node types, account for variations: users may include spaces (e.g., 'Image Generation' vs 'ImageGeneration') or reorder words (e.g., 'Generate Image' vs 'Image Generation'). Match based on the words present, not exact spelling."
+                        ),
+                        Rule(
+                            "If you cannot determine the correct node type or node creation fails, ask the user for clarification."
+                        ),
+                    ],
+                ),
             ],
         )
 
@@ -453,7 +485,7 @@ class AgentManager:
             msg = f"Secret '{API_KEY_ENV_VAR}' not found"
             raise ValueError(msg)
         return NodesPromptImageGenerationTool(
-            image_generation_driver=GriptapeCloudImageGenerationDriver(api_key=api_key, model="gpt-image-1"),
+            image_generation_driver=GriptapeCloudImageGenerationDriver(api_key=api_key),
             static_files_manager=self.static_files_manager,
         )