apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-04-28 10:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: linting

Browse source
This commit is contained in:
DESKTOP-RTLN3BA\$punk 2026-02-15 23:38:15 -08:00
parent b9159a8329
commit 81c70befcf
10 changed files with 265 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

6
surfsense_backend/app/agents/new_chat/chat_deepagent.py
View file

@ -249,7 +249,11 @@ async def create_surfsense_deep_agent(
available_connectors is not None and "NOTION_CONNECTOR" in available_connectors available_connectors is not None and "NOTION_CONNECTOR" in available_connectors
) )
if not has_notion_connector: if not has_notion_connector:
notion_tools = ["create_notion_page", "update_notion_page", "delete_notion_page"] notion_tools = [
"create_notion_page",
"update_notion_page",
"delete_notion_page",
]
modified_disabled_tools.extend(notion_tools) modified_disabled_tools.extend(notion_tools)
# Build tools using the async registry (includes MCP tools) # Build tools using the async registry (includes MCP tools)

84
surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
View file

@ -55,19 +55,23 @@ def create_create_notion_page_tool(
- url: URL to the created page (if success) - url: URL to the created page (if success)
- title: Page title (if success) - title: Page title (if success)
- message: Result message - message: Result message
IMPORTANT: If status is "rejected", the user explicitly declined the action. IMPORTANT: If status is "rejected", the user explicitly declined the action.
Respond with a brief acknowledgment (e.g., "Understood, I didn't create the page.") Respond with a brief acknowledgment (e.g., "Understood, I didn't create the page.")
and move on. Do NOT ask for parent page IDs, troubleshoot, or suggest alternatives. and move on. Do NOT ask for parent page IDs, troubleshoot, or suggest alternatives.
Examples: Examples:
- "Create a Notion page titled 'Meeting Notes' with content 'Discussed project timeline'" - "Create a Notion page titled 'Meeting Notes' with content 'Discussed project timeline'"
- "Save this to Notion with title 'Research Summary'" - "Save this to Notion with title 'Research Summary'"
""" """
logger.info(f"create_notion_page called: title='{title}', parent_page_id={parent_page_id}") logger.info(
f"create_notion_page called: title='{title}', parent_page_id={parent_page_id}"
)
if db_session is None or search_space_id is None or user_id is None: if db_session is None or search_space_id is None or user_id is None:
logger.error("Notion tool not properly configured - missing required parameters") logger.error(
"Notion tool not properly configured - missing required parameters"
)
return { return {
"status": "error", "status": "error",
"message": "Notion tool not properly configured. Please contact support.", "message": "Notion tool not properly configured. Please contact support.",
@ -75,30 +79,34 @@ def create_create_notion_page_tool(
try: try:
metadata_service = NotionToolMetadataService(db_session) metadata_service = NotionToolMetadataService(db_session)
context = await metadata_service.get_creation_context(search_space_id, user_id) context = await metadata_service.get_creation_context(
search_space_id, user_id
)
if "error" in context: if "error" in context:
logger.error(f"Failed to fetch creation context: {context['error']}") logger.error(f"Failed to fetch creation context: {context['error']}")
return { return {
"status": "error", "status": "error",
"message": context["error"], "message": context["error"],
} }
logger.info(f"Requesting approval for creating Notion page: '{title}'") logger.info(f"Requesting approval for creating Notion page: '{title}'")
approval = interrupt({ approval = interrupt(
"type": "notion_page_creation", {
"action": { "type": "notion_page_creation",
"tool": "create_notion_page", "action": {
"params": { "tool": "create_notion_page",
"title": title, "params": {
"content": content, "title": title,
"parent_page_id": parent_page_id, "content": content,
"connector_id": connector_id, "parent_page_id": parent_page_id,
"connector_id": connector_id,
},
}, },
}, "context": context,
"context": context, }
}) )
decisions = approval.get("decisions", []) decisions = approval.get("decisions", [])
if not decisions: if not decisions:
logger.warning("No approval decision received") logger.warning("No approval decision received")
@ -106,35 +114,37 @@ def create_create_notion_page_tool(
"status": "error", "status": "error",
"message": "No approval decision received", "message": "No approval decision received",
} }
decision = decisions[0] decision = decisions[0]
decision_type = decision.get("type") or decision.get("decision_type") decision_type = decision.get("type") or decision.get("decision_type")
logger.info(f"User decision: {decision_type}") logger.info(f"User decision: {decision_type}")
if decision_type == "reject": if decision_type == "reject":
logger.info("Notion page creation rejected by user") logger.info("Notion page creation rejected by user")
return { return {
"status": "rejected", "status": "rejected",
"message": "User declined. The page was not created. Do not ask again or suggest alternatives.", "message": "User declined. The page was not created. Do not ask again or suggest alternatives.",
} }
edited_action = decision.get("edited_action", {}) edited_action = decision.get("edited_action", {})
final_params = edited_action.get("args", {}) if edited_action else {} final_params = edited_action.get("args", {}) if edited_action else {}
final_title = final_params.get("title", title) final_title = final_params.get("title", title)
final_content = final_params.get("content", content) final_content = final_params.get("content", content)
final_parent_page_id = final_params.get("parent_page_id", parent_page_id) final_parent_page_id = final_params.get("parent_page_id", parent_page_id)
final_connector_id = final_params.get("connector_id", connector_id) final_connector_id = final_params.get("connector_id", connector_id)
if not final_title or not final_title.strip(): if not final_title or not final_title.strip():
logger.error("Title is empty or contains only whitespace") logger.error("Title is empty or contains only whitespace")
return { return {
"status": "error", "status": "error",
"message": "Page title cannot be empty. Please provide a valid title.", "message": "Page title cannot be empty. Please provide a valid title.",
} }
logger.info(f"Creating Notion page with final params: title='{final_title}'") logger.info(
f"Creating Notion page with final params: title='{final_title}'"
)
from sqlalchemy.future import select from sqlalchemy.future import select
from app.db import SearchSourceConnector, SearchSourceConnectorType from app.db import SearchSourceConnector, SearchSourceConnectorType
@ -152,7 +162,9 @@ def create_create_notion_page_tool(
connector = result.scalars().first() connector = result.scalars().first()
if not connector: if not connector:
logger.warning(f"No Notion connector found for search_space_id={search_space_id}") logger.warning(
f"No Notion connector found for search_space_id={search_space_id}"
)
return { return {
"status": "error", "status": "error",
"message": "No Notion connector found. Please connect Notion in your workspace settings.", "message": "No Notion connector found. Please connect Notion in your workspace settings.",
@ -192,19 +204,23 @@ def create_create_notion_page_tool(
content=final_content, content=final_content,
parent_page_id=final_parent_page_id, parent_page_id=final_parent_page_id,
) )
logger.info(f"create_page result: {result.get('status')} - {result.get('message', '')}") logger.info(
f"create_page result: {result.get('status')} - {result.get('message', '')}"
)
return result return result
except Exception as e: except Exception as e:
from langgraph.errors import GraphInterrupt from langgraph.errors import GraphInterrupt
if isinstance(e, GraphInterrupt): if isinstance(e, GraphInterrupt):
raise raise
logger.error(f"Error creating Notion page: {e}", exc_info=True) logger.error(f"Error creating Notion page: {e}", exc_info=True)
return { return {
"status": "error", "status": "error",
"message": str(e) if isinstance(e, ValueError) else f"Unexpected error: {e!s}", "message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
} }
return create_notion_page return create_notion_page

52
surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
View file

@ -59,10 +59,14 @@ def create_delete_notion_page_tool(
- "Remove the 'Old Project Plan' Notion page" - "Remove the 'Old Project Plan' Notion page"
- "Archive the 'Draft Ideas' Notion page" - "Archive the 'Draft Ideas' Notion page"
""" """
logger.info(f"delete_notion_page called: page_title='{page_title}', delete_from_db={delete_from_db}") logger.info(
f"delete_notion_page called: page_title='{page_title}', delete_from_db={delete_from_db}"
)
if db_session is None or search_space_id is None or user_id is None: if db_session is None or search_space_id is None or user_id is None:
logger.error("Notion tool not properly configured - missing required parameters") logger.error(
"Notion tool not properly configured - missing required parameters"
)
return { return {
"status": "error", "status": "error",
"message": "Notion tool not properly configured. Please contact support.", "message": "Notion tool not properly configured. Please contact support.",
@ -95,8 +99,10 @@ def create_delete_notion_page_tool(
connector_id_from_context = context.get("account", {}).get("id") connector_id_from_context = context.get("account", {}).get("id")
document_id = context.get("document_id") document_id = context.get("document_id")
logger.info(f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id}, delete_from_db={delete_from_db})") logger.info(
f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id}, delete_from_db={delete_from_db})"
)
# Request approval before deleting # Request approval before deleting
approval = interrupt( approval = interrupt(
{ {
@ -137,10 +143,14 @@ def create_delete_notion_page_tool(
final_params = edited_action.get("args", {}) if edited_action else {} final_params = edited_action.get("args", {}) if edited_action else {}
final_page_id = final_params.get("page_id", page_id) final_page_id = final_params.get("page_id", page_id)
final_connector_id = final_params.get("connector_id", connector_id_from_context) final_connector_id = final_params.get(
"connector_id", connector_id_from_context
)
final_delete_from_db = final_params.get("delete_from_db", delete_from_db) final_delete_from_db = final_params.get("delete_from_db", delete_from_db)
logger.info(f"Deleting Notion page with final params: page_id={final_page_id}, connector_id={final_connector_id}, delete_from_db={final_delete_from_db}") logger.info(
f"Deleting Notion page with final params: page_id={final_page_id}, connector_id={final_connector_id}, delete_from_db={final_delete_from_db}"
)
from sqlalchemy.future import select from sqlalchemy.future import select
@ -184,11 +194,17 @@ def create_delete_notion_page_tool(
# Delete the page from Notion # Delete the page from Notion
result = await notion_connector.delete_page(page_id=final_page_id) result = await notion_connector.delete_page(page_id=final_page_id)
logger.info(f"delete_page result: {result.get('status')} - {result.get('message', '')}") logger.info(
f"delete_page result: {result.get('status')} - {result.get('message', '')}"
)
# If deletion was successful and user wants to delete from DB # If deletion was successful and user wants to delete from DB
deleted_from_db = False deleted_from_db = False
if result.get("status") == "success" and final_delete_from_db and document_id: if (
result.get("status") == "success"
and final_delete_from_db
and document_id
):
try: try:
from sqlalchemy.future import select from sqlalchemy.future import select
@ -204,21 +220,27 @@ def create_delete_notion_page_tool(
await db_session.delete(document) await db_session.delete(document)
await db_session.commit() await db_session.commit()
deleted_from_db = True deleted_from_db = True
logger.info(f"Deleted document {document_id} from knowledge base") logger.info(
f"Deleted document {document_id} from knowledge base"
)
else: else:
logger.warning(f"Document {document_id} not found in DB") logger.warning(f"Document {document_id} not found in DB")
except Exception as e: except Exception as e:
logger.error(f"Failed to delete document from DB: {e}") logger.error(f"Failed to delete document from DB: {e}")
# Don't fail the whole operation if DB deletion fails # Don't fail the whole operation if DB deletion fails
# The page is already deleted from Notion, so inform the user # The page is already deleted from Notion, so inform the user
result["warning"] = f"Page deleted from Notion, but failed to remove from knowledge base: {e!s}" result["warning"] = (
f"Page deleted from Notion, but failed to remove from knowledge base: {e!s}"
)
# Update result with DB deletion status # Update result with DB deletion status
if result.get("status") == "success": if result.get("status") == "success":
result["deleted_from_db"] = deleted_from_db result["deleted_from_db"] = deleted_from_db
if deleted_from_db: if deleted_from_db:
result["message"] = f"{result.get('message', '')} (also removed from knowledge base)" result["message"] = (
f"{result.get('message', '')} (also removed from knowledge base)"
)
return result return result
except Exception as e: except Exception as e:

34
surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
View file

@ -51,24 +51,28 @@ def create_update_notion_page_tool(
- url: URL to the updated page (if success) - url: URL to the updated page (if success)
- title: Current page title (if success) - title: Current page title (if success)
- message: Result message - message: Result message
IMPORTANT: IMPORTANT:
- If status is "rejected", the user explicitly declined the action. - If status is "rejected", the user explicitly declined the action.
Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.") Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.")
and move on. Do NOT ask for alternatives or troubleshoot. and move on. Do NOT ask for alternatives or troubleshoot.
- If status is "not_found", inform the user conversationally using the exact message provided. - If status is "not_found", inform the user conversationally using the exact message provided.
Example: "I couldn't find the page '[page_title]' in your indexed Notion pages. [message details]" Example: "I couldn't find the page '[page_title]' in your indexed Notion pages. [message details]"
Do NOT treat this as an error. Do NOT invent information. Simply relay the message and Do NOT treat this as an error. Do NOT invent information. Simply relay the message and
ask the user to verify the page title or check if it's been indexed. ask the user to verify the page title or check if it's been indexed.
Examples: Examples:
- "Add 'New meeting notes from today' to the 'Meeting Notes' Notion page" - "Add 'New meeting notes from today' to the 'Meeting Notes' Notion page"
- "Append the following to the 'Project Plan' Notion page: '# Status Update\n\nCompleted phase 1'" - "Append the following to the 'Project Plan' Notion page: '# Status Update\n\nCompleted phase 1'"
""" """
logger.info(f"update_notion_page called: page_title='{page_title}', content_length={len(content) if content else 0}") logger.info(
f"update_notion_page called: page_title='{page_title}', content_length={len(content) if content else 0}"
)
if db_session is None or search_space_id is None or user_id is None: if db_session is None or search_space_id is None or user_id is None:
logger.error("Notion tool not properly configured - missing required parameters") logger.error(
"Notion tool not properly configured - missing required parameters"
)
return { return {
"status": "error", "status": "error",
"message": "Notion tool not properly configured. Please contact support.", "message": "Notion tool not properly configured. Please contact support.",
@ -106,7 +110,9 @@ def create_update_notion_page_tool(
page_id = context.get("page_id") page_id = context.get("page_id")
connector_id_from_context = context.get("account", {}).get("id") connector_id_from_context = context.get("account", {}).get("id")
logger.info(f"Requesting approval for updating Notion page: '{page_title}' (page_id={page_id})") logger.info(
f"Requesting approval for updating Notion page: '{page_title}' (page_id={page_id})"
)
approval = interrupt( approval = interrupt(
{ {
"type": "notion_page_update", "type": "notion_page_update",
@ -146,9 +152,13 @@ def create_update_notion_page_tool(
final_page_id = final_params.get("page_id", page_id) final_page_id = final_params.get("page_id", page_id)
final_content = final_params.get("content", content) final_content = final_params.get("content", content)
final_connector_id = final_params.get("connector_id", connector_id_from_context) final_connector_id = final_params.get(
"connector_id", connector_id_from_context
)
logger.info(f"Updating Notion page with final params: page_id={final_page_id}, has_content={final_content is not None}") logger.info(
f"Updating Notion page with final params: page_id={final_page_id}, has_content={final_content is not None}"
)
from sqlalchemy.future import select from sqlalchemy.future import select
@ -192,7 +202,9 @@ def create_update_notion_page_tool(
page_id=final_page_id, page_id=final_page_id,
content=final_content, content=final_content,
) )
logger.info(f"update_page result: {result.get('status')} - {result.get('message', '')}") logger.info(
f"update_page result: {result.get('status')} - {result.get('message', '')}"
)
return result return result
except Exception as e: except Exception as e:

155
surfsense_backend/app/connectors/notion_history.py
View file

@ -1,4 +1,5 @@
import asyncio import asyncio
import contextlib
import logging import logging
import re import re
from collections.abc import Awaitable, Callable from collections.abc import Awaitable, Callable
@ -220,6 +221,7 @@ class NotionHistoryConnector:
# Refresh token # Refresh token
from app.routes.notion_add_connector_route import refresh_notion_token from app.routes.notion_add_connector_route import refresh_notion_token
connector = await refresh_notion_token(self._session, connector) connector = await refresh_notion_token(self._session, connector)
# Reload credentials after refresh # Reload credentials after refresh
@ -804,7 +806,7 @@ class NotionHistoryConnector:
results = response.get("results", []) results = response.get("results", [])
if results: if results:
return results[0]["id"] return results[0]["id"]
return None return None
except Exception as e: except Exception as e:
@ -835,59 +837,81 @@ class NotionHistoryConnector:
# Heading 1 # Heading 1
if line.startswith("# "): if line.startswith("# "):
blocks.append({ blocks.append(
"object": "block", {
"type": "heading_1", "object": "block",
"heading_1": { "type": "heading_1",
"rich_text": [{"type": "text", "text": {"content": line[2:]}}] "heading_1": {
}, "rich_text": [
}) {"type": "text", "text": {"content": line[2:]}}
]
},
}
)
# Heading 2 # Heading 2
elif line.startswith("## "): elif line.startswith("## "):
blocks.append({ blocks.append(
"object": "block", {
"type": "heading_2", "object": "block",
"heading_2": { "type": "heading_2",
"rich_text": [{"type": "text", "text": {"content": line[3:]}}] "heading_2": {
}, "rich_text": [
}) {"type": "text", "text": {"content": line[3:]}}
]
},
}
)
# Heading 3 # Heading 3
elif line.startswith("### "): elif line.startswith("### "):
blocks.append({ blocks.append(
"object": "block", {
"type": "heading_3", "object": "block",
"heading_3": { "type": "heading_3",
"rich_text": [{"type": "text", "text": {"content": line[4:]}}] "heading_3": {
}, "rich_text": [
}) {"type": "text", "text": {"content": line[4:]}}
]
},
}
)
# Bullet list # Bullet list
elif line.startswith("- ") or line.startswith("* "): elif line.startswith("- ") or line.startswith("* "):
blocks.append({ blocks.append(
"object": "block", {
"type": "bulleted_list_item", "object": "block",
"bulleted_list_item": { "type": "bulleted_list_item",
"rich_text": [{"type": "text", "text": {"content": line[2:]}}] "bulleted_list_item": {
}, "rich_text": [
}) {"type": "text", "text": {"content": line[2:]}}
]
},
}
)
# Numbered list # Numbered list
elif (match := re.match(r'^(\d+)\.\s+(.*)$', line)): elif match := re.match(r"^(\d+)\.\s+(.*)$", line):
content = match.group(2) # Extract text after "number. " content = match.group(2) # Extract text after "number. "
blocks.append({ blocks.append(
"object": "block", {
"type": "numbered_list_item", "object": "block",
"numbered_list_item": { "type": "numbered_list_item",
"rich_text": [{"type": "text", "text": {"content": content}}] "numbered_list_item": {
}, "rich_text": [
}) {"type": "text", "text": {"content": content}}
]
},
}
)
# Regular paragraph # Regular paragraph
else: else:
blocks.append({ blocks.append(
"object": "block", {
"type": "paragraph", "object": "block",
"paragraph": { "type": "paragraph",
"rich_text": [{"type": "text", "text": {"content": line}}] "paragraph": {
}, "rich_text": [{"type": "text", "text": {"content": line}}]
}) },
}
)
return blocks return blocks
@ -914,8 +938,10 @@ class NotionHistoryConnector:
APIResponseError: If Notion API returns an error APIResponseError: If Notion API returns an error
""" """
try: try:
logger.info(f"Creating Notion page: title='{title}', parent_page_id={parent_page_id}") logger.info(
f"Creating Notion page: title='{title}', parent_page_id={parent_page_id}"
)
# Get Notion client # Get Notion client
notion = await self._get_client() notion = await self._get_client()
@ -924,14 +950,16 @@ class NotionHistoryConnector:
# Prepare parent - find first available page if not provided # Prepare parent - find first available page if not provided
if not parent_page_id: if not parent_page_id:
logger.info("No parent_page_id provided, searching for first accessible page...") logger.info(
"No parent_page_id provided, searching for first accessible page..."
)
parent_page_id = await self._get_first_accessible_parent() parent_page_id = await self._get_first_accessible_parent()
if not parent_page_id: if not parent_page_id:
logger.warning("No accessible parent pages found") logger.warning("No accessible parent pages found")
return { return {
"status": "error", "status": "error",
"message": "Could not find any accessible Notion pages to use as parent. " "message": "Could not find any accessible Notion pages to use as parent. "
"Please make sure your Notion integration has access to at least one page.", "Please make sure your Notion integration has access to at least one page.",
} }
logger.info(f"Using parent_page_id: {parent_page_id}") logger.info(f"Using parent_page_id: {parent_page_id}")
@ -939,9 +967,7 @@ class NotionHistoryConnector:
# Create the page with standard title property # Create the page with standard title property
properties = { properties = {
"title": { "title": {"title": [{"type": "text", "text": {"content": title}}]}
"title": [{"type": "text", "text": {"content": title}}]
}
} }
response = await self._api_call_with_retry( response = await self._api_call_with_retry(
@ -959,9 +985,7 @@ class NotionHistoryConnector:
for i in range(100, len(children), 100): for i in range(100, len(children), 100):
batch = children[i : i + 100] batch = children[i : i + 100]
await self._api_call_with_retry( await self._api_call_with_retry(
notion.blocks.children.append, notion.blocks.children.append, block_id=page_id, children=batch
block_id=page_id,
children=batch
) )
return { return {
@ -991,7 +1015,7 @@ class NotionHistoryConnector:
) -> dict[str, Any]: ) -> dict[str, Any]:
""" """
Update an existing Notion page by appending new content. Update an existing Notion page by appending new content.
Note: Content is appended to the page, not replaced. Note: Content is appended to the page, not replaced.
Args: Args:
@ -1013,7 +1037,9 @@ class NotionHistoryConnector:
try: try:
children = self._markdown_to_blocks(content) children = self._markdown_to_blocks(content)
if not children: if not children:
logger.warning("No blocks generated from content, skipping append") logger.warning(
"No blocks generated from content, skipping append"
)
return { return {
"status": "error", "status": "error",
"message": "Content conversion failed: no valid blocks generated", "message": "Content conversion failed: no valid blocks generated",
@ -1032,9 +1058,11 @@ class NotionHistoryConnector:
await self._api_call_with_retry( await self._api_call_with_retry(
notion.blocks.children.append, notion.blocks.children.append,
block_id=page_id, block_id=page_id,
children=batch children=batch,
) )
logger.info(f"Successfully appended {len(children)} new blocks to page {page_id}") logger.info(
f"Successfully appended {len(children)} new blocks to page {page_id}"
)
except Exception as e: except Exception as e:
logger.error(f"Failed to append content blocks: {e}") logger.error(f"Failed to append content blocks: {e}")
return { return {
@ -1044,8 +1072,7 @@ class NotionHistoryConnector:
# Get updated page info # Get updated page info
response = await self._api_call_with_retry( response = await self._api_call_with_retry(
notion.pages.retrieve, notion.pages.retrieve, page_id=page_id
page_id=page_id
) )
page_url = response["url"] page_url = response["url"]
page_title = response["properties"]["title"]["title"][0]["text"]["content"] page_title = response["properties"]["title"]["title"][0]["text"]["content"]
@ -1092,18 +1119,14 @@ class NotionHistoryConnector:
# Archive the page (Notion's way of "deleting") # Archive the page (Notion's way of "deleting")
response = await self._api_call_with_retry( response = await self._api_call_with_retry(
notion.pages.update, notion.pages.update, page_id=page_id, archived=True
page_id=page_id,
archived=True
) )
page_title = "Unknown" page_title = "Unknown"
try: with contextlib.suppress(KeyError, IndexError):
page_title = response["properties"]["title"]["title"][0]["text"][ page_title = response["properties"]["title"]["title"][0]["text"][
"content" "content"
] ]
except (KeyError, IndexError):
pass
return { return {
"status": "success", "status": "success",

4
surfsense_backend/app/services/new_streaming_service.py
View file

@ -518,7 +518,9 @@ class VercelStreamingService:
normalized_payload = self._normalize_interrupt_payload(interrupt_value) normalized_payload = self._normalize_interrupt_payload(interrupt_value)
return self.format_data("interrupt-request", normalized_payload) return self.format_data("interrupt-request", normalized_payload)
def _normalize_interrupt_payload(self, interrupt_value: dict[str, Any]) -> dict[str, Any]: def _normalize_interrupt_payload(
self, interrupt_value: dict[str, Any]
) -> dict[str, Any]:
"""Normalize interrupt payloads from different sources into a consistent format. """Normalize interrupt payloads from different sources into a consistent format.
Handles two interrupt sources: Handles two interrupt sources:

52
surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
View file

@ -33,8 +33,8 @@ import { membersAtom } from "@/atoms/members/members-query.atoms";
import { currentUserAtom } from "@/atoms/user/user-query.atoms"; import { currentUserAtom } from "@/atoms/user/user-query.atoms";
import { Thread } from "@/components/assistant-ui/thread"; import { Thread } from "@/components/assistant-ui/thread";
import { ChatHeader } from "@/components/new-chat/chat-header"; import { ChatHeader } from "@/components/new-chat/chat-header";
import { CreateNotionPageToolUI } from "@/components/tool-ui/create-notion-page";
import { ReportPanel } from "@/components/report-panel/report-panel"; import { ReportPanel } from "@/components/report-panel/report-panel";
import { CreateNotionPageToolUI } from "@/components/tool-ui/create-notion-page";
import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking"; import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking";
import { DeleteNotionPageToolUI } from "@/components/tool-ui/delete-notion-page"; import { DeleteNotionPageToolUI } from "@/components/tool-ui/delete-notion-page";
import { DisplayImageToolUI } from "@/components/tool-ui/display-image"; import { DisplayImageToolUI } from "@/components/tool-ui/display-image";
@ -969,36 +969,36 @@ export default function NewChatPage() {
contentPartsState.currentTextPartIndex = -1; contentPartsState.currentTextPartIndex = -1;
} }
} }
}
}
// Merge edited args if present to fix race condition
if (decisions.length > 0 && decisions[0].type === "edit" && decisions[0].edited_action) {
const editedAction = decisions[0].edited_action;
for (const part of contentParts) {
if (part.type === "tool-call" && part.toolName === editedAction.name) {
part.args = { ...part.args, ...editedAction.args };
break;
} }
} }
}
const decisionType = decisions[0]?.type as "approve" | "reject" | undefined; // Merge edited args if present to fix race condition
if (decisionType) { if (decisions.length > 0 && decisions[0].type === "edit" && decisions[0].edited_action) {
for (const part of contentParts) { const editedAction = decisions[0].edited_action;
if ( for (const part of contentParts) {
part.type === "tool-call" && if (part.type === "tool-call" && part.toolName === editedAction.name) {
typeof part.result === "object" && part.args = { ...part.args, ...editedAction.args };
part.result !== null && break;
"__interrupt__" in (part.result as Record<string, unknown>) }
) { }
part.result = { }
...(part.result as Record<string, unknown>),
__decided__: decisionType, const decisionType = decisions[0]?.type as "approve" | "reject" | undefined;
}; if (decisionType) {
for (const part of contentParts) {
if (
part.type === "tool-call" &&
typeof part.result === "object" &&
part.result !== null &&
"__interrupt__" in (part.result as Record<string, unknown>)
) {
part.result = {
...(part.result as Record<string, unknown>),
__decided__: decisionType,
};
}
} }
} }
}
try { try {
const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000"; const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";

2
surfsense_web/components/assistant-ui/markdown-text.tsx
View file

@ -10,9 +10,9 @@ import {
} from "@assistant-ui/react-markdown"; } from "@assistant-ui/react-markdown";
import { CheckIcon, CopyIcon } from "lucide-react"; import { CheckIcon, CopyIcon } from "lucide-react";
import { type FC, memo, type ReactNode, useState } from "react"; import { type FC, memo, type ReactNode, useState } from "react";
import rehypeKatex from "rehype-katex";
import remarkGfm from "remark-gfm"; import remarkGfm from "remark-gfm";
import remarkMath from "remark-math"; import remarkMath from "remark-math";
import rehypeKatex from "rehype-katex";
import "katex/dist/katex.min.css"; import "katex/dist/katex.min.css";
import { InlineCitation } from "@/components/assistant-ui/inline-citation"; import { InlineCitation } from "@/components/assistant-ui/inline-citation";
import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button"; import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button";

40
surfsense_web/components/tool-ui/delete-notion-page.tsx
View file

@ -68,7 +68,12 @@ interface WarningResult {
message?: string; message?: string;
} }
type DeleteNotionPageResult = InterruptResult | SuccessResult | ErrorResult | InfoResult | WarningResult; type DeleteNotionPageResult =
| InterruptResult
| SuccessResult
| ErrorResult
| InfoResult
| WarningResult;
function isInterruptResult(result: unknown): result is InterruptResult { function isInterruptResult(result: unknown): result is InterruptResult {
return ( return (
@ -341,22 +346,23 @@ function SuccessCard({ result }: { result: SuccessResult }) {
</p> </p>
</div> </div>
</div> </div>
{(result.deleted_from_db || result.title) && ( {(result.deleted_from_db || result.title) && (
<div className="space-y-2 px-4 py-3 text-xs"> <div className="space-y-2 px-4 py-3 text-xs">
{result.title && ( {result.title && (
<div> <div>
<span className="font-medium text-muted-foreground">Deleted page: </span> <span className="font-medium text-muted-foreground">Deleted page: </span>
<span>{result.title}</span> <span>{result.title}</span>
</div> </div>
)} )}
{result.deleted_from_db && ( {result.deleted_from_db && (
<div className="pt-1"> <div className="pt-1">
<span className="text-green-600 dark:text-green-500"> <span className="text-green-600 dark:text-green-500">
✓ Also removed from knowledge base ✓ Also removed from knowledge base
</span> </span>
</div> </div>
)} )}
</div>)} </div>
)}
</div> </div>
); );
} }

16
surfsense_web/hooks/use-inbox.ts
View file

@ -129,15 +129,15 @@ export function useInbox(
// Skip if already syncing with this key // Skip if already syncing with this key
if (userSyncKeyRef.current === userSyncKey) return; if (userSyncKeyRef.current === userSyncKey) return;
// Clean up previous sync // Clean up previous sync
if (syncHandleRef.current) { if (syncHandleRef.current) {
try { try {
syncHandleRef.current.unsubscribe(); syncHandleRef.current.unsubscribe();
} catch { } catch {
// PGlite may already be closed during cleanup // PGlite may already be closed during cleanup
}
syncHandleRef.current = null;
} }
syncHandleRef.current = null;
}
console.log("[useInbox] Starting sync for:", userId); console.log("[useInbox] Starting sync for:", userId);
userSyncKeyRef.current = userSyncKey; userSyncKeyRef.current = userSyncKey;