diff --git a/surfsense_backend/app/agents/new_chat/tools/google_drive/__init__.py b/surfsense_backend/app/agents/new_chat/tools/google_drive/__init__.py index c148c0afb..9c63bceb1 100644 --- a/surfsense_backend/app/agents/new_chat/tools/google_drive/__init__.py +++ b/surfsense_backend/app/agents/new_chat/tools/google_drive/__init__.py @@ -2,10 +2,10 @@ from app.agents.new_chat.tools.google_drive.create_file import ( create_create_google_drive_file_tool, ) from app.agents.new_chat.tools.google_drive.trash_file import ( - create_trash_google_drive_file_tool, + create_delete_google_drive_file_tool, ) __all__ = [ "create_create_google_drive_file_tool", - "create_trash_google_drive_file_tool", + "create_delete_google_drive_file_tool", ] diff --git a/surfsense_backend/app/agents/new_chat/tools/google_drive/trash_file.py b/surfsense_backend/app/agents/new_chat/tools/google_drive/trash_file.py index c932d9f0e..56b43e265 100644 --- a/surfsense_backend/app/agents/new_chat/tools/google_drive/trash_file.py +++ b/surfsense_backend/app/agents/new_chat/tools/google_drive/trash_file.py @@ -12,13 +12,13 @@ from app.services.google_drive import GoogleDriveToolMetadataService logger = logging.getLogger(__name__) -def create_trash_google_drive_file_tool( +def create_delete_google_drive_file_tool( db_session: AsyncSession | None = None, search_space_id: int | None = None, user_id: str | None = None, ): @tool - async def trash_google_drive_file( + async def delete_google_drive_file( file_name: str, delete_from_kb: bool = False, ) -> dict[str, Any]: @@ -52,7 +52,7 @@ def create_trash_google_drive_file_tool( - "Delete the 'Meeting Notes' file from Google Drive" - "Trash the 'Old Budget' spreadsheet" """ - logger.info(f"trash_google_drive_file called: file_name='{file_name}', delete_from_kb={delete_from_kb}") + logger.info(f"delete_google_drive_file called: file_name='{file_name}', delete_from_kb={delete_from_kb}") if db_session is None or search_space_id is None or user_id is None: return { @@ -92,7 +92,7 @@ def create_trash_google_drive_file_tool( { "type": "google_drive_file_trash", "action": { - "tool": "trash_google_drive_file", + "tool": "delete_google_drive_file", "params": { "file_id": file_id, "connector_id": connector_id_from_context, @@ -225,4 +225,4 @@ def create_trash_google_drive_file_tool( "message": "Something went wrong while trashing the file. Please try again.", } - return trash_google_drive_file + return delete_google_drive_file diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py index f2557eec0..565de01ab 100644 --- a/surfsense_backend/app/agents/new_chat/tools/registry.py +++ b/surfsense_backend/app/agents/new_chat/tools/registry.py @@ -57,7 +57,7 @@ from .link_preview import create_link_preview_tool from .mcp_tool import load_mcp_tools from .google_drive import ( create_create_google_drive_file_tool, - create_trash_google_drive_file_tool, + create_delete_google_drive_file_tool, ) from .notion import ( create_create_notion_page_tool, @@ -310,9 +310,9 @@ BUILTIN_TOOLS: list[ToolDefinition] = [ requires=["db_session", "search_space_id", "user_id"], ), ToolDefinition( - name="trash_google_drive_file", + name="delete_google_drive_file", description="Move an indexed Google Drive file to trash", - factory=lambda deps: create_trash_google_drive_file_tool( + factory=lambda deps: create_delete_google_drive_file_tool( db_session=deps["db_session"], search_space_id=deps["search_space_id"], user_id=deps["user_id"], diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py index 7524c7680..670cb45c6 100644 --- a/surfsense_backend/app/tasks/chat/stream_new_chat.py +++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py @@ -803,7 +803,7 @@ async def _stream_agent_events( "update_linear_issue", "delete_linear_issue", "create_google_drive_file", - "trash_google_drive_file", + "delete_google_drive_file", ): yield streaming_service.format_tool_output_available( tool_call_id, diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx index 351515e94..66d7b4f04 100644 --- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx +++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx @@ -40,7 +40,7 @@ import { GeneratePodcastToolUI } from "@/components/tool-ui/generate-podcast"; import { GenerateReportToolUI } from "@/components/tool-ui/generate-report"; import { CreateGoogleDriveFileToolUI, - TrashGoogleDriveFileToolUI, + DeleteGoogleDriveFileToolUI, } from "@/components/tool-ui/google-drive"; import { CreateLinearIssueToolUI, @@ -156,7 +156,7 @@ const TOOLS_WITH_UI = new Set([ "update_linear_issue", "delete_linear_issue", "create_google_drive_file", - "trash_google_drive_file", + "delete_google_drive_file", // "write_todos", // Disabled for now ]); @@ -1671,7 +1671,7 @@ export default function NewChatPage() { - + {/* Disabled for now */}
diff --git a/surfsense_web/components/tool-ui/google-drive/index.ts b/surfsense_web/components/tool-ui/google-drive/index.ts index 8a4225469..68aa2b00f 100644 --- a/surfsense_web/components/tool-ui/google-drive/index.ts +++ b/surfsense_web/components/tool-ui/google-drive/index.ts @@ -1,2 +1,2 @@ export { CreateGoogleDriveFileToolUI } from "./create-file"; -export { TrashGoogleDriveFileToolUI } from "./trash-file"; +export { DeleteGoogleDriveFileToolUI } from "./trash-file"; diff --git a/surfsense_web/components/tool-ui/google-drive/trash-file.tsx b/surfsense_web/components/tool-ui/google-drive/trash-file.tsx index 65125bbe1..7544dc56e 100644 --- a/surfsense_web/components/tool-ui/google-drive/trash-file.tsx +++ b/surfsense_web/components/tool-ui/google-drive/trash-file.tsx @@ -75,7 +75,7 @@ interface InsufficientPermissionsResult { message: string; } -type TrashGoogleDriveFileResult = +type DeleteGoogleDriveFileResult = | InterruptResult | SuccessResult | WarningResult @@ -445,12 +445,12 @@ function SuccessCard({ result }: { result: SuccessResult }) { ); } -export const TrashGoogleDriveFileToolUI = makeAssistantToolUI< +export const DeleteGoogleDriveFileToolUI = makeAssistantToolUI< { file_name: string; delete_from_kb?: boolean }, - TrashGoogleDriveFileResult + DeleteGoogleDriveFileResult >({ - toolName: "trash_google_drive_file", - render: function TrashGoogleDriveFileUI({ result, status }) { + toolName: "delete_google_drive_file", + render: function DeleteGoogleDriveFileUI({ result, status }) { if (status.type === "running") { return (
diff --git a/surfsense_web/components/tool-ui/index.ts b/surfsense_web/components/tool-ui/index.ts index 0af026dac..c04dd5ccc 100644 --- a/surfsense_web/components/tool-ui/index.ts +++ b/surfsense_web/components/tool-ui/index.ts @@ -32,7 +32,7 @@ export { } from "./display-image"; export { GeneratePodcastToolUI } from "./generate-podcast"; export { GenerateReportToolUI } from "./generate-report"; -export { CreateGoogleDriveFileToolUI, TrashGoogleDriveFileToolUI } from "./google-drive"; +export { CreateGoogleDriveFileToolUI, DeleteGoogleDriveFileToolUI } from "./google-drive"; export { Image, ImageErrorBoundary,