griptape-nodes 0.68.0__py3-none-any.whl → 0.68.1__py3-none-any.whl

griptape_nodes/retained_mode/events/mcp_events.py

@@ -33,6 +33,7 @@ class MCPServerConfig(TypedDict, total=False):
     terminate_on_close: bool  # Session termination behavior for streamable HTTP transport
     description: str | None
     capabilities: list[str] | None
+    rules: str | None  # Optional rules for this MCP server as a single string
 
 
 class MCPServerCapability(TypedDict):
@@ -162,6 +163,7 @@ class CreateMCPServerRequest(RequestPayload):
         description: Optional description of the server
         capabilities: List of server capabilities
         enabled: Whether the server is enabled by default
+        rules: Optional rules for this MCP server as a single string
     """
 
     name: str
@@ -186,6 +188,7 @@ class CreateMCPServerRequest(RequestPayload):
     # Common fields
     description: str | None = None
     capabilities: list[str] | None = None
+    rules: str | None = None
 
 
 @dataclass
@@ -224,6 +227,7 @@ class UpdateMCPServerRequest(RequestPayload):
         terminate_on_close: Updated session termination behavior for streamable HTTP transport
         description: Updated description of the server
         capabilities: Updated list of server capabilities
+        rules: Updated rules for this MCP server as a single string
     """
 
     name: str
@@ -249,6 +253,7 @@ class UpdateMCPServerRequest(RequestPayload):
     # Common fields
     description: str | None = None
     capabilities: list[str] | None = None
+    rules: str | None = None
 
 
 @dataclass

griptape_nodes/retained_mode/managers/agent_manager.py

@@ -389,49 +389,107 @@ class AgentManager:
         driver = self.thread_storage_driver.get_conversation_memory_driver(thread_id)
         conversation_memory = ConversationMemory(conversation_memory_driver=driver)
 
+        # Collect MCP server rulesets
+        mcp_rulesets = self._collect_mcp_server_rulesets(additional_mcp_servers)
+
+        # Get default rulesets
+        default_rulesets = self._get_default_rulesets()
+
         return Agent(
             prompt_driver=self.prompt_driver,
             conversation_memory=conversation_memory,
             tools=tools,
             output_schema=output_schema,
-            rulesets=[
-                Ruleset(
-                    name="generated_image_urls",
-                    rules=[
-                        Rule("Do not hallucinate generated_image_urls."),
-                        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."
-                        ),
-                    ],
-                ),
-            ],
+            rulesets=[*default_rulesets, *mcp_rulesets],
         )
 
+    @staticmethod
+    def _create_ruleset_from_rules_string(rules_string: str | None, server_name: str) -> Ruleset | None:
+        """Create a Ruleset from a rules string for an MCP server.
+
+        Args:
+            rules_string: Optional rules string for the MCP server
+            server_name: Name of the MCP server
+
+        Returns:
+            Ruleset with a single Rule containing the rules string, or None if rules_string is None/empty
+        """
+        if not rules_string or not rules_string.strip():
+            return None
+
+        rules_text = rules_string.strip()
+        ruleset_name = f"mcp_{server_name}_rules"
+
+        return Ruleset(name=ruleset_name, rules=[Rule(rules_text)])
+
+    def _collect_mcp_server_rulesets(self, additional_mcp_servers: list[str] | None) -> list[Ruleset]:
+        """Collect rulesets from MCP server configurations."""
+        mcp_rulesets = []
+
+        # Collect server names to get rules for
+        server_names_to_check = []
+        if additional_mcp_servers:
+            server_names_to_check.extend(additional_mcp_servers)
+
+        # Get rules for all MCP servers
+        if not server_names_to_check:
+            return mcp_rulesets
+
+        enabled_result = GriptapeNodes.handle_request(GetEnabledMCPServersRequest())
+        if not isinstance(enabled_result, GetEnabledMCPServersResultSuccess):
+            return mcp_rulesets
+
+        for server_name in server_names_to_check:
+            if server_name not in enabled_result.servers:
+                continue
+
+            server_config = enabled_result.servers[server_name]
+            rules_string = server_config.get("rules")
+            ruleset = AgentManager._create_ruleset_from_rules_string(rules_string, server_name)
+            if ruleset is not None:
+                mcp_rulesets.append(ruleset)
+
+        return mcp_rulesets
+
+    def _get_default_rulesets(self) -> list[Ruleset]:
+        """Get the default rulesets for agents."""
+        return [
+            Ruleset(
+                name="generated_image_urls",
+                rules=[
+                    Rule("Do not hallucinate generated_image_urls."),
+                    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."
+                    ),
+                ],
+            ),
+        ]
+
     def _validate_thread_for_run(self, thread_id: str | None) -> str:
         """Validate and return thread_id for agent run, or raise ValueError."""
         if thread_id is None:
@@ -510,10 +568,7 @@ class AgentManager:
         additional_tools = []
 
         try:
-            app = GriptapeNodes()
-
-            enabled_request = GetEnabledMCPServersRequest()
-            enabled_result = app.handle_request(enabled_request)
+            enabled_result = GriptapeNodes.handle_request(GetEnabledMCPServersRequest())
 
             if not isinstance(enabled_result, GetEnabledMCPServersResultSuccess):
                 msg = f"Failed to get enabled MCP servers for additional tools: {enabled_result}. Agent will continue with default MCP tool only."

griptape_nodes/retained_mode/managers/mcp_manager.py

@@ -127,6 +127,7 @@ class MCPManager:
             "terminate_on_close": "terminate_on_close",
             "description": "description",
             "capabilities": "capabilities",
+            "rules": "rules",
         }
 
         # Update fields that are not None
@@ -213,6 +214,7 @@ class MCPManager:
             # Common fields
             description=request.description,
             capabilities=request.capabilities or [],
+            rules=request.rules,
         )
 
         servers.append(server_config)

griptape_nodes/retained_mode/managers/settings.py

@@ -97,6 +97,7 @@ class MCPServerConfig(BaseModel):
     # Common fields
     description: str | None = Field(default=None, description="Optional description of what this MCP server provides")
     capabilities: list[str] = Field(default_factory=list, description="List of capabilities this MCP server provides")
+    rules: str | None = Field(default=None, description="Optional rules for this MCP server as a single string.")
 
     def __str__(self) -> str:
         return f"{self.name} ({'enabled' if self.enabled else 'disabled'})"

{griptape_nodes-0.68.0.dist-info → griptape_nodes-0.68.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: griptape-nodes
-Version: 0.68.0
+Version: 0.68.1
 Summary: Add your description here
 Requires-Dist: griptape>=1.8.12
 Requires-Dist: pydantic>=2.10.6

{griptape_nodes-0.68.0.dist-info → griptape_nodes-0.68.1.dist-info}/RECORD

@@ -128,7 +128,7 @@ griptape_nodes/retained_mode/events/flow_events.py,sha256=UcRHfaubb1GpDFSPg-5HRW
 griptape_nodes/retained_mode/events/generate_request_payload_schemas.py,sha256=PQ0QRZAUBljSIGjB8QhYUeRmSrfmLsJ6XVcygJKi13I,1102
 griptape_nodes/retained_mode/events/library_events.py,sha256=4NUc3uoLgofo1X9nrCVl2zPX3hsnk06Oo4Op0AQKA5o,36229
 griptape_nodes/retained_mode/events/logger_events.py,sha256=jYlxzPomgCsJuPtJ0znWBhD8QJfC8qC4xfChDiuVuyg,705
-griptape_nodes/retained_mode/events/mcp_events.py,sha256=51OlMZVcabdcIxBb_ojvrHtq2jAzZA31pooPBKaApyg,10734
+griptape_nodes/retained_mode/events/mcp_events.py,sha256=fs83jAQamhwNC9Zt8UNkBKd6iTids8531V_RMnGj__o,11008
 griptape_nodes/retained_mode/events/model_events.py,sha256=jXm-v-_Uxysn4MJ7a80_uIphrxTHgua3BGgHGyy3T_Y,9232
 griptape_nodes/retained_mode/events/node_events.py,sha256=vpILjBkgrPzF_KSow2EJCwcU-tDD78WEWM2DAAzhhiE,37720
 griptape_nodes/retained_mode/events/object_events.py,sha256=cJaqEU73Lzf1RRxJrFqEpl8eTr-gDhKpXKywJ-vVCJQ,2631
@@ -145,7 +145,7 @@ griptape_nodes/retained_mode/events/variable_events.py,sha256=fnl_sY8GWI_R4UJQTE
 griptape_nodes/retained_mode/events/workflow_events.py,sha256=TFJBYAERYZ6gLGGkLFUNxEkPP0uub7RXubPjvgy0ark,24915
 griptape_nodes/retained_mode/griptape_nodes.py,sha256=0pv6TmHqcaNPb1Rd4XJzhYMLtxrl7eLQLpZsDSvrhz0,20178
 griptape_nodes/retained_mode/managers/__init__.py,sha256=OTXysKusqYCQeAYwnVj4PbE3MxvAUTq9xOZT6vUE3JA,24
-griptape_nodes/retained_mode/managers/agent_manager.py,sha256=B7O9lczy83AJjRwdHUFgs6I0Pd3ANNbzPYhf70bsg7c,26311
+griptape_nodes/retained_mode/managers/agent_manager.py,sha256=FOKrcHEBw6M-RmfWTWEQmV-9iy9cD1zHiiDUDMqJHE4,28307
 griptape_nodes/retained_mode/managers/arbitrary_code_exec_manager.py,sha256=LyWzHQKmyDh-2zh2PIahdYyAthf_rMYs4zvhtVo-LsU,3423
 griptape_nodes/retained_mode/managers/config_manager.py,sha256=74AMeaCS0eOeFbzMk5I54MtB7-SNQbwlx_-O6zBBQRo,26739
 griptape_nodes/retained_mode/managers/context_manager.py,sha256=eb44_CAZhCg2iYIoodlAPpYc67tG3sHyq9dPNoiq_1s,23031
@@ -203,7 +203,7 @@ griptape_nodes/retained_mode/managers/fitness_problems/workflows/workflow_proble
 griptape_nodes/retained_mode/managers/fitness_problems/workflows/workflow_schema_version_problem.py,sha256=rUnbBBnGwgq5WTVPt2G4pGP3gVPoX5xvCdTkRPBmP04,1328
 griptape_nodes/retained_mode/managers/flow_manager.py,sha256=fY0xCXHiualDwVQJnNlPpMUnLz5bYWvr5D1_UvOyNVM,220269
 griptape_nodes/retained_mode/managers/library_manager.py,sha256=paogGavZj2MDOYvfUklhjORQg16YdpVGBxBncVSxtR0,192265
-griptape_nodes/retained_mode/managers/mcp_manager.py,sha256=Ezmn5_48r4JWYe-tFGqmw9dXLvvTiO1rw9b4MNCkw0U,15955
+griptape_nodes/retained_mode/managers/mcp_manager.py,sha256=AEHG1SqFc3g5hOImOHaH7ZjOkmgNAavmQgG9osXVGkE,16018
 griptape_nodes/retained_mode/managers/model_manager.py,sha256=3lj2X8vIvDSERPtR2VEXNFEWy_D8H6muxRvD-PEx8U8,44845
 griptape_nodes/retained_mode/managers/node_manager.py,sha256=KbThJ5fvBTuF9EEIqBT37Rop41_7o-irb_-KY8hkXVY,225038
 griptape_nodes/retained_mode/managers/object_manager.py,sha256=xABsjpE1_HLEIFwYj60zDOLi18EqrYUBuNaj37lUcH4,12921
@@ -222,7 +222,7 @@ griptape_nodes/retained_mode/managers/resource_types/cpu_resource.py,sha256=YHjU
 griptape_nodes/retained_mode/managers/resource_types/os_resource.py,sha256=HHJ-kgZB2BsnvU0rp-CQlM1xTJm3OZ3Dh-NpB01gGG8,3439
 griptape_nodes/retained_mode/managers/secrets_manager.py,sha256=knoHlbR-VrkeNULYjq72cHnhbCeupkKjtUT0EfBH8LQ,7743
 griptape_nodes/retained_mode/managers/session_manager.py,sha256=u3OEir9rjwG7GFM4MA5crKwcwq6F-lCUKlFzxlFU4co,14085
-griptape_nodes/retained_mode/managers/settings.py,sha256=BnIOYxsaE834_oIg6C_oRqFz0MDv8qSqLtwEGpiJZvA,12054
+griptape_nodes/retained_mode/managers/settings.py,sha256=UxYA5GzHqBPFMNwKqq2Np4nT8ZciBahpDIFrhQKNMm0,12168
 griptape_nodes/retained_mode/managers/static_files_manager.py,sha256=rWeI5mO8CCdEHx1odo4z4pxfTy33ggzCcUwkRj67aNM,12408
 griptape_nodes/retained_mode/managers/sync_manager.py,sha256=dF6nAAy1DLDQydefx7v3EtPCBiCrk4vURMum57WfmK8,21448
 griptape_nodes/retained_mode/managers/user_manager.py,sha256=JAOOKDhUfIbj0CJ5EHRBcplmxheQTzeogbvGO23VqXQ,4508
@@ -276,7 +276,7 @@ griptape_nodes/version_compatibility/versions/v0_65_5/__init__.py,sha256=4UyspOV
 griptape_nodes/version_compatibility/versions/v0_65_5/flux_2_removed_parameters.py,sha256=jOlmY5kKHXh8HPzAUtvwMJqzD4bP7pkE--yHUb7jTRA,3305
 griptape_nodes/version_compatibility/versions/v0_7_0/__init__.py,sha256=IzPPmGK86h2swfGGTOHyVcBIlOng6SjgWQzlbf3ngmo,51
 griptape_nodes/version_compatibility/versions/v0_7_0/local_executor_argument_addition.py,sha256=Thx8acnbw5OychhwEEj9aFxvbPe7Wgn4V9ZmZ7KRZqc,2082
-griptape_nodes-0.68.0.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
-griptape_nodes-0.68.0.dist-info/entry_points.txt,sha256=qvevqd3BVbAV5TcantnAm0ouqaqYKhsRO3pkFymWLWM,82
-griptape_nodes-0.68.0.dist-info/METADATA,sha256=N19_zdNWANm20AwShxLGrCdlns7RVwaJ9IoewOOXH1Q,5374
-griptape_nodes-0.68.0.dist-info/RECORD,,
+griptape_nodes-0.68.1.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
+griptape_nodes-0.68.1.dist-info/entry_points.txt,sha256=qvevqd3BVbAV5TcantnAm0ouqaqYKhsRO3pkFymWLWM,82
+griptape_nodes-0.68.1.dist-info/METADATA,sha256=c23iianw-Es7pl0SlHWlsx04xm_T9PMujNlLdfT2jDk,5374
+griptape_nodes-0.68.1.dist-info/RECORD,,