refactor: replace interrupt calls with request_approval utility in Linear and Notion tools

Updated the create, delete, and update functions in Linear and Notion tools to utilize the new request_approval utility for handling user approvals. This change improves code consistency and simplifies decision handling by directly merging parameters from the approval response.

surfsense_backend/app/agents/new_chat/tools/notion/create_page.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any
 
 from langchain_core.tools import tool
-from langgraph.types import interrupt
+from app.agents.new_chat.tools.hitl import request_approval
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
@@ -99,61 +99,29 @@ def create_create_notion_page_tool(
                 }
 
             logger.info(f"Requesting approval for creating Notion page: '{title}'")
-            approval = interrupt(
-                {
-                    "type": "notion_page_creation",
-                    "action": {
-                        "tool": "create_notion_page",
-                        "params": {
-                            "title": title,
-                            "content": content,
-                            "parent_page_id": None,
-                            "connector_id": connector_id,
-                        },
-                    },
-                    "context": context,
-                }
+            result = request_approval(
+                action_type="notion_page_creation",
+                tool_name="create_notion_page",
+                params={
+                    "title": title,
+                    "content": content,
+                    "parent_page_id": None,
+                    "connector_id": connector_id,
+                },
+                context=context,
             )
 
-            decisions_raw = (
-                approval.get("decisions", []) if isinstance(approval, dict) else []
-            )
-            decisions = (
-                decisions_raw if isinstance(decisions_raw, list) else [decisions_raw]
-            )
-            decisions = [d for d in decisions if isinstance(d, dict)]
-            if not decisions:
-                logger.warning("No approval decision received")
-                return {
-                    "status": "error",
-                    "message": "No approval decision received",
-                }
-
-            decision = decisions[0]
-            decision_type = decision.get("type") or decision.get("decision_type")
-            logger.info(f"User decision: {decision_type}")
-
-            if decision_type == "reject":
+            if result.rejected:
                 logger.info("Notion page creation rejected by user")
                 return {
                     "status": "rejected",
-                    "message": "User declined. The page was not created. Do not ask again or suggest alternatives.",
+                    "message": "User declined. Do not retry or suggest alternatives.",
                 }
 
-            edited_action = decision.get("edited_action")
-            final_params: dict[str, Any] = {}
-            if isinstance(edited_action, dict):
-                edited_args = edited_action.get("args")
-                if isinstance(edited_args, dict):
-                    final_params = edited_args
-            elif isinstance(decision.get("args"), dict):
-                # Some interrupt payloads place args directly on the decision.
-                final_params = decision["args"]
-
-            final_title = final_params.get("title", title)
-            final_content = final_params.get("content", content)
-            final_parent_page_id = final_params.get("parent_page_id")
-            final_connector_id = final_params.get("connector_id", connector_id)
+            final_title = result.params.get("title", title)
+            final_content = result.params.get("content", content)
+            final_parent_page_id = result.params.get("parent_page_id")
+            final_connector_id = result.params.get("connector_id", connector_id)
 
             if not final_title or not final_title.strip():
                 logger.error("Title is empty or contains only whitespace")

surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any
 
 from langchain_core.tools import tool
-from langgraph.types import interrupt
+from app.agents.new_chat.tools.hitl import request_approval
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
@@ -114,63 +114,29 @@ def create_delete_notion_page_tool(
                 f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id}, delete_from_kb={delete_from_kb})"
             )
 
-            # Request approval before deleting
-            approval = interrupt(
-                {
-                    "type": "notion_page_deletion",
-                    "action": {
-                        "tool": "delete_notion_page",
-                        "params": {
-                            "page_id": page_id,
-                            "connector_id": connector_id_from_context,
-                            "delete_from_kb": delete_from_kb,
-                        },
-                    },
-                    "context": context,
-                }
+            result = request_approval(
+                action_type="notion_page_deletion",
+                tool_name="delete_notion_page",
+                params={
+                    "page_id": page_id,
+                    "connector_id": connector_id_from_context,
+                    "delete_from_kb": delete_from_kb,
+                },
+                context=context,
             )
 
-            decisions_raw = (
-                approval.get("decisions", []) if isinstance(approval, dict) else []
-            )
-            decisions = (
-                decisions_raw if isinstance(decisions_raw, list) else [decisions_raw]
-            )
-            decisions = [d for d in decisions if isinstance(d, dict)]
-            if not decisions:
-                logger.warning("No approval decision received")
-                return {
-                    "status": "error",
-                    "message": "No approval decision received",
-                }
-
-            decision = decisions[0]
-            decision_type = decision.get("type") or decision.get("decision_type")
-            logger.info(f"User decision: {decision_type}")
-
-            if decision_type == "reject":
+            if result.rejected:
                 logger.info("Notion page deletion rejected by user")
                 return {
                     "status": "rejected",
-                    "message": "User declined. The page was not deleted. Do not ask again or suggest alternatives.",
+                    "message": "User declined. Do not retry or suggest alternatives.",
                 }
 
-            # Extract edited action arguments (if user modified the checkbox)
-            edited_action = decision.get("edited_action")
-            final_params: dict[str, Any] = {}
-            if isinstance(edited_action, dict):
-                edited_args = edited_action.get("args")
-                if isinstance(edited_args, dict):
-                    final_params = edited_args
-            elif isinstance(decision.get("args"), dict):
-                # Some interrupt payloads place args directly on the decision.
-                final_params = decision["args"]
-
-            final_page_id = final_params.get("page_id", page_id)
-            final_connector_id = final_params.get(
+            final_page_id = result.params.get("page_id", page_id)
+            final_connector_id = result.params.get(
                 "connector_id", connector_id_from_context
             )
-            final_delete_from_kb = final_params.get("delete_from_kb", delete_from_kb)
+            final_delete_from_kb = result.params.get("delete_from_kb", delete_from_kb)
 
             logger.info(
                 f"Deleting Notion page with final params: page_id={final_page_id}, connector_id={final_connector_id}, delete_from_kb={final_delete_from_kb}"

surfsense_backend/app/agents/new_chat/tools/notion/update_page.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any
 
 from langchain_core.tools import tool
-from langgraph.types import interrupt
+from app.agents.new_chat.tools.hitl import request_approval
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
@@ -127,59 +127,27 @@ def create_update_notion_page_tool(
             logger.info(
                 f"Requesting approval for updating Notion page: '{page_title}' (page_id={page_id})"
             )
-            approval = interrupt(
-                {
-                    "type": "notion_page_update",
-                    "action": {
-                        "tool": "update_notion_page",
-                        "params": {
-                            "page_id": page_id,
-                            "content": content,
-                            "connector_id": connector_id_from_context,
-                        },
-                    },
-                    "context": context,
-                }
+            result = request_approval(
+                action_type="notion_page_update",
+                tool_name="update_notion_page",
+                params={
+                    "page_id": page_id,
+                    "content": content,
+                    "connector_id": connector_id_from_context,
+                },
+                context=context,
             )
 
-            decisions_raw = (
-                approval.get("decisions", []) if isinstance(approval, dict) else []
-            )
-            decisions = (
-                decisions_raw if isinstance(decisions_raw, list) else [decisions_raw]
-            )
-            decisions = [d for d in decisions if isinstance(d, dict)]
-            if not decisions:
-                logger.warning("No approval decision received")
-                return {
-                    "status": "error",
-                    "message": "No approval decision received",
-                }
-
-            decision = decisions[0]
-            decision_type = decision.get("type") or decision.get("decision_type")
-            logger.info(f"User decision: {decision_type}")
-
-            if decision_type == "reject":
+            if result.rejected:
                 logger.info("Notion page update rejected by user")
                 return {
                     "status": "rejected",
-                    "message": "User declined. The page was not updated. Do not ask again or suggest alternatives.",
+                    "message": "User declined. Do not retry or suggest alternatives.",
                 }
 
-            edited_action = decision.get("edited_action")
-            final_params: dict[str, Any] = {}
-            if isinstance(edited_action, dict):
-                edited_args = edited_action.get("args")
-                if isinstance(edited_args, dict):
-                    final_params = edited_args
-            elif isinstance(decision.get("args"), dict):
-                # Some interrupt payloads place args directly on the decision.
-                final_params = decision["args"]
-
-            final_page_id = final_params.get("page_id", page_id)
-            final_content = final_params.get("content", content)
-            final_connector_id = final_params.get(
+            final_page_id = result.params.get("page_id", page_id)
+            final_content = result.params.get("content", content)
+            final_connector_id = result.params.get(
                 "connector_id", connector_id_from_context
             )