Merge pull request #211 from moonpyt/main

Add an optional bearer_token argument to the delete operation and Fixed InterruptError propagation

Author: veithly

spoon_ai/graph/engine.py

@@ -86,6 +86,9 @@ async def __call__(self, state: State, config: Optional[Dict[str, Any]] = None)
             else:
                 return {"result": result}
 
+        except InterruptError:
+            # Let InterruptError propagate to be handled in invoke()
+            raise
         except Exception as e:
             logger.error(f"Node {self.name} execution failed: {e}")
             raise NodeExecutionError(f"Node '{self.name}' failed", node_name=self.name, original_error=e, state=state) from e
@@ -757,8 +760,44 @@ async def invoke(self, initial_state: Optional[Dict[str, Any]] = None, config: O
         config = config or {}
         thread_id = config.get("configurable", {}).get("thread_id", str(uuid.uuid4()))
 
-        # Handle resume from checkpoint
-        if self._resume_thread_id:
+        # Handle Command object (for resume/goto/update)
+        if isinstance(initial_state, Command):
+            cmd = initial_state
+            # Handle resume: load checkpoint and merge updates
+            if cmd.resume is not None:
+                checkpoint = self.graph.checkpointer.get_checkpoint(thread_id)
+                if checkpoint:
+                    state = checkpoint.values.copy()
+                    # Merge resume data into state
+                    if isinstance(cmd.resume, dict):
+                        state.update(cmd.resume)
+                    current_node = checkpoint.next[0] if checkpoint.next else self.graph._entry_point
+                    iteration = checkpoint.metadata.get("iteration", 0) + 1
+                else:
+                    raise GraphExecutionError(f"No checkpoint found for thread_id '{thread_id}' to resume from")
+            # Handle goto: jump to specific node
+            elif cmd.goto:
+                state = self._initialize_state(cmd.update or {})
+                current_node = cmd.goto
+                iteration = 0
+            # Handle update: update state and continue
+            elif cmd.update:
+                checkpoint = self.graph.checkpointer.get_checkpoint(thread_id)
+                if checkpoint:
+                    state = checkpoint.values.copy()
+                    state.update(cmd.update)
+                    current_node = checkpoint.next[0] if checkpoint.next else self.graph._entry_point
+                    iteration = checkpoint.metadata.get("iteration", 0) + 1
+                else:
+                    state = self._initialize_state(cmd.update)
+                    current_node = self.graph._entry_point
+                    iteration = 0
+            else:
+                state = self._initialize_state({})
+                current_node = self.graph._entry_point
+                iteration = 0
+        # Handle resume from checkpoint (legacy)
+        elif self._resume_thread_id:
             thread_id = self._resume_thread_id
             checkpoint = self.graph.checkpointer.get_checkpoint(thread_id, self._resume_checkpoint_id)
             if checkpoint:
@@ -871,6 +910,9 @@ async def _execute_node(self, node_name: str, state: State, config: Optional[Dic
             except Exception:
                 pass
             return result if isinstance(result, dict) else {"result": result}
+        except InterruptError:
+            # Let InterruptError propagate to be handled in invoke()
+            raise
         except Exception as e:
             logger.error(f"Node {node_name} execution failed: {e}")
             try:

spoon_ai/neofs/client.py

@@ -345,9 +345,27 @@ def get_object_header_by_attribute(
         return self._request('HEAD', f'/v1/objects/{container_id}/by_attribute/{encoded_key}/{encoded_val}', headers=headers, params=params if params else None)
 
     # 8. Object Delete
-    def delete_object(self, container_id: str, object_id: str) -> SuccessResponse:
-        params = generate_simple_signature_params(self.private_key_wif)
-        response = self._request('DELETE', f'/v1/objects/{container_id}/{object_id}', params=params)
+    def delete_object(
+        self, 
+        container_id: str, 
+        object_id: str,
+        *,
+        bearer_token: Optional[str] = None
+    ) -> SuccessResponse:
+        """Delete object. Bearer token is optional for public containers, required for eACL containers with DENY DELETE rule."""
+        headers = {}
+        params = {}
+        
+        if bearer_token:
+            signature_value, signature_key = sign_bearer_token(bearer_token, self.private_key_wif, wallet_connect=False)
+            headers['Authorization'] = f'Bearer {bearer_token}'
+            headers['X-Bearer-Signature'] = signature_value
+            headers['X-Bearer-Signature-Key'] = signature_key
+            params = generate_simple_signature_params(self.private_key_wif, payload_parts=(signature_value.encode(),))
+        else:
+            params = generate_simple_signature_params(self.private_key_wif)
+        
+        response = self._request('DELETE', f'/v1/objects/{container_id}/{object_id}', headers=headers, params=params)
         return SuccessResponse(**response.json())
 
     # 9. Object Search

spoon_ai/tools/mcp_tool.py

@@ -111,10 +111,15 @@ def _create_transport_from_config(self, config: dict):
             elif command == "uvx":
                 if not args:
                     raise ValueError("No package specified for uvx transport")
-                package = args[0]
-                return UvxStdioTransport(package=package, args=args[1:], env_vars=env)
+                tool_name = args[0]
+                tool_args = args[1:] if len(args) > 1 else None
+                return UvxStdioTransport(tool_name=tool_name, tool_args=tool_args, env_vars=env)
             elif command in ["python", "python3"]:
-                return PythonStdioTransport(args=args, env=merged_env)
+                if not args:
+                    raise ValueError("No script path specified for python transport")
+                script_path = args[0]
+                script_args = args[1:] if len(args) > 1 else None
+                return PythonStdioTransport(script_path=script_path, args=script_args, env=merged_env)
             else:
                 full_command = [command] + args
                 return StdioTransport(command=full_command[0], args=full_command[1:], env=merged_env)

spoon_ai/tools/neofs_tools.py

@@ -578,20 +578,21 @@ class DeleteObjectTool(BaseTool):
     """Delete an object"""
 
     name: str = "delete_neofs_object"
-    description: str = "Delete an object from container."
+    description: str = "Delete an object from container. Bearer token is optional for public containers, required for eACL containers with DENY DELETE rule."
     parameters: dict = {
         "type": "object",
         "properties": {
             "container_id": {"type": "string", "description": "Container ID"},
-            "object_id": {"type": "string", "description": "Object ID"}
+            "object_id": {"type": "string", "description": "Object ID"},
+            "bearer_token": {"type": "string", "description": "Bearer token (optional for public containers, required for eACL containers with DENY DELETE rule)"}
         },
         "required": ["container_id", "object_id"]
     }
 
-    async def execute(self, container_id: str, object_id: str, **kwargs) -> str:
+    async def execute(self, container_id: str, object_id: str, bearer_token: str = None, **kwargs) -> str:
         try:
             client = get_shared_neofs_client()
-            result = client.delete_object(container_id, object_id)
+            result = client.delete_object(container_id, object_id, bearer_token=bearer_token)
 
             return f"""✅ Object deleted!
 Object ID: {object_id}
@@ -802,18 +803,18 @@ class DeleteContainerTool(BaseTool):
     """Delete container"""
 
     name: str = "delete_neofs_container"
-    description: str = "Delete container. Requires bearer token."
+    description: str = "Delete container. Bearer token is optional but recommended - can use private key signature if not provided."
     parameters: dict = {
         "type": "object",
         "properties": {
             "container_id": {"type": "string", "description": "Container ID"},
-            "bearer_token": {"type": "string", "description": "Bearer token (required)"},
+            "bearer_token": {"type": "string", "description": "Bearer token (optional but recommended for security)"},
             "wallet_connect": {"type": "boolean", "description": "Use wallet_connect mode"}
         },
-        "required": ["container_id", "bearer_token"]
+        "required": ["container_id"]
     }
 
-    async def execute(self, container_id: str, bearer_token: str, wallet_connect: bool = True, **kwargs) -> str:
+    async def execute(self, container_id: str, bearer_token: str = None, wallet_connect: bool = True, **kwargs) -> str:
         try:
             client = get_shared_neofs_client()
             client.delete_container(container_id, bearer_token=bearer_token, wallet_connect=wallet_connect)