From 0f846cd9c4a2da279bc2f721cfc414dc92697809 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:06:01 +0200 Subject: [PATCH 001/163] track frontmost app on shortcut trigger --- surfsense_desktop/src/modules/quick-ask.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 9009099a3..0779b514f 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -1,4 +1,5 @@ import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell } from 'electron'; +import { execSync } from 'child_process'; import path from 'path'; import { IPC_CHANNELS } from '../ipc/channels'; import { getServerPort } from './server'; @@ -6,6 +7,18 @@ import { getServerPort } from './server'; const SHORTCUT = 'CommandOrControl+Option+S'; let quickAskWindow: BrowserWindow | null = null; let pendingText = ''; +let sourceApp = ''; + +function getFrontmostApp(): string { + if (process.platform !== 'darwin') return ''; + try { + return execSync( + 'osascript -e \'tell application "System Events" to get name of first application process whose frontmost is true\'' + ).toString().trim(); + } catch { + return ''; + } +} function hideQuickAsk(): void { if (quickAskWindow && !quickAskWindow.isDestroyed()) { @@ -83,6 +96,8 @@ export function registerQuickAsk(): void { return; } + sourceApp = getFrontmostApp(); + const text = clipboard.readText().trim(); if (!text) return; From 0abbfbfe27e1c9fbc0621fb77575bdfcc7ccbf4c Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:08:23 +0200 Subject: [PATCH 002/163] save clipboard contents on shortcut trigger --- surfsense_desktop/src/modules/quick-ask.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 0779b514f..59246e946 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -8,6 +8,7 @@ const SHORTCUT = 'CommandOrControl+Option+S'; let quickAskWindow: BrowserWindow | null = null; let pendingText = ''; let sourceApp = ''; +let savedClipboard = ''; function getFrontmostApp(): string { if (process.platform !== 'darwin') return ''; @@ -97,8 +98,9 @@ export function registerQuickAsk(): void { } sourceApp = getFrontmostApp(); + savedClipboard = clipboard.readText(); - const text = clipboard.readText().trim(); + const text = savedClipboard.trim(); if (!text) return; pendingText = text; From 6597649fd19048403abd429c1ace21f9c98c7e3d Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:09:04 +0200 Subject: [PATCH 003/163] add REPLACE_TEXT IPC channel --- surfsense_desktop/src/ipc/channels.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/surfsense_desktop/src/ipc/channels.ts b/surfsense_desktop/src/ipc/channels.ts index 18002b520..1a2a9993e 100644 --- a/surfsense_desktop/src/ipc/channels.ts +++ b/surfsense_desktop/src/ipc/channels.ts @@ -3,4 +3,5 @@ export const IPC_CHANNELS = { GET_APP_VERSION: 'get-app-version', DEEP_LINK: 'deep-link', QUICK_ASK_TEXT: 'quick-ask-text', + REPLACE_TEXT: 'replace-text', } as const; From f931b4cf9dcaee683065de22c559699cc9b54173 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:10:10 +0200 Subject: [PATCH 004/163] expose replaceText in preload --- surfsense_desktop/src/preload.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/surfsense_desktop/src/preload.ts b/surfsense_desktop/src/preload.ts index 9c857de1b..fbb272108 100644 --- a/surfsense_desktop/src/preload.ts +++ b/surfsense_desktop/src/preload.ts @@ -18,4 +18,5 @@ contextBridge.exposeInMainWorld('electronAPI', { }; }, getQuickAskText: () => ipcRenderer.invoke(IPC_CHANNELS.QUICK_ASK_TEXT), + replaceText: (text: string) => ipcRenderer.invoke(IPC_CHANNELS.REPLACE_TEXT, text), }); From 6e74f462a2ab133d13a6c81365ce694523573197 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:11:15 +0200 Subject: [PATCH 005/163] add replaceText type to ElectronAPI --- surfsense_web/types/window.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/surfsense_web/types/window.d.ts b/surfsense_web/types/window.d.ts index c8b4c004a..65ab135ea 100644 --- a/surfsense_web/types/window.d.ts +++ b/surfsense_web/types/window.d.ts @@ -11,6 +11,7 @@ interface ElectronAPI { getAppVersion: () => Promise; onDeepLink: (callback: (url: string) => void) => () => void; getQuickAskText: () => Promise; + replaceText: (text: string) => Promise; } declare global { From 5bb4f5c08422260cbebd29d9d08ee78ba0c9d6ef Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:12:33 +0200 Subject: [PATCH 006/163] implement replace handler with clipboard swap and paste-back --- surfsense_desktop/src/modules/quick-ask.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 59246e946..3bee2bbc2 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -118,6 +118,23 @@ export function registerQuickAsk(): void { pendingText = ''; return text; }); + + ipcMain.handle(IPC_CHANNELS.REPLACE_TEXT, async (_event, text: string) => { + if (process.platform !== 'darwin' || !sourceApp) return; + + clipboard.writeText(text); + hideQuickAsk(); + + try { + execSync(`osascript -e 'tell application "${sourceApp}" to activate'`); + await new Promise((r) => setTimeout(r, 100)); + execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\''); + await new Promise((r) => setTimeout(r, 100)); + clipboard.writeText(savedClipboard); + } catch { + clipboard.writeText(savedClipboard); + } + }); } export function unregisterQuickAsk(): void { From 2adffccd9283124e53af162e3b89143ce6ac644f Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:30:19 +0200 Subject: [PATCH 007/163] add paste-back button to assistant action bar --- .../assistant-ui/assistant-message.tsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx index 9fefecb1c..910e1fc89 100644 --- a/surfsense_web/components/assistant-ui/assistant-message.tsx +++ b/surfsense_web/components/assistant-ui/assistant-message.tsx @@ -3,10 +3,11 @@ import { AuiIf, ErrorPrimitive, MessagePrimitive, + useAui, useAuiState, } from "@assistant-ui/react"; import { useAtomValue } from "jotai"; -import { CheckIcon, CopyIcon, DownloadIcon, MessageSquare, RefreshCwIcon } from "lucide-react"; +import { CheckIcon, ClipboardPaste, CopyIcon, DownloadIcon, MessageSquare, RefreshCwIcon } from "lucide-react"; import type { FC } from "react"; import { useEffect, useMemo, useRef, useState } from "react"; import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom"; @@ -272,6 +273,8 @@ export const AssistantMessage: FC = () => { const AssistantActionBar: FC = () => { const isLast = useAuiState((s) => s.message.isLast); + const aui = useAui(); + const canReplace = isLast && typeof window !== "undefined" && !!window.electronAPI?.replaceText; return ( { - {/* Only allow regenerating the last assistant message */} + {canReplace && ( + { + const text = aui.message().getCopyText(); + window.electronAPI?.replaceText(text); + }} + > + + + )} {isLast && ( From bc16c0362dce2ac399aca5f8383733f625eec973 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:34:37 +0200 Subject: [PATCH 008/163] check accessibility permission before paste-back --- surfsense_desktop/src/modules/quick-ask.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 3bee2bbc2..3e8f29bc7 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -1,4 +1,4 @@ -import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell } from 'electron'; +import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell, systemPreferences } from 'electron'; import { execSync } from 'child_process'; import path from 'path'; import { IPC_CHANNELS } from '../ipc/channels'; @@ -122,6 +122,8 @@ export function registerQuickAsk(): void { ipcMain.handle(IPC_CHANNELS.REPLACE_TEXT, async (_event, text: string) => { if (process.platform !== 'darwin' || !sourceApp) return; + if (!systemPreferences.isTrustedAccessibilityClient(true)) return; + clipboard.writeText(text); hideQuickAsk(); From 2f08d401fa6184acaa84ce6d474eaa19850e681a Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Thu, 26 Mar 2026 20:58:04 +0200 Subject: [PATCH 009/163] destroy panel on dismiss, remove activate to preserve selection --- surfsense_desktop/src/modules/quick-ask.ts | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 3e8f29bc7..1f1d7f313 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -21,10 +21,11 @@ function getFrontmostApp(): string { } } -function hideQuickAsk(): void { +function destroyQuickAsk(): void { if (quickAskWindow && !quickAskWindow.isDestroyed()) { - quickAskWindow.hide(); + quickAskWindow.close(); } + quickAskWindow = null; } function clampToScreen(x: number, y: number, w: number, h: number): { x: number; y: number } { @@ -37,12 +38,7 @@ function clampToScreen(x: number, y: number, w: number, h: number): { x: number; } function createQuickAskWindow(x: number, y: number): BrowserWindow { - if (quickAskWindow && !quickAskWindow.isDestroyed()) { - quickAskWindow.setPosition(x, y); - quickAskWindow.show(); - quickAskWindow.focus(); - return quickAskWindow; - } + destroyQuickAsk(); quickAskWindow = new BrowserWindow({ width: 450, @@ -72,7 +68,7 @@ function createQuickAskWindow(x: number, y: number): BrowserWindow { }); quickAskWindow.webContents.on('before-input-event', (_event, input) => { - if (input.key === 'Escape') hideQuickAsk(); + if (input.key === 'Escape') destroyQuickAsk(); }); quickAskWindow.webContents.setWindowOpenHandler(({ url }) => { @@ -92,8 +88,8 @@ function createQuickAskWindow(x: number, y: number): BrowserWindow { export function registerQuickAsk(): void { const ok = globalShortcut.register(SHORTCUT, () => { - if (quickAskWindow && !quickAskWindow.isDestroyed() && quickAskWindow.isVisible()) { - hideQuickAsk(); + if (quickAskWindow && !quickAskWindow.isDestroyed()) { + destroyQuickAsk(); return; } @@ -125,11 +121,10 @@ export function registerQuickAsk(): void { if (!systemPreferences.isTrustedAccessibilityClient(true)) return; clipboard.writeText(text); - hideQuickAsk(); + destroyQuickAsk(); try { - execSync(`osascript -e 'tell application "${sourceApp}" to activate'`); - await new Promise((r) => setTimeout(r, 100)); + await new Promise((r) => setTimeout(r, 50)); execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\''); await new Promise((r) => setTimeout(r, 100)); clipboard.writeText(savedClipboard); From 1133a36fe2ce6a18b5fb7cae52c27e82fa51371b Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 15:59:41 +0200 Subject: [PATCH 010/163] extract keyboard module with macOS and Windows support --- surfsense_desktop/src/modules/keyboard.ts | 33 ++++++++++++++++++++++ surfsense_desktop/src/modules/quick-ask.ts | 21 ++++---------- 2 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 surfsense_desktop/src/modules/keyboard.ts diff --git a/surfsense_desktop/src/modules/keyboard.ts b/surfsense_desktop/src/modules/keyboard.ts new file mode 100644 index 000000000..1fca34b79 --- /dev/null +++ b/surfsense_desktop/src/modules/keyboard.ts @@ -0,0 +1,33 @@ +import { execSync } from 'child_process'; +import { systemPreferences } from 'electron'; + +export function getFrontmostApp(): string { + try { + if (process.platform === 'darwin') { + return execSync( + 'osascript -e \'tell application "System Events" to get name of first application process whose frontmost is true\'' + ).toString().trim(); + } + if (process.platform === 'win32') { + return execSync( + 'powershell -command "Add-Type \'using System; using System.Runtime.InteropServices; public class W { [DllImport(\\\"user32.dll\\\")] public static extern IntPtr GetForegroundWindow(); }\'; (Get-Process | Where-Object { $_.MainWindowHandle -eq [W]::GetForegroundWindow() }).ProcessName"' + ).toString().trim(); + } + } catch { + return ''; + } + return ''; +} + +export function simulatePaste(): void { + if (process.platform === 'darwin') { + execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\''); + } else if (process.platform === 'win32') { + execSync('powershell -command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait(\'^v\')"'); + } +} + +export function checkAccessibilityPermission(): boolean { + if (process.platform !== 'darwin') return true; + return systemPreferences.isTrustedAccessibilityClient(true); +} diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 1f1d7f313..b3aa10e3a 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -1,7 +1,7 @@ -import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell, systemPreferences } from 'electron'; -import { execSync } from 'child_process'; +import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell } from 'electron'; import path from 'path'; import { IPC_CHANNELS } from '../ipc/channels'; +import { checkAccessibilityPermission, getFrontmostApp, simulatePaste } from './keyboard'; import { getServerPort } from './server'; const SHORTCUT = 'CommandOrControl+Option+S'; @@ -10,17 +10,6 @@ let pendingText = ''; let sourceApp = ''; let savedClipboard = ''; -function getFrontmostApp(): string { - if (process.platform !== 'darwin') return ''; - try { - return execSync( - 'osascript -e \'tell application "System Events" to get name of first application process whose frontmost is true\'' - ).toString().trim(); - } catch { - return ''; - } -} - function destroyQuickAsk(): void { if (quickAskWindow && !quickAskWindow.isDestroyed()) { quickAskWindow.close(); @@ -116,16 +105,16 @@ export function registerQuickAsk(): void { }); ipcMain.handle(IPC_CHANNELS.REPLACE_TEXT, async (_event, text: string) => { - if (process.platform !== 'darwin' || !sourceApp) return; + if (!sourceApp) return; - if (!systemPreferences.isTrustedAccessibilityClient(true)) return; + if (!checkAccessibilityPermission()) return; clipboard.writeText(text); destroyQuickAsk(); try { await new Promise((r) => setTimeout(r, 50)); - execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\''); + simulatePaste(); await new Promise((r) => setTimeout(r, 100)); clipboard.writeText(savedClipboard); } catch { From f931f08f006db9bb645a095172e70da00ed4dd58 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 16:53:09 +0200 Subject: [PATCH 011/163] rename keyboard to platform module, add getSelectedText --- .../src/modules/{keyboard.ts => platform.ts} | 22 +++++++++++++++++++ surfsense_desktop/src/modules/quick-ask.ts | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) rename surfsense_desktop/src/modules/{keyboard.ts => platform.ts} (62%) diff --git a/surfsense_desktop/src/modules/keyboard.ts b/surfsense_desktop/src/modules/platform.ts similarity index 62% rename from surfsense_desktop/src/modules/keyboard.ts rename to surfsense_desktop/src/modules/platform.ts index 1fca34b79..37e126799 100644 --- a/surfsense_desktop/src/modules/keyboard.ts +++ b/surfsense_desktop/src/modules/platform.ts @@ -19,6 +19,28 @@ export function getFrontmostApp(): string { return ''; } +export function getSelectedText(): string { + try { + if (process.platform === 'darwin') { + return execSync( + 'osascript -e \'tell application "System Events" to get value of attribute "AXSelectedText" of focused UI element of first application process whose frontmost is true\'' + ).toString().trim(); + } + // Windows: no reliable accessibility API for selected text across apps + } catch { + return ''; + } + return ''; +} + +export function simulateCopy(): void { + if (process.platform === 'darwin') { + execSync('osascript -e \'tell application "System Events" to keystroke "c" using command down\''); + } else if (process.platform === 'win32') { + execSync('powershell -command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait(\'^c\')"'); + } +} + export function simulatePaste(): void { if (process.platform === 'darwin') { execSync('osascript -e \'tell application "System Events" to keystroke "v" using command down\''); diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index b3aa10e3a..4aa930d4f 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -1,7 +1,7 @@ import { BrowserWindow, clipboard, globalShortcut, ipcMain, screen, shell } from 'electron'; import path from 'path'; import { IPC_CHANNELS } from '../ipc/channels'; -import { checkAccessibilityPermission, getFrontmostApp, simulatePaste } from './keyboard'; +import { checkAccessibilityPermission, getFrontmostApp, simulatePaste } from './platform'; import { getServerPort } from './server'; const SHORTCUT = 'CommandOrControl+Option+S'; From 2a8f393cde4cc6337179539c40d7aa66c499e9fd Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:13:37 +0200 Subject: [PATCH 012/163] add quick-ask action type definition --- .../contracts/types/quick-ask-actions.types.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 surfsense_web/contracts/types/quick-ask-actions.types.ts diff --git a/surfsense_web/contracts/types/quick-ask-actions.types.ts b/surfsense_web/contracts/types/quick-ask-actions.types.ts new file mode 100644 index 000000000..f7ee22c0b --- /dev/null +++ b/surfsense_web/contracts/types/quick-ask-actions.types.ts @@ -0,0 +1,10 @@ +export type QuickAskActionMode = "transform" | "explore"; + +export interface QuickAskAction { + id: string; + name: string; + prompt: string; + mode: QuickAskActionMode; + icon: string; + group: "transform" | "explore" | "knowledge" | "custom"; +} From d48f6aafce3fcc20572b439512c22d275be6eb3c Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:17:27 +0200 Subject: [PATCH 013/163] add quick-ask page with default action menu --- surfsense_web/app/quick-ask/actions.ts | 68 ++++++++++++++ surfsense_web/app/quick-ask/page.tsx | 117 +++++++++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 surfsense_web/app/quick-ask/actions.ts create mode 100644 surfsense_web/app/quick-ask/page.tsx diff --git a/surfsense_web/app/quick-ask/actions.ts b/surfsense_web/app/quick-ask/actions.ts new file mode 100644 index 000000000..8d4ff0bb5 --- /dev/null +++ b/surfsense_web/app/quick-ask/actions.ts @@ -0,0 +1,68 @@ +import type { QuickAskAction } from "@/contracts/types/quick-ask-actions.types"; + +export const DEFAULT_ACTIONS: QuickAskAction[] = [ + { + id: "fix-grammar", + name: "Fix grammar", + prompt: "Fix the grammar and spelling in the following text. Return only the corrected text, nothing else.\n\n{selection}", + mode: "transform", + icon: "check", + group: "transform", + }, + { + id: "make-shorter", + name: "Make shorter", + prompt: "Make the following text more concise while preserving its meaning. Return only the shortened text, nothing else.\n\n{selection}", + mode: "transform", + icon: "minimize", + group: "transform", + }, + { + id: "translate", + name: "Translate", + prompt: "Translate the following text to English. If it is already in English, translate it to French. Return only the translation, nothing else.\n\n{selection}", + mode: "transform", + icon: "languages", + group: "transform", + }, + { + id: "rewrite", + name: "Rewrite", + prompt: "Rewrite the following text to improve clarity and readability. Return only the rewritten text, nothing else.\n\n{selection}", + mode: "transform", + icon: "pen-line", + group: "transform", + }, + { + id: "explain", + name: "Explain", + prompt: "Explain the following text in simple terms:\n\n{selection}", + mode: "explore", + icon: "book-open", + group: "explore", + }, + { + id: "summarize", + name: "Summarize", + prompt: "Summarize the following text:\n\n{selection}", + mode: "explore", + icon: "list", + group: "explore", + }, + { + id: "search-knowledge", + name: "Search my knowledge", + prompt: "Search my knowledge base for information related to:\n\n{selection}", + mode: "explore", + icon: "search", + group: "knowledge", + }, + { + id: "search-web", + name: "Search the web", + prompt: "Search the web for information about:\n\n{selection}", + mode: "explore", + icon: "globe", + group: "knowledge", + }, +]; diff --git a/surfsense_web/app/quick-ask/page.tsx b/surfsense_web/app/quick-ask/page.tsx new file mode 100644 index 000000000..22e29b4b7 --- /dev/null +++ b/surfsense_web/app/quick-ask/page.tsx @@ -0,0 +1,117 @@ +"use client"; + +import { + BookOpen, + Check, + Globe, + Languages, + List, + MessageSquare, + Minimize2, + PenLine, + Search, +} from "lucide-react"; +import { useEffect, useState } from "react"; +import { + Command, + CommandEmpty, + CommandGroup, + CommandInput, + CommandItem, + CommandList, + CommandSeparator, +} from "@/components/ui/command"; +import { DEFAULT_ACTIONS } from "./actions"; + +const ICONS: Record = { + check: , + minimize: , + languages: , + "pen-line": , + "book-open": , + list: , + search: , + globe: , +}; + +export default function QuickAskPage() { + const [clipboardText, setClipboardText] = useState(""); + + useEffect(() => { + window.electronAPI?.getQuickAskText().then((text) => { + if (text) setClipboardText(text); + }); + }, []); + + const handleAction = (actionId: string) => { + const action = DEFAULT_ACTIONS.find((a) => a.id === actionId); + if (!action || !clipboardText) return; + + const prompt = action.prompt.replace("{selection}", clipboardText); + const encoded = encodeURIComponent(prompt); + const mode = action.mode; + + window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=${mode}`; + }; + + const handleAskAnything = () => { + if (!clipboardText) return; + const encoded = encodeURIComponent(clipboardText); + window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=explore`; + }; + + const transformActions = DEFAULT_ACTIONS.filter((a) => a.group === "transform"); + const exploreActions = DEFAULT_ACTIONS.filter((a) => a.group === "explore"); + const knowledgeActions = DEFAULT_ACTIONS.filter((a) => a.group === "knowledge"); + + return ( +
+ + + + No actions found. + + + {transformActions.map((action) => ( + handleAction(action.id)}> + {ICONS[action.icon]} + {action.name} + + ))} + + + + + + {exploreActions.map((action) => ( + handleAction(action.id)}> + {ICONS[action.icon]} + {action.name} + + ))} + + + + + + {knowledgeActions.map((action) => ( + handleAction(action.id)}> + {ICONS[action.icon]} + {action.name} + + ))} + + + + + + + + Ask anything... + + + + +
+ ); +} From 98e12dd195b4073d77577266ae0048b63f624237 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:19:13 +0200 Subject: [PATCH 014/163] load /quick-ask page in panel --- surfsense_desktop/src/modules/quick-ask.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 4aa930d4f..3ff108dd3 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -50,7 +50,7 @@ function createQuickAskWindow(x: number, y: number): BrowserWindow { skipTaskbar: true, }); - quickAskWindow.loadURL(`http://localhost:${getServerPort()}/dashboard`); + quickAskWindow.loadURL(`http://localhost:${getServerPort()}/quick-ask`); quickAskWindow.once('ready-to-show', () => { quickAskWindow?.show(); From 06f02fba0a8bc8ef4df3a1e753d9d505a56ef62e Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:38:34 +0200 Subject: [PATCH 015/163] navigate directly to chat with search space id --- surfsense_web/app/quick-ask/page.tsx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/surfsense_web/app/quick-ask/page.tsx b/surfsense_web/app/quick-ask/page.tsx index 22e29b4b7..00d47ae48 100644 --- a/surfsense_web/app/quick-ask/page.tsx +++ b/surfsense_web/app/quick-ask/page.tsx @@ -1,5 +1,6 @@ "use client"; +import { useAtomValue } from "jotai"; import { BookOpen, Check, @@ -11,7 +12,9 @@ import { PenLine, Search, } from "lucide-react"; +import { useRouter } from "next/navigation"; import { useEffect, useState } from "react"; +import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms"; import { Command, CommandEmpty, @@ -35,6 +38,8 @@ const ICONS: Record = { }; export default function QuickAskPage() { + const router = useRouter(); + const { data: searchSpaces = [] } = useAtomValue(searchSpacesAtom); const [clipboardText, setClipboardText] = useState(""); useEffect(() => { @@ -43,21 +48,24 @@ export default function QuickAskPage() { }); }, []); + const navigateToChat = (prompt: string, mode: string) => { + if (!searchSpaces.length) return; + const spaceId = searchSpaces[0].id; + const encoded = encodeURIComponent(prompt); + router.push(`/dashboard/${spaceId}/new-chat?quickAskPrompt=${encoded}&quickAskMode=${mode}`); + }; + const handleAction = (actionId: string) => { const action = DEFAULT_ACTIONS.find((a) => a.id === actionId); if (!action || !clipboardText) return; const prompt = action.prompt.replace("{selection}", clipboardText); - const encoded = encodeURIComponent(prompt); - const mode = action.mode; - - window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=${mode}`; + navigateToChat(prompt, action.mode); }; const handleAskAnything = () => { if (!clipboardText) return; - const encoded = encodeURIComponent(clipboardText); - window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=explore`; + navigateToChat(clipboardText, "explore"); }; const transformActions = DEFAULT_ACTIONS.filter((a) => a.group === "transform"); From 6c59b3ee95ff6be48e4eb8fa6c1a96c290aeb227 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:43:32 +0200 Subject: [PATCH 016/163] auto-submit quick-ask prompt from URL param --- .../new-chat/[[...chat_id]]/page.tsx | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) 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 8578d2dcb..e91ad43e9 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 @@ -4,6 +4,7 @@ import { type AppendMessage, AssistantRuntimeProvider, type ThreadMessageLike, + useAui, useExternalStoreRuntime, } from "@assistant-ui/react"; import { useQueryClient } from "@tanstack/react-query"; @@ -158,6 +159,27 @@ const TOOLS_WITH_UI = new Set([ // "write_todos", // Disabled for now ]); +function QuickAskAutoSubmit() { + const searchParams = useSearchParams(); + const aui = useAui(); + const submittedRef = useRef(false); + + useEffect(() => { + if (!window.electronAPI || submittedRef.current) return; + + const prompt = searchParams.get("quickAskPrompt"); + if (!prompt) return; + + submittedRef.current = true; + setTimeout(() => { + aui.composer().setText(prompt); + aui.composer().send(); + }, 500); + }, [searchParams, aui]); + + return null; +} + export default function NewChatPage() { const params = useParams(); const queryClient = useQueryClient(); @@ -1587,6 +1609,7 @@ export default function NewChatPage() { return ( +
From cc9cb3919ef7821844349828f683f1ebd60a111f Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 17:47:02 +0200 Subject: [PATCH 017/163] show paste-back button only for transform actions --- .../assistant-ui/assistant-message.tsx | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx index 910e1fc89..27ba08395 100644 --- a/surfsense_web/components/assistant-ui/assistant-message.tsx +++ b/surfsense_web/components/assistant-ui/assistant-message.tsx @@ -8,6 +8,7 @@ import { } from "@assistant-ui/react"; import { useAtomValue } from "jotai"; import { CheckIcon, ClipboardPaste, CopyIcon, DownloadIcon, MessageSquare, RefreshCwIcon } from "lucide-react"; +import { useSearchParams } from "next/navigation"; import type { FC } from "react"; import { useEffect, useMemo, useRef, useState } from "react"; import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom"; @@ -274,7 +275,12 @@ export const AssistantMessage: FC = () => { const AssistantActionBar: FC = () => { const isLast = useAuiState((s) => s.message.isLast); const aui = useAui(); - const canReplace = isLast && typeof window !== "undefined" && !!window.electronAPI?.replaceText; + const searchParams = useSearchParams(); + const isTransform = + isLast && + typeof window !== "undefined" && + !!window.electronAPI?.replaceText && + searchParams.get("quickAskMode") === "transform"; return ( { - {canReplace && ( - { - const text = aui.message().getCopyText(); - window.electronAPI?.replaceText(text); - }} - > - - - )} {isLast && ( @@ -316,6 +311,19 @@ const AssistantActionBar: FC = () => { )} + {isTransform && ( + + )} ); }; From 59e0579cc0b5311fc398e383a07b660c8ed8959a Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 18:24:34 +0200 Subject: [PATCH 018/163] simplify action menu to plain buttons, remove old quickAskText from thread --- surfsense_web/app/quick-ask/page.tsx | 105 +++++++++--------- .../components/assistant-ui/thread.tsx | 8 -- 2 files changed, 53 insertions(+), 60 deletions(-) diff --git a/surfsense_web/app/quick-ask/page.tsx b/surfsense_web/app/quick-ask/page.tsx index 00d47ae48..e8191c913 100644 --- a/surfsense_web/app/quick-ask/page.tsx +++ b/surfsense_web/app/quick-ask/page.tsx @@ -12,18 +12,8 @@ import { PenLine, Search, } from "lucide-react"; -import { useRouter } from "next/navigation"; import { useEffect, useState } from "react"; import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms"; -import { - Command, - CommandEmpty, - CommandGroup, - CommandInput, - CommandItem, - CommandList, - CommandSeparator, -} from "@/components/ui/command"; import { DEFAULT_ACTIONS } from "./actions"; const ICONS: Record = { @@ -38,8 +28,7 @@ const ICONS: Record = { }; export default function QuickAskPage() { - const router = useRouter(); - const { data: searchSpaces = [] } = useAtomValue(searchSpacesAtom); + const { data: searchSpaces = [], isLoading } = useAtomValue(searchSpacesAtom); const [clipboardText, setClipboardText] = useState(""); useEffect(() => { @@ -49,77 +38,89 @@ export default function QuickAskPage() { }, []); const navigateToChat = (prompt: string, mode: string) => { - if (!searchSpaces.length) return; + if (!searchSpaces.length || !clipboardText) return; const spaceId = searchSpaces[0].id; const encoded = encodeURIComponent(prompt); - router.push(`/dashboard/${spaceId}/new-chat?quickAskPrompt=${encoded}&quickAskMode=${mode}`); + window.location.href = `/dashboard/${spaceId}/new-chat?quickAskPrompt=${encoded}&quickAskMode=${mode}`; }; const handleAction = (actionId: string) => { const action = DEFAULT_ACTIONS.find((a) => a.id === actionId); - if (!action || !clipboardText) return; - + if (!action) return; const prompt = action.prompt.replace("{selection}", clipboardText); navigateToChat(prompt, action.mode); }; - const handleAskAnything = () => { - if (!clipboardText) return; - navigateToChat(clipboardText, "explore"); - }; - const transformActions = DEFAULT_ACTIONS.filter((a) => a.group === "transform"); const exploreActions = DEFAULT_ACTIONS.filter((a) => a.group === "explore"); const knowledgeActions = DEFAULT_ACTIONS.filter((a) => a.group === "knowledge"); + const ready = !isLoading && clipboardText; + return ( -
- - - - No actions found. - - +
+
+ {!ready && ( +
Loading...
+ )} + {ready && ( +
+
Transform
{transformActions.map((action) => ( - handleAction(action.id)}> + ))} - - +
- +
Explore
{exploreActions.map((action) => ( - handleAction(action.id)}> + ))} - - +
- +
Knowledge
{knowledgeActions.map((action) => ( - handleAction(action.id)}> + ))} - - +
- - + +
+ )} +
); } diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx index 1644b0163..195afc090 100644 --- a/surfsense_web/components/assistant-ui/thread.tsx +++ b/surfsense_web/components/assistant-ui/thread.tsx @@ -306,13 +306,6 @@ const Composer: FC = () => { const aui = useAui(); const hasAutoFocusedRef = useRef(false); - const [quickAskText, setQuickAskText] = useState(); - useEffect(() => { - window.electronAPI?.getQuickAskText().then((text) => { - if (text) setQuickAskText(text); - }); - }, []); - const isThreadEmpty = useAuiState(({ thread }) => thread.isEmpty); const isThreadRunning = useAuiState(({ thread }) => thread.isRunning); @@ -519,7 +512,6 @@ const Composer: FC = () => { onDocumentRemove={handleDocumentRemove} onSubmit={handleSubmit} onKeyDown={handleKeyDown} - initialText={quickAskText} className="min-h-[24px]" />
From 8d60fc7279437753815fded1bd63cb37dca0c240 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 18:41:58 +0200 Subject: [PATCH 019/163] remove searchSpacesAtom from quick-ask, forward params via dashboard --- surfsense_web/app/dashboard/page.tsx | 9 ++++++--- surfsense_web/app/quick-ask/page.tsx | 13 +++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/surfsense_web/app/dashboard/page.tsx b/surfsense_web/app/dashboard/page.tsx index 2bd8f4462..525060bed 100644 --- a/surfsense_web/app/dashboard/page.tsx +++ b/surfsense_web/app/dashboard/page.tsx @@ -3,7 +3,7 @@ import { useAtomValue } from "jotai"; import { AlertCircle, Plus, Search } from "lucide-react"; import { motion } from "motion/react"; -import { useRouter } from "next/navigation"; +import { useRouter, useSearchParams } from "next/navigation"; import { useTranslations } from "next-intl"; import { useEffect, useState } from "react"; import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms"; @@ -89,6 +89,7 @@ function EmptyState({ onCreateClick }: { onCreateClick: () => void }) { export default function DashboardPage() { const router = useRouter(); + const searchParams = useSearchParams(); const [showCreateDialog, setShowCreateDialog] = useState(false); const t = useTranslations("dashboard"); @@ -98,9 +99,11 @@ export default function DashboardPage() { if (isLoading) return; if (searchSpaces.length > 0) { - router.replace(`/dashboard/${searchSpaces[0].id}/new-chat`); + const params = searchParams.toString(); + const query = params ? `?${params}` : ""; + router.replace(`/dashboard/${searchSpaces[0].id}/new-chat${query}`); } - }, [isLoading, searchSpaces, router]); + }, [isLoading, searchSpaces, router, searchParams]); // Show loading while fetching or while we have spaces and are about to redirect const shouldShowLoading = isLoading || searchSpaces.length > 0; diff --git a/surfsense_web/app/quick-ask/page.tsx b/surfsense_web/app/quick-ask/page.tsx index e8191c913..0a304b3db 100644 --- a/surfsense_web/app/quick-ask/page.tsx +++ b/surfsense_web/app/quick-ask/page.tsx @@ -1,6 +1,5 @@ "use client"; -import { useAtomValue } from "jotai"; import { BookOpen, Check, @@ -13,7 +12,6 @@ import { Search, } from "lucide-react"; import { useEffect, useState } from "react"; -import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms"; import { DEFAULT_ACTIONS } from "./actions"; const ICONS: Record = { @@ -28,7 +26,6 @@ const ICONS: Record = { }; export default function QuickAskPage() { - const { data: searchSpaces = [], isLoading } = useAtomValue(searchSpacesAtom); const [clipboardText, setClipboardText] = useState(""); useEffect(() => { @@ -38,10 +35,8 @@ export default function QuickAskPage() { }, []); const navigateToChat = (prompt: string, mode: string) => { - if (!searchSpaces.length || !clipboardText) return; - const spaceId = searchSpaces[0].id; const encoded = encodeURIComponent(prompt); - window.location.href = `/dashboard/${spaceId}/new-chat?quickAskPrompt=${encoded}&quickAskMode=${mode}`; + window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=${mode}`; }; const handleAction = (actionId: string) => { @@ -55,15 +50,13 @@ export default function QuickAskPage() { const exploreActions = DEFAULT_ACTIONS.filter((a) => a.group === "explore"); const knowledgeActions = DEFAULT_ACTIONS.filter((a) => a.group === "knowledge"); - const ready = !isLoading && clipboardText; - return (
- {!ready && ( + {!clipboardText && (
Loading...
)} - {ready && ( + {clipboardText && (
Transform
{transformActions.map((action) => ( From af2129ebb65a825359b96042f826764f0e143555 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 18:55:03 +0200 Subject: [PATCH 020/163] move quick-ask page into dashboard route for auth context --- surfsense_desktop/src/modules/quick-ask.ts | 2 +- surfsense_web/app/{ => dashboard}/quick-ask/actions.ts | 0 surfsense_web/app/{ => dashboard}/quick-ask/page.tsx | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename surfsense_web/app/{ => dashboard}/quick-ask/actions.ts (100%) rename surfsense_web/app/{ => dashboard}/quick-ask/page.tsx (100%) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 3ff108dd3..436281c2d 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -50,7 +50,7 @@ function createQuickAskWindow(x: number, y: number): BrowserWindow { skipTaskbar: true, }); - quickAskWindow.loadURL(`http://localhost:${getServerPort()}/quick-ask`); + quickAskWindow.loadURL(`http://localhost:${getServerPort()}/dashboard/quick-ask`); quickAskWindow.once('ready-to-show', () => { quickAskWindow?.show(); diff --git a/surfsense_web/app/quick-ask/actions.ts b/surfsense_web/app/dashboard/quick-ask/actions.ts similarity index 100% rename from surfsense_web/app/quick-ask/actions.ts rename to surfsense_web/app/dashboard/quick-ask/actions.ts diff --git a/surfsense_web/app/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx similarity index 100% rename from surfsense_web/app/quick-ask/page.tsx rename to surfsense_web/app/dashboard/quick-ask/page.tsx From f9a6e648cffdf765e4479209aaccb15cf3dff8c5 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 19:10:15 +0200 Subject: [PATCH 021/163] fix: don't clear pendingText on read to survive auth remount --- surfsense_desktop/src/modules/quick-ask.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 436281c2d..6c7e7a711 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -99,9 +99,7 @@ export function registerQuickAsk(): void { } ipcMain.handle(IPC_CHANNELS.QUICK_ASK_TEXT, () => { - const text = pendingText; - pendingText = ''; - return text; + return pendingText; }); ipcMain.handle(IPC_CHANNELS.REPLACE_TEXT, async (_event, text: string) => { From 151d6a853e3c2fe1d1d44c6ee2453c2b60a5f96c Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 19:20:14 +0200 Subject: [PATCH 022/163] use sessionStorage for quickAskMode to survive route changes --- surfsense_web/app/dashboard/quick-ask/page.tsx | 3 ++- surfsense_web/components/assistant-ui/assistant-message.tsx | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/surfsense_web/app/dashboard/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx index 0a304b3db..b6194d0af 100644 --- a/surfsense_web/app/dashboard/quick-ask/page.tsx +++ b/surfsense_web/app/dashboard/quick-ask/page.tsx @@ -35,8 +35,9 @@ export default function QuickAskPage() { }, []); const navigateToChat = (prompt: string, mode: string) => { + sessionStorage.setItem("quickAskMode", mode); const encoded = encodeURIComponent(prompt); - window.location.href = `/dashboard?quickAskPrompt=${encoded}&quickAskMode=${mode}`; + window.location.href = `/dashboard?quickAskPrompt=${encoded}`; }; const handleAction = (actionId: string) => { diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx index 27ba08395..d9837b224 100644 --- a/surfsense_web/components/assistant-ui/assistant-message.tsx +++ b/surfsense_web/components/assistant-ui/assistant-message.tsx @@ -8,7 +8,6 @@ import { } from "@assistant-ui/react"; import { useAtomValue } from "jotai"; import { CheckIcon, ClipboardPaste, CopyIcon, DownloadIcon, MessageSquare, RefreshCwIcon } from "lucide-react"; -import { useSearchParams } from "next/navigation"; import type { FC } from "react"; import { useEffect, useMemo, useRef, useState } from "react"; import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom"; @@ -275,12 +274,11 @@ export const AssistantMessage: FC = () => { const AssistantActionBar: FC = () => { const isLast = useAuiState((s) => s.message.isLast); const aui = useAui(); - const searchParams = useSearchParams(); const isTransform = isLast && typeof window !== "undefined" && !!window.electronAPI?.replaceText && - searchParams.get("quickAskMode") === "transform"; + sessionStorage.getItem("quickAskMode") === "transform"; return ( Date: Fri, 27 Mar 2026 19:47:02 +0200 Subject: [PATCH 023/163] redesign action menu: grid layout, search, Ask SurfSense, fix action groups --- .../new-chat/[[...chat_id]]/page.tsx | 23 ++- .../app/dashboard/quick-ask/actions.ts | 28 ++-- .../app/dashboard/quick-ask/page.tsx | 152 +++++++++++------- 3 files changed, 120 insertions(+), 83 deletions(-) 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 e91ad43e9..5024c446c 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 @@ -162,19 +162,26 @@ const TOOLS_WITH_UI = new Set([ function QuickAskAutoSubmit() { const searchParams = useSearchParams(); const aui = useAui(); - const submittedRef = useRef(false); + const handledRef = useRef(false); useEffect(() => { - if (!window.electronAPI || submittedRef.current) return; + if (!window.electronAPI || handledRef.current) return; const prompt = searchParams.get("quickAskPrompt"); - if (!prompt) return; + const initialText = searchParams.get("quickAskInitialText"); - submittedRef.current = true; - setTimeout(() => { - aui.composer().setText(prompt); - aui.composer().send(); - }, 500); + if (prompt) { + handledRef.current = true; + setTimeout(() => { + aui.composer().setText(prompt); + aui.composer().send(); + }, 500); + } else if (initialText) { + handledRef.current = true; + setTimeout(() => { + aui.composer().setText(initialText); + }, 500); + } }, [searchParams, aui]); return null; diff --git a/surfsense_web/app/dashboard/quick-ask/actions.ts b/surfsense_web/app/dashboard/quick-ask/actions.ts index 8d4ff0bb5..984aef2b6 100644 --- a/surfsense_web/app/dashboard/quick-ask/actions.ts +++ b/surfsense_web/app/dashboard/quick-ask/actions.ts @@ -33,6 +33,14 @@ export const DEFAULT_ACTIONS: QuickAskAction[] = [ icon: "pen-line", group: "transform", }, + { + id: "summarize", + name: "Summarize", + prompt: "Summarize the following text concisely. Return only the summary, nothing else.\n\n{selection}", + mode: "transform", + icon: "list", + group: "transform", + }, { id: "explain", name: "Explain", @@ -42,27 +50,19 @@ export const DEFAULT_ACTIONS: QuickAskAction[] = [ group: "explore", }, { - id: "summarize", - name: "Summarize", - prompt: "Summarize the following text:\n\n{selection}", - mode: "explore", - icon: "list", - group: "explore", - }, - { - id: "search-knowledge", - name: "Search my knowledge", + id: "ask-knowledge-base", + name: "Ask my knowledge base", prompt: "Search my knowledge base for information related to:\n\n{selection}", mode: "explore", icon: "search", - group: "knowledge", + group: "explore", }, { - id: "search-web", - name: "Search the web", + id: "look-up-web", + name: "Look up on the web", prompt: "Search the web for information about:\n\n{selection}", mode: "explore", icon: "globe", - group: "knowledge", + group: "explore", }, ]; diff --git a/surfsense_web/app/dashboard/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx index b6194d0af..95395c14d 100644 --- a/surfsense_web/app/dashboard/quick-ask/page.tsx +++ b/surfsense_web/app/dashboard/quick-ask/page.tsx @@ -11,7 +11,7 @@ import { PenLine, Search, } from "lucide-react"; -import { useEffect, useState } from "react"; +import { useEffect, useMemo, useState } from "react"; import { DEFAULT_ACTIONS } from "./actions"; const ICONS: Record = { @@ -27,6 +27,7 @@ const ICONS: Record = { export default function QuickAskPage() { const [clipboardText, setClipboardText] = useState(""); + const [searchQuery, setSearchQuery] = useState(""); useEffect(() => { window.electronAPI?.getQuickAskText().then((text) => { @@ -40,80 +41,109 @@ export default function QuickAskPage() { window.location.href = `/dashboard?quickAskPrompt=${encoded}`; }; + const navigateWithInitialText = () => { + if (!clipboardText) return; + sessionStorage.setItem("quickAskMode", "explore"); + const encoded = encodeURIComponent(clipboardText); + window.location.href = `/dashboard?quickAskInitialText=${encoded}`; + }; + const handleAction = (actionId: string) => { const action = DEFAULT_ACTIONS.find((a) => a.id === actionId); - if (!action) return; + if (!action || !clipboardText) return; const prompt = action.prompt.replace("{selection}", clipboardText); navigateToChat(prompt, action.mode); }; const transformActions = DEFAULT_ACTIONS.filter((a) => a.group === "transform"); const exploreActions = DEFAULT_ACTIONS.filter((a) => a.group === "explore"); - const knowledgeActions = DEFAULT_ACTIONS.filter((a) => a.group === "knowledge"); + + const filteredTransform = useMemo( + () => transformActions.filter((a) => a.name.toLowerCase().includes(searchQuery.toLowerCase())), + [searchQuery] + ); + const filteredExplore = useMemo( + () => exploreActions.filter((a) => a.name.toLowerCase().includes(searchQuery.toLowerCase())), + [searchQuery] + ); + + if (!clipboardText) { + return ( +
+
Loading...
+
+ ); + } return (
-
- {!clipboardText && ( -
Loading...
+
+
+ + setSearchQuery(e.target.value)} + className="flex-1 bg-transparent text-sm outline-none placeholder:text-muted-foreground" + /> +
+
+ +
+ {filteredTransform.length > 0 && ( + <> +
Transform
+
+ {filteredTransform.map((action) => ( + + ))} +
+ )} - {clipboardText && ( -
-
Transform
- {transformActions.map((action) => ( - - ))} -
- -
Explore
- {exploreActions.map((action) => ( - - ))} - -
- -
Knowledge
- {knowledgeActions.map((action) => ( - - ))} - -
- - -
+ {filteredExplore.length > 0 && ( + <> +
Explore
+
+ {filteredExplore.map((action) => ( + + ))} +
+ )} + +
My Actions
+
+ Custom actions coming soon +
+
+ +
+
); From 9f13da3fd12e76e0337c453cc4ec24ef270b8a50 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 20:07:55 +0200 Subject: [PATCH 024/163] fix Ask SurfSense: pre-fill with initialText and cursor positioning --- .../new-chat/[[...chat_id]]/page.tsx | 20 +++++++------------ .../app/dashboard/quick-ask/page.tsx | 6 ++++-- .../components/assistant-ui/thread.tsx | 13 ++++++++++++ 3 files changed, 24 insertions(+), 15 deletions(-) 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 5024c446c..b0928d9b2 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 @@ -166,22 +166,16 @@ function QuickAskAutoSubmit() { useEffect(() => { if (!window.electronAPI || handledRef.current) return; + if (sessionStorage.getItem("quickAskAutoSubmit") === "false") return; const prompt = searchParams.get("quickAskPrompt"); - const initialText = searchParams.get("quickAskInitialText"); + if (!prompt) return; - if (prompt) { - handledRef.current = true; - setTimeout(() => { - aui.composer().setText(prompt); - aui.composer().send(); - }, 500); - } else if (initialText) { - handledRef.current = true; - setTimeout(() => { - aui.composer().setText(initialText); - }, 500); - } + handledRef.current = true; + setTimeout(() => { + aui.composer().setText(prompt); + aui.composer().send(); + }, 500); }, [searchParams, aui]); return null; diff --git a/surfsense_web/app/dashboard/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx index 95395c14d..e4fb18dde 100644 --- a/surfsense_web/app/dashboard/quick-ask/page.tsx +++ b/surfsense_web/app/dashboard/quick-ask/page.tsx @@ -37,6 +37,7 @@ export default function QuickAskPage() { const navigateToChat = (prompt: string, mode: string) => { sessionStorage.setItem("quickAskMode", mode); + sessionStorage.setItem("quickAskAutoSubmit", "true"); const encoded = encodeURIComponent(prompt); window.location.href = `/dashboard?quickAskPrompt=${encoded}`; }; @@ -44,8 +45,9 @@ export default function QuickAskPage() { const navigateWithInitialText = () => { if (!clipboardText) return; sessionStorage.setItem("quickAskMode", "explore"); - const encoded = encodeURIComponent(clipboardText); - window.location.href = `/dashboard?quickAskInitialText=${encoded}`; + sessionStorage.setItem("quickAskAutoSubmit", "false"); + sessionStorage.setItem("quickAskInitialText", clipboardText); + window.location.href = `/dashboard?quickAskPrompt=${encodeURIComponent(clipboardText)}`; }; const handleAction = (actionId: string) => { diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx index 195afc090..059aaf5a0 100644 --- a/surfsense_web/components/assistant-ui/thread.tsx +++ b/surfsense_web/components/assistant-ui/thread.tsx @@ -306,6 +306,18 @@ const Composer: FC = () => { const aui = useAui(); const hasAutoFocusedRef = useRef(false); + const [quickAskInitialText, setQuickAskInitialText] = useState(); + useEffect(() => { + if (!window.electronAPI) return; + if (sessionStorage.getItem("quickAskAutoSubmit") === "false") { + const text = sessionStorage.getItem("quickAskInitialText"); + if (text) { + setQuickAskInitialText(text); + sessionStorage.removeItem("quickAskInitialText"); + } + } + }, []); + const isThreadEmpty = useAuiState(({ thread }) => thread.isEmpty); const isThreadRunning = useAuiState(({ thread }) => thread.isRunning); @@ -512,6 +524,7 @@ const Composer: FC = () => { onDocumentRemove={handleDocumentRemove} onSubmit={handleSubmit} onKeyDown={handleKeyDown} + initialText={quickAskInitialText} className="min-h-[24px]" />
From 58ac17fb81893fe5b587a386dc2fcf942c46e483 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 20:35:29 +0200 Subject: [PATCH 025/163] fix: move quickAskMode to IPC to prevent sessionStorage leak between windows --- surfsense_desktop/src/ipc/channels.ts | 2 ++ surfsense_desktop/src/modules/quick-ask.ts | 10 ++++++++++ surfsense_desktop/src/preload.ts | 2 ++ .../new-chat/[[...chat_id]]/page.tsx | 2 +- surfsense_web/app/dashboard/quick-ask/page.tsx | 8 ++++---- .../assistant-ui/assistant-message.tsx | 17 +++++++++++------ surfsense_web/types/window.d.ts | 2 ++ 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/surfsense_desktop/src/ipc/channels.ts b/surfsense_desktop/src/ipc/channels.ts index 1a2a9993e..25ec1bc0e 100644 --- a/surfsense_desktop/src/ipc/channels.ts +++ b/surfsense_desktop/src/ipc/channels.ts @@ -3,5 +3,7 @@ export const IPC_CHANNELS = { GET_APP_VERSION: 'get-app-version', DEEP_LINK: 'deep-link', QUICK_ASK_TEXT: 'quick-ask-text', + SET_QUICK_ASK_MODE: 'set-quick-ask-mode', + GET_QUICK_ASK_MODE: 'get-quick-ask-mode', REPLACE_TEXT: 'replace-text', } as const; diff --git a/surfsense_desktop/src/modules/quick-ask.ts b/surfsense_desktop/src/modules/quick-ask.ts index 6c7e7a711..4a8b4c315 100644 --- a/surfsense_desktop/src/modules/quick-ask.ts +++ b/surfsense_desktop/src/modules/quick-ask.ts @@ -7,6 +7,7 @@ import { getServerPort } from './server'; const SHORTCUT = 'CommandOrControl+Option+S'; let quickAskWindow: BrowserWindow | null = null; let pendingText = ''; +let pendingMode = ''; let sourceApp = ''; let savedClipboard = ''; @@ -15,6 +16,7 @@ function destroyQuickAsk(): void { quickAskWindow.close(); } quickAskWindow = null; + pendingMode = ''; } function clampToScreen(x: number, y: number, w: number, h: number): { x: number; y: number } { @@ -102,6 +104,14 @@ export function registerQuickAsk(): void { return pendingText; }); + ipcMain.handle(IPC_CHANNELS.SET_QUICK_ASK_MODE, (_event, mode: string) => { + pendingMode = mode; + }); + + ipcMain.handle(IPC_CHANNELS.GET_QUICK_ASK_MODE, () => { + return pendingMode; + }); + ipcMain.handle(IPC_CHANNELS.REPLACE_TEXT, async (_event, text: string) => { if (!sourceApp) return; diff --git a/surfsense_desktop/src/preload.ts b/surfsense_desktop/src/preload.ts index fbb272108..264ec25b3 100644 --- a/surfsense_desktop/src/preload.ts +++ b/surfsense_desktop/src/preload.ts @@ -18,5 +18,7 @@ contextBridge.exposeInMainWorld('electronAPI', { }; }, getQuickAskText: () => ipcRenderer.invoke(IPC_CHANNELS.QUICK_ASK_TEXT), + setQuickAskMode: (mode: string) => ipcRenderer.invoke(IPC_CHANNELS.SET_QUICK_ASK_MODE, mode), + getQuickAskMode: () => ipcRenderer.invoke(IPC_CHANNELS.GET_QUICK_ASK_MODE), replaceText: (text: string) => ipcRenderer.invoke(IPC_CHANNELS.REPLACE_TEXT, text), }); 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 b0928d9b2..ac203157a 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 @@ -1621,4 +1621,4 @@ export default function NewChatPage() {
); -} +} \ No newline at end of file diff --git a/surfsense_web/app/dashboard/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx index e4fb18dde..dca398254 100644 --- a/surfsense_web/app/dashboard/quick-ask/page.tsx +++ b/surfsense_web/app/dashboard/quick-ask/page.tsx @@ -35,16 +35,16 @@ export default function QuickAskPage() { }); }, []); - const navigateToChat = (prompt: string, mode: string) => { - sessionStorage.setItem("quickAskMode", mode); + const navigateToChat = async (prompt: string, mode: string) => { + await window.electronAPI?.setQuickAskMode(mode); sessionStorage.setItem("quickAskAutoSubmit", "true"); const encoded = encodeURIComponent(prompt); window.location.href = `/dashboard?quickAskPrompt=${encoded}`; }; - const navigateWithInitialText = () => { + const navigateWithInitialText = async () => { if (!clipboardText) return; - sessionStorage.setItem("quickAskMode", "explore"); + await window.electronAPI?.setQuickAskMode("explore"); sessionStorage.setItem("quickAskAutoSubmit", "false"); sessionStorage.setItem("quickAskInitialText", clipboardText); window.location.href = `/dashboard?quickAskPrompt=${encodeURIComponent(clipboardText)}`; diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx index d9837b224..af4d8def4 100644 --- a/surfsense_web/components/assistant-ui/assistant-message.tsx +++ b/surfsense_web/components/assistant-ui/assistant-message.tsx @@ -9,7 +9,7 @@ import { import { useAtomValue } from "jotai"; import { CheckIcon, ClipboardPaste, CopyIcon, DownloadIcon, MessageSquare, RefreshCwIcon } from "lucide-react"; import type { FC } from "react"; -import { useEffect, useMemo, useRef, useState } from "react"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom"; import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms"; import { MarkdownText } from "@/components/assistant-ui/markdown-text"; @@ -274,11 +274,16 @@ export const AssistantMessage: FC = () => { const AssistantActionBar: FC = () => { const isLast = useAuiState((s) => s.message.isLast); const aui = useAui(); - const isTransform = - isLast && - typeof window !== "undefined" && - !!window.electronAPI?.replaceText && - sessionStorage.getItem("quickAskMode") === "transform"; + const [quickAskMode, setQuickAskMode] = useState(""); + + useEffect(() => { + if (!isLast || !window.electronAPI?.getQuickAskMode) return; + window.electronAPI.getQuickAskMode().then((mode) => { + if (mode) setQuickAskMode(mode); + }); + }, [isLast]); + + const isTransform = isLast && !!window.electronAPI?.replaceText && quickAskMode === "transform"; return ( Promise; onDeepLink: (callback: (url: string) => void) => () => void; getQuickAskText: () => Promise; + setQuickAskMode: (mode: string) => Promise; + getQuickAskMode: () => Promise; replaceText: (text: string) => Promise; } From 64be61b627a956c36b9600c256cf0def5804929b Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 12:18:57 +0530 Subject: [PATCH 026/163] refactor: change button to div for accessibility in DocumentNode component --- .../components/documents/DocumentNode.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/surfsense_web/components/documents/DocumentNode.tsx b/surfsense_web/components/documents/DocumentNode.tsx index 57a12ab3a..da488a199 100644 --- a/surfsense_web/components/documents/DocumentNode.tsx +++ b/surfsense_web/components/documents/DocumentNode.tsx @@ -89,7 +89,7 @@ export const DocumentNode = React.memo(function DocumentNode({ const isProcessing = statusState === "pending" || statusState === "processing"; const [dropdownOpen, setDropdownOpen] = useState(false); const [exporting, setExporting] = useState(null); - const rowRef = useRef(null); + const rowRef = useRef(null); const handleExport = useCallback( (format: string) => { @@ -102,8 +102,8 @@ export const DocumentNode = React.memo(function DocumentNode({ ); const attachRef = useCallback( - (node: HTMLButtonElement | null) => { - (rowRef as React.MutableRefObject).current = node; + (node: HTMLDivElement | null) => { + (rowRef as React.MutableRefObject).current = node; drag(node); }, [drag] @@ -112,8 +112,10 @@ export const DocumentNode = React.memo(function DocumentNode({ return ( - +
{contextMenuOpen && ( From 5bddde60cbec18410857315c3d2ce390fb251157 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 14:31:25 +0530 Subject: [PATCH 027/163] feat: implement Microsoft OneDrive connector with OAuth support and indexing capabilities --- .../110_add_onedrive_connector_enums.py | 54 ++ .../agents/new_chat/tools/knowledge_base.py | 1 + surfsense_backend/app/config/__init__.py | 5 + .../app/connectors/onedrive/__init__.py | 13 + .../app/connectors/onedrive/client.py | 276 ++++++++ .../connectors/onedrive/content_extractor.py | 169 +++++ .../app/connectors/onedrive/file_types.py | 50 ++ .../app/connectors/onedrive/folder_manager.py | 90 +++ surfsense_backend/app/db.py | 2 + surfsense_backend/app/routes/__init__.py | 2 + .../routes/onedrive_add_connector_route.py | 474 ++++++++++++++ .../routes/search_source_connectors_routes.py | 149 +++++ .../app/schemas/onedrive_auth_credentials.py | 71 ++ .../app/tasks/celery_tasks/connector_tasks.py | 48 ++ .../connector_indexers/onedrive_indexer.py | 606 ++++++++++++++++++ .../app/utils/connector_naming.py | 4 + 16 files changed, 2014 insertions(+) create mode 100644 surfsense_backend/alembic/versions/110_add_onedrive_connector_enums.py create mode 100644 surfsense_backend/app/connectors/onedrive/__init__.py create mode 100644 surfsense_backend/app/connectors/onedrive/client.py create mode 100644 surfsense_backend/app/connectors/onedrive/content_extractor.py create mode 100644 surfsense_backend/app/connectors/onedrive/file_types.py create mode 100644 surfsense_backend/app/connectors/onedrive/folder_manager.py create mode 100644 surfsense_backend/app/routes/onedrive_add_connector_route.py create mode 100644 surfsense_backend/app/schemas/onedrive_auth_credentials.py create mode 100644 surfsense_backend/app/tasks/connector_indexers/onedrive_indexer.py diff --git a/surfsense_backend/alembic/versions/110_add_onedrive_connector_enums.py b/surfsense_backend/alembic/versions/110_add_onedrive_connector_enums.py new file mode 100644 index 000000000..699a50ef0 --- /dev/null +++ b/surfsense_backend/alembic/versions/110_add_onedrive_connector_enums.py @@ -0,0 +1,54 @@ +"""Add OneDrive connector enums + +Revision ID: 110 +Revises: 109 +Create Date: 2026-03-28 00:00:00.000000 + +""" + +from collections.abc import Sequence + +from alembic import op + +revision: str = "110" +down_revision: str | None = "109" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.execute( + """ + DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 FROM pg_type t + JOIN pg_enum e ON t.oid = e.enumtypid + WHERE t.typname = 'searchsourceconnectortype' AND e.enumlabel = 'ONEDRIVE_CONNECTOR' + ) THEN + ALTER TYPE searchsourceconnectortype ADD VALUE 'ONEDRIVE_CONNECTOR'; + END IF; + END + $$; + """ + ) + + op.execute( + """ + DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 FROM pg_type t + JOIN pg_enum e ON t.oid = e.enumtypid + WHERE t.typname = 'documenttype' AND e.enumlabel = 'ONEDRIVE_FILE' + ) THEN + ALTER TYPE documenttype ADD VALUE 'ONEDRIVE_FILE'; + END IF; + END + $$; + """ + ) + + +def downgrade() -> None: + pass diff --git a/surfsense_backend/app/agents/new_chat/tools/knowledge_base.py b/surfsense_backend/app/agents/new_chat/tools/knowledge_base.py index 429dafc46..d30288390 100644 --- a/surfsense_backend/app/agents/new_chat/tools/knowledge_base.py +++ b/surfsense_backend/app/agents/new_chat/tools/knowledge_base.py @@ -360,6 +360,7 @@ _INTERNAL_METADATA_KEYS: frozenset[str] = frozenset( "event_id", "calendar_id", "google_drive_file_id", + "onedrive_file_id", "page_id", "issue_id", "connector_id", diff --git a/surfsense_backend/app/config/__init__.py b/surfsense_backend/app/config/__init__.py index 186936325..70100bd0a 100644 --- a/surfsense_backend/app/config/__init__.py +++ b/surfsense_backend/app/config/__init__.py @@ -286,6 +286,11 @@ class Config: TEAMS_CLIENT_SECRET = os.getenv("TEAMS_CLIENT_SECRET") TEAMS_REDIRECT_URI = os.getenv("TEAMS_REDIRECT_URI") + # Microsoft OneDrive OAuth + ONEDRIVE_CLIENT_ID = os.getenv("ONEDRIVE_CLIENT_ID") + ONEDRIVE_CLIENT_SECRET = os.getenv("ONEDRIVE_CLIENT_SECRET") + ONEDRIVE_REDIRECT_URI = os.getenv("ONEDRIVE_REDIRECT_URI") + # ClickUp OAuth CLICKUP_CLIENT_ID = os.getenv("CLICKUP_CLIENT_ID") CLICKUP_CLIENT_SECRET = os.getenv("CLICKUP_CLIENT_SECRET") diff --git a/surfsense_backend/app/connectors/onedrive/__init__.py b/surfsense_backend/app/connectors/onedrive/__init__.py new file mode 100644 index 000000000..91b28bd37 --- /dev/null +++ b/surfsense_backend/app/connectors/onedrive/__init__.py @@ -0,0 +1,13 @@ +"""Microsoft OneDrive Connector Module.""" + +from .client import OneDriveClient +from .content_extractor import download_and_extract_content +from .folder_manager import get_file_by_id, get_files_in_folder, list_folder_contents + +__all__ = [ + "OneDriveClient", + "download_and_extract_content", + "get_file_by_id", + "get_files_in_folder", + "list_folder_contents", +] diff --git a/surfsense_backend/app/connectors/onedrive/client.py b/surfsense_backend/app/connectors/onedrive/client.py new file mode 100644 index 000000000..bb9fbb42b --- /dev/null +++ b/surfsense_backend/app/connectors/onedrive/client.py @@ -0,0 +1,276 @@ +"""Microsoft OneDrive API client using Microsoft Graph API v1.0.""" + +import logging +from datetime import UTC, datetime, timedelta +from typing import Any + +import httpx +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.future import select +from sqlalchemy.orm.attributes import flag_modified + +from app.config import config +from app.db import SearchSourceConnector +from app.utils.oauth_security import TokenEncryption + +logger = logging.getLogger(__name__) + +GRAPH_API_BASE = "https://graph.microsoft.com/v1.0" +TOKEN_URL = "https://login.microsoftonline.com/common/oauth2/v2.0/token" + + +class OneDriveClient: + """Client for Microsoft OneDrive via the Graph API.""" + + def __init__(self, session: AsyncSession, connector_id: int): + self._session = session + self._connector_id = connector_id + + async def _get_valid_token(self) -> str: + """Get a valid access token, refreshing if needed.""" + result = await self._session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == self._connector_id + ) + ) + connector = result.scalars().first() + if not connector: + raise ValueError(f"Connector {self._connector_id} not found") + + cfg = connector.config or {} + is_encrypted = cfg.get("_token_encrypted", False) + token_encryption = TokenEncryption(config.SECRET_KEY) if config.SECRET_KEY else None + + access_token = cfg.get("access_token", "") + refresh_token = cfg.get("refresh_token") + + if is_encrypted and token_encryption: + if access_token: + access_token = token_encryption.decrypt_token(access_token) + if refresh_token: + refresh_token = token_encryption.decrypt_token(refresh_token) + + expires_at_str = cfg.get("expires_at") + is_expired = False + if expires_at_str: + expires_at = datetime.fromisoformat(expires_at_str) + if expires_at.tzinfo is None: + expires_at = expires_at.replace(tzinfo=UTC) + is_expired = expires_at <= datetime.now(UTC) + + if not is_expired and access_token: + return access_token + + if not refresh_token: + cfg["auth_expired"] = True + connector.config = cfg + flag_modified(connector, "config") + await self._session.commit() + raise ValueError("OneDrive token expired and no refresh token available") + + token_data = await self._refresh_token(refresh_token) + + new_access = token_data["access_token"] + new_refresh = token_data.get("refresh_token", refresh_token) + expires_in = token_data.get("expires_in") + + new_expires_at = None + if expires_in: + new_expires_at = datetime.now(UTC) + timedelta(seconds=int(expires_in)) + + if token_encryption: + cfg["access_token"] = token_encryption.encrypt_token(new_access) + cfg["refresh_token"] = token_encryption.encrypt_token(new_refresh) + else: + cfg["access_token"] = new_access + cfg["refresh_token"] = new_refresh + + cfg["expires_at"] = new_expires_at.isoformat() if new_expires_at else None + cfg["expires_in"] = expires_in + cfg["_token_encrypted"] = bool(token_encryption) + cfg.pop("auth_expired", None) + + connector.config = cfg + flag_modified(connector, "config") + await self._session.commit() + + return new_access + + async def _refresh_token(self, refresh_token: str) -> dict: + data = { + "client_id": config.ONEDRIVE_CLIENT_ID, + "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "grant_type": "refresh_token", + "refresh_token": refresh_token, + "scope": "offline_access User.Read Files.Read.All Files.ReadWrite.All", + } + async with httpx.AsyncClient() as client: + resp = await client.post( + TOKEN_URL, + data=data, + headers={"Content-Type": "application/x-www-form-urlencoded"}, + timeout=30.0, + ) + if resp.status_code != 200: + error_detail = resp.text + try: + error_json = resp.json() + error_detail = error_json.get("error_description", error_detail) + except Exception: + pass + raise ValueError(f"OneDrive token refresh failed: {error_detail}") + return resp.json() + + async def _request(self, method: str, path: str, **kwargs) -> httpx.Response: + """Make an authenticated request to the Graph API.""" + token = await self._get_valid_token() + headers = {"Authorization": f"Bearer {token}"} + if "headers" in kwargs: + headers.update(kwargs.pop("headers")) + + async with httpx.AsyncClient() as client: + resp = await client.request( + method, + f"{GRAPH_API_BASE}{path}", + headers=headers, + timeout=60.0, + **kwargs, + ) + + if resp.status_code == 401: + result = await self._session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == self._connector_id + ) + ) + connector = result.scalars().first() + if connector: + cfg = connector.config or {} + cfg["auth_expired"] = True + connector.config = cfg + flag_modified(connector, "config") + await self._session.commit() + raise ValueError("OneDrive authentication expired (401)") + + return resp + + async def list_children( + self, item_id: str = "root" + ) -> tuple[list[dict[str, Any]], str | None]: + all_items: list[dict[str, Any]] = [] + url = f"/me/drive/items/{item_id}/children" + params: dict[str, Any] = { + "$top": 200, + "$select": "id,name,size,file,folder,parentReference,lastModifiedDateTime,createdDateTime,webUrl,remoteItem,package", + } + while url: + resp = await self._request("GET", url, params=params) + if resp.status_code != 200: + return [], f"Failed to list children: {resp.status_code} - {resp.text}" + data = resp.json() + all_items.extend(data.get("value", [])) + next_link = data.get("@odata.nextLink") + if next_link: + url = next_link.replace(GRAPH_API_BASE, "") + params = {} + else: + url = "" + return all_items, None + + async def get_item_metadata( + self, item_id: str + ) -> tuple[dict[str, Any] | None, str | None]: + resp = await self._request( + "GET", + f"/me/drive/items/{item_id}", + params={ + "$select": "id,name,size,file,folder,parentReference,lastModifiedDateTime,createdDateTime,webUrl" + }, + ) + if resp.status_code != 200: + return None, f"Failed to get item: {resp.status_code} - {resp.text}" + return resp.json(), None + + async def download_file(self, item_id: str) -> tuple[bytes | None, str | None]: + token = await self._get_valid_token() + async with httpx.AsyncClient(follow_redirects=True) as client: + resp = await client.get( + f"{GRAPH_API_BASE}/me/drive/items/{item_id}/content", + headers={"Authorization": f"Bearer {token}"}, + timeout=120.0, + ) + if resp.status_code != 200: + return None, f"Download failed: {resp.status_code}" + return resp.content, None + + async def download_file_to_disk(self, item_id: str, dest_path: str) -> str | None: + """Stream file content to disk. Returns error message on failure.""" + token = await self._get_valid_token() + async with httpx.AsyncClient(follow_redirects=True) as client: + async with client.stream( + "GET", + f"{GRAPH_API_BASE}/me/drive/items/{item_id}/content", + headers={"Authorization": f"Bearer {token}"}, + timeout=120.0, + ) as resp: + if resp.status_code != 200: + return f"Download failed: {resp.status_code}" + with open(dest_path, "wb") as f: + async for chunk in resp.aiter_bytes(chunk_size=5 * 1024 * 1024): + f.write(chunk) + return None + + async def create_file( + self, + name: str, + parent_id: str | None = None, + content: str | None = None, + mime_type: str | None = None, + ) -> dict[str, Any]: + """Create (upload) a file in OneDrive.""" + folder_path = f"/me/drive/items/{parent_id or 'root'}" + body = (content or "").encode("utf-8") + resp = await self._request( + "PUT", + f"{folder_path}:/{name}:/content", + content=body, + headers={"Content-Type": mime_type or "application/octet-stream"}, + ) + if resp.status_code not in (200, 201): + raise ValueError(f"File creation failed: {resp.status_code} - {resp.text}") + return resp.json() + + async def trash_file(self, item_id: str) -> bool: + """Delete (move to recycle bin) a OneDrive item.""" + resp = await self._request("DELETE", f"/me/drive/items/{item_id}") + if resp.status_code not in (200, 204): + raise ValueError(f"Trash failed: {resp.status_code} - {resp.text}") + return True + + async def get_delta( + self, folder_id: str | None = None, delta_link: str | None = None + ) -> tuple[list[dict[str, Any]], str | None, str | None]: + """Get delta changes. Returns (changes, new_delta_link, error).""" + all_changes: list[dict[str, Any]] = [] + if delta_link: + url = delta_link.replace(GRAPH_API_BASE, "") + elif folder_id: + url = f"/me/drive/items/{folder_id}/delta" + else: + url = "/me/drive/root/delta" + + params: dict[str, Any] = {"$top": 200} + while url: + resp = await self._request("GET", url, params=params) + if resp.status_code != 200: + return [], None, f"Delta failed: {resp.status_code} - {resp.text}" + data = resp.json() + all_changes.extend(data.get("value", [])) + next_link = data.get("@odata.nextLink") + new_delta_link = data.get("@odata.deltaLink") + if next_link: + url = next_link.replace(GRAPH_API_BASE, "") + params = {} + else: + url = "" + return all_changes, new_delta_link, None diff --git a/surfsense_backend/app/connectors/onedrive/content_extractor.py b/surfsense_backend/app/connectors/onedrive/content_extractor.py new file mode 100644 index 000000000..109a8cb15 --- /dev/null +++ b/surfsense_backend/app/connectors/onedrive/content_extractor.py @@ -0,0 +1,169 @@ +"""Content extraction for OneDrive files. + +Reuses the same ETL parsing logic as Google Drive since file parsing is +extension-based, not provider-specific. +""" + +import asyncio +import logging +import os +import tempfile +import threading +import time +from pathlib import Path +from typing import Any + +from .client import OneDriveClient +from .file_types import get_extension_from_mime, should_skip_file + +logger = logging.getLogger(__name__) + + +async def download_and_extract_content( + client: OneDriveClient, + file: dict[str, Any], +) -> tuple[str | None, dict[str, Any], str | None]: + """Download a OneDrive file and extract its content as markdown. + + Returns (markdown_content, onedrive_metadata, error_message). + """ + item_id = file.get("id") + file_name = file.get("name", "Unknown") + + if should_skip_file(file): + return None, {}, "Skipping non-indexable item" + + file_info = file.get("file", {}) + mime_type = file_info.get("mimeType", "") + + logger.info(f"Downloading file for content extraction: {file_name} ({mime_type})") + + metadata: dict[str, Any] = { + "onedrive_file_id": item_id, + "onedrive_file_name": file_name, + "onedrive_mime_type": mime_type, + "source_connector": "onedrive", + } + if "lastModifiedDateTime" in file: + metadata["modified_time"] = file["lastModifiedDateTime"] + if "createdDateTime" in file: + metadata["created_time"] = file["createdDateTime"] + if "size" in file: + metadata["file_size"] = file["size"] + if "webUrl" in file: + metadata["web_url"] = file["webUrl"] + file_hashes = file_info.get("hashes", {}) + if file_hashes.get("sha256Hash"): + metadata["sha256_hash"] = file_hashes["sha256Hash"] + elif file_hashes.get("quickXorHash"): + metadata["quick_xor_hash"] = file_hashes["quickXorHash"] + + temp_file_path = None + try: + extension = Path(file_name).suffix or get_extension_from_mime(mime_type) or ".bin" + with tempfile.NamedTemporaryFile(delete=False, suffix=extension) as tmp: + temp_file_path = tmp.name + + error = await client.download_file_to_disk(item_id, temp_file_path) + if error: + return None, metadata, error + + markdown = await _parse_file_to_markdown(temp_file_path, file_name) + return markdown, metadata, None + + except Exception as e: + logger.warning(f"Failed to extract content from {file_name}: {e!s}") + return None, metadata, str(e) + finally: + if temp_file_path and os.path.exists(temp_file_path): + try: + os.unlink(temp_file_path) + except Exception: + pass + + +async def _parse_file_to_markdown(file_path: str, filename: str) -> str: + """Parse a local file to markdown using the configured ETL service. + + Same logic as Google Drive -- file parsing is extension-based. + """ + lower = filename.lower() + + if lower.endswith((".md", ".markdown", ".txt")): + with open(file_path, encoding="utf-8") as f: + return f.read() + + if lower.endswith((".mp3", ".mp4", ".mpeg", ".mpga", ".m4a", ".wav", ".webm")): + from app.config import config as app_config + from litellm import atranscription + + stt_service_type = ( + "local" + if app_config.STT_SERVICE and app_config.STT_SERVICE.startswith("local/") + else "external" + ) + if stt_service_type == "local": + from app.services.stt_service import stt_service + + t0 = time.monotonic() + logger.info(f"[local-stt] START file={filename} thread={threading.current_thread().name}") + result = await asyncio.to_thread(stt_service.transcribe_file, file_path) + logger.info(f"[local-stt] END file={filename} elapsed={time.monotonic() - t0:.2f}s") + text = result.get("text", "") + else: + with open(file_path, "rb") as audio_file: + kwargs: dict[str, Any] = { + "model": app_config.STT_SERVICE, + "file": audio_file, + "api_key": app_config.STT_SERVICE_API_KEY, + } + if app_config.STT_SERVICE_API_BASE: + kwargs["api_base"] = app_config.STT_SERVICE_API_BASE + resp = await atranscription(**kwargs) + text = resp.get("text", "") + + if not text: + raise ValueError("Transcription returned empty text") + return f"# Transcription of {filename}\n\n{text}" + + from app.config import config as app_config + + if app_config.ETL_SERVICE == "UNSTRUCTURED": + from langchain_unstructured import UnstructuredLoader + + from app.utils.document_converters import convert_document_to_markdown + + loader = UnstructuredLoader( + file_path, + mode="elements", + post_processors=[], + languages=["eng"], + include_orig_elements=False, + include_metadata=False, + strategy="auto", + ) + docs = await loader.aload() + return await convert_document_to_markdown(docs) + + if app_config.ETL_SERVICE == "LLAMACLOUD": + from app.tasks.document_processors.file_processors import ( + parse_with_llamacloud_retry, + ) + + result = await parse_with_llamacloud_retry(file_path=file_path, estimated_pages=50) + markdown_documents = await result.aget_markdown_documents(split_by_page=False) + if not markdown_documents: + raise RuntimeError(f"LlamaCloud returned no documents for {filename}") + return markdown_documents[0].text + + if app_config.ETL_SERVICE == "DOCLING": + from docling.document_converter import DocumentConverter + + converter = DocumentConverter() + t0 = time.monotonic() + logger.info(f"[docling] START file={filename} thread={threading.current_thread().name}") + result = await asyncio.to_thread(converter.convert, file_path) + logger.info(f"[docling] END file={filename} elapsed={time.monotonic() - t0:.2f}s") + return result.document.export_to_markdown() + + raise RuntimeError(f"Unknown ETL_SERVICE: {app_config.ETL_SERVICE}") diff --git a/surfsense_backend/app/connectors/onedrive/file_types.py b/surfsense_backend/app/connectors/onedrive/file_types.py new file mode 100644 index 000000000..403fdc337 --- /dev/null +++ b/surfsense_backend/app/connectors/onedrive/file_types.py @@ -0,0 +1,50 @@ +"""File type handlers for Microsoft OneDrive.""" + +ONEDRIVE_FOLDER_FACET = "folder" +ONENOTE_MIME = "application/msonenote" + +SKIP_MIME_TYPES = frozenset( + { + ONENOTE_MIME, + "application/vnd.ms-onenotesection", + "application/vnd.ms-onenotenotebook", + } +) + +MIME_TO_EXTENSION: dict[str, str] = { + "application/pdf": ".pdf", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx", + "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx", + "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx", + "application/vnd.ms-excel": ".xls", + "application/msword": ".doc", + "application/vnd.ms-powerpoint": ".ppt", + "text/plain": ".txt", + "text/csv": ".csv", + "text/html": ".html", + "text/markdown": ".md", + "application/json": ".json", + "application/xml": ".xml", + "image/png": ".png", + "image/jpeg": ".jpg", +} + + +def get_extension_from_mime(mime_type: str) -> str | None: + return MIME_TO_EXTENSION.get(mime_type) + + +def is_folder(item: dict) -> bool: + return ONEDRIVE_FOLDER_FACET in item + + +def should_skip_file(item: dict) -> bool: + """Skip folders, OneNote files, remote items (shared links), and packages.""" + if is_folder(item): + return True + if "remoteItem" in item: + return True + if "package" in item: + return True + mime = item.get("file", {}).get("mimeType", "") + return mime in SKIP_MIME_TYPES diff --git a/surfsense_backend/app/connectors/onedrive/folder_manager.py b/surfsense_backend/app/connectors/onedrive/folder_manager.py new file mode 100644 index 000000000..ad04e12ff --- /dev/null +++ b/surfsense_backend/app/connectors/onedrive/folder_manager.py @@ -0,0 +1,90 @@ +"""Folder management for Microsoft OneDrive.""" + +import logging +from typing import Any + +from .client import OneDriveClient +from .file_types import is_folder, should_skip_file + +logger = logging.getLogger(__name__) + + +async def list_folder_contents( + client: OneDriveClient, + parent_id: str | None = None, +) -> tuple[list[dict[str, Any]], str | None]: + """List folders and files in a OneDrive folder. + + Returns (items list with folders first, error message). + """ + try: + items, error = await client.list_children(parent_id or "root") + if error: + return [], error + + for item in items: + item["isFolder"] = is_folder(item) + + items.sort(key=lambda x: (not x["isFolder"], x.get("name", "").lower())) + + folder_count = sum(1 for item in items if item["isFolder"]) + file_count = len(items) - folder_count + logger.info( + f"Listed {len(items)} items ({folder_count} folders, {file_count} files) " + + (f"in folder {parent_id}" if parent_id else "in root") + ) + return items, None + + except Exception as e: + logger.error(f"Error listing folder contents: {e!s}", exc_info=True) + return [], f"Error listing folder contents: {e!s}" + + +async def get_files_in_folder( + client: OneDriveClient, + folder_id: str, + include_subfolders: bool = True, +) -> tuple[list[dict[str, Any]], str | None]: + """Get all indexable files in a folder, optionally recursing into subfolders.""" + try: + items, error = await client.list_children(folder_id) + if error: + return [], error + + files: list[dict[str, Any]] = [] + for item in items: + if is_folder(item): + if include_subfolders: + sub_files, sub_error = await get_files_in_folder( + client, item["id"], include_subfolders=True + ) + if sub_error: + logger.warning(f"Error recursing into folder {item.get('name')}: {sub_error}") + continue + files.extend(sub_files) + elif not should_skip_file(item): + files.append(item) + + return files, None + + except Exception as e: + logger.error(f"Error getting files in folder: {e!s}", exc_info=True) + return [], f"Error getting files in folder: {e!s}" + + +async def get_file_by_id( + client: OneDriveClient, + file_id: str, +) -> tuple[dict[str, Any] | None, str | None]: + """Get file metadata by ID.""" + try: + item, error = await client.get_item_metadata(file_id) + if error: + return None, error + if not item: + return None, f"File not found: {file_id}" + return item, None + + except Exception as e: + logger.error(f"Error getting file by ID: {e!s}", exc_info=True) + return None, f"Error getting file by ID: {e!s}" diff --git a/surfsense_backend/app/db.py b/surfsense_backend/app/db.py index 9680a7bfd..a8510ebab 100644 --- a/surfsense_backend/app/db.py +++ b/surfsense_backend/app/db.py @@ -40,6 +40,7 @@ class DocumentType(StrEnum): FILE = "FILE" SLACK_CONNECTOR = "SLACK_CONNECTOR" TEAMS_CONNECTOR = "TEAMS_CONNECTOR" + ONEDRIVE_FILE = "ONEDRIVE_FILE" NOTION_CONNECTOR = "NOTION_CONNECTOR" YOUTUBE_VIDEO = "YOUTUBE_VIDEO" GITHUB_CONNECTOR = "GITHUB_CONNECTOR" @@ -81,6 +82,7 @@ class SearchSourceConnectorType(StrEnum): BAIDU_SEARCH_API = "BAIDU_SEARCH_API" # Baidu AI Search API for Chinese web search SLACK_CONNECTOR = "SLACK_CONNECTOR" TEAMS_CONNECTOR = "TEAMS_CONNECTOR" + ONEDRIVE_CONNECTOR = "ONEDRIVE_CONNECTOR" NOTION_CONNECTOR = "NOTION_CONNECTOR" GITHUB_CONNECTOR = "GITHUB_CONNECTOR" LINEAR_CONNECTOR = "LINEAR_CONNECTOR" diff --git a/surfsense_backend/app/routes/__init__.py b/surfsense_backend/app/routes/__init__.py index 7782c064c..af26e3680 100644 --- a/surfsense_backend/app/routes/__init__.py +++ b/surfsense_backend/app/routes/__init__.py @@ -43,6 +43,7 @@ from .search_spaces_routes import router as search_spaces_router from .slack_add_connector_route import router as slack_add_connector_router from .surfsense_docs_routes import router as surfsense_docs_router from .teams_add_connector_route import router as teams_add_connector_router +from .onedrive_add_connector_route import router as onedrive_add_connector_router from .video_presentations_routes import router as video_presentations_router from .youtube_routes import router as youtube_router @@ -73,6 +74,7 @@ router.include_router(luma_add_connector_router) router.include_router(notion_add_connector_router) router.include_router(slack_add_connector_router) router.include_router(teams_add_connector_router) +router.include_router(onedrive_add_connector_router) router.include_router(discord_add_connector_router) router.include_router(jira_add_connector_router) router.include_router(confluence_add_connector_router) diff --git a/surfsense_backend/app/routes/onedrive_add_connector_route.py b/surfsense_backend/app/routes/onedrive_add_connector_route.py new file mode 100644 index 000000000..0494888d9 --- /dev/null +++ b/surfsense_backend/app/routes/onedrive_add_connector_route.py @@ -0,0 +1,474 @@ +""" +Microsoft OneDrive Connector OAuth Routes. + +Endpoints: +- GET /auth/onedrive/connector/add - Initiate OAuth +- GET /auth/onedrive/connector/callback - Handle OAuth callback +- GET /auth/onedrive/connector/reauth - Re-authenticate existing connector +- GET /connectors/{connector_id}/onedrive/folders - List folder contents +""" + +import logging +from datetime import UTC, datetime, timedelta +from urllib.parse import urlencode +from uuid import UUID + +import httpx +from fastapi import APIRouter, Depends, HTTPException +from fastapi.responses import RedirectResponse +from sqlalchemy.exc import IntegrityError +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.future import select +from sqlalchemy.orm.attributes import flag_modified + +from app.config import config +from app.connectors.onedrive import OneDriveClient, list_folder_contents +from app.db import ( + SearchSourceConnector, + SearchSourceConnectorType, + User, + get_async_session, +) +from app.users import current_active_user +from app.utils.connector_naming import ( + check_duplicate_connector, + extract_identifier_from_credentials, + generate_unique_connector_name, +) +from app.utils.oauth_security import OAuthStateManager, TokenEncryption + +logger = logging.getLogger(__name__) +router = APIRouter() + +AUTHORIZATION_URL = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize" +TOKEN_URL = "https://login.microsoftonline.com/common/oauth2/v2.0/token" + +SCOPES = [ + "offline_access", + "User.Read", + "Files.Read.All", + "Files.ReadWrite.All", +] + +_state_manager = None +_token_encryption = None + + +def get_state_manager() -> OAuthStateManager: + global _state_manager + if _state_manager is None: + if not config.SECRET_KEY: + raise ValueError("SECRET_KEY must be set for OAuth security") + _state_manager = OAuthStateManager(config.SECRET_KEY) + return _state_manager + + +def get_token_encryption() -> TokenEncryption: + global _token_encryption + if _token_encryption is None: + if not config.SECRET_KEY: + raise ValueError("SECRET_KEY must be set for token encryption") + _token_encryption = TokenEncryption(config.SECRET_KEY) + return _token_encryption + + +@router.get("/auth/onedrive/connector/add") +async def connect_onedrive(space_id: int, user: User = Depends(current_active_user)): + """Initiate OneDrive OAuth flow.""" + try: + if not space_id: + raise HTTPException(status_code=400, detail="space_id is required") + if not config.ONEDRIVE_CLIENT_ID: + raise HTTPException(status_code=500, detail="Microsoft OneDrive OAuth not configured.") + if not config.SECRET_KEY: + raise HTTPException(status_code=500, detail="SECRET_KEY not configured for OAuth security.") + + state_manager = get_state_manager() + state_encoded = state_manager.generate_secure_state(space_id, user.id) + + auth_params = { + "client_id": config.ONEDRIVE_CLIENT_ID, + "response_type": "code", + "redirect_uri": config.ONEDRIVE_REDIRECT_URI, + "response_mode": "query", + "scope": " ".join(SCOPES), + "state": state_encoded, + } + auth_url = f"{AUTHORIZATION_URL}?{urlencode(auth_params)}" + + logger.info("Generated OneDrive OAuth URL for user %s, space %s", user.id, space_id) + return {"auth_url": auth_url} + + except HTTPException: + raise + except Exception as e: + logger.error("Failed to initiate OneDrive OAuth: %s", str(e), exc_info=True) + raise HTTPException(status_code=500, detail=f"Failed to initiate OneDrive OAuth: {e!s}") from e + + +@router.get("/auth/onedrive/connector/reauth") +async def reauth_onedrive( + space_id: int, + connector_id: int, + return_url: str | None = None, + user: User = Depends(current_active_user), + session: AsyncSession = Depends(get_async_session), +): + """Re-authenticate an existing OneDrive connector.""" + try: + result = await session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == connector_id, + SearchSourceConnector.user_id == user.id, + SearchSourceConnector.search_space_id == space_id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connector = result.scalars().first() + if not connector: + raise HTTPException(status_code=404, detail="OneDrive connector not found or access denied") + + if not config.SECRET_KEY: + raise HTTPException(status_code=500, detail="SECRET_KEY not configured for OAuth security.") + + state_manager = get_state_manager() + extra: dict = {"connector_id": connector_id} + if return_url and return_url.startswith("/"): + extra["return_url"] = return_url + state_encoded = state_manager.generate_secure_state(space_id, user.id, **extra) + + auth_params = { + "client_id": config.ONEDRIVE_CLIENT_ID, + "response_type": "code", + "redirect_uri": config.ONEDRIVE_REDIRECT_URI, + "response_mode": "query", + "scope": " ".join(SCOPES), + "state": state_encoded, + "prompt": "consent", + } + auth_url = f"{AUTHORIZATION_URL}?{urlencode(auth_params)}" + + logger.info("Initiating OneDrive re-auth for user %s, connector %s", user.id, connector_id) + return {"auth_url": auth_url} + + except HTTPException: + raise + except Exception as e: + logger.error("Failed to initiate OneDrive re-auth: %s", str(e), exc_info=True) + raise HTTPException(status_code=500, detail=f"Failed to initiate OneDrive re-auth: {e!s}") from e + + +@router.get("/auth/onedrive/connector/callback") +async def onedrive_callback( + code: str | None = None, + error: str | None = None, + error_description: str | None = None, + state: str | None = None, + session: AsyncSession = Depends(get_async_session), +): + """Handle OneDrive OAuth callback.""" + try: + if error: + error_msg = error_description or error + logger.warning("OneDrive OAuth error: %s", error_msg) + space_id = None + if state: + try: + data = get_state_manager().validate_state(state) + space_id = data.get("space_id") + except Exception: + pass + if space_id: + return RedirectResponse( + url=f"{config.NEXT_FRONTEND_URL}/dashboard/{space_id}/connectors/callback?error=onedrive_oauth_denied" + ) + return RedirectResponse(url=f"{config.NEXT_FRONTEND_URL}/dashboard?error=onedrive_oauth_denied") + + if not code or not state: + raise HTTPException(status_code=400, detail="Missing required OAuth parameters") + + state_manager = get_state_manager() + try: + data = state_manager.validate_state(state) + space_id = data["space_id"] + user_id = UUID(data["user_id"]) + except (HTTPException, ValueError, KeyError) as e: + logger.error("Invalid OAuth state: %s", str(e)) + return RedirectResponse(url=f"{config.NEXT_FRONTEND_URL}/dashboard?error=invalid_state") + + reauth_connector_id = data.get("connector_id") + reauth_return_url = data.get("return_url") + + token_data = { + "client_id": config.ONEDRIVE_CLIENT_ID, + "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "code": code, + "redirect_uri": config.ONEDRIVE_REDIRECT_URI, + "grant_type": "authorization_code", + } + + async with httpx.AsyncClient() as client: + token_response = await client.post( + TOKEN_URL, + data=token_data, + headers={"Content-Type": "application/x-www-form-urlencoded"}, + timeout=30.0, + ) + + if token_response.status_code != 200: + error_detail = token_response.text + try: + error_json = token_response.json() + error_detail = error_json.get("error_description", error_detail) + except Exception: + pass + raise HTTPException(status_code=400, detail=f"Token exchange failed: {error_detail}") + + token_json = token_response.json() + access_token = token_json.get("access_token") + refresh_token = token_json.get("refresh_token") + + if not access_token: + raise HTTPException(status_code=400, detail="No access token received from Microsoft") + + token_encryption = get_token_encryption() + + expires_at = None + if token_json.get("expires_in"): + expires_at = datetime.now(UTC) + timedelta(seconds=int(token_json["expires_in"])) + + user_info: dict = {} + try: + async with httpx.AsyncClient() as client: + user_response = await client.get( + "https://graph.microsoft.com/v1.0/me", + headers={"Authorization": f"Bearer {access_token}"}, + timeout=30.0, + ) + if user_response.status_code == 200: + user_data = user_response.json() + user_info = { + "user_email": user_data.get("mail") or user_data.get("userPrincipalName"), + "user_name": user_data.get("displayName"), + } + except Exception as e: + logger.warning("Failed to fetch user info from Graph: %s", str(e)) + + connector_config = { + "access_token": token_encryption.encrypt_token(access_token), + "refresh_token": token_encryption.encrypt_token(refresh_token) if refresh_token else None, + "token_type": token_json.get("token_type", "Bearer"), + "expires_in": token_json.get("expires_in"), + "expires_at": expires_at.isoformat() if expires_at else None, + "scope": token_json.get("scope"), + "user_email": user_info.get("user_email"), + "user_name": user_info.get("user_name"), + "_token_encrypted": True, + } + + # Handle re-authentication + if reauth_connector_id: + result = await session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == reauth_connector_id, + SearchSourceConnector.user_id == user_id, + SearchSourceConnector.search_space_id == space_id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + db_connector = result.scalars().first() + if not db_connector: + raise HTTPException(status_code=404, detail="Connector not found or access denied during re-auth") + + existing_delta_link = db_connector.config.get("delta_link") + db_connector.config = {**connector_config, "delta_link": existing_delta_link, "auth_expired": False} + flag_modified(db_connector, "config") + await session.commit() + await session.refresh(db_connector) + + logger.info("Re-authenticated OneDrive connector %s for user %s", db_connector.id, user_id) + if reauth_return_url and reauth_return_url.startswith("/"): + return RedirectResponse(url=f"{config.NEXT_FRONTEND_URL}{reauth_return_url}") + return RedirectResponse( + url=f"{config.NEXT_FRONTEND_URL}/dashboard/{space_id}/connectors/callback?success=true&connector=ONEDRIVE_CONNECTOR&connectorId={db_connector.id}" + ) + + # New connector -- check for duplicates + connector_identifier = extract_identifier_from_credentials( + SearchSourceConnectorType.ONEDRIVE_CONNECTOR, connector_config + ) + is_duplicate = await check_duplicate_connector( + session, SearchSourceConnectorType.ONEDRIVE_CONNECTOR, space_id, user_id, connector_identifier, + ) + if is_duplicate: + logger.warning("Duplicate OneDrive connector for user %s, space %s", user_id, space_id) + return RedirectResponse( + url=f"{config.NEXT_FRONTEND_URL}/dashboard/{space_id}/connectors/callback?error=duplicate_account&connector=ONEDRIVE_CONNECTOR" + ) + + connector_name = await generate_unique_connector_name( + session, SearchSourceConnectorType.ONEDRIVE_CONNECTOR, space_id, user_id, connector_identifier, + ) + + new_connector = SearchSourceConnector( + name=connector_name, + connector_type=SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + is_indexable=True, + config=connector_config, + search_space_id=space_id, + user_id=user_id, + ) + + try: + session.add(new_connector) + await session.commit() + await session.refresh(new_connector) + logger.info("Successfully created OneDrive connector %s for user %s", new_connector.id, user_id) + return RedirectResponse( + url=f"{config.NEXT_FRONTEND_URL}/dashboard/{space_id}/connectors/callback?success=true&connector=ONEDRIVE_CONNECTOR&connectorId={new_connector.id}" + ) + except IntegrityError as e: + await session.rollback() + logger.error("Database integrity error creating OneDrive connector: %s", str(e)) + return RedirectResponse(url=f"{config.NEXT_FRONTEND_URL}/dashboard?error=connector_creation_failed") + + except HTTPException: + raise + except (IntegrityError, ValueError) as e: + logger.error("OneDrive OAuth callback error: %s", str(e), exc_info=True) + return RedirectResponse(url=f"{config.NEXT_FRONTEND_URL}/dashboard?error=onedrive_auth_error") + + +@router.get("/connectors/{connector_id}/onedrive/folders") +async def list_onedrive_folders( + connector_id: int, + parent_id: str | None = None, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + """List folders and files in user's OneDrive.""" + connector = None + try: + result = await session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == connector_id, + SearchSourceConnector.user_id == user.id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connector = result.scalars().first() + if not connector: + raise HTTPException(status_code=404, detail="OneDrive connector not found or access denied") + + onedrive_client = OneDriveClient(session, connector_id) + items, error = await list_folder_contents(onedrive_client, parent_id=parent_id) + + if error: + error_lower = error.lower() + if "401" in error or "authentication expired" in error_lower or "invalid_grant" in error_lower: + try: + if connector and not connector.config.get("auth_expired"): + connector.config = {**connector.config, "auth_expired": True} + flag_modified(connector, "config") + await session.commit() + except Exception: + logger.warning("Failed to persist auth_expired for connector %s", connector_id, exc_info=True) + raise HTTPException(status_code=400, detail="OneDrive authentication expired. Please re-authenticate.") + raise HTTPException(status_code=500, detail=f"Failed to list folder contents: {error}") + + return {"items": items} + + except HTTPException: + raise + except Exception as e: + logger.error("Error listing OneDrive contents: %s", str(e), exc_info=True) + error_lower = str(e).lower() + if "401" in str(e) or "authentication expired" in error_lower: + try: + if connector and not connector.config.get("auth_expired"): + connector.config = {**connector.config, "auth_expired": True} + flag_modified(connector, "config") + await session.commit() + except Exception: + pass + raise HTTPException(status_code=400, detail="OneDrive authentication expired. Please re-authenticate.") from e + raise HTTPException(status_code=500, detail=f"Failed to list OneDrive contents: {e!s}") from e + + +async def refresh_onedrive_token( + session: AsyncSession, connector: SearchSourceConnector +) -> SearchSourceConnector: + """Refresh OneDrive OAuth tokens.""" + logger.info("Refreshing OneDrive OAuth tokens for connector %s", connector.id) + + token_encryption = get_token_encryption() + is_encrypted = connector.config.get("_token_encrypted", False) + refresh_token = connector.config.get("refresh_token") + + if is_encrypted and refresh_token: + try: + refresh_token = token_encryption.decrypt_token(refresh_token) + except Exception as e: + logger.error("Failed to decrypt refresh token: %s", str(e)) + raise HTTPException(status_code=500, detail="Failed to decrypt stored refresh token") from e + + if not refresh_token: + raise HTTPException(status_code=400, detail=f"No refresh token available for connector {connector.id}") + + refresh_data = { + "client_id": config.ONEDRIVE_CLIENT_ID, + "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "grant_type": "refresh_token", + "refresh_token": refresh_token, + "scope": " ".join(SCOPES), + } + + async with httpx.AsyncClient() as client: + token_response = await client.post( + TOKEN_URL, data=refresh_data, + headers={"Content-Type": "application/x-www-form-urlencoded"}, timeout=30.0, + ) + + if token_response.status_code != 200: + error_detail = token_response.text + error_code = "" + try: + error_json = token_response.json() + error_detail = error_json.get("error_description", error_detail) + error_code = error_json.get("error", "") + except Exception: + pass + error_lower = (error_detail + error_code).lower() + if "invalid_grant" in error_lower or "expired" in error_lower or "revoked" in error_lower: + raise HTTPException(status_code=401, detail="OneDrive authentication failed. Please re-authenticate.") + raise HTTPException(status_code=400, detail=f"Token refresh failed: {error_detail}") + + token_json = token_response.json() + access_token = token_json.get("access_token") + new_refresh_token = token_json.get("refresh_token") + + if not access_token: + raise HTTPException(status_code=400, detail="No access token received from Microsoft refresh") + + expires_at = None + expires_in = token_json.get("expires_in") + if expires_in: + expires_at = datetime.now(UTC) + timedelta(seconds=int(expires_in)) + + cfg = dict(connector.config) + cfg["access_token"] = token_encryption.encrypt_token(access_token) + if new_refresh_token: + cfg["refresh_token"] = token_encryption.encrypt_token(new_refresh_token) + cfg["expires_in"] = expires_in + cfg["expires_at"] = expires_at.isoformat() if expires_at else None + cfg["scope"] = token_json.get("scope") + cfg["_token_encrypted"] = True + cfg.pop("auth_expired", None) + + connector.config = cfg + flag_modified(connector, "config") + await session.commit() + await session.refresh(connector) + + logger.info("Successfully refreshed OneDrive tokens for connector %s", connector.id) + return connector diff --git a/surfsense_backend/app/routes/search_source_connectors_routes.py b/surfsense_backend/app/routes/search_source_connectors_routes.py index bef2329d8..2183e3677 100644 --- a/surfsense_backend/app/routes/search_source_connectors_routes.py +++ b/surfsense_backend/app/routes/search_source_connectors_routes.py @@ -999,6 +999,53 @@ async def index_connector_content( ) response_message = "Google Drive indexing started in the background." + elif connector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR: + from app.tasks.celery_tasks.connector_tasks import ( + index_onedrive_files_task, + ) + + if drive_items and drive_items.has_items(): + logger.info( + f"Triggering OneDrive indexing for connector {connector_id} into search space {search_space_id}, " + f"folders: {len(drive_items.folders)}, files: {len(drive_items.files)}" + ) + items_dict = drive_items.model_dump() + else: + config = connector.config or {} + selected_folders = config.get("selected_folders", []) + selected_files = config.get("selected_files", []) + if not selected_folders and not selected_files: + raise HTTPException( + status_code=400, + detail="OneDrive indexing requires folders or files to be configured. " + "Please select folders/files to index.", + ) + indexing_options = config.get( + "indexing_options", + { + "max_files_per_folder": 100, + "incremental_sync": True, + "include_subfolders": True, + }, + ) + items_dict = { + "folders": selected_folders, + "files": selected_files, + "indexing_options": indexing_options, + } + logger.info( + f"Triggering OneDrive indexing for connector {connector_id} into search space {search_space_id} " + f"using existing config" + ) + + index_onedrive_files_task.delay( + connector_id, + search_space_id, + str(user.id), + items_dict, + ) + response_message = "OneDrive indexing started in the background." + elif connector.connector_type == SearchSourceConnectorType.DISCORD_CONNECTOR: from app.tasks.celery_tasks.connector_tasks import ( index_discord_messages_task, @@ -2485,6 +2532,108 @@ async def run_google_drive_indexing( logger.error(f"Failed to update notification: {notif_error!s}") +async def run_onedrive_indexing( + session: AsyncSession, + connector_id: int, + search_space_id: int, + user_id: str, + items_dict: dict, +): + """Runs the OneDrive indexing task for folders and files with notifications.""" + from uuid import UUID + + notification = None + try: + from app.tasks.connector_indexers.onedrive_indexer import index_onedrive_files + + connector_result = await session.execute( + select(SearchSourceConnector).where( + SearchSourceConnector.id == connector_id + ) + ) + connector = connector_result.scalar_one_or_none() + + if connector: + notification = await NotificationService.connector_indexing.notify_google_drive_indexing_started( + session=session, + user_id=UUID(user_id), + connector_id=connector_id, + connector_name=connector.name, + connector_type=connector.connector_type.value, + search_space_id=search_space_id, + folder_count=len(items_dict.get("folders", [])), + file_count=len(items_dict.get("files", [])), + folder_names=[f.get("name", "Unknown") for f in items_dict.get("folders", [])], + file_names=[f.get("name", "Unknown") for f in items_dict.get("files", [])], + ) + + if notification: + await NotificationService.connector_indexing.notify_indexing_progress( + session=session, + notification=notification, + indexed_count=0, + stage="fetching", + ) + + total_indexed, total_skipped, error_message = await index_onedrive_files( + session, + connector_id, + search_space_id, + user_id, + items_dict, + ) + + if error_message: + logger.error( + f"OneDrive indexing completed with errors for connector {connector_id}: {error_message}" + ) + if _is_auth_error(error_message): + await _persist_auth_expired(session, connector_id) + error_message = "OneDrive authentication expired. Please re-authenticate." + else: + if notification: + await session.refresh(notification) + await NotificationService.connector_indexing.notify_indexing_progress( + session=session, + notification=notification, + indexed_count=total_indexed, + stage="storing", + ) + + logger.info( + f"OneDrive indexing successful for connector {connector_id}. Indexed {total_indexed} documents." + ) + await _update_connector_timestamp_by_id(session, connector_id) + await session.commit() + + if notification: + await session.refresh(notification) + await NotificationService.connector_indexing.notify_indexing_completed( + session=session, + notification=notification, + indexed_count=total_indexed, + error_message=error_message, + skipped_count=total_skipped, + ) + + except Exception as e: + logger.error( + f"Critical error in run_onedrive_indexing for connector {connector_id}: {e}", + exc_info=True, + ) + if notification: + try: + await session.refresh(notification) + await NotificationService.connector_indexing.notify_indexing_completed( + session=session, + notification=notification, + indexed_count=0, + error_message=str(e), + ) + except Exception as notif_error: + logger.error(f"Failed to update notification: {notif_error!s}") + + # Add new helper functions for luma indexing async def run_luma_indexing_with_new_session( connector_id: int, diff --git a/surfsense_backend/app/schemas/onedrive_auth_credentials.py b/surfsense_backend/app/schemas/onedrive_auth_credentials.py new file mode 100644 index 000000000..7690a2694 --- /dev/null +++ b/surfsense_backend/app/schemas/onedrive_auth_credentials.py @@ -0,0 +1,71 @@ +"""Microsoft OneDrive OAuth credentials schema.""" + +from datetime import UTC, datetime + +from pydantic import BaseModel, field_validator + + +class OneDriveAuthCredentialsBase(BaseModel): + """Microsoft OneDrive OAuth credentials.""" + + access_token: str + refresh_token: str | None = None + token_type: str = "Bearer" + expires_in: int | None = None + expires_at: datetime | None = None + scope: str | None = None + user_email: str | None = None + user_name: str | None = None + tenant_id: str | None = None + + @property + def is_expired(self) -> bool: + if self.expires_at is None: + return False + return self.expires_at <= datetime.now(UTC) + + @property + def is_refreshable(self) -> bool: + return self.refresh_token is not None + + def to_dict(self) -> dict: + return { + "access_token": self.access_token, + "refresh_token": self.refresh_token, + "token_type": self.token_type, + "expires_in": self.expires_in, + "expires_at": self.expires_at.isoformat() if self.expires_at else None, + "scope": self.scope, + "user_email": self.user_email, + "user_name": self.user_name, + "tenant_id": self.tenant_id, + } + + @classmethod + def from_dict(cls, data: dict) -> "OneDriveAuthCredentialsBase": + expires_at = None + if data.get("expires_at"): + expires_at = datetime.fromisoformat(data["expires_at"]) + return cls( + access_token=data.get("access_token", ""), + refresh_token=data.get("refresh_token"), + token_type=data.get("token_type", "Bearer"), + expires_in=data.get("expires_in"), + expires_at=expires_at, + scope=data.get("scope"), + user_email=data.get("user_email"), + user_name=data.get("user_name"), + tenant_id=data.get("tenant_id"), + ) + + @field_validator("expires_at", mode="before") + @classmethod + def ensure_aware_utc(cls, v): + if isinstance(v, str): + if v.endswith("Z"): + return datetime.fromisoformat(v.replace("Z", "+00:00")) + dt = datetime.fromisoformat(v) + return dt if dt.tzinfo else dt.replace(tzinfo=UTC) + if isinstance(v, datetime): + return v if v.tzinfo else v.replace(tzinfo=UTC) + return v diff --git a/surfsense_backend/app/tasks/celery_tasks/connector_tasks.py b/surfsense_backend/app/tasks/celery_tasks/connector_tasks.py index 9d52add9c..9eccbc798 100644 --- a/surfsense_backend/app/tasks/celery_tasks/connector_tasks.py +++ b/surfsense_backend/app/tasks/celery_tasks/connector_tasks.py @@ -526,6 +526,54 @@ async def _index_google_drive_files( ) +@celery_app.task(name="index_onedrive_files", bind=True) +def index_onedrive_files_task( + self, + connector_id: int, + search_space_id: int, + user_id: str, + items_dict: dict, +): + """Celery task to index OneDrive folders and files.""" + import asyncio + + loop = asyncio.new_event_loop() + asyncio.set_event_loop(loop) + + try: + loop.run_until_complete( + _index_onedrive_files( + connector_id, + search_space_id, + user_id, + items_dict, + ) + ) + finally: + loop.close() + + +async def _index_onedrive_files( + connector_id: int, + search_space_id: int, + user_id: str, + items_dict: dict, +): + """Index OneDrive folders and files with new session.""" + from app.routes.search_source_connectors_routes import ( + run_onedrive_indexing, + ) + + async with get_celery_session_maker()() as session: + await run_onedrive_indexing( + session, + connector_id, + search_space_id, + user_id, + items_dict, + ) + + @celery_app.task(name="index_discord_messages", bind=True) def index_discord_messages_task( self, diff --git a/surfsense_backend/app/tasks/connector_indexers/onedrive_indexer.py b/surfsense_backend/app/tasks/connector_indexers/onedrive_indexer.py new file mode 100644 index 000000000..e565f6a6a --- /dev/null +++ b/surfsense_backend/app/tasks/connector_indexers/onedrive_indexer.py @@ -0,0 +1,606 @@ +"""OneDrive indexer using the shared IndexingPipelineService. + +File-level pre-filter (_should_skip_file) handles hash/modifiedDateTime +checks and rename-only detection. download_and_extract_content() +returns markdown which is fed into ConnectorDocument -> pipeline. +""" + +import asyncio +import logging +import time +from collections.abc import Awaitable, Callable + +from sqlalchemy import String, cast, select +from sqlalchemy.exc import SQLAlchemyError +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.orm.attributes import flag_modified + +from app.config import config +from app.connectors.onedrive import ( + OneDriveClient, + download_and_extract_content, + get_file_by_id, + get_files_in_folder, +) +from app.connectors.onedrive.file_types import should_skip_file as skip_item +from app.db import Document, DocumentStatus, DocumentType, SearchSourceConnectorType +from app.indexing_pipeline.connector_document import ConnectorDocument +from app.indexing_pipeline.document_hashing import compute_identifier_hash +from app.indexing_pipeline.indexing_pipeline_service import IndexingPipelineService +from app.services.llm_service import get_user_long_context_llm +from app.services.task_logging_service import TaskLoggingService +from app.tasks.connector_indexers.base import ( + check_document_by_unique_identifier, + get_connector_by_id, + update_connector_last_indexed, +) + +HeartbeatCallbackType = Callable[[int], Awaitable[None]] +HEARTBEAT_INTERVAL_SECONDS = 30 + +logger = logging.getLogger(__name__) + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +async def _should_skip_file( + session: AsyncSession, + file: dict, + search_space_id: int, +) -> tuple[bool, str | None]: + """Pre-filter: detect unchanged / rename-only files.""" + file_id = file.get("id") + file_name = file.get("name", "Unknown") + + if skip_item(file): + return True, "folder/onenote/remote" + if not file_id: + return True, "missing file_id" + + primary_hash = compute_identifier_hash( + DocumentType.ONEDRIVE_FILE.value, file_id, search_space_id + ) + existing = await check_document_by_unique_identifier(session, primary_hash) + + if not existing: + result = await session.execute( + select(Document).where( + Document.search_space_id == search_space_id, + Document.document_type == DocumentType.ONEDRIVE_FILE, + cast(Document.document_metadata["onedrive_file_id"], String) == file_id, + ) + ) + existing = result.scalar_one_or_none() + if existing: + existing.unique_identifier_hash = primary_hash + logger.debug(f"Found OneDrive doc by metadata for file_id: {file_id}") + + if not existing: + return False, None + + incoming_mtime = file.get("lastModifiedDateTime") + meta = existing.document_metadata or {} + stored_mtime = meta.get("modified_time") + + file_info = file.get("file", {}) + file_hashes = file_info.get("hashes", {}) + incoming_hash = file_hashes.get("sha256Hash") or file_hashes.get("quickXorHash") + stored_hash = meta.get("sha256_hash") or meta.get("quick_xor_hash") + + content_unchanged = False + if incoming_hash and stored_hash: + content_unchanged = incoming_hash == stored_hash + elif incoming_hash and not stored_hash: + return False, None + elif not incoming_hash and incoming_mtime and stored_mtime: + content_unchanged = incoming_mtime == stored_mtime + elif not incoming_hash: + return False, None + + if not content_unchanged: + return False, None + + old_name = meta.get("onedrive_file_name") + if old_name and old_name != file_name: + existing.title = file_name + if not existing.document_metadata: + existing.document_metadata = {} + existing.document_metadata["onedrive_file_name"] = file_name + if incoming_mtime: + existing.document_metadata["modified_time"] = incoming_mtime + flag_modified(existing, "document_metadata") + await session.commit() + logger.info(f"Rename-only update: '{old_name}' -> '{file_name}'") + return True, f"File renamed: '{old_name}' -> '{file_name}'" + + if not DocumentStatus.is_state(existing.status, DocumentStatus.READY): + return True, "skipped (previously failed)" + return True, "unchanged" + + +def _build_connector_doc( + file: dict, + markdown: str, + onedrive_metadata: dict, + *, + connector_id: int, + search_space_id: int, + user_id: str, + enable_summary: bool, +) -> ConnectorDocument: + file_id = file.get("id", "") + file_name = file.get("name", "Unknown") + + metadata = { + **onedrive_metadata, + "connector_id": connector_id, + "document_type": "OneDrive File", + "connector_type": "OneDrive", + } + + fallback_summary = f"File: {file_name}\n\n{markdown[:4000]}" + + return ConnectorDocument( + title=file_name, + source_markdown=markdown, + unique_id=file_id, + document_type=DocumentType.ONEDRIVE_FILE, + search_space_id=search_space_id, + connector_id=connector_id, + created_by_id=user_id, + should_summarize=enable_summary, + fallback_summary=fallback_summary, + metadata=metadata, + ) + + +async def _download_files_parallel( + onedrive_client: OneDriveClient, + files: list[dict], + *, + connector_id: int, + search_space_id: int, + user_id: str, + enable_summary: bool, + max_concurrency: int = 3, + on_heartbeat: HeartbeatCallbackType | None = None, +) -> tuple[list[ConnectorDocument], int]: + """Download and ETL files in parallel. Returns (docs, failed_count).""" + results: list[ConnectorDocument] = [] + sem = asyncio.Semaphore(max_concurrency) + last_heartbeat = time.time() + completed_count = 0 + hb_lock = asyncio.Lock() + + async def _download_one(file: dict) -> ConnectorDocument | None: + nonlocal last_heartbeat, completed_count + async with sem: + markdown, od_metadata, error = await download_and_extract_content( + onedrive_client, file + ) + if error or not markdown: + file_name = file.get("name", "Unknown") + reason = error or "empty content" + logger.warning(f"Download/ETL failed for {file_name}: {reason}") + return None + doc = _build_connector_doc( + file, markdown, od_metadata, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=enable_summary, + ) + async with hb_lock: + completed_count += 1 + if on_heartbeat: + now = time.time() + if now - last_heartbeat >= HEARTBEAT_INTERVAL_SECONDS: + await on_heartbeat(completed_count) + last_heartbeat = now + return doc + + tasks = [_download_one(f) for f in files] + outcomes = await asyncio.gather(*tasks, return_exceptions=True) + + failed = 0 + for outcome in outcomes: + if isinstance(outcome, Exception): + failed += 1 + elif outcome is None: + failed += 1 + else: + results.append(outcome) + + return results, failed + + +async def _download_and_index( + onedrive_client: OneDriveClient, + session: AsyncSession, + files: list[dict], + *, + connector_id: int, + search_space_id: int, + user_id: str, + enable_summary: bool, + on_heartbeat: HeartbeatCallbackType | None = None, +) -> tuple[int, int]: + """Parallel download then parallel indexing. Returns (batch_indexed, total_failed).""" + connector_docs, download_failed = await _download_files_parallel( + onedrive_client, files, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=enable_summary, + on_heartbeat=on_heartbeat, + ) + + batch_indexed = 0 + batch_failed = 0 + if connector_docs: + pipeline = IndexingPipelineService(session) + + async def _get_llm(s): + return await get_user_long_context_llm(s, user_id, search_space_id) + + _, batch_indexed, batch_failed = await pipeline.index_batch_parallel( + connector_docs, _get_llm, max_concurrency=3, + on_heartbeat=on_heartbeat, + ) + + return batch_indexed, download_failed + batch_failed + + +async def _remove_document(session: AsyncSession, file_id: str, search_space_id: int): + """Remove a document that was deleted in OneDrive.""" + primary_hash = compute_identifier_hash( + DocumentType.ONEDRIVE_FILE.value, file_id, search_space_id + ) + existing = await check_document_by_unique_identifier(session, primary_hash) + + if not existing: + result = await session.execute( + select(Document).where( + Document.search_space_id == search_space_id, + Document.document_type == DocumentType.ONEDRIVE_FILE, + cast(Document.document_metadata["onedrive_file_id"], String) == file_id, + ) + ) + existing = result.scalar_one_or_none() + + if existing: + await session.delete(existing) + logger.info(f"Removed deleted OneDrive file document: {file_id}") + + +async def _index_selected_files( + onedrive_client: OneDriveClient, + session: AsyncSession, + file_ids: list[tuple[str, str | None]], + *, + connector_id: int, + search_space_id: int, + user_id: str, + enable_summary: bool, + on_heartbeat: HeartbeatCallbackType | None = None, +) -> tuple[int, int, list[str]]: + """Index user-selected files using the parallel pipeline.""" + files_to_download: list[dict] = [] + errors: list[str] = [] + renamed_count = 0 + skipped = 0 + + for file_id, file_name in file_ids: + file, error = await get_file_by_id(onedrive_client, file_id) + if error or not file: + display = file_name or file_id + errors.append(f"File '{display}': {error or 'File not found'}") + continue + + skip, msg = await _should_skip_file(session, file, search_space_id) + if skip: + if msg and "renamed" in msg.lower(): + renamed_count += 1 + else: + skipped += 1 + continue + + files_to_download.append(file) + + batch_indexed, failed = await _download_and_index( + onedrive_client, session, files_to_download, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=enable_summary, + on_heartbeat=on_heartbeat, + ) + + return renamed_count + batch_indexed, skipped, errors + + +# --------------------------------------------------------------------------- +# Scan strategies +# --------------------------------------------------------------------------- + +async def _index_full_scan( + onedrive_client: OneDriveClient, + session: AsyncSession, + connector_id: int, + search_space_id: int, + user_id: str, + folder_id: str, + folder_name: str, + task_logger: TaskLoggingService, + log_entry: object, + max_files: int, + include_subfolders: bool = True, + on_heartbeat_callback: HeartbeatCallbackType | None = None, + enable_summary: bool = True, +) -> tuple[int, int]: + """Full scan indexing of a folder.""" + await task_logger.log_task_progress( + log_entry, + f"Starting full scan of folder: {folder_name}", + {"stage": "full_scan", "folder_id": folder_id, "include_subfolders": include_subfolders}, + ) + + renamed_count = 0 + skipped = 0 + files_to_download: list[dict] = [] + + all_files, error = await get_files_in_folder( + onedrive_client, folder_id, include_subfolders=include_subfolders, + ) + if error: + err_lower = error.lower() + if "401" in error or "authentication expired" in err_lower: + raise Exception(f"OneDrive authentication failed. Please re-authenticate. (Error: {error})") + raise Exception(f"Failed to list OneDrive files: {error}") + + for file in all_files[:max_files]: + skip, msg = await _should_skip_file(session, file, search_space_id) + if skip: + if msg and "renamed" in msg.lower(): + renamed_count += 1 + else: + skipped += 1 + continue + files_to_download.append(file) + + batch_indexed, failed = await _download_and_index( + onedrive_client, session, files_to_download, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=enable_summary, + on_heartbeat=on_heartbeat_callback, + ) + + indexed = renamed_count + batch_indexed + logger.info(f"Full scan complete: {indexed} indexed, {skipped} skipped, {failed} failed") + return indexed, skipped + + +async def _index_with_delta_sync( + onedrive_client: OneDriveClient, + session: AsyncSession, + connector_id: int, + search_space_id: int, + user_id: str, + folder_id: str | None, + delta_link: str, + task_logger: TaskLoggingService, + log_entry: object, + max_files: int, + on_heartbeat_callback: HeartbeatCallbackType | None = None, + enable_summary: bool = True, +) -> tuple[int, int, str | None]: + """Delta sync using OneDrive change tracking. Returns (indexed, skipped, new_delta_link).""" + await task_logger.log_task_progress( + log_entry, "Starting delta sync", + {"stage": "delta_sync"}, + ) + + changes, new_delta_link, error = await onedrive_client.get_delta( + folder_id=folder_id, delta_link=delta_link + ) + if error: + err_lower = error.lower() + if "401" in error or "authentication expired" in err_lower: + raise Exception(f"OneDrive authentication failed. Please re-authenticate. (Error: {error})") + raise Exception(f"Failed to fetch OneDrive changes: {error}") + + if not changes: + logger.info("No changes detected since last sync") + return 0, 0, new_delta_link + + logger.info(f"Processing {len(changes)} delta changes") + + renamed_count = 0 + skipped = 0 + files_to_download: list[dict] = [] + files_processed = 0 + + for change in changes: + if files_processed >= max_files: + break + files_processed += 1 + + if change.get("deleted"): + fid = change.get("id") + if fid: + await _remove_document(session, fid, search_space_id) + continue + + if "folder" in change: + continue + + if not change.get("file"): + continue + + skip, msg = await _should_skip_file(session, change, search_space_id) + if skip: + if msg and "renamed" in msg.lower(): + renamed_count += 1 + else: + skipped += 1 + continue + + files_to_download.append(change) + + batch_indexed, failed = await _download_and_index( + onedrive_client, session, files_to_download, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=enable_summary, + on_heartbeat=on_heartbeat_callback, + ) + + indexed = renamed_count + batch_indexed + logger.info(f"Delta sync complete: {indexed} indexed, {skipped} skipped, {failed} failed") + return indexed, skipped, new_delta_link + + +# --------------------------------------------------------------------------- +# Public entry point +# --------------------------------------------------------------------------- + +async def index_onedrive_files( + session: AsyncSession, + connector_id: int, + search_space_id: int, + user_id: str, + items_dict: dict, +) -> tuple[int, int, str | None]: + """Index OneDrive files for a specific connector. + + items_dict format: + { + "folders": [{"id": "...", "name": "..."}, ...], + "files": [{"id": "...", "name": "..."}, ...], + "indexing_options": {"max_files": 500, "include_subfolders": true, "use_delta_sync": true} + } + """ + task_logger = TaskLoggingService(session, search_space_id) + log_entry = await task_logger.log_task_start( + task_name="onedrive_files_indexing", + source="connector_indexing_task", + message=f"Starting OneDrive indexing for connector {connector_id}", + metadata={"connector_id": connector_id, "user_id": str(user_id)}, + ) + + try: + connector = await get_connector_by_id( + session, connector_id, SearchSourceConnectorType.ONEDRIVE_CONNECTOR + ) + if not connector: + error_msg = f"OneDrive connector with ID {connector_id} not found" + await task_logger.log_task_failure(log_entry, error_msg, None, {"error_type": "ConnectorNotFound"}) + return 0, 0, error_msg + + token_encrypted = connector.config.get("_token_encrypted", False) + if token_encrypted and not config.SECRET_KEY: + error_msg = "SECRET_KEY not configured but credentials are encrypted" + await task_logger.log_task_failure(log_entry, error_msg, "Missing SECRET_KEY", {"error_type": "MissingSecretKey"}) + return 0, 0, error_msg + + connector_enable_summary = getattr(connector, "enable_summary", True) + onedrive_client = OneDriveClient(session, connector_id) + + indexing_options = items_dict.get("indexing_options", {}) + max_files = indexing_options.get("max_files", 500) + include_subfolders = indexing_options.get("include_subfolders", True) + use_delta_sync = indexing_options.get("use_delta_sync", True) + + total_indexed = 0 + total_skipped = 0 + + # Index selected individual files + selected_files = items_dict.get("files", []) + if selected_files: + file_tuples = [(f["id"], f.get("name")) for f in selected_files] + indexed, skipped, errors = await _index_selected_files( + onedrive_client, session, file_tuples, + connector_id=connector_id, search_space_id=search_space_id, + user_id=user_id, enable_summary=connector_enable_summary, + ) + total_indexed += indexed + total_skipped += skipped + + # Index selected folders + folders = items_dict.get("folders", []) + for folder in folders: + folder_id = folder.get("id", "root") + folder_name = folder.get("name", "Root") + + folder_delta_links = connector.config.get("folder_delta_links", {}) + delta_link = folder_delta_links.get(folder_id) + can_use_delta = use_delta_sync and delta_link and connector.last_indexed_at + + if can_use_delta: + logger.info(f"Using delta sync for folder {folder_name}") + indexed, skipped, new_delta_link = await _index_with_delta_sync( + onedrive_client, session, connector_id, search_space_id, user_id, + folder_id, delta_link, task_logger, log_entry, max_files, + enable_summary=connector_enable_summary, + ) + total_indexed += indexed + total_skipped += skipped + + if new_delta_link: + await session.refresh(connector) + if "folder_delta_links" not in connector.config: + connector.config["folder_delta_links"] = {} + connector.config["folder_delta_links"][folder_id] = new_delta_link + flag_modified(connector, "config") + + # Reconciliation full scan + ri, rs = await _index_full_scan( + onedrive_client, session, connector_id, search_space_id, user_id, + folder_id, folder_name, task_logger, log_entry, max_files, + include_subfolders, enable_summary=connector_enable_summary, + ) + total_indexed += ri + total_skipped += rs + else: + logger.info(f"Using full scan for folder {folder_name}") + indexed, skipped = await _index_full_scan( + onedrive_client, session, connector_id, search_space_id, user_id, + folder_id, folder_name, task_logger, log_entry, max_files, + include_subfolders, enable_summary=connector_enable_summary, + ) + total_indexed += indexed + total_skipped += skipped + + # Store new delta link for this folder + _, new_delta_link, _ = await onedrive_client.get_delta(folder_id=folder_id) + if new_delta_link: + await session.refresh(connector) + if "folder_delta_links" not in connector.config: + connector.config["folder_delta_links"] = {} + connector.config["folder_delta_links"][folder_id] = new_delta_link + flag_modified(connector, "config") + + if total_indexed > 0 or folders: + await update_connector_last_indexed(session, connector, True) + + await session.commit() + + await task_logger.log_task_success( + log_entry, + f"Successfully completed OneDrive indexing for connector {connector_id}", + {"files_processed": total_indexed, "files_skipped": total_skipped}, + ) + logger.info(f"OneDrive indexing completed: {total_indexed} indexed, {total_skipped} skipped") + return total_indexed, total_skipped, None + + except SQLAlchemyError as db_error: + await session.rollback() + await task_logger.log_task_failure( + log_entry, f"Database error during OneDrive indexing for connector {connector_id}", + str(db_error), {"error_type": "SQLAlchemyError"}, + ) + logger.error(f"Database error: {db_error!s}", exc_info=True) + return 0, 0, f"Database error: {db_error!s}" + except Exception as e: + await session.rollback() + await task_logger.log_task_failure( + log_entry, f"Failed to index OneDrive files for connector {connector_id}", + str(e), {"error_type": type(e).__name__}, + ) + logger.error(f"Failed to index OneDrive files: {e!s}", exc_info=True) + return 0, 0, f"Failed to index OneDrive files: {e!s}" diff --git a/surfsense_backend/app/utils/connector_naming.py b/surfsense_backend/app/utils/connector_naming.py index 9fdec3e79..7c72e0781 100644 --- a/surfsense_backend/app/utils/connector_naming.py +++ b/surfsense_backend/app/utils/connector_naming.py @@ -21,6 +21,7 @@ BASE_NAME_FOR_TYPE = { SearchSourceConnectorType.GOOGLE_CALENDAR_CONNECTOR: "Google Calendar", SearchSourceConnectorType.SLACK_CONNECTOR: "Slack", SearchSourceConnectorType.TEAMS_CONNECTOR: "Microsoft Teams", + SearchSourceConnectorType.ONEDRIVE_CONNECTOR: "OneDrive", SearchSourceConnectorType.NOTION_CONNECTOR: "Notion", SearchSourceConnectorType.LINEAR_CONNECTOR: "Linear", SearchSourceConnectorType.JIRA_CONNECTOR: "Jira", @@ -61,6 +62,9 @@ def extract_identifier_from_credentials( if connector_type == SearchSourceConnectorType.TEAMS_CONNECTOR: return credentials.get("tenant_name") + if connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR: + return credentials.get("user_email") + if connector_type == SearchSourceConnectorType.NOTION_CONNECTOR: return credentials.get("workspace_name") From 5f0a4d1a0f698cb4e8871bc24bbfa06d77f8eb85 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 14:34:30 +0530 Subject: [PATCH 028/163] feat: add OneDrive file creation and deletion tools with connector checks --- .../app/agents/new_chat/chat_deepagent.py | 6 + .../new_chat/middleware/dedup_tool_calls.py | 1 + .../new_chat/tools/onedrive/__init__.py | 11 + .../new_chat/tools/onedrive/create_file.py | 172 ++++++++++++++++ .../new_chat/tools/onedrive/trash_file.py | 192 ++++++++++++++++++ .../app/agents/new_chat/tools/registry.py | 28 +++ 6 files changed, 410 insertions(+) create mode 100644 surfsense_backend/app/agents/new_chat/tools/onedrive/__init__.py create mode 100644 surfsense_backend/app/agents/new_chat/tools/onedrive/create_file.py create mode 100644 surfsense_backend/app/agents/new_chat/tools/onedrive/trash_file.py diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py index 2857be4a7..76e19cc81 100644 --- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py +++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py @@ -305,6 +305,12 @@ async def create_surfsense_deep_agent( ] modified_disabled_tools.extend(google_drive_tools) + has_onedrive_connector = ( + available_connectors is not None and "ONEDRIVE_FILE" in available_connectors + ) + if not has_onedrive_connector: + modified_disabled_tools.extend(["create_onedrive_file", "delete_onedrive_file"]) + # Disable Google Calendar action tools if no Google Calendar connector is configured has_google_calendar_connector = ( available_connectors is not None diff --git a/surfsense_backend/app/agents/new_chat/middleware/dedup_tool_calls.py b/surfsense_backend/app/agents/new_chat/middleware/dedup_tool_calls.py index 5f1f864a0..f5e8f1235 100644 --- a/surfsense_backend/app/agents/new_chat/middleware/dedup_tool_calls.py +++ b/surfsense_backend/app/agents/new_chat/middleware/dedup_tool_calls.py @@ -26,6 +26,7 @@ _HITL_TOOL_DEDUP_KEYS: dict[str, str] = { "trash_gmail_email": "email_subject_or_id", "update_gmail_draft": "draft_subject_or_id", "delete_google_drive_file": "file_name", + "delete_onedrive_file": "file_name", "delete_notion_page": "page_title", "update_notion_page": "page_title", "delete_linear_issue": "issue_ref", diff --git a/surfsense_backend/app/agents/new_chat/tools/onedrive/__init__.py b/surfsense_backend/app/agents/new_chat/tools/onedrive/__init__.py new file mode 100644 index 000000000..8edb4857e --- /dev/null +++ b/surfsense_backend/app/agents/new_chat/tools/onedrive/__init__.py @@ -0,0 +1,11 @@ +from app.agents.new_chat.tools.onedrive.create_file import ( + create_create_onedrive_file_tool, +) +from app.agents.new_chat.tools.onedrive.trash_file import ( + create_delete_onedrive_file_tool, +) + +__all__ = [ + "create_create_onedrive_file_tool", + "create_delete_onedrive_file_tool", +] diff --git a/surfsense_backend/app/agents/new_chat/tools/onedrive/create_file.py b/surfsense_backend/app/agents/new_chat/tools/onedrive/create_file.py new file mode 100644 index 000000000..3904a4a1d --- /dev/null +++ b/surfsense_backend/app/agents/new_chat/tools/onedrive/create_file.py @@ -0,0 +1,172 @@ +import logging +from typing import Any + +from langchain_core.tools import tool +from langgraph.types import interrupt +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.future import select + +from app.connectors.onedrive.client import OneDriveClient +from app.db import SearchSourceConnector, SearchSourceConnectorType + +logger = logging.getLogger(__name__) + + +def create_create_onedrive_file_tool( + db_session: AsyncSession | None = None, + search_space_id: int | None = None, + user_id: str | None = None, +): + @tool + async def create_onedrive_file( + name: str, + content: str | None = None, + ) -> dict[str, Any]: + """Create a new file in Microsoft OneDrive. + + Use this tool when the user explicitly asks to create a new document + in OneDrive. The user MUST specify a topic before you call this tool. + + Args: + name: The file name (with extension, e.g. "notes.txt" or "report.docx"). + content: Optional initial content as plain text or markdown. + + Returns: + Dictionary with status, file_id, name, web_url, and message. + """ + logger.info(f"create_onedrive_file called: name='{name}'") + + if db_session is None or search_space_id is None or user_id is None: + return { + "status": "error", + "message": "OneDrive tool not properly configured.", + } + + try: + result = await db_session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.search_space_id == search_space_id, + SearchSourceConnector.user_id == user_id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connectors = result.scalars().all() + + if not connectors: + return { + "status": "error", + "message": "No OneDrive connector found. Please connect OneDrive in your workspace settings.", + } + + accounts = [] + for c in connectors: + cfg = c.config or {} + accounts.append({ + "id": c.id, + "name": c.name, + "user_email": cfg.get("user_email"), + "auth_expired": cfg.get("auth_expired", False), + }) + + if all(a.get("auth_expired") for a in accounts): + return { + "status": "auth_error", + "message": "All connected OneDrive accounts need re-authentication.", + "connector_type": "onedrive", + } + + context = {"accounts": accounts} + + approval = interrupt( + { + "type": "onedrive_file_creation", + "action": { + "tool": "create_onedrive_file", + "params": { + "name": name, + "content": content, + "connector_id": None, + "parent_folder_id": None, + }, + }, + "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: + return {"status": "error", "message": "No approval decision received"} + + decision = decisions[0] + decision_type = decision.get("type") or decision.get("decision_type") + + if decision_type == "reject": + return { + "status": "rejected", + "message": "User declined. The file was not created.", + } + + final_params: dict[str, Any] = {} + edited_action = decision.get("edited_action") + 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): + final_params = decision["args"] + + final_name = final_params.get("name", name) + final_content = final_params.get("content", content) + final_connector_id = final_params.get("connector_id") + final_parent_folder_id = final_params.get("parent_folder_id") + + if not final_name or not final_name.strip(): + return {"status": "error", "message": "File name cannot be empty."} + + if final_connector_id is not None: + result = await db_session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == final_connector_id, + SearchSourceConnector.search_space_id == search_space_id, + SearchSourceConnector.user_id == user_id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connector = result.scalars().first() + else: + connector = connectors[0] + + if not connector: + return {"status": "error", "message": "Selected OneDrive connector is invalid."} + + client = OneDriveClient(session=db_session, connector_id=connector.id) + created = await client.create_file( + name=final_name, + parent_id=final_parent_folder_id, + content=final_content, + ) + + logger.info(f"OneDrive file created: id={created.get('id')}, name={created.get('name')}") + + return { + "status": "success", + "file_id": created.get("id"), + "name": created.get("name"), + "web_url": created.get("webUrl"), + "message": f"Successfully created '{created.get('name')}' in OneDrive.", + } + + except Exception as e: + from langgraph.errors import GraphInterrupt + + if isinstance(e, GraphInterrupt): + raise + logger.error(f"Error creating OneDrive file: {e}", exc_info=True) + return { + "status": "error", + "message": "Something went wrong while creating the file. Please try again.", + } + + return create_onedrive_file diff --git a/surfsense_backend/app/agents/new_chat/tools/onedrive/trash_file.py b/surfsense_backend/app/agents/new_chat/tools/onedrive/trash_file.py new file mode 100644 index 000000000..8c7651858 --- /dev/null +++ b/surfsense_backend/app/agents/new_chat/tools/onedrive/trash_file.py @@ -0,0 +1,192 @@ +import logging +from typing import Any + +from langchain_core.tools import tool +from langgraph.types import interrupt +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.future import select + +from app.connectors.onedrive.client import OneDriveClient +from app.db import ( + Document, + DocumentType, + SearchSourceConnector, + SearchSourceConnectorType, +) + +logger = logging.getLogger(__name__) + + +def create_delete_onedrive_file_tool( + db_session: AsyncSession | None = None, + search_space_id: int | None = None, + user_id: str | None = None, +): + @tool + async def delete_onedrive_file( + file_name: str, + delete_from_kb: bool = False, + ) -> dict[str, Any]: + """Move a OneDrive file to the recycle bin. + + Use this tool when the user explicitly asks to delete, remove, or trash + a file in OneDrive. + + Args: + file_name: The exact name of the file to trash. + delete_from_kb: Whether to also remove the file from the knowledge base. + + Returns: + Dictionary with status, file_id, deleted_from_kb, and message. + """ + logger.info(f"delete_onedrive_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 {"status": "error", "message": "OneDrive tool not properly configured."} + + try: + from sqlalchemy import String, cast + + doc_result = await db_session.execute( + select(Document).where( + Document.search_space_id == search_space_id, + Document.document_type == DocumentType.ONEDRIVE_FILE, + Document.title == file_name, + ) + ) + document = doc_result.scalars().first() + + if not document: + doc_result = await db_session.execute( + select(Document).where( + Document.search_space_id == search_space_id, + Document.document_type == DocumentType.ONEDRIVE_FILE, + cast(Document.document_metadata["onedrive_file_name"], String) == file_name, + ) + ) + document = doc_result.scalars().first() + + if not document: + return {"status": "not_found", "message": f"File '{file_name}' not found in your OneDrive knowledge base."} + + meta = document.document_metadata or {} + file_id = meta.get("onedrive_file_id") + connector_id = meta.get("connector_id") + document_id = document.id + + if not file_id: + return {"status": "error", "message": "File ID is missing. Please re-index the file."} + + conn_result = await db_session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == connector_id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connector = conn_result.scalars().first() + if not connector: + return {"status": "error", "message": "OneDrive connector not found for this file."} + + cfg = connector.config or {} + if cfg.get("auth_expired"): + return { + "status": "auth_error", + "message": "OneDrive account needs re-authentication.", + "connector_type": "onedrive", + } + + context = { + "file": { + "file_id": file_id, + "name": file_name, + "document_id": document_id, + "web_url": meta.get("web_url"), + }, + "account": { + "id": connector.id, + "name": connector.name, + "user_email": cfg.get("user_email"), + }, + } + + approval = interrupt( + { + "type": "onedrive_file_trash", + "action": { + "tool": "delete_onedrive_file", + "params": { + "file_id": file_id, + "connector_id": connector_id, + "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: + return {"status": "error", "message": "No approval decision received"} + + decision = decisions[0] + decision_type = decision.get("type") or decision.get("decision_type") + + if decision_type == "reject": + return {"status": "rejected", "message": "User declined. The file was not trashed."} + + final_params: dict[str, Any] = {} + edited_action = decision.get("edited_action") + 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): + final_params = decision["args"] + + final_file_id = final_params.get("file_id", file_id) + final_connector_id = final_params.get("connector_id", connector_id) + final_delete_from_kb = final_params.get("delete_from_kb", delete_from_kb) + + client = OneDriveClient(session=db_session, connector_id=final_connector_id) + await client.trash_file(final_file_id) + + logger.info(f"OneDrive file deleted (moved to recycle bin): file_id={final_file_id}") + + trash_result: dict[str, Any] = { + "status": "success", + "file_id": final_file_id, + "message": f"Successfully moved '{file_name}' to the recycle bin.", + } + + deleted_from_kb = False + if final_delete_from_kb and document_id: + try: + doc_result = await db_session.execute( + select(Document).filter(Document.id == document_id) + ) + doc = doc_result.scalars().first() + if doc: + await db_session.delete(doc) + await db_session.commit() + deleted_from_kb = True + except Exception as e: + logger.error(f"Failed to delete document from KB: {e}") + await db_session.rollback() + + trash_result["deleted_from_kb"] = deleted_from_kb + if deleted_from_kb: + trash_result["message"] += " (also removed from knowledge base)" + + return trash_result + + except Exception as e: + from langgraph.errors import GraphInterrupt + + if isinstance(e, GraphInterrupt): + raise + logger.error(f"Error deleting OneDrive file: {e}", exc_info=True) + return {"status": "error", "message": "Something went wrong while trashing the file."} + + return delete_onedrive_file diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py index 7700d47d3..a8aa13230 100644 --- a/surfsense_backend/app/agents/new_chat/tools/registry.py +++ b/surfsense_backend/app/agents/new_chat/tools/registry.py @@ -83,6 +83,10 @@ from .notion import ( create_delete_notion_page_tool, create_update_notion_page_tool, ) +from .onedrive import ( + create_create_onedrive_file_tool, + create_delete_onedrive_file_tool, +) from .podcast import create_generate_podcast_tool from .report import create_generate_report_tool from .scrape_webpage import create_scrape_webpage_tool @@ -354,6 +358,30 @@ BUILTIN_TOOLS: list[ToolDefinition] = [ requires=["db_session", "search_space_id", "user_id"], ), # ========================================================================= + # ONEDRIVE TOOLS - create and trash files + # Auto-disabled when no OneDrive connector is configured (see chat_deepagent.py) + # ========================================================================= + ToolDefinition( + name="create_onedrive_file", + description="Create a new file in Microsoft OneDrive", + factory=lambda deps: create_create_onedrive_file_tool( + db_session=deps["db_session"], + search_space_id=deps["search_space_id"], + user_id=deps["user_id"], + ), + requires=["db_session", "search_space_id", "user_id"], + ), + ToolDefinition( + name="delete_onedrive_file", + description="Move a OneDrive file to the recycle bin", + factory=lambda deps: create_delete_onedrive_file_tool( + db_session=deps["db_session"], + search_space_id=deps["search_space_id"], + user_id=deps["user_id"], + ), + requires=["db_session", "search_space_id", "user_id"], + ), + # ========================================================================= # GOOGLE CALENDAR TOOLS - create, update, delete events # Auto-disabled when no Google Calendar connector is configured # ========================================================================= From bb894ee1586005342045519a0fc5188818e78766 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 16:35:36 +0530 Subject: [PATCH 029/163] chore: update environment variable names for Microsoft OAuth integration in Docker and SurfSense backend --- docker/.env.example | 5 +++++ surfsense_backend/.env.example | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docker/.env.example b/docker/.env.example index 766f92dcc..8345e7dd7 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -208,6 +208,11 @@ STT_SERVICE=local/base # TEAMS_CLIENT_SECRET= # TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback +# -- Microsoft OneDrive -- +# ONEDRIVE_CLIENT_ID= +# ONEDRIVE_CLIENT_SECRET= +# ONEDRIVE_REDIRECT_URI=http://localhost:8000/api/v1/auth/onedrive/connector/callback + # -- Composio -- # COMPOSIO_API_KEY= # COMPOSIO_ENABLED=TRUE diff --git a/surfsense_backend/.env.example b/surfsense_backend/.env.example index 94d5c8c9b..7a0b095e2 100644 --- a/surfsense_backend/.env.example +++ b/surfsense_backend/.env.example @@ -95,11 +95,16 @@ SLACK_CLIENT_ID=your_slack_client_id_here SLACK_CLIENT_SECRET=your_slack_client_secret_here SLACK_REDIRECT_URI=http://localhost:8000/api/v1/auth/slack/connector/callback -# Teams OAuth Configuration +# Microsoft Teams OAuth Configuration TEAMS_CLIENT_ID=your_teams_client_id_here TEAMS_CLIENT_SECRET=your_teams_client_secret_here TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback +# Microsoft OneDrive OAuth +ONEDRIVE_CLIENT_ID=your_onedrive_client_id_here +ONEDRIVE_CLIENT_SECRET=your_onedrive_client_secret_here +ONEDRIVE_REDIRECT_URI=http://localhost:8000/api/v1/auth/onedrive/connector/callback + # Composio Connector # NOTE: Disable "Mask Connected Account Secrets" in Composio dashboard (Settings → Project Settings) for Google indexing to work. COMPOSIO_API_KEY=your_api_key_here From 7004e764a994e411d0288615a9cbe318008850b3 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 16:37:23 +0530 Subject: [PATCH 030/163] chore: refactor Microsoft OAuth configuration to unify client ID and secret for Teams and OneDrive in environment files and related code --- docker/.env.example | 10 +++------- surfsense_backend/.env.example | 10 +++------- surfsense_backend/app/config/__init__.py | 10 +++------- .../app/connectors/onedrive/client.py | 4 ++-- .../app/routes/onedrive_add_connector_route.py | 14 +++++++------- .../app/routes/teams_add_connector_route.py | 12 ++++++------ 6 files changed, 24 insertions(+), 36 deletions(-) diff --git a/docker/.env.example b/docker/.env.example index 8345e7dd7..3fb02d612 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -203,14 +203,10 @@ STT_SERVICE=local/base # AIRTABLE_CLIENT_SECRET= # AIRTABLE_REDIRECT_URI=http://localhost:8000/api/v1/auth/airtable/connector/callback -# -- Microsoft Teams -- -# TEAMS_CLIENT_ID= -# TEAMS_CLIENT_SECRET= +# -- Microsoft OAuth (shared for Teams and OneDrive) -- +# MICROSOFT_CLIENT_ID= +# MICROSOFT_CLIENT_SECRET= # TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback - -# -- Microsoft OneDrive -- -# ONEDRIVE_CLIENT_ID= -# ONEDRIVE_CLIENT_SECRET= # ONEDRIVE_REDIRECT_URI=http://localhost:8000/api/v1/auth/onedrive/connector/callback # -- Composio -- diff --git a/surfsense_backend/.env.example b/surfsense_backend/.env.example index 7a0b095e2..0b2cda19b 100644 --- a/surfsense_backend/.env.example +++ b/surfsense_backend/.env.example @@ -95,14 +95,10 @@ SLACK_CLIENT_ID=your_slack_client_id_here SLACK_CLIENT_SECRET=your_slack_client_secret_here SLACK_REDIRECT_URI=http://localhost:8000/api/v1/auth/slack/connector/callback -# Microsoft Teams OAuth Configuration -TEAMS_CLIENT_ID=your_teams_client_id_here -TEAMS_CLIENT_SECRET=your_teams_client_secret_here +# Microsoft OAuth (shared for Teams and OneDrive) +MICROSOFT_CLIENT_ID=your_microsoft_client_id_here +MICROSOFT_CLIENT_SECRET=your_microsoft_client_secret_here TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback - -# Microsoft OneDrive OAuth -ONEDRIVE_CLIENT_ID=your_onedrive_client_id_here -ONEDRIVE_CLIENT_SECRET=your_onedrive_client_secret_here ONEDRIVE_REDIRECT_URI=http://localhost:8000/api/v1/auth/onedrive/connector/callback # Composio Connector diff --git a/surfsense_backend/app/config/__init__.py b/surfsense_backend/app/config/__init__.py index 70100bd0a..b38d7fd1d 100644 --- a/surfsense_backend/app/config/__init__.py +++ b/surfsense_backend/app/config/__init__.py @@ -281,14 +281,10 @@ class Config: DISCORD_REDIRECT_URI = os.getenv("DISCORD_REDIRECT_URI") DISCORD_BOT_TOKEN = os.getenv("DISCORD_BOT_TOKEN") - # Microsoft Teams OAuth - TEAMS_CLIENT_ID = os.getenv("TEAMS_CLIENT_ID") - TEAMS_CLIENT_SECRET = os.getenv("TEAMS_CLIENT_SECRET") + # Microsoft OAuth (shared for Teams and OneDrive) + MICROSOFT_CLIENT_ID = os.getenv("MICROSOFT_CLIENT_ID") + MICROSOFT_CLIENT_SECRET = os.getenv("MICROSOFT_CLIENT_SECRET") TEAMS_REDIRECT_URI = os.getenv("TEAMS_REDIRECT_URI") - - # Microsoft OneDrive OAuth - ONEDRIVE_CLIENT_ID = os.getenv("ONEDRIVE_CLIENT_ID") - ONEDRIVE_CLIENT_SECRET = os.getenv("ONEDRIVE_CLIENT_SECRET") ONEDRIVE_REDIRECT_URI = os.getenv("ONEDRIVE_REDIRECT_URI") # ClickUp OAuth diff --git a/surfsense_backend/app/connectors/onedrive/client.py b/surfsense_backend/app/connectors/onedrive/client.py index bb9fbb42b..0b90a1332 100644 --- a/surfsense_backend/app/connectors/onedrive/client.py +++ b/surfsense_backend/app/connectors/onedrive/client.py @@ -98,8 +98,8 @@ class OneDriveClient: async def _refresh_token(self, refresh_token: str) -> dict: data = { - "client_id": config.ONEDRIVE_CLIENT_ID, - "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, "grant_type": "refresh_token", "refresh_token": refresh_token, "scope": "offline_access User.Read Files.Read.All Files.ReadWrite.All", diff --git a/surfsense_backend/app/routes/onedrive_add_connector_route.py b/surfsense_backend/app/routes/onedrive_add_connector_route.py index 0494888d9..19bcbe6ff 100644 --- a/surfsense_backend/app/routes/onedrive_add_connector_route.py +++ b/surfsense_backend/app/routes/onedrive_add_connector_route.py @@ -78,7 +78,7 @@ async def connect_onedrive(space_id: int, user: User = Depends(current_active_us try: if not space_id: raise HTTPException(status_code=400, detail="space_id is required") - if not config.ONEDRIVE_CLIENT_ID: + if not config.MICROSOFT_CLIENT_ID: raise HTTPException(status_code=500, detail="Microsoft OneDrive OAuth not configured.") if not config.SECRET_KEY: raise HTTPException(status_code=500, detail="SECRET_KEY not configured for OAuth security.") @@ -87,7 +87,7 @@ async def connect_onedrive(space_id: int, user: User = Depends(current_active_us state_encoded = state_manager.generate_secure_state(space_id, user.id) auth_params = { - "client_id": config.ONEDRIVE_CLIENT_ID, + "client_id": config.MICROSOFT_CLIENT_ID, "response_type": "code", "redirect_uri": config.ONEDRIVE_REDIRECT_URI, "response_mode": "query", @@ -138,7 +138,7 @@ async def reauth_onedrive( state_encoded = state_manager.generate_secure_state(space_id, user.id, **extra) auth_params = { - "client_id": config.ONEDRIVE_CLIENT_ID, + "client_id": config.MICROSOFT_CLIENT_ID, "response_type": "code", "redirect_uri": config.ONEDRIVE_REDIRECT_URI, "response_mode": "query", @@ -200,8 +200,8 @@ async def onedrive_callback( reauth_return_url = data.get("return_url") token_data = { - "client_id": config.ONEDRIVE_CLIENT_ID, - "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, "code": code, "redirect_uri": config.ONEDRIVE_REDIRECT_URI, "grant_type": "authorization_code", @@ -416,8 +416,8 @@ async def refresh_onedrive_token( raise HTTPException(status_code=400, detail=f"No refresh token available for connector {connector.id}") refresh_data = { - "client_id": config.ONEDRIVE_CLIENT_ID, - "client_secret": config.ONEDRIVE_CLIENT_SECRET, + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, "grant_type": "refresh_token", "refresh_token": refresh_token, "scope": " ".join(SCOPES), diff --git a/surfsense_backend/app/routes/teams_add_connector_route.py b/surfsense_backend/app/routes/teams_add_connector_route.py index 77ce4965e..4442307ba 100644 --- a/surfsense_backend/app/routes/teams_add_connector_route.py +++ b/surfsense_backend/app/routes/teams_add_connector_route.py @@ -88,7 +88,7 @@ async def connect_teams(space_id: int, user: User = Depends(current_active_user) if not space_id: raise HTTPException(status_code=400, detail="space_id is required") - if not config.TEAMS_CLIENT_ID: + if not config.MICROSOFT_CLIENT_ID: raise HTTPException( status_code=500, detail="Microsoft Teams OAuth not configured." ) @@ -106,7 +106,7 @@ async def connect_teams(space_id: int, user: User = Depends(current_active_user) from urllib.parse import urlencode auth_params = { - "client_id": config.TEAMS_CLIENT_ID, + "client_id": config.MICROSOFT_CLIENT_ID, "response_type": "code", "redirect_uri": config.TEAMS_REDIRECT_URI, "response_mode": "query", @@ -181,8 +181,8 @@ async def teams_callback( # Exchange authorization code for access token token_data = { - "client_id": config.TEAMS_CLIENT_ID, - "client_secret": config.TEAMS_CLIENT_SECRET, + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, "code": code, "redirect_uri": config.TEAMS_REDIRECT_URI, "grant_type": "authorization_code", @@ -403,8 +403,8 @@ async def refresh_teams_token( # Microsoft uses oauth2/v2.0/token for token refresh refresh_data = { - "client_id": config.TEAMS_CLIENT_ID, - "client_secret": config.TEAMS_CLIENT_SECRET, + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, "grant_type": "refresh_token", "refresh_token": refresh_token, "scope": " ".join(SCOPES), From 028c88be72c1d0fea5b110de2a1ef57dc6d1261b Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 16:39:47 +0530 Subject: [PATCH 031/163] feat: add integration and unit tests for OneDrive indexing pipeline and parallel downloads --- docker/.env.example | 2 +- surfsense_backend/.env.example | 4 +- .../test_onedrive_pipeline.py | 100 ++++++++ .../test_onedrive_parallel.py | 227 ++++++++++++++++++ 4 files changed, 330 insertions(+), 3 deletions(-) create mode 100644 surfsense_backend/tests/integration/indexing_pipeline/test_onedrive_pipeline.py create mode 100644 surfsense_backend/tests/unit/connector_indexers/test_onedrive_parallel.py diff --git a/docker/.env.example b/docker/.env.example index 3fb02d612..8297aae44 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -203,7 +203,7 @@ STT_SERVICE=local/base # AIRTABLE_CLIENT_SECRET= # AIRTABLE_REDIRECT_URI=http://localhost:8000/api/v1/auth/airtable/connector/callback -# -- Microsoft OAuth (shared for Teams and OneDrive) -- +# -- Microsoft OAuth (Teams & OneDrive) -- # MICROSOFT_CLIENT_ID= # MICROSOFT_CLIENT_SECRET= # TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback diff --git a/surfsense_backend/.env.example b/surfsense_backend/.env.example index 0b2cda19b..0361e2467 100644 --- a/surfsense_backend/.env.example +++ b/surfsense_backend/.env.example @@ -74,7 +74,7 @@ DISCORD_CLIENT_SECRET=your_discord_client_secret_here DISCORD_REDIRECT_URI=http://localhost:8000/api/v1/auth/discord/connector/callback DISCORD_BOT_TOKEN=your_bot_token_from_developer_portal -# Atlassian OAuth Configuration +# Atlassian OAuth Configuration (Jira & Confluence) ATLASSIAN_CLIENT_ID=your_atlassian_client_id_here ATLASSIAN_CLIENT_SECRET=your_atlassian_client_secret_here JIRA_REDIRECT_URI=http://localhost:8000/api/v1/auth/jira/connector/callback @@ -95,7 +95,7 @@ SLACK_CLIENT_ID=your_slack_client_id_here SLACK_CLIENT_SECRET=your_slack_client_secret_here SLACK_REDIRECT_URI=http://localhost:8000/api/v1/auth/slack/connector/callback -# Microsoft OAuth (shared for Teams and OneDrive) +# Microsoft OAuth (Teams & OneDrive) MICROSOFT_CLIENT_ID=your_microsoft_client_id_here MICROSOFT_CLIENT_SECRET=your_microsoft_client_secret_here TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback diff --git a/surfsense_backend/tests/integration/indexing_pipeline/test_onedrive_pipeline.py b/surfsense_backend/tests/integration/indexing_pipeline/test_onedrive_pipeline.py new file mode 100644 index 000000000..ee83795a5 --- /dev/null +++ b/surfsense_backend/tests/integration/indexing_pipeline/test_onedrive_pipeline.py @@ -0,0 +1,100 @@ +"""Integration tests: OneDrive ConnectorDocuments flow through the pipeline.""" + +import pytest +from sqlalchemy import select + +from app.config import config as app_config +from app.db import Document, DocumentStatus, DocumentType +from app.indexing_pipeline.connector_document import ConnectorDocument +from app.indexing_pipeline.indexing_pipeline_service import IndexingPipelineService + +_EMBEDDING_DIM = app_config.embedding_model_instance.dimension + +pytestmark = pytest.mark.integration + + +def _onedrive_doc(*, unique_id: str, search_space_id: int, connector_id: int, user_id: str) -> ConnectorDocument: + return ConnectorDocument( + title=f"File {unique_id}.docx", + source_markdown=f"## Document\n\nContent from {unique_id}", + unique_id=unique_id, + document_type=DocumentType.ONEDRIVE_FILE, + search_space_id=search_space_id, + connector_id=connector_id, + created_by_id=user_id, + should_summarize=True, + fallback_summary=f"File: {unique_id}.docx", + metadata={ + "onedrive_file_id": unique_id, + "onedrive_file_name": f"{unique_id}.docx", + "document_type": "OneDrive File", + }, + ) + + +@pytest.mark.usefixtures("patched_summarize", "patched_embed_texts", "patched_chunk_text") +async def test_onedrive_pipeline_creates_ready_document( + db_session, db_search_space, db_connector, db_user, mocker +): + """A OneDrive ConnectorDocument flows through prepare + index to a READY document.""" + space_id = db_search_space.id + doc = _onedrive_doc( + unique_id="od-file-abc", + search_space_id=space_id, + connector_id=db_connector.id, + user_id=str(db_user.id), + ) + + service = IndexingPipelineService(session=db_session) + prepared = await service.prepare_for_indexing([doc]) + assert len(prepared) == 1 + + await service.index(prepared[0], doc, llm=mocker.Mock()) + + result = await db_session.execute( + select(Document).filter(Document.search_space_id == space_id) + ) + row = result.scalars().first() + + assert row is not None + assert row.document_type == DocumentType.ONEDRIVE_FILE + assert DocumentStatus.is_state(row.status, DocumentStatus.READY) + + +@pytest.mark.usefixtures("patched_summarize", "patched_embed_texts", "patched_chunk_text") +async def test_onedrive_duplicate_content_skipped( + db_session, db_search_space, db_connector, db_user, mocker +): + """Re-indexing a OneDrive doc with the same content is skipped (content hash match).""" + space_id = db_search_space.id + user_id = str(db_user.id) + + doc = _onedrive_doc( + unique_id="od-dup-file", + search_space_id=space_id, + connector_id=db_connector.id, + user_id=user_id, + ) + + service = IndexingPipelineService(session=db_session) + + prepared = await service.prepare_for_indexing([doc]) + assert len(prepared) == 1 + await service.index(prepared[0], doc, llm=mocker.Mock()) + + result = await db_session.execute( + select(Document).filter(Document.search_space_id == space_id) + ) + first_doc = result.scalars().first() + assert first_doc is not None + first_id = first_doc.id + + doc2 = _onedrive_doc( + unique_id="od-dup-file", + search_space_id=space_id, + connector_id=db_connector.id, + user_id=user_id, + ) + + prepared2 = await service.prepare_for_indexing([doc2]) + assert len(prepared2) == 0 or (len(prepared2) == 1 and prepared2[0].existing_document is not None) diff --git a/surfsense_backend/tests/unit/connector_indexers/test_onedrive_parallel.py b/surfsense_backend/tests/unit/connector_indexers/test_onedrive_parallel.py new file mode 100644 index 000000000..b5c774c6f --- /dev/null +++ b/surfsense_backend/tests/unit/connector_indexers/test_onedrive_parallel.py @@ -0,0 +1,227 @@ +"""Tests for parallel download + indexing in the OneDrive indexer.""" + +import asyncio +from unittest.mock import AsyncMock, MagicMock + +import pytest + +from app.db import DocumentType +from app.tasks.connector_indexers.onedrive_indexer import ( + _download_files_parallel, +) + +pytestmark = pytest.mark.unit + +_USER_ID = "00000000-0000-0000-0000-000000000001" +_CONNECTOR_ID = 42 +_SEARCH_SPACE_ID = 1 + + +def _make_file_dict(file_id: str, name: str, mime: str = "text/plain") -> dict: + return { + "id": file_id, + "name": name, + "file": {"mimeType": mime}, + "lastModifiedDateTime": "2026-01-01T00:00:00Z", + } + + +def _mock_extract_ok(file_id: str, file_name: str): + return ( + f"# Content of {file_name}", + {"onedrive_file_id": file_id, "onedrive_file_name": file_name}, + None, + ) + + +@pytest.fixture +def mock_onedrive_client(): + return MagicMock() + + +@pytest.fixture +def patch_extract(monkeypatch): + def _patch(side_effect=None, return_value=None): + mock = AsyncMock(side_effect=side_effect, return_value=return_value) + monkeypatch.setattr( + "app.tasks.connector_indexers.onedrive_indexer.download_and_extract_content", + mock, + ) + return mock + return _patch + + +# Slice 1: Tracer bullet +async def test_single_file_returns_one_connector_document( + mock_onedrive_client, patch_extract, +): + patch_extract(return_value=_mock_extract_ok("f1", "test.txt")) + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + [_make_file_dict("f1", "test.txt")], + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + ) + + assert len(docs) == 1 + assert failed == 0 + assert docs[0].title == "test.txt" + assert docs[0].unique_id == "f1" + assert docs[0].document_type == DocumentType.ONEDRIVE_FILE + + +# Slice 2: Multiple files all produce documents +async def test_multiple_files_all_produce_documents( + mock_onedrive_client, patch_extract, +): + files = [_make_file_dict(f"f{i}", f"file{i}.txt") for i in range(3)] + patch_extract( + side_effect=[_mock_extract_ok(f"f{i}", f"file{i}.txt") for i in range(3)] + ) + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + files, + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + ) + + assert len(docs) == 3 + assert failed == 0 + assert {d.unique_id for d in docs} == {"f0", "f1", "f2"} + + +# Slice 3: Error isolation +async def test_one_download_exception_does_not_block_others( + mock_onedrive_client, patch_extract, +): + files = [_make_file_dict(f"f{i}", f"file{i}.txt") for i in range(3)] + patch_extract( + side_effect=[ + _mock_extract_ok("f0", "file0.txt"), + RuntimeError("network timeout"), + _mock_extract_ok("f2", "file2.txt"), + ] + ) + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + files, + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + ) + + assert len(docs) == 2 + assert failed == 1 + assert {d.unique_id for d in docs} == {"f0", "f2"} + + +# Slice 4: ETL error counts as download failure +async def test_etl_error_counts_as_download_failure( + mock_onedrive_client, patch_extract, +): + files = [_make_file_dict("f0", "good.txt"), _make_file_dict("f1", "bad.txt")] + patch_extract( + side_effect=[ + _mock_extract_ok("f0", "good.txt"), + (None, {}, "ETL failed"), + ] + ) + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + files, + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + ) + + assert len(docs) == 1 + assert failed == 1 + + +# Slice 5: Semaphore bound +async def test_concurrency_bounded_by_semaphore( + mock_onedrive_client, monkeypatch, +): + lock = asyncio.Lock() + active = 0 + peak = 0 + + async def _slow_extract(client, file): + nonlocal active, peak + async with lock: + active += 1 + peak = max(peak, active) + await asyncio.sleep(0.05) + async with lock: + active -= 1 + return _mock_extract_ok(file["id"], file["name"]) + + monkeypatch.setattr( + "app.tasks.connector_indexers.onedrive_indexer.download_and_extract_content", + _slow_extract, + ) + + files = [_make_file_dict(f"f{i}", f"file{i}.txt") for i in range(6)] + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + files, + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + max_concurrency=2, + ) + + assert len(docs) == 6 + assert failed == 0 + assert peak <= 2, f"Peak concurrency was {peak}, expected <= 2" + + +# Slice 6: Heartbeat fires +async def test_heartbeat_fires_during_parallel_downloads( + mock_onedrive_client, monkeypatch, +): + import app.tasks.connector_indexers.onedrive_indexer as _mod + + monkeypatch.setattr(_mod, "HEARTBEAT_INTERVAL_SECONDS", 0) + + async def _slow_extract(client, file): + await asyncio.sleep(0.05) + return _mock_extract_ok(file["id"], file["name"]) + + monkeypatch.setattr( + "app.tasks.connector_indexers.onedrive_indexer.download_and_extract_content", + _slow_extract, + ) + + heartbeat_calls: list[int] = [] + + async def _on_heartbeat(count: int): + heartbeat_calls.append(count) + + files = [_make_file_dict(f"f{i}", f"file{i}.txt") for i in range(3)] + + docs, failed = await _download_files_parallel( + mock_onedrive_client, + files, + connector_id=_CONNECTOR_ID, + search_space_id=_SEARCH_SPACE_ID, + user_id=_USER_ID, + enable_summary=True, + on_heartbeat=_on_heartbeat, + ) + + assert len(docs) == 3 + assert failed == 0 + assert len(heartbeat_calls) >= 1, "Heartbeat should have fired at least once" From 147061284b912a5250c8448d86c5875afb63503d Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 17:00:52 +0530 Subject: [PATCH 032/163] feat: integrate OneDrive connector with UI components and configuration options --- .../(manage)/components/DocumentTypeIcon.tsx | 1 + .../components/onedrive-config.tsx | 443 ++++++++++++++++++ .../connector-configs/index.tsx | 3 + .../views/connector-edit-view.tsx | 1 + .../constants/connector-constants.ts | 7 + .../hooks/use-connector-dialog.ts | 23 +- .../views/connector-accounts-list-view.tsx | 1 + .../components/assistant-ui/thread.tsx | 6 + surfsense_web/contracts/enums/connector.ts | 1 + .../contracts/enums/connectorIcons.tsx | 5 + .../lib/apis/connectors-api.service.ts | 13 + surfsense_web/lib/chat/streaming-state.ts | 21 +- surfsense_web/lib/connectors/utils.ts | 1 + 13 files changed, 516 insertions(+), 10 deletions(-) create mode 100644 surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx diff --git a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx index 25eeb4cab..3cd1fffe6 100644 --- a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx +++ b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx @@ -16,6 +16,7 @@ export function getDocumentTypeLabel(type: string): string { FILE: "File", SLACK_CONNECTOR: "Slack", TEAMS_CONNECTOR: "Microsoft Teams", + ONEDRIVE_FILE: "OneDrive", NOTION_CONNECTOR: "Notion", YOUTUBE_VIDEO: "YouTube Video", GITHUB_CONNECTOR: "GitHub", diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx new file mode 100644 index 000000000..e5f6caf06 --- /dev/null +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx @@ -0,0 +1,443 @@ +"use client"; + +import { + ChevronRight, + File, + FileSpreadsheet, + FileText, + FolderClosed, + FolderOpen, + Image, + Presentation, + X, +} from "lucide-react"; +import type { FC } from "react"; +import { useCallback, useEffect, useState } from "react"; +import { Button } from "@/components/ui/button"; +import { Checkbox } from "@/components/ui/checkbox"; +import { Label } from "@/components/ui/label"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@/components/ui/select"; +import { Spinner } from "@/components/ui/spinner"; +import { Switch } from "@/components/ui/switch"; +import { useAuth } from "@/context/AuthContext"; +import type { ConnectorConfigProps } from "../index"; + +interface SelectedItem { + id: string; + name: string; +} + +interface IndexingOptions { + max_files_per_folder: number; + incremental_sync: boolean; + include_subfolders: boolean; +} + +interface OneDriveItem { + id: string; + name: string; + isFolder: boolean; + size?: number; + lastModifiedDateTime?: string; + file?: { mimeType: string }; + folder?: { childCount: number }; + webUrl?: string; +} + +const DEFAULT_INDEXING_OPTIONS: IndexingOptions = { + max_files_per_folder: 100, + incremental_sync: true, + include_subfolders: true, +}; + +function getFileIconFromName(fileName: string, className = "size-3.5 shrink-0") { + const lowerName = fileName.toLowerCase(); + if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls") || lowerName.endsWith(".csv")) { + return ; + } + if (lowerName.endsWith(".pptx") || lowerName.endsWith(".ppt")) { + return ; + } + if (lowerName.endsWith(".docx") || lowerName.endsWith(".doc") || lowerName.endsWith(".txt")) { + return ; + } + if (/\.(png|jpe?g|gif|webp|svg)$/.test(lowerName)) { + return ; + } + return ; +} + +export const OneDriveConfig: FC = ({ connector, onConfigChange }) => { + const { authenticatedFetch } = useAuth(); + const existingFolders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; + const existingFiles = (connector.config?.selected_files as SelectedItem[] | undefined) || []; + const existingIndexingOptions = + (connector.config?.indexing_options as IndexingOptions | undefined) || DEFAULT_INDEXING_OPTIONS; + + const [selectedFolders, setSelectedFolders] = useState(existingFolders); + const [selectedFiles, setSelectedFiles] = useState(existingFiles); + const [indexingOptions, setIndexingOptions] = useState(existingIndexingOptions); + + const [browserOpen, setBrowserOpen] = useState(false); + const [browseItems, setBrowseItems] = useState([]); + const [browseLoading, setBrowseLoading] = useState(false); + const [browseError, setBrowseError] = useState(null); + const [breadcrumbs, setBreadcrumbs] = useState<{ id: string; name: string }[]>([ + { id: "root", name: "My files" }, + ]); + + useEffect(() => { + const folders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; + const files = (connector.config?.selected_files as SelectedItem[] | undefined) || []; + const options = + (connector.config?.indexing_options as IndexingOptions | undefined) || DEFAULT_INDEXING_OPTIONS; + setSelectedFolders(folders); + setSelectedFiles(files); + setIndexingOptions(options); + }, [connector.config]); + + const updateConfig = useCallback( + (folders: SelectedItem[], files: SelectedItem[], options: IndexingOptions) => { + if (onConfigChange) { + onConfigChange({ + ...connector.config, + selected_folders: folders, + selected_files: files, + indexing_options: options, + }); + } + }, + [onConfigChange, connector.config], + ); + + const fetchFolderContents = useCallback( + async (parentId: string) => { + setBrowseLoading(true); + setBrowseError(null); + try { + const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000"; + const url = `${backendUrl}/api/v1/connectors/${connector.id}/onedrive/folders?parent_id=${encodeURIComponent(parentId)}`; + const response = await authenticatedFetch(url); + if (!response.ok) { + const data = await response.json().catch(() => ({})); + throw new Error(data.detail || `Failed to load folder contents (${response.status})`); + } + const data = await response.json(); + setBrowseItems(data.items || []); + } catch (err: unknown) { + const message = err instanceof Error ? err.message : "Failed to load folder contents"; + setBrowseError(message); + } finally { + setBrowseLoading(false); + } + }, + [connector.id, authenticatedFetch], + ); + + const handleOpenBrowser = useCallback(() => { + setBrowserOpen(true); + setBreadcrumbs([{ id: "root", name: "My files" }]); + fetchFolderContents("root"); + }, [fetchFolderContents]); + + const handleNavigateFolder = useCallback( + (folderId: string, folderName: string) => { + setBreadcrumbs((prev) => [...prev, { id: folderId, name: folderName }]); + fetchFolderContents(folderId); + }, + [fetchFolderContents], + ); + + const handleBreadcrumbClick = useCallback( + (index: number) => { + const newBreadcrumbs = breadcrumbs.slice(0, index + 1); + setBreadcrumbs(newBreadcrumbs); + fetchFolderContents(newBreadcrumbs[newBreadcrumbs.length - 1].id); + }, + [breadcrumbs, fetchFolderContents], + ); + + const isItemSelected = useCallback( + (item: OneDriveItem) => { + if (item.isFolder) { + return selectedFolders.some((f) => f.id === item.id); + } + return selectedFiles.some((f) => f.id === item.id); + }, + [selectedFolders, selectedFiles], + ); + + const handleToggleItem = useCallback( + (item: OneDriveItem) => { + if (item.isFolder) { + const exists = selectedFolders.some((f) => f.id === item.id); + const newFolders = exists + ? selectedFolders.filter((f) => f.id !== item.id) + : [...selectedFolders, { id: item.id, name: item.name }]; + setSelectedFolders(newFolders); + updateConfig(newFolders, selectedFiles, indexingOptions); + } else { + const exists = selectedFiles.some((f) => f.id === item.id); + const newFiles = exists + ? selectedFiles.filter((f) => f.id !== item.id) + : [...selectedFiles, { id: item.id, name: item.name }]; + setSelectedFiles(newFiles); + updateConfig(selectedFolders, newFiles, indexingOptions); + } + }, + [selectedFolders, selectedFiles, indexingOptions, updateConfig], + ); + + const handleRemoveFolder = (folderId: string) => { + const newFolders = selectedFolders.filter((f) => f.id !== folderId); + setSelectedFolders(newFolders); + updateConfig(newFolders, selectedFiles, indexingOptions); + }; + + const handleRemoveFile = (fileId: string) => { + const newFiles = selectedFiles.filter((f) => f.id !== fileId); + setSelectedFiles(newFiles); + updateConfig(selectedFolders, newFiles, indexingOptions); + }; + + const handleIndexingOptionChange = (key: keyof IndexingOptions, value: number | boolean) => { + const newOptions = { ...indexingOptions, [key]: value }; + setIndexingOptions(newOptions); + updateConfig(selectedFolders, selectedFiles, newOptions); + }; + + const isAuthExpired = connector.config?.auth_expired === true; + const totalSelected = selectedFolders.length + selectedFiles.length; + + return ( +
+ {/* Folder & File Selection */} +
+
+

Folder & File Selection

+

+ Browse and select specific folders and/or files to index from your OneDrive. +

+
+ + {totalSelected > 0 && ( +
+

+ Selected {totalSelected} item{totalSelected > 1 ? "s" : ""} +

+
+ {selectedFolders.map((folder) => ( +
+ + {folder.name} + +
+ ))} + {selectedFiles.map((file) => ( +
+ {getFileIconFromName(file.name)} + {file.name} + +
+ ))} +
+
+ )} + + {!browserOpen ? ( + + ) : ( +
+ {/* Breadcrumbs */} +
+ {breadcrumbs.map((crumb, index) => ( + + {index > 0 && } + + + ))} +
+ + {/* File list */} +
+ {browseLoading ? ( +
+ +
+ ) : browseError ? ( +
{browseError}
+ ) : browseItems.length === 0 ? ( +
This folder is empty
+ ) : ( + browseItems.map((item) => ( +
+ handleToggleItem(item)} + className="size-3.5" + /> + {item.isFolder ? ( + + ) : ( +
+ {getFileIconFromName(item.name)} + {item.name} +
+ )} +
+ )) + )} +
+ +
+ +
+
+ )} + + {isAuthExpired && ( +

+ Your OneDrive authentication has expired. Please re-authenticate using the button below. +

+ )} +
+ + {/* Indexing Options */} +
+
+

Indexing Options

+

+ Configure how files are indexed from your OneDrive. +

+
+ +
+
+
+ +

+ Maximum number of files to index from each folder +

+
+ +
+
+ +
+
+ +

+ Only sync changes since last index (faster). Disable for a full re-index. +

+
+ handleIndexingOptionChange("incremental_sync", checked)} + /> +
+ +
+
+ +

+ Recursively index files in subfolders of selected folders +

+
+ handleIndexingOptionChange("include_subfolders", checked)} + /> +
+
+
+ ); +}; diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx index cef0c99ac..ba43ce823 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx @@ -21,6 +21,7 @@ import { MCPConfig } from "./components/mcp-config"; import { ObsidianConfig } from "./components/obsidian-config"; import { SlackConfig } from "./components/slack-config"; import { TavilyApiConfig } from "./components/tavily-api-config"; +import { OneDriveConfig } from "./components/onedrive-config"; import { TeamsConfig } from "./components/teams-config"; import { WebcrawlerConfig } from "./components/webcrawler-config"; @@ -58,6 +59,8 @@ export function getConnectorConfigComponent( return DiscordConfig; case "TEAMS_CONNECTOR": return TeamsConfig; + case "ONEDRIVE_CONNECTOR": + return OneDriveConfig; case "CONFLUENCE_CONNECTOR": return ConfluenceConfig; case "BOOKSTACK_CONNECTOR": diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx index 93d280a15..e50f61692 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx @@ -27,6 +27,7 @@ const REAUTH_ENDPOINTS: Partial> = { [EnumConnectorName.COMPOSIO_GOOGLE_DRIVE_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", [EnumConnectorName.COMPOSIO_GMAIL_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", [EnumConnectorName.COMPOSIO_GOOGLE_CALENDAR_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", + [EnumConnectorName.ONEDRIVE_CONNECTOR]: "/api/v1/auth/onedrive/connector/reauth", }; interface ConnectorEditViewProps { diff --git a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts index ab69d4ca2..969ae1897 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts +++ b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts @@ -61,6 +61,13 @@ export const OAUTH_CONNECTORS = [ connectorType: EnumConnectorName.TEAMS_CONNECTOR, authEndpoint: "/api/v1/auth/teams/connector/add/", }, + { + id: "onedrive-connector", + title: "OneDrive", + description: "Search your OneDrive files", + connectorType: EnumConnectorName.ONEDRIVE_CONNECTOR, + authEndpoint: "/api/v1/auth/onedrive/connector/add/", + }, { id: "discord-connector", title: "Discord", diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts index 03d8a8fb4..0ee34d7c2 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts +++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts @@ -729,10 +729,11 @@ export const useConnectorDialog = () => { async (refreshConnectors: () => void) => { if (!indexingConfig || !searchSpaceId) return; - // Validate date range (skip for Google Drive, Composio Drive, and Webcrawler) + // Validate date range (skip for Google Drive, Composio Drive, OneDrive, and Webcrawler) if ( indexingConfig.connectorType !== "GOOGLE_DRIVE_CONNECTOR" && indexingConfig.connectorType !== "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" && + indexingConfig.connectorType !== "ONEDRIVE_CONNECTOR" && indexingConfig.connectorType !== "WEBCRAWLER_CONNECTOR" ) { const dateRangeValidation = dateRangeSchema.safeParse({ startDate, endDate }); @@ -778,10 +779,11 @@ export const useConnectorDialog = () => { }); } - // Handle Google Drive folder selection (regular and Composio) - if ( - (indexingConfig.connectorType === "GOOGLE_DRIVE_CONNECTOR" || - indexingConfig.connectorType === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR") && + // Handle Google Drive / OneDrive folder selection (regular and Composio) + if ( + (indexingConfig.connectorType === "GOOGLE_DRIVE_CONNECTOR" || + indexingConfig.connectorType === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" || + indexingConfig.connectorType === "ONEDRIVE_CONNECTOR") && indexingConnectorConfig ) { const selectedFolders = indexingConnectorConfig.selected_folders as @@ -967,10 +969,11 @@ export const useConnectorDialog = () => { async (refreshConnectors: () => void) => { if (!editingConnector || !searchSpaceId || isSaving) return; - // Validate date range (skip for Google Drive which uses folder selection, Webcrawler which uses config, and non-indexable connectors) + // Validate date range (skip for Google Drive/OneDrive which uses folder selection, Webcrawler which uses config, and non-indexable connectors) if ( editingConnector.is_indexable && editingConnector.connector_type !== "GOOGLE_DRIVE_CONNECTOR" && + editingConnector.connector_type !== "ONEDRIVE_CONNECTOR" && editingConnector.connector_type !== "WEBCRAWLER_CONNECTOR" ) { const dateRangeValidation = dateRangeSchema.safeParse({ startDate, endDate }); @@ -986,11 +989,12 @@ export const useConnectorDialog = () => { return; } - // Prevent periodic indexing for Google Drive (regular or Composio) without folders/files selected + // Prevent periodic indexing for Google Drive / OneDrive (regular or Composio) without folders/files selected if ( periodicEnabled && (editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" || - editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR") + editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" || + editingConnector.connector_type === "ONEDRIVE_CONNECTOR") ) { const selectedFolders = (connectorConfig || editingConnector.config)?.selected_folders as | Array<{ id: string; name: string }> @@ -1043,7 +1047,8 @@ export const useConnectorDialog = () => { indexingDescription = "Settings saved."; } else if ( editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" || - editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" + editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" || + editingConnector.connector_type === "ONEDRIVE_CONNECTOR" ) { // Google Drive (both regular and Composio) uses folder selection from config, not date ranges const selectedFolders = (connectorConfig || editingConnector.config)?.selected_folders as diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx index da6ad8540..8a1a78807 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx @@ -25,6 +25,7 @@ const REAUTH_ENDPOINTS: Partial> = { [EnumConnectorName.COMPOSIO_GOOGLE_DRIVE_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", [EnumConnectorName.COMPOSIO_GMAIL_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", [EnumConnectorName.COMPOSIO_GOOGLE_CALENDAR_CONNECTOR]: "/api/v1/auth/composio/connector/reauth", + [EnumConnectorName.ONEDRIVE_CONNECTOR]: "/api/v1/auth/onedrive/connector/reauth", [EnumConnectorName.JIRA_CONNECTOR]: "/api/v1/auth/jira/connector/reauth", [EnumConnectorName.CONFLUENCE_CONNECTOR]: "/api/v1/auth/confluence/connector/reauth", }; diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx index 1644b0163..ba3883adf 100644 --- a/surfsense_web/components/assistant-ui/thread.tsx +++ b/surfsense_web/components/assistant-ui/thread.tsx @@ -1090,6 +1090,12 @@ const TOOL_GROUPS: ToolGroup[] = [ connectorIcon: "google_drive", tooltip: "Create and delete files in Google Drive.", }, + { + label: "OneDrive", + tools: ["create_onedrive_file", "delete_onedrive_file"], + connectorIcon: "onedrive", + tooltip: "Create and delete files in OneDrive.", + }, { label: "Notion", tools: ["create_notion_page", "update_notion_page", "delete_notion_page"], diff --git a/surfsense_web/contracts/enums/connector.ts b/surfsense_web/contracts/enums/connector.ts index 45b13a20b..36d39f4fc 100644 --- a/surfsense_web/contracts/enums/connector.ts +++ b/surfsense_web/contracts/enums/connector.ts @@ -6,6 +6,7 @@ export enum EnumConnectorName { BAIDU_SEARCH_API = "BAIDU_SEARCH_API", SLACK_CONNECTOR = "SLACK_CONNECTOR", TEAMS_CONNECTOR = "TEAMS_CONNECTOR", + ONEDRIVE_CONNECTOR = "ONEDRIVE_CONNECTOR", NOTION_CONNECTOR = "NOTION_CONNECTOR", GITHUB_CONNECTOR = "GITHUB_CONNECTOR", LINEAR_CONNECTOR = "LINEAR_CONNECTOR", diff --git a/surfsense_web/contracts/enums/connectorIcons.tsx b/surfsense_web/contracts/enums/connectorIcons.tsx index c9375a5ca..19b24cd59 100644 --- a/surfsense_web/contracts/enums/connectorIcons.tsx +++ b/surfsense_web/contracts/enums/connectorIcons.tsx @@ -39,6 +39,8 @@ export const getConnectorIcon = (connectorType: EnumConnectorName | string, clas return Slack; case EnumConnectorName.TEAMS_CONNECTOR: return Microsoft Teams; + case EnumConnectorName.ONEDRIVE_CONNECTOR: + return OneDrive; case EnumConnectorName.NOTION_CONNECTOR: return Notion; case EnumConnectorName.DISCORD_CONNECTOR: @@ -98,6 +100,9 @@ export const getConnectorIcon = (connectorType: EnumConnectorName | string, clas return ; case "GOOGLE_DRIVE_FILE": return Google Drive; + case "ONEDRIVE_FILE": + case "ONEDRIVE_CONNECTOR": + return OneDrive; case "COMPOSIO_GOOGLE_DRIVE_CONNECTOR": return Google Drive; case "COMPOSIO_GMAIL_CONNECTOR": diff --git a/surfsense_web/lib/apis/connectors-api.service.ts b/surfsense_web/lib/apis/connectors-api.service.ts index fafe1a8fa..062d3b780 100644 --- a/surfsense_web/lib/apis/connectors-api.service.ts +++ b/surfsense_web/lib/apis/connectors-api.service.ts @@ -277,6 +277,19 @@ class ConnectorsApiService { }>(`/api/v1/connectors/${connectorId}/drive-picker-token`); }; + /** + * List OneDrive folders and files + */ + listOneDriveFolders = async (request: { connector_id: number; parent_id?: string }) => { + const queryParams = request.parent_id + ? `?parent_id=${encodeURIComponent(request.parent_id)}` + : ""; + return baseApiService.get( + `/api/v1/connectors/${request.connector_id}/onedrive/folders${queryParams}`, + listGoogleDriveFoldersResponse + ); + }; + // ============================================================================= // MCP Connector Methods // ============================================================================= diff --git a/surfsense_web/lib/chat/streaming-state.ts b/surfsense_web/lib/chat/streaming-state.ts index cd0a4d7f6..71965a2cb 100644 --- a/surfsense_web/lib/chat/streaming-state.ts +++ b/surfsense_web/lib/chat/streaming-state.ts @@ -132,11 +132,30 @@ export function buildContentForPersistence( return parts.length > 0 ? parts : [{ type: "text", text: "" }]; } +export type SSEEvent = + | { type: "text-delta"; delta: string } + | { type: "tool-input-start"; toolCallId: string; toolName: string } + | { + type: "tool-input-available"; + toolCallId: string; + toolName: string; + input: Record; + } + | { + type: "tool-output-available"; + toolCallId: string; + output: Record; + } + | { type: "data-thinking-step"; data: ThinkingStepData } + | { type: "data-thread-title-update"; data: { threadId: number; title: string } } + | { type: "data-interrupt-request"; data: Record } + | { type: "error"; errorText: string }; + /** * Async generator that reads an SSE stream and yields parsed JSON objects. * Handles buffering, event splitting, and skips malformed JSON / [DONE] lines. */ -export async function* readSSEStream(response: Response): AsyncGenerator { +export async function* readSSEStream(response: Response): AsyncGenerator { if (!response.body) { throw new Error("No response body"); } diff --git a/surfsense_web/lib/connectors/utils.ts b/surfsense_web/lib/connectors/utils.ts index 27da40cc3..623a7b862 100644 --- a/surfsense_web/lib/connectors/utils.ts +++ b/surfsense_web/lib/connectors/utils.ts @@ -8,6 +8,7 @@ export const getConnectorTypeDisplay = (type: string): string => { BAIDU_SEARCH_API: "Baidu Search", SLACK_CONNECTOR: "Slack", TEAMS_CONNECTOR: "Microsoft Teams", + ONEDRIVE_CONNECTOR: "OneDrive", NOTION_CONNECTOR: "Notion", GITHUB_CONNECTOR: "GitHub", LINEAR_CONNECTOR: "Linear", From b42b3a0a9b21e5db8509129e91badb00699ae7fb Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 17:01:08 +0530 Subject: [PATCH 033/163] feat: enhance OneDrive integration with new file creation and deletion UI components --- .../new-chat/[[...chat_id]]/page.tsx | 4 +- .../assistant-ui/assistant-message.tsx | 6 + surfsense_web/components/tool-ui/index.ts | 1 + .../tool-ui/onedrive/create-file.tsx | 298 ++++++++++++++++++ .../components/tool-ui/onedrive/index.ts | 2 + .../tool-ui/onedrive/trash-file.tsx | 219 +++++++++++++ 6 files changed, 529 insertions(+), 1 deletion(-) create mode 100644 surfsense_web/components/tool-ui/onedrive/create-file.tsx create mode 100644 surfsense_web/components/tool-ui/onedrive/index.ts create mode 100644 surfsense_web/components/tool-ui/onedrive/trash-file.tsx 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 e173cfdf2..c2bc096b2 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 @@ -39,7 +39,6 @@ import { Thread } from "@/components/assistant-ui/thread"; import { MobileEditorPanel } from "@/components/editor-panel/editor-panel"; import { MobileHitlEditPanel } from "@/components/hitl-edit-panel/hitl-edit-panel"; import { MobileReportPanel } from "@/components/report-panel/report-panel"; -import { Skeleton } from "@/components/ui/skeleton"; import { useChatSessionStateSync } from "@/hooks/use-chat-session-state"; import { useMessagesSync } from "@/hooks/use-messages-sync"; import { documentsApiService } from "@/lib/apis/documents-api.service"; @@ -143,6 +142,8 @@ const TOOLS_WITH_UI = new Set([ "delete_linear_issue", "create_google_drive_file", "delete_google_drive_file", + "create_onedrive_file", + "delete_onedrive_file", "create_calendar_event", "update_calendar_event", "delete_calendar_event", @@ -886,6 +887,7 @@ export default function NewChatPage() { currentThread, currentUser, disabledTools, + updateChatTabTitle, ] ); diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx index 9fefecb1c..7be3932af 100644 --- a/surfsense_web/components/assistant-ui/assistant-message.tsx +++ b/surfsense_web/components/assistant-ui/assistant-message.tsx @@ -39,6 +39,10 @@ import { CreateGoogleDriveFileToolUI, DeleteGoogleDriveFileToolUI, } from "@/components/tool-ui/google-drive"; +import { + CreateOneDriveFileToolUI, + DeleteOneDriveFileToolUI, +} from "@/components/tool-ui/onedrive"; import { CreateJiraIssueToolUI, DeleteJiraIssueToolUI, @@ -96,6 +100,8 @@ const AssistantMessageInner: FC = () => { delete_linear_issue: DeleteLinearIssueToolUI, create_google_drive_file: CreateGoogleDriveFileToolUI, delete_google_drive_file: DeleteGoogleDriveFileToolUI, + create_onedrive_file: CreateOneDriveFileToolUI, + delete_onedrive_file: DeleteOneDriveFileToolUI, create_calendar_event: CreateCalendarEventToolUI, update_calendar_event: UpdateCalendarEventToolUI, delete_calendar_event: DeleteCalendarEventToolUI, diff --git a/surfsense_web/components/tool-ui/index.ts b/surfsense_web/components/tool-ui/index.ts index f6cdad692..2e4ea82ef 100644 --- a/surfsense_web/components/tool-ui/index.ts +++ b/surfsense_web/components/tool-ui/index.ts @@ -17,6 +17,7 @@ export { export { GeneratePodcastToolUI } from "./generate-podcast"; export { GenerateReportToolUI } from "./generate-report"; export { CreateGoogleDriveFileToolUI, DeleteGoogleDriveFileToolUI } from "./google-drive"; +export { CreateOneDriveFileToolUI, DeleteOneDriveFileToolUI } from "./onedrive"; export { Image, ImageErrorBoundary, diff --git a/surfsense_web/components/tool-ui/onedrive/create-file.tsx b/surfsense_web/components/tool-ui/onedrive/create-file.tsx new file mode 100644 index 000000000..5af1c3d94 --- /dev/null +++ b/surfsense_web/components/tool-ui/onedrive/create-file.tsx @@ -0,0 +1,298 @@ +"use client"; + +import type { ToolCallMessagePartProps } from "@assistant-ui/react"; +import { useSetAtom } from "jotai"; +import { CornerDownLeftIcon, FileIcon, Pen } from "lucide-react"; +import { useCallback, useEffect, useMemo, useState } from "react"; +import { openHitlEditPanelAtom } from "@/atoms/chat/hitl-edit-panel.atom"; +import { PlateEditor } from "@/components/editor/plate-editor"; +import { TextShimmerLoader } from "@/components/prompt-kit/loader"; +import { Button } from "@/components/ui/button"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@/components/ui/select"; +import { useHitlPhase } from "@/hooks/use-hitl-phase"; + +interface OneDriveAccount { + id: number; + name: string; + user_email?: string; + auth_expired?: boolean; +} + +interface InterruptResult { + __interrupt__: true; + __decided__?: "approve" | "reject" | "edit"; + __completed__?: boolean; + action_requests: Array<{ name: string; args: Record }>; + review_configs: Array<{ + action_name: string; + allowed_decisions: Array<"approve" | "edit" | "reject">; + }>; + context?: { + accounts?: OneDriveAccount[]; + error?: string; + }; +} + +interface SuccessResult { + status: "success"; + file_id: string; + name: string; + web_url?: string; + message?: string; +} + +interface ErrorResult { + status: "error"; + message: string; +} + +interface AuthErrorResult { + status: "auth_error"; + message: string; + connector_type?: string; +} + +type CreateOneDriveFileResult = InterruptResult | SuccessResult | ErrorResult | AuthErrorResult; + +function isInterruptResult(result: unknown): result is InterruptResult { + return ( + typeof result === "object" && + result !== null && + "__interrupt__" in result && + (result as InterruptResult).__interrupt__ === true + ); +} + +function isErrorResult(result: unknown): result is ErrorResult { + return ( + typeof result === "object" && + result !== null && + "status" in result && + (result as ErrorResult).status === "error" + ); +} + +function isAuthErrorResult(result: unknown): result is AuthErrorResult { + return ( + typeof result === "object" && + result !== null && + "status" in result && + (result as AuthErrorResult).status === "auth_error" + ); +} + +function ApprovalCard({ + args, + interruptData, + onDecision, +}: { + args: { name: string; content?: string }; + interruptData: InterruptResult; + onDecision: (decision: { + type: "approve" | "reject" | "edit"; + message?: string; + edited_action?: { name: string; args: Record }; + }) => void; +}) { + const { phase, setProcessing, setRejected } = useHitlPhase(interruptData); + const [isPanelOpen, setIsPanelOpen] = useState(false); + const openHitlEditPanel = useSetAtom(openHitlEditPanelAtom); + const [pendingEdits, setPendingEdits] = useState<{ name: string; content: string } | null>(null); + + const accounts = interruptData.context?.accounts ?? []; + const validAccounts = accounts.filter((a) => !a.auth_expired); + + const defaultAccountId = useMemo(() => { + if (validAccounts.length === 1) return String(validAccounts[0].id); + return ""; + }, [validAccounts]); + + const [selectedAccountId, setSelectedAccountId] = useState(defaultAccountId); + + const isNameValid = useMemo(() => { + const name = pendingEdits?.name ?? args.name; + return name && typeof name === "string" && name.trim().length > 0; + }, [pendingEdits?.name, args.name]); + + const canApprove = !!selectedAccountId && isNameValid; + const reviewConfig = interruptData.review_configs?.[0]; + const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"]; + const canEdit = allowedDecisions.includes("edit"); + + const handleApprove = useCallback(() => { + if (phase !== "pending" || isPanelOpen || !canApprove) return; + if (!allowedDecisions.includes("approve")) return; + const isEdited = pendingEdits !== null; + setProcessing(); + onDecision({ + type: isEdited ? "edit" : "approve", + edited_action: { + name: interruptData.action_requests[0].name, + args: { + ...args, + ...(pendingEdits && { name: pendingEdits.name, content: pendingEdits.content }), + connector_id: selectedAccountId ? Number(selectedAccountId) : null, + }, + }, + }); + }, [phase, isPanelOpen, canApprove, allowedDecisions, pendingEdits, setProcessing, onDecision, interruptData, args, selectedAccountId]); + + useEffect(() => { + const handler = (e: KeyboardEvent) => { + if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey) handleApprove(); + }; + window.addEventListener("keydown", handler); + return () => window.removeEventListener("keydown", handler); + }, [handleApprove]); + + return ( +
+
+
+

+ {phase === "rejected" ? "OneDrive File Rejected" : phase === "processing" || phase === "complete" ? "OneDrive File Approved" : "Create OneDrive File"} +

+ {phase === "processing" ? ( + + ) : phase === "complete" ? ( +

{pendingEdits ? "File created with your changes" : "File created"}

+ ) : phase === "rejected" ? ( +

File creation was cancelled

+ ) : ( +

Requires your approval to proceed

+ )} +
+ {phase === "pending" && canEdit && ( + + )} +
+ + {phase === "pending" && interruptData.context && ( + <> +
+
+ {interruptData.context.error ? ( +

{interruptData.context.error}

+ ) : accounts.length > 0 ? ( +
+

OneDrive Account *

+ +
+ ) : null} +
+ + )} + +
+
+ {(pendingEdits?.name ?? args.name) != null && ( +

{String(pendingEdits?.name ?? args.name)}

+ )} + {(pendingEdits?.content ?? args.content) != null && ( +
+ +
+ )} +
+ + {phase === "pending" && ( + <> +
+
+ {allowedDecisions.includes("approve") && ( + + )} + {allowedDecisions.includes("reject") && ( + + )} +
+ + )} +
+ ); +} + +function ErrorCard({ result }: { result: ErrorResult }) { + return ( +
+
+

Failed to create OneDrive file

+
+
+

{result.message}

+
+ ); +} + +function AuthErrorCard({ result }: { result: AuthErrorResult }) { + return ( +
+
+

OneDrive authentication expired

+
+
+

{result.message}

+
+ ); +} + +function SuccessCard({ result }: { result: SuccessResult }) { + return ( +
+
+

{result.message || "OneDrive file created successfully"}

+
+
+
+
+ + {result.name} +
+ {result.web_url && ( + + )} +
+
+ ); +} + +export const CreateOneDriveFileToolUI = ({ args, result }: ToolCallMessagePartProps<{ name: string; content?: string }, CreateOneDriveFileResult>) => { + if (!result) return null; + if (isInterruptResult(result)) { + return { window.dispatchEvent(new CustomEvent("hitl-decision", { detail: { decisions: [decision] } })); }} />; + } + if (typeof result === "object" && result !== null && "status" in result && (result as { status: string }).status === "rejected") return null; + if (isAuthErrorResult(result)) return ; + if (isErrorResult(result)) return ; + return ; +}; diff --git a/surfsense_web/components/tool-ui/onedrive/index.ts b/surfsense_web/components/tool-ui/onedrive/index.ts new file mode 100644 index 000000000..4872112ba --- /dev/null +++ b/surfsense_web/components/tool-ui/onedrive/index.ts @@ -0,0 +1,2 @@ +export { CreateOneDriveFileToolUI } from "./create-file"; +export { DeleteOneDriveFileToolUI } from "./trash-file"; diff --git a/surfsense_web/components/tool-ui/onedrive/trash-file.tsx b/surfsense_web/components/tool-ui/onedrive/trash-file.tsx new file mode 100644 index 000000000..b5efd4fab --- /dev/null +++ b/surfsense_web/components/tool-ui/onedrive/trash-file.tsx @@ -0,0 +1,219 @@ +"use client"; + +import type { ToolCallMessagePartProps } from "@assistant-ui/react"; +import { CornerDownLeftIcon, InfoIcon } from "lucide-react"; +import { useCallback, useEffect, useState } from "react"; +import { TextShimmerLoader } from "@/components/prompt-kit/loader"; +import { Button } from "@/components/ui/button"; +import { Checkbox } from "@/components/ui/checkbox"; +import { useHitlPhase } from "@/hooks/use-hitl-phase"; + +interface OneDriveAccount { + id: number; + name: string; + user_email?: string; + auth_expired?: boolean; +} + +interface OneDriveFile { + file_id: string; + name: string; + document_id?: number; + web_url?: string; +} + +interface InterruptResult { + __interrupt__: true; + __decided__?: "approve" | "reject"; + __completed__?: boolean; + action_requests: Array<{ name: string; args: Record }>; + review_configs: Array<{ action_name: string; allowed_decisions: Array<"approve" | "reject"> }>; + context?: { account?: OneDriveAccount; file?: OneDriveFile; error?: string }; +} + +interface SuccessResult { status: "success"; file_id: string; message?: string; deleted_from_kb?: boolean } +interface ErrorResult { status: "error"; message: string } +interface NotFoundResult { status: "not_found"; message: string } +interface AuthErrorResult { status: "auth_error"; message: string; connector_type?: string } + +type DeleteOneDriveFileResult = InterruptResult | SuccessResult | ErrorResult | NotFoundResult | AuthErrorResult; + +function isInterruptResult(result: unknown): result is InterruptResult { + return typeof result === "object" && result !== null && "__interrupt__" in result && (result as InterruptResult).__interrupt__ === true; +} +function isErrorResult(result: unknown): result is ErrorResult { + return typeof result === "object" && result !== null && "status" in result && (result as ErrorResult).status === "error"; +} +function isNotFoundResult(result: unknown): result is NotFoundResult { + return typeof result === "object" && result !== null && "status" in result && (result as NotFoundResult).status === "not_found"; +} +function isAuthErrorResult(result: unknown): result is AuthErrorResult { + return typeof result === "object" && result !== null && "status" in result && (result as AuthErrorResult).status === "auth_error"; +} + +function ApprovalCard({ interruptData, onDecision }: { + interruptData: InterruptResult; + onDecision: (decision: { type: "approve" | "reject"; message?: string; edited_action?: { name: string; args: Record } }) => void; +}) { + const { phase, setProcessing, setRejected } = useHitlPhase(interruptData); + const [deleteFromKb, setDeleteFromKb] = useState(false); + + const context = interruptData.context; + const account = context?.account; + const file = context?.file; + + const handleApprove = useCallback(() => { + if (phase !== "pending") return; + setProcessing(); + onDecision({ + type: "approve", + edited_action: { + name: interruptData.action_requests[0].name, + args: { file_id: file?.file_id, connector_id: account?.id, delete_from_kb: deleteFromKb }, + }, + }); + }, [phase, setProcessing, onDecision, interruptData, file?.file_id, account?.id, deleteFromKb]); + + useEffect(() => { + const handler = (e: KeyboardEvent) => { + if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey) handleApprove(); + }; + window.addEventListener("keydown", handler); + return () => window.removeEventListener("keydown", handler); + }, [handleApprove]); + + return ( +
+
+
+

+ {phase === "rejected" ? "OneDrive File Deletion Rejected" : phase === "processing" || phase === "complete" ? "OneDrive File Deletion Approved" : "Delete OneDrive File"} +

+ {phase === "processing" ? ( + + ) : phase === "complete" ? ( +

File trashed

+ ) : phase === "rejected" ? ( +

File deletion was cancelled

+ ) : ( +

Requires your approval to proceed

+ )} +
+
+ + {phase !== "rejected" && context && ( + <> +
+
+ {context.error ? ( +

{context.error}

+ ) : ( + <> + {account && ( +
+

OneDrive Account

+
{account.name}
+
+ )} + {file && ( +
+

File to Delete

+
+
{file.name}
+ {file.web_url && ( + Open in OneDrive + )} +
+
+ )} + + )} +
+ + )} + + {phase === "pending" && ( + <> +
+
+

The file will be moved to the OneDrive recycle bin. You can restore it within 93 days.

+
+ setDeleteFromKb(v === true)} className="shrink-0" /> + +
+
+ + )} + + {phase === "pending" && ( + <> +
+
+ + +
+ + )} +
+ ); +} + +function ErrorCard({ result }: { result: ErrorResult }) { + return ( +
+

Failed to delete file

+
+

{result.message}

+
+ ); +} + +function NotFoundCard({ result }: { result: NotFoundResult }) { + return ( +
+
+ +

{result.message}

+
+
+ ); +} + +function AuthErrorCard({ result }: { result: AuthErrorResult }) { + return ( +
+

OneDrive authentication expired

+
+

{result.message}

+
+ ); +} + +function SuccessCard({ result }: { result: SuccessResult }) { + return ( +
+

{result.message || "File moved to recycle bin"}

+ {result.deleted_from_kb && ( + <> +
+
Also removed from knowledge base
+ + )} +
+ ); +} + +export const DeleteOneDriveFileToolUI = ({ result }: ToolCallMessagePartProps<{ file_name: string; delete_from_kb?: boolean }, DeleteOneDriveFileResult>) => { + if (!result) return null; + if (isInterruptResult(result)) { + return { window.dispatchEvent(new CustomEvent("hitl-decision", { detail: { decisions: [decision] } })); }} />; + } + if (typeof result === "object" && result !== null && "status" in result && (result as { status: string }).status === "rejected") return null; + if (isAuthErrorResult(result)) return ; + if (isNotFoundResult(result)) return ; + if (isErrorResult(result)) return ; + return ; +}; From 40f086b6edcd3f60ad43029887c8555b058436fb Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 17:33:41 +0530 Subject: [PATCH 034/163] refactor: replace useAuth with authenticatedFetch in OneDriveConfig and add OneDrive SVG icon --- .../components/onedrive-config.tsx | 5 +- surfsense_web/public/connectors/onedrive.svg | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 surfsense_web/public/connectors/onedrive.svg diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx index e5f6caf06..eda686596 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx @@ -25,7 +25,7 @@ import { } from "@/components/ui/select"; import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; -import { useAuth } from "@/context/AuthContext"; +import { authenticatedFetch } from "@/lib/auth-utils"; import type { ConnectorConfigProps } from "../index"; interface SelectedItem { @@ -74,7 +74,6 @@ function getFileIconFromName(fileName: string, className = "size-3.5 shrink-0") } export const OneDriveConfig: FC = ({ connector, onConfigChange }) => { - const { authenticatedFetch } = useAuth(); const existingFolders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; const existingFiles = (connector.config?.selected_files as SelectedItem[] | undefined) || []; const existingIndexingOptions = @@ -137,7 +136,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh setBrowseLoading(false); } }, - [connector.id, authenticatedFetch], + [connector.id], ); const handleOpenBrowser = useCallback(() => { diff --git a/surfsense_web/public/connectors/onedrive.svg b/surfsense_web/public/connectors/onedrive.svg new file mode 100644 index 000000000..499a4ade6 --- /dev/null +++ b/surfsense_web/public/connectors/onedrive.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9160c4ce4ead811e325493e24a64b0e9c70a12ae Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:22:25 +0530 Subject: [PATCH 035/163] feat: add Microsoft OneDrive connector documentation and sitemap entry --- surfsense_web/app/sitemap.ts | 6 + .../content/docs/connectors/index.mdx | 5 + .../content/docs/connectors/meta.json | 1 + .../docs/connectors/microsoft-onedrive.mdx | 104 ++++++++++++++++++ .../docs/connectors/microsoft-teams.mdx | 25 ++++- 5 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 surfsense_web/content/docs/connectors/microsoft-onedrive.mdx diff --git a/surfsense_web/app/sitemap.ts b/surfsense_web/app/sitemap.ts index f1f0bad72..e7c0d576e 100644 --- a/surfsense_web/app/sitemap.ts +++ b/surfsense_web/app/sitemap.ts @@ -181,6 +181,12 @@ export default function sitemap(): MetadataRoute.Sitemap { changeFrequency: "daily", priority: 0.8, }, + { + url: "https://www.surfsense.com/docs/connectors/microsoft-onedrive", + lastModified, + changeFrequency: "daily", + priority: 0.8, + }, { url: "https://www.surfsense.com/docs/connectors/microsoft-teams", lastModified, diff --git a/surfsense_web/content/docs/connectors/index.mdx b/surfsense_web/content/docs/connectors/index.mdx index 501b1fc0b..93caf807d 100644 --- a/surfsense_web/content/docs/connectors/index.mdx +++ b/surfsense_web/content/docs/connectors/index.mdx @@ -53,6 +53,11 @@ Connect SurfSense to your favorite tools and services. Browse the available inte description="Connect your Microsoft Teams to SurfSense" href="/docs/connectors/microsoft-teams" /> + + Microsoft OneDrive and [Microsoft Teams](/docs/connectors/microsoft-teams) share the same Azure App Registration. If you have already created an app for Teams, you can reuse the same Client ID and Client Secret. Just make sure both redirect URIs are added (see Step 3). + + +## Step 1: Access Azure App Registrations + +1. Navigate to [portal.azure.com](https://portal.azure.com) +2. In the search bar, type **"app reg"** +3. Select **"App registrations"** from the Services results + +## Step 2: Create New Registration + +1. On the **App registrations** page, click **"+ New registration"** + +## Step 3: Register the Application + +Fill in the application details: + +| Field | Value | +|-------|-------| +| **Name** | `SurfSense` | +| **Supported account types** | Select **"Accounts in any organizational directory (Any Microsoft Entra ID tenant - Multitenant) and personal Microsoft accounts"** | +| **Redirect URI** | Platform: `Web`, URI: `http://localhost:8000/api/v1/auth/onedrive/connector/callback` | + +Click **"Register"** + +After registration, add the Teams redirect URI as well (if you plan to use the Teams connector): + +1. Go to **Authentication** in the left sidebar +2. Under **Platform configurations** > **Web** > **Redirect URIs**, click **Add URI** +3. Add: `http://localhost:8000/api/v1/auth/teams/connector/callback` +4. Click **Save** + +## Step 4: Get Application (Client) ID + +After registration, you will be taken to the app's **Overview** page. Here you will find: + +1. Copy the **Application (client) ID** - this is your Client ID +2. Note the **Directory (tenant) ID** if needed + +## Step 5: Create Client Secret + +1. In the left sidebar under **Manage**, click **"Certificates & secrets"** +2. Select the **"Client secrets"** tab +3. Click **"+ New client secret"** +4. Enter a description (e.g., `SurfSense`) and select an expiration period +5. Click **"Add"** +6. **Important**: Copy the secret **Value** immediately. It will not be shown again! + + + Never share your client secret publicly or include it in code repositories. + + +## Step 6: Configure API Permissions + +1. In the left sidebar under **Manage**, click **"API permissions"** +2. Click **"+ Add a permission"** +3. Select **"Microsoft Graph"** +4. Select **"Delegated permissions"** +5. Add the following permissions: + +| Permission | Type | Description | Admin Consent | +|------------|------|-------------|---------------| +| `Files.Read` | Delegated | Read user files | No | +| `Files.ReadWrite` | Delegated | Read and write user files | No | +| `offline_access` | Delegated | Maintain access to data you have given it access to | No | +| `User.Read` | Delegated | Sign in and read user profile | No | + +6. Click **"Add permissions"** + + + The `Files.ReadWrite` permission is required for HITL (Human-in-the-Loop) tools like creating and trashing files. If you only need read access for indexing, `Files.Read` is sufficient, but HITL tools will not work. + + +--- + +## Running SurfSense with Microsoft OneDrive Connector + +Add the Microsoft OAuth credentials to your `.env` file (created during [Docker installation](/docs/docker-installation/docker-compose)): + +```bash +MICROSOFT_CLIENT_ID=your_microsoft_client_id +MICROSOFT_CLIENT_SECRET=your_microsoft_client_secret +ONEDRIVE_REDIRECT_URI=http://localhost:8000/api/v1/auth/onedrive/connector/callback +``` + + + The `MICROSOFT_CLIENT_ID` and `MICROSOFT_CLIENT_SECRET` are shared between the OneDrive and Teams connectors. You only need to set them once. + + +Then restart the services: + +```bash +docker compose up -d +``` diff --git a/surfsense_web/content/docs/connectors/microsoft-teams.mdx b/surfsense_web/content/docs/connectors/microsoft-teams.mdx index aba64da20..166004c1f 100644 --- a/surfsense_web/content/docs/connectors/microsoft-teams.mdx +++ b/surfsense_web/content/docs/connectors/microsoft-teams.mdx @@ -7,6 +7,10 @@ description: Connect your Microsoft Teams to SurfSense This guide walks you through setting up a Microsoft Teams OAuth integration for SurfSense using Azure App Registration. + + Microsoft Teams and [Microsoft OneDrive](/docs/connectors/microsoft-onedrive) share the same Azure App Registration. If you have already created an app for OneDrive, you can reuse the same Client ID and Client Secret. Just make sure both redirect URIs are added (see Step 3). + + ## Step 1: Access Azure App Registrations 1. Navigate to [portal.azure.com](https://portal.azure.com) @@ -33,11 +37,18 @@ Fill in the application details: Click **"Register"** +After registration, add the OneDrive redirect URI as well: + +1. Go to **Authentication** in the left sidebar +2. Under **Platform configurations** > **Web** > **Redirect URIs**, click **Add URI** +3. Add: `http://localhost:8000/api/v1/auth/onedrive/connector/callback` +4. Click **Save** + ![Register Application Form](/docs/connectors/microsoft-teams/azure-register-app.png) ## Step 4: Get Application (Client) ID -After registration, you'll be taken to the app's **Overview** page. Here you'll find: +After registration, you will be taken to the app's **Overview** page. Here you will find: 1. Copy the **Application (client) ID** - this is your Client ID 2. Note the **Directory (tenant) ID** if needed @@ -54,7 +65,7 @@ After registration, you'll be taken to the app's **Overview** page. Here you'll ![Certificates & Secrets - Empty](/docs/connectors/microsoft-teams/azure-certificates-empty.png) -6. **Important**: Copy the secret **Value** immediately - it won't be shown again! +6. **Important**: Copy the secret **Value** immediately. It will not be shown again! ![Certificates & Secrets - Created](/docs/connectors/microsoft-teams/azure-certificates-created.png) @@ -90,14 +101,18 @@ After registration, you'll be taken to the app's **Overview** page. Here you'll ## Running SurfSense with Microsoft Teams Connector -Add the Microsoft Teams credentials to your `.env` file (created during [Docker installation](/docs/docker-installation/docker-compose)): +Add the Microsoft OAuth credentials to your `.env` file (created during [Docker installation](/docs/docker-installation/docker-compose)): ```bash -TEAMS_CLIENT_ID=your_microsoft_client_id -TEAMS_CLIENT_SECRET=your_microsoft_client_secret +MICROSOFT_CLIENT_ID=your_microsoft_client_id +MICROSOFT_CLIENT_SECRET=your_microsoft_client_secret TEAMS_REDIRECT_URI=http://localhost:8000/api/v1/auth/teams/connector/callback ``` + + The `MICROSOFT_CLIENT_ID` and `MICROSOFT_CLIENT_SECRET` are shared between the Teams and OneDrive connectors. You only need to set them once. + + Then restart the services: ```bash From dd6558e8eb2cada2b4b8d08ac1d41bff6e0f206a Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:23:49 +0530 Subject: [PATCH 036/163] chore: update Microsoft OAuth configuration in documentation to reflect unified client ID and secret for Teams and OneDrive --- .../content/docs/docker-installation/docker-compose.mdx | 2 +- surfsense_web/content/docs/manual-installation.mdx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/surfsense_web/content/docs/docker-installation/docker-compose.mdx b/surfsense_web/content/docs/docker-installation/docker-compose.mdx index 1560d3759..25ace2180 100644 --- a/surfsense_web/content/docs/docker-installation/docker-compose.mdx +++ b/surfsense_web/content/docs/docker-installation/docker-compose.mdx @@ -117,7 +117,7 @@ Uncomment the connectors you want to use. Redirect URIs follow the pattern `http | Linear | `LINEAR_CLIENT_ID`, `LINEAR_CLIENT_SECRET`, `LINEAR_REDIRECT_URI` | | ClickUp | `CLICKUP_CLIENT_ID`, `CLICKUP_CLIENT_SECRET`, `CLICKUP_REDIRECT_URI` | | Airtable | `AIRTABLE_CLIENT_ID`, `AIRTABLE_CLIENT_SECRET`, `AIRTABLE_REDIRECT_URI` | -| Microsoft Teams | `TEAMS_CLIENT_ID`, `TEAMS_CLIENT_SECRET`, `TEAMS_REDIRECT_URI` | +| Microsoft (Teams & OneDrive) | `MICROSOFT_CLIENT_ID`, `MICROSOFT_CLIENT_SECRET`, `TEAMS_REDIRECT_URI`, `ONEDRIVE_REDIRECT_URI` | ### Observability (optional) diff --git a/surfsense_web/content/docs/manual-installation.mdx b/surfsense_web/content/docs/manual-installation.mdx index 1577b8d8b..05e646d6d 100644 --- a/surfsense_web/content/docs/manual-installation.mdx +++ b/surfsense_web/content/docs/manual-installation.mdx @@ -127,9 +127,10 @@ Edit the `.env` file and set the following variables: | SLACK_CLIENT_ID | (Optional) Slack OAuth client ID | | SLACK_CLIENT_SECRET | (Optional) Slack OAuth client secret | | SLACK_REDIRECT_URI | (Optional) Redirect URI for Slack connector OAuth callback (e.g., `http://localhost:8000/api/v1/auth/slack/connector/callback`) | -| TEAMS_CLIENT_ID | (Optional) Microsoft Teams OAuth client ID | -| TEAMS_CLIENT_SECRET | (Optional) Microsoft Teams OAuth client secret | +| MICROSOFT_CLIENT_ID | (Optional) Microsoft OAuth client ID (shared for Teams and OneDrive) | +| MICROSOFT_CLIENT_SECRET | (Optional) Microsoft OAuth client secret (shared for Teams and OneDrive) | | TEAMS_REDIRECT_URI | (Optional) Redirect URI for Teams connector OAuth callback (e.g., `http://localhost:8000/api/v1/auth/teams/connector/callback`) | +| ONEDRIVE_REDIRECT_URI | (Optional) Redirect URI for OneDrive connector OAuth callback (e.g., `http://localhost:8000/api/v1/auth/onedrive/connector/callback`) | **(Optional) Backend LangSmith Observability:** | ENV VARIABLE | DESCRIPTION | From e2dd6e61a90246f03d4fe710b3e370010ac8e2af Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:25:35 +0530 Subject: [PATCH 037/163] docs: update OneDrive permissions in documentation to reflect required access for connector authentication --- .../docs/connectors/microsoft-onedrive.mdx | 8 +- .../public/connectors/microsoft-teams.svg | 156 +----------------- 2 files changed, 5 insertions(+), 159 deletions(-) diff --git a/surfsense_web/content/docs/connectors/microsoft-onedrive.mdx b/surfsense_web/content/docs/connectors/microsoft-onedrive.mdx index 709a6ff7b..8bd76532e 100644 --- a/surfsense_web/content/docs/connectors/microsoft-onedrive.mdx +++ b/surfsense_web/content/docs/connectors/microsoft-onedrive.mdx @@ -70,15 +70,15 @@ After registration, you will be taken to the app's **Overview** page. Here you w | Permission | Type | Description | Admin Consent | |------------|------|-------------|---------------| -| `Files.Read` | Delegated | Read user files | No | -| `Files.ReadWrite` | Delegated | Read and write user files | No | +| `Files.Read.All` | Delegated | Read all files the user can access | No | +| `Files.ReadWrite.All` | Delegated | Read and write all files the user can access | No | | `offline_access` | Delegated | Maintain access to data you have given it access to | No | | `User.Read` | Delegated | Sign in and read user profile | No | 6. Click **"Add permissions"** - - The `Files.ReadWrite` permission is required for HITL (Human-in-the-Loop) tools like creating and trashing files. If you only need read access for indexing, `Files.Read` is sufficient, but HITL tools will not work. + + All four permissions listed above are required. The connector will not authenticate successfully if any are missing. --- diff --git a/surfsense_web/public/connectors/microsoft-teams.svg b/surfsense_web/public/connectors/microsoft-teams.svg index caa352dff..891dccd9d 100644 --- a/surfsense_web/public/connectors/microsoft-teams.svg +++ b/surfsense_web/public/connectors/microsoft-teams.svg @@ -1,155 +1 @@ - \ No newline at end of file + \ No newline at end of file From ea218b7be6ba0c5bf376de1b7a7eb74c7321ebda Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:57:46 +0530 Subject: [PATCH 038/163] feat: implement OneDrive picker integration and enhance connector functionality with new API endpoints and UI updates --- .../routes/onedrive_add_connector_route.py | 118 +++++++- .../assistant-ui/connector-popup.tsx | 17 +- .../components/onedrive-config.tsx | 281 +++++------------- .../contracts/types/connector.types.ts | 1 + surfsense_web/hooks/use-onedrive-picker.ts | 252 ++++++++++++++++ 5 files changed, 457 insertions(+), 212 deletions(-) create mode 100644 surfsense_web/hooks/use-onedrive-picker.ts diff --git a/surfsense_backend/app/routes/onedrive_add_connector_route.py b/surfsense_backend/app/routes/onedrive_add_connector_route.py index 19bcbe6ff..64f5b2461 100644 --- a/surfsense_backend/app/routes/onedrive_add_connector_route.py +++ b/surfsense_backend/app/routes/onedrive_add_connector_route.py @@ -5,7 +5,8 @@ Endpoints: - GET /auth/onedrive/connector/add - Initiate OAuth - GET /auth/onedrive/connector/callback - Handle OAuth callback - GET /auth/onedrive/connector/reauth - Re-authenticate existing connector -- GET /connectors/{connector_id}/onedrive/folders - List folder contents +- GET /connectors/{connector_id}/onedrive/folders - List folder contents (legacy custom browser) +- GET /connectors/{connector_id}/onedrive/picker-token - Get SharePoint token for File Picker v8 """ import logging @@ -395,6 +396,121 @@ async def list_onedrive_folders( raise HTTPException(status_code=500, detail=f"Failed to list OneDrive contents: {e!s}") from e +@router.get("/connectors/{connector_id}/onedrive/picker-token") +async def get_onedrive_picker_token( + connector_id: int, + resource: str | None = None, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + """Get an access token scoped for the OneDrive File Picker v8. + + The picker requires SharePoint-audience tokens, not Graph tokens. + If *resource* is omitted the user's OneDrive root URL is resolved via + Graph and used as the resource. + """ + try: + result = await session.execute( + select(SearchSourceConnector).filter( + SearchSourceConnector.id == connector_id, + SearchSourceConnector.user_id == user.id, + SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, + ) + ) + connector = result.scalars().first() + if not connector: + raise HTTPException(status_code=404, detail="OneDrive connector not found or access denied") + + token_encryption = get_token_encryption() + is_encrypted = connector.config.get("_token_encrypted", False) + + # Resolve the SharePoint base URL when the caller doesn't provide one + if not resource: + access_token = connector.config.get("access_token") + if is_encrypted and access_token: + access_token = token_encryption.decrypt_token(access_token) + + # Refresh the Graph token if it has expired + expires_at_str = connector.config.get("expires_at") + if expires_at_str: + from dateutil.parser import parse as parse_date + if datetime.now(UTC) >= parse_date(expires_at_str): + connector = await refresh_onedrive_token(session, connector) + access_token = connector.config.get("access_token") + if connector.config.get("_token_encrypted") and access_token: + access_token = token_encryption.decrypt_token(access_token) + + async with httpx.AsyncClient() as client: + drive_resp = await client.get( + "https://graph.microsoft.com/v1.0/me/drive/root", + headers={"Authorization": f"Bearer {access_token}"}, + timeout=30.0, + ) + if drive_resp.status_code != 200: + raise HTTPException( + status_code=500, + detail="Failed to resolve OneDrive base URL from Graph API", + ) + from urllib.parse import urlparse + web_url = drive_resp.json().get("webUrl", "") + parsed = urlparse(web_url) + resource = f"{parsed.scheme}://{parsed.hostname}" + + # Exchange the refresh token for a SharePoint-audience token + refresh_token = connector.config.get("refresh_token") + if is_encrypted and refresh_token: + refresh_token = token_encryption.decrypt_token(refresh_token) + if not refresh_token: + raise HTTPException(status_code=400, detail="No refresh token available") + + token_data = { + "client_id": config.MICROSOFT_CLIENT_ID, + "client_secret": config.MICROSOFT_CLIENT_SECRET, + "grant_type": "refresh_token", + "refresh_token": refresh_token, + "scope": f"{resource}/.default", + } + async with httpx.AsyncClient() as client: + token_response = await client.post( + TOKEN_URL, + data=token_data, + headers={"Content-Type": "application/x-www-form-urlencoded"}, + timeout=30.0, + ) + + if token_response.status_code != 200: + error_detail = "Failed to acquire picker token" + try: + error_json = token_response.json() + error_detail = error_json.get("error_description", error_detail) + except Exception: + pass + logger.error("Picker token exchange failed for connector %s: %s", connector_id, error_detail) + raise HTTPException(status_code=400, detail=error_detail) + + token_json = token_response.json() + + # Persist new refresh token when Microsoft rotates it + new_refresh = token_json.get("refresh_token") + if new_refresh: + cfg = dict(connector.config) + cfg["refresh_token"] = token_encryption.encrypt_token(new_refresh) + connector.config = cfg + flag_modified(connector, "config") + await session.commit() + + return { + "access_token": token_json["access_token"], + "base_url": resource, + } + + except HTTPException: + raise + except Exception as e: + logger.error("Error getting OneDrive picker token: %s", str(e), exc_info=True) + raise HTTPException(status_code=500, detail=f"Failed to get picker token: {e!s}") from e + + async def refresh_onedrive_token( session: AsyncSession, connector: SearchSourceConnector ) -> SearchSourceConnector: diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx index ae50ed7a4..b725ab703 100644 --- a/surfsense_web/components/assistant-ui/connector-popup.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup.tsx @@ -22,6 +22,10 @@ import { Tabs, TabsContent } from "@/components/ui/tabs"; import type { SearchSourceConnector } from "@/contracts/types/connector.types"; import { useConnectorsSync } from "@/hooks/use-connectors-sync"; import { PICKER_CLOSE_EVENT, PICKER_OPEN_EVENT } from "@/hooks/use-google-picker"; +import { + ONEDRIVE_PICKER_CLOSE_EVENT, + ONEDRIVE_PICKER_OPEN_EVENT, +} from "@/hooks/use-onedrive-picker"; import { cn } from "@/lib/utils"; import { ConnectorDialogHeader } from "./connector-popup/components/connector-dialog-header"; import { ConnectorConnectView } from "./connector-popup/connector-configs/views/connector-connect-view"; @@ -149,9 +153,13 @@ export const ConnectorIndicator = forwardRef setPickerOpen(false); window.addEventListener(PICKER_OPEN_EVENT, onOpen); window.addEventListener(PICKER_CLOSE_EVENT, onClose); + window.addEventListener(ONEDRIVE_PICKER_OPEN_EVENT, onOpen); + window.addEventListener(ONEDRIVE_PICKER_CLOSE_EVENT, onClose); return () => { window.removeEventListener(PICKER_OPEN_EVENT, onOpen); window.removeEventListener(PICKER_CLOSE_EVENT, onClose); + window.removeEventListener(ONEDRIVE_PICKER_OPEN_EVENT, onOpen); + window.removeEventListener(ONEDRIVE_PICKER_CLOSE_EVENT, onClose); }; }, []); @@ -340,10 +348,11 @@ export const ConnectorIndicator = forwardRef { const cfg = connectorConfig || editingConnector.config; - const isDrive = - editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" || - editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR"; - const hasDriveItems = isDrive + const isDriveOrOneDrive = + editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" || + editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" || + editingConnector.connector_type === "ONEDRIVE_CONNECTOR"; + const hasDriveItems = isDriveOrOneDrive ? ((cfg?.selected_folders as unknown[]) ?? []).length > 0 || ((cfg?.selected_files as unknown[]) ?? []).length > 0 : true; diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx index eda686596..65df4d01e 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx @@ -1,12 +1,10 @@ "use client"; import { - ChevronRight, File, FileSpreadsheet, FileText, FolderClosed, - FolderOpen, Image, Presentation, X, @@ -14,7 +12,6 @@ import { import type { FC } from "react"; import { useCallback, useEffect, useState } from "react"; import { Button } from "@/components/ui/button"; -import { Checkbox } from "@/components/ui/checkbox"; import { Label } from "@/components/ui/label"; import { Select, @@ -25,12 +22,13 @@ import { } from "@/components/ui/select"; import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; -import { authenticatedFetch } from "@/lib/auth-utils"; +import { type OneDrivePickerResult, useOneDrivePicker } from "@/hooks/use-onedrive-picker"; import type { ConnectorConfigProps } from "../index"; interface SelectedItem { id: string; name: string; + driveId?: string; } interface IndexingOptions { @@ -39,17 +37,6 @@ interface IndexingOptions { include_subfolders: boolean; } -interface OneDriveItem { - id: string; - name: string; - isFolder: boolean; - size?: number; - lastModifiedDateTime?: string; - file?: { mimeType: string }; - folder?: { childCount: number }; - webUrl?: string; -} - const DEFAULT_INDEXING_OPTIONS: IndexingOptions = { max_files_per_folder: 100, incremental_sync: true, @@ -83,115 +70,62 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh const [selectedFiles, setSelectedFiles] = useState(existingFiles); const [indexingOptions, setIndexingOptions] = useState(existingIndexingOptions); - const [browserOpen, setBrowserOpen] = useState(false); - const [browseItems, setBrowseItems] = useState([]); - const [browseLoading, setBrowseLoading] = useState(false); - const [browseError, setBrowseError] = useState(null); - const [breadcrumbs, setBreadcrumbs] = useState<{ id: string; name: string }[]>([ - { id: "root", name: "My files" }, - ]); - useEffect(() => { const folders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; const files = (connector.config?.selected_files as SelectedItem[] | undefined) || []; const options = - (connector.config?.indexing_options as IndexingOptions | undefined) || DEFAULT_INDEXING_OPTIONS; + (connector.config?.indexing_options as IndexingOptions | undefined) || + DEFAULT_INDEXING_OPTIONS; setSelectedFolders(folders); setSelectedFiles(files); setIndexingOptions(options); }, [connector.config]); - const updateConfig = useCallback( - (folders: SelectedItem[], files: SelectedItem[], options: IndexingOptions) => { - if (onConfigChange) { - onConfigChange({ - ...connector.config, - selected_folders: folders, - selected_files: files, - indexing_options: options, - }); - } + const updateConfig = ( + folders: SelectedItem[], + files: SelectedItem[], + options: IndexingOptions, + ) => { + if (onConfigChange) { + onConfigChange({ + ...connector.config, + selected_folders: folders, + selected_files: files, + indexing_options: options, + }); + } + }; + + const handlePicked = useCallback( + (result: OneDrivePickerResult) => { + const folders = result.folders.map((f) => ({ id: f.id, name: f.name, driveId: f.driveId })); + const files = result.files.map((f) => ({ id: f.id, name: f.name, driveId: f.driveId })); + setSelectedFolders(folders); + setSelectedFiles(files); + updateConfig(folders, files, indexingOptions); }, - [onConfigChange, connector.config], + // eslint-disable-next-line react-hooks/exhaustive-deps + [indexingOptions, connector.config], ); - const fetchFolderContents = useCallback( - async (parentId: string) => { - setBrowseLoading(true); - setBrowseError(null); - try { - const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000"; - const url = `${backendUrl}/api/v1/connectors/${connector.id}/onedrive/folders?parent_id=${encodeURIComponent(parentId)}`; - const response = await authenticatedFetch(url); - if (!response.ok) { - const data = await response.json().catch(() => ({})); - throw new Error(data.detail || `Failed to load folder contents (${response.status})`); - } - const data = await response.json(); - setBrowseItems(data.items || []); - } catch (err: unknown) { - const message = err instanceof Error ? err.message : "Failed to load folder contents"; - setBrowseError(message); - } finally { - setBrowseLoading(false); - } - }, - [connector.id], - ); + const { + openPicker, + loading: pickerLoading, + error: pickerError, + } = useOneDrivePicker({ + connectorId: connector.id, + onPicked: handlePicked, + }); - const handleOpenBrowser = useCallback(() => { - setBrowserOpen(true); - setBreadcrumbs([{ id: "root", name: "My files" }]); - fetchFolderContents("root"); - }, [fetchFolderContents]); + const isAuthExpired = + connector.config?.auth_expired === true || + (!!pickerError && pickerError.toLowerCase().includes("authentication expired")); - const handleNavigateFolder = useCallback( - (folderId: string, folderName: string) => { - setBreadcrumbs((prev) => [...prev, { id: folderId, name: folderName }]); - fetchFolderContents(folderId); - }, - [fetchFolderContents], - ); - - const handleBreadcrumbClick = useCallback( - (index: number) => { - const newBreadcrumbs = breadcrumbs.slice(0, index + 1); - setBreadcrumbs(newBreadcrumbs); - fetchFolderContents(newBreadcrumbs[newBreadcrumbs.length - 1].id); - }, - [breadcrumbs, fetchFolderContents], - ); - - const isItemSelected = useCallback( - (item: OneDriveItem) => { - if (item.isFolder) { - return selectedFolders.some((f) => f.id === item.id); - } - return selectedFiles.some((f) => f.id === item.id); - }, - [selectedFolders, selectedFiles], - ); - - const handleToggleItem = useCallback( - (item: OneDriveItem) => { - if (item.isFolder) { - const exists = selectedFolders.some((f) => f.id === item.id); - const newFolders = exists - ? selectedFolders.filter((f) => f.id !== item.id) - : [...selectedFolders, { id: item.id, name: item.name }]; - setSelectedFolders(newFolders); - updateConfig(newFolders, selectedFiles, indexingOptions); - } else { - const exists = selectedFiles.some((f) => f.id === item.id); - const newFiles = exists - ? selectedFiles.filter((f) => f.id !== item.id) - : [...selectedFiles, { id: item.id, name: item.name }]; - setSelectedFiles(newFiles); - updateConfig(selectedFolders, newFiles, indexingOptions); - } - }, - [selectedFolders, selectedFiles, indexingOptions, updateConfig], - ); + const handleIndexingOptionChange = (key: keyof IndexingOptions, value: number | boolean) => { + const newOptions = { ...indexingOptions, [key]: value }; + setIndexingOptions(newOptions); + updateConfig(selectedFolders, selectedFiles, newOptions); + }; const handleRemoveFolder = (folderId: string) => { const newFolders = selectedFolders.filter((f) => f.id !== folderId); @@ -205,13 +139,6 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh updateConfig(selectedFolders, newFiles, indexingOptions); }; - const handleIndexingOptionChange = (key: keyof IndexingOptions, value: number | boolean) => { - const newOptions = { ...indexingOptions, [key]: value }; - setIndexingOptions(newOptions); - updateConfig(selectedFolders, selectedFiles, newOptions); - }; - - const isAuthExpired = connector.config?.auth_expired === true; const totalSelected = selectedFolders.length + selectedFiles.length; return ( @@ -221,20 +148,31 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh

Folder & File Selection

- Browse and select specific folders and/or files to index from your OneDrive. + Select specific folders and/or individual files to index.

{totalSelected > 0 && (

- Selected {totalSelected} item{totalSelected > 1 ? "s" : ""} + Selected {totalSelected} item{totalSelected > 1 ? "s" : ""}: {(() => { + const parts: string[] = []; + if (selectedFolders.length > 0) { + parts.push( + `${selectedFolders.length} folder${selectedFolders.length > 1 ? "s" : ""}`, + ); + } + if (selectedFiles.length > 0) { + parts.push(`${selectedFiles.length} file${selectedFiles.length > 1 ? "s" : ""}`); + } + return parts.length > 0 ? `(${parts.join(", ")})` : ""; + })()}

{selectedFolders.map((folder) => (
@@ -243,6 +181,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh type="button" onClick={() => handleRemoveFolder(folder.id)} className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors" + aria-label={`Remove ${folder.name}`} > @@ -251,7 +190,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh {selectedFiles.map((file) => (
{getFileIconFromName(file.name)} @@ -260,6 +199,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh type="button" onClick={() => handleRemoveFile(file.id)} className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors" + aria-label={`Remove ${file.name}`} > @@ -269,96 +209,23 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh
)} - {!browserOpen ? ( - - ) : ( -
- {/* Breadcrumbs */} -
- {breadcrumbs.map((crumb, index) => ( - - {index > 0 && } - - - ))} -
+ - {/* File list */} -
- {browseLoading ? ( -
- -
- ) : browseError ? ( -
{browseError}
- ) : browseItems.length === 0 ? ( -
This folder is empty
- ) : ( - browseItems.map((item) => ( -
- handleToggleItem(item)} - className="size-3.5" - /> - {item.isFolder ? ( - - ) : ( -
- {getFileIconFromName(item.name)} - {item.name} -
- )} -
- )) - )} -
- -
- -
-
- )} + {pickerError && !isAuthExpired &&

{pickerError}

} {isAuthExpired && (

- Your OneDrive authentication has expired. Please re-authenticate using the button below. + Your OneDrive authentication has expired. Please re-authenticate using the button + below.

)}
diff --git a/surfsense_web/contracts/types/connector.types.ts b/surfsense_web/contracts/types/connector.types.ts index 2204d4e5e..82d509a4b 100644 --- a/surfsense_web/contracts/types/connector.types.ts +++ b/surfsense_web/contracts/types/connector.types.ts @@ -9,6 +9,7 @@ export const searchSourceConnectorTypeEnum = z.enum([ "BAIDU_SEARCH_API", "SLACK_CONNECTOR", "TEAMS_CONNECTOR", + "ONEDRIVE_CONNECTOR", "NOTION_CONNECTOR", "GITHUB_CONNECTOR", "LINEAR_CONNECTOR", diff --git a/surfsense_web/hooks/use-onedrive-picker.ts b/surfsense_web/hooks/use-onedrive-picker.ts new file mode 100644 index 000000000..b5546074a --- /dev/null +++ b/surfsense_web/hooks/use-onedrive-picker.ts @@ -0,0 +1,252 @@ +"use client"; + +import { useCallback, useEffect, useRef, useState } from "react"; +import { authenticatedFetch } from "@/lib/auth-utils"; + +export interface OneDrivePickerItem { + id: string; + name: string; + isFolder: boolean; + driveId?: string; +} + +export interface OneDrivePickerResult { + folders: OneDrivePickerItem[]; + files: OneDrivePickerItem[]; +} + +interface UseOneDrivePickerOptions { + connectorId: number; + onPicked: (result: OneDrivePickerResult) => void; +} + +export const ONEDRIVE_PICKER_OPEN_EVENT = "onedrive-picker-open"; +export const ONEDRIVE_PICKER_CLOSE_EVENT = "onedrive-picker-close"; + +async function fetchPickerToken( + connectorId: number, + resource?: string, +): Promise<{ access_token: string; base_url: string }> { + const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000"; + const params = new URLSearchParams(); + if (resource) params.set("resource", resource); + const qs = params.toString(); + const url = `${backendUrl}/api/v1/connectors/${connectorId}/onedrive/picker-token${qs ? `?${qs}` : ""}`; + const response = await authenticatedFetch(url); + if (!response.ok) { + const data = await response.json().catch(() => ({})); + throw new Error(data.detail || `Failed to get picker token (${response.status})`); + } + return response.json(); +} + +export function useOneDrivePicker({ connectorId, onPicked }: UseOneDrivePickerOptions) { + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + const onPickedRef = useRef(onPicked); + onPickedRef.current = onPicked; + const openingRef = useRef(false); + const winRef = useRef(null); + const portRef = useRef(null); + const messageHandlerRef = useRef<((e: MessageEvent) => void) | null>(null); + const pollRef = useRef | null>(null); + + const closePicker = useCallback(() => { + window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT)); + if (pollRef.current) { + clearInterval(pollRef.current); + pollRef.current = null; + } + if (messageHandlerRef.current) { + window.removeEventListener("message", messageHandlerRef.current); + messageHandlerRef.current = null; + } + if (winRef.current && !winRef.current.closed) { + winRef.current.close(); + } + winRef.current = null; + portRef.current = null; + openingRef.current = false; + }, []); + + useEffect(() => { + const onEscape = (e: KeyboardEvent) => { + if (e.key === "Escape" && winRef.current) { + closePicker(); + } + }; + window.addEventListener("keydown", onEscape); + return () => { + window.removeEventListener("keydown", onEscape); + closePicker(); + }; + }, [closePicker]); + + const openPicker = useCallback(async () => { + if (openingRef.current) return; + openingRef.current = true; + setLoading(true); + setError(null); + + try { + const { access_token, base_url } = await fetchPickerToken(connectorId); + + const win = window.open("", "OneDrivePicker", "width=1080,height=680"); + if (!win) { + throw new Error("Popup blocked. Please allow popups for this site."); + } + winRef.current = win; + + const channelId = crypto.randomUUID(); + + const pickerConfig = { + sdk: "8.0", + entry: { oneDrive: { files: {} } }, + authentication: {}, + messaging: { + origin: window.location.origin, + channelId, + }, + selection: { mode: "multiple" }, + typesAndSources: { + mode: "all" as const, + pivots: { oneDrive: true, recent: true }, + }, + }; + + const qs = new URLSearchParams({ + filePicker: JSON.stringify(pickerConfig), + locale: navigator.language || "en-us", + }); + const pickerUrl = `${base_url}/_layouts/15/FilePicker.aspx?${qs}`; + + const form = win.document.createElement("form"); + form.setAttribute("action", pickerUrl); + form.setAttribute("method", "POST"); + const input = win.document.createElement("input"); + input.setAttribute("type", "hidden"); + input.setAttribute("name", "access_token"); + input.setAttribute("value", access_token); + form.appendChild(input); + win.document.body.append(form); + form.submit(); + + const handleMessage = (event: MessageEvent) => { + if (event.source !== win) return; + const msg = event.data; + if (msg?.type !== "initialize" || msg.channelId !== channelId) return; + + const port = event.ports[0]; + portRef.current = port; + + port.addEventListener("message", async (portEvent: MessageEvent) => { + const payload = portEvent.data; + if (payload.type !== "command") return; + + port.postMessage({ type: "acknowledge", id: payload.id }); + + const cmd = payload.data; + switch (cmd.command) { + case "authenticate": { + try { + const result = await fetchPickerToken(connectorId, cmd.resource); + port.postMessage({ + type: "result", + id: payload.id, + data: { result: "token", token: result.access_token }, + }); + } catch (err) { + port.postMessage({ + type: "result", + id: payload.id, + data: { + result: "error", + error: { + code: "unableToObtainToken", + message: err instanceof Error ? err.message : "Token error", + }, + }, + }); + } + break; + } + case "pick": { + const items: Record[] = cmd.items || []; + const folders: OneDrivePickerItem[] = []; + const files: OneDrivePickerItem[] = []; + + for (const item of items) { + const isFolder = + item.folder != null || + (typeof item["@odata.type"] === "string" && + (item["@odata.type"] as string).includes("folder")); + const parentRef = item.parentReference as + | { driveId?: string } + | undefined; + const pickerItem: OneDrivePickerItem = { + id: item.id as string, + name: (item.name as string) || "Untitled", + isFolder, + driveId: parentRef?.driveId, + }; + if (isFolder) { + folders.push(pickerItem); + } else { + files.push(pickerItem); + } + } + + onPickedRef.current({ folders, files }); + port.postMessage({ + type: "result", + id: payload.id, + data: { result: "success" }, + }); + closePicker(); + break; + } + case "close": { + closePicker(); + break; + } + default: { + port.postMessage({ + type: "result", + id: payload.id, + data: { + result: "error", + error: { code: "unsupportedCommand", message: cmd.command }, + }, + }); + break; + } + } + }); + + port.start(); + port.postMessage({ type: "activate" }); + }; + + messageHandlerRef.current = handleMessage; + window.addEventListener("message", handleMessage); + + pollRef.current = setInterval(() => { + if (win.closed) { + closePicker(); + } + }, 500); + + window.dispatchEvent(new Event(ONEDRIVE_PICKER_OPEN_EVENT)); + } catch (err) { + openingRef.current = false; + const msg = err instanceof Error ? err.message : "Failed to open OneDrive Picker"; + setError(msg); + console.error("OneDrive Picker error:", err); + window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT)); + } finally { + setLoading(false); + } + }, [connectorId, closePicker]); + + return { openPicker, closePicker, loading, error }; +} From 101e426792b1134a7890ecb20c34a0a8b89db5d2 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:57:57 +0530 Subject: [PATCH 039/163] fix: remove error message display for Google Drive and OneDrive authentication issues; add toast notifications for picker errors --- .../connector-configs/components/google-drive-config.tsx | 2 -- .../connector-configs/components/onedrive-config.tsx | 2 -- surfsense_web/hooks/use-google-picker.ts | 6 +++++- surfsense_web/hooks/use-onedrive-picker.ts | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx index 6b01df9f8..bab993b5d 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx @@ -242,8 +242,6 @@ export const GoogleDriveConfig: FC = ({ connector, onConfi {totalSelected > 0 ? "Change Selection" : "Select from Google Drive"} - {pickerError && !isAuthExpired &&

{pickerError}

} - {isAuthExpired && (

Your Google Drive authentication has expired. Please re-authenticate using the button diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx index 65df4d01e..792c3f1c0 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx @@ -220,8 +220,6 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh {totalSelected > 0 ? "Change Selection" : "Select from OneDrive"} - {pickerError && !isAuthExpired &&

{pickerError}

} - {isAuthExpired && (

Your OneDrive authentication has expired. Please re-authenticate using the button diff --git a/surfsense_web/hooks/use-google-picker.ts b/surfsense_web/hooks/use-google-picker.ts index 6dd65f9e3..3a29bcd3e 100644 --- a/surfsense_web/hooks/use-google-picker.ts +++ b/surfsense_web/hooks/use-google-picker.ts @@ -1,6 +1,7 @@ "use client"; import { useCallback, useEffect, useRef, useState } from "react"; +import { toast } from "sonner"; import { connectorsApiService } from "@/lib/apis/connectors-api.service"; export interface PickerItem { @@ -159,7 +160,9 @@ export function useGooglePicker({ connectorId, onPicked }: UseGooglePickerOption } if (action === google.picker.Action.ERROR) { - setError("Google Drive encountered an error. Please try again."); + const msg = "Google Drive encountered an error. Please try again."; + setError(msg); + toast.error("Google Drive Picker failed", { description: msg }); } if ( @@ -180,6 +183,7 @@ export function useGooglePicker({ connectorId, onPicked }: UseGooglePickerOption openingRef.current = false; const msg = err instanceof Error ? err.message : "Failed to open Google Picker"; setError(msg); + toast.error("Google Drive Picker failed", { description: msg }); console.error("Google Picker error:", err); } finally { setLoading(false); diff --git a/surfsense_web/hooks/use-onedrive-picker.ts b/surfsense_web/hooks/use-onedrive-picker.ts index b5546074a..d94d7da50 100644 --- a/surfsense_web/hooks/use-onedrive-picker.ts +++ b/surfsense_web/hooks/use-onedrive-picker.ts @@ -1,6 +1,7 @@ "use client"; import { useCallback, useEffect, useRef, useState } from "react"; +import { toast } from "sonner"; import { authenticatedFetch } from "@/lib/auth-utils"; export interface OneDrivePickerItem { @@ -241,6 +242,7 @@ export function useOneDrivePicker({ connectorId, onPicked }: UseOneDrivePickerOp openingRef.current = false; const msg = err instanceof Error ? err.message : "Failed to open OneDrive Picker"; setError(msg); + toast.error("OneDrive Picker failed", { description: msg }); console.error("OneDrive Picker error:", err); window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT)); } finally { From cb6f4562ded756a92fb29cecc764a1bc0241b2b0 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Sat, 28 Mar 2026 23:12:33 +0200 Subject: [PATCH 040/163] add / action trigger to InlineMentionEditor --- .../assistant-ui/inline-mention-editor.tsx | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx index 66389cade..3994de1d5 100644 --- a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx +++ b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx @@ -40,6 +40,8 @@ interface InlineMentionEditorProps { placeholder?: string; onMentionTrigger?: (query: string) => void; onMentionClose?: () => void; + onActionTrigger?: (query: string) => void; + onActionClose?: () => void; onSubmit?: () => void; onChange?: (text: string, docs: MentionedDocument[]) => void; onDocumentRemove?: (docId: number, docType?: string) => void; @@ -90,6 +92,8 @@ export const InlineMentionEditor = forwardRef 0) { + const range = selection.getRangeAt(0); + const textNode = range.startContainer; + + if (textNode.nodeType === Node.TEXT_NODE) { + const textContent = textNode.textContent || ""; + const cursorPos = range.startOffset; + + let slashIndex = -1; + for (let i = cursorPos - 1; i >= 0; i--) { + if (textContent[i] === "/") { + slashIndex = i; + break; + } + if (textContent[i] === " " || textContent[i] === "\n") { + break; + } + } + + if (slashIndex !== -1 && (slashIndex === 0 || textContent[slashIndex - 1] === " " || textContent[slashIndex - 1] === "\n")) { + const query = textContent.slice(slashIndex + 1, cursorPos); + if (!query.startsWith(" ")) { + shouldTriggerAction = true; + actionQuery = query; + } + } + } + } + // If no @ found before cursor, check if text contains @ at all // If text is empty or doesn't contain @, close the mention if (!shouldTriggerMention) { @@ -533,9 +570,15 @@ export const InlineMentionEditor = forwardRef Date: Sat, 28 Mar 2026 23:16:02 +0200 Subject: [PATCH 041/163] add ActionPicker component for / command trigger --- .../components/new-chat/action-picker.tsx | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 surfsense_web/components/new-chat/action-picker.tsx diff --git a/surfsense_web/components/new-chat/action-picker.tsx b/surfsense_web/components/new-chat/action-picker.tsx new file mode 100644 index 000000000..d5ef01ae1 --- /dev/null +++ b/surfsense_web/components/new-chat/action-picker.tsx @@ -0,0 +1,164 @@ +"use client"; + +import { + BookOpen, + Check, + Globe, + Languages, + List, + Minimize2, + PenLine, + Search, + Zap, +} from "lucide-react"; +import { + forwardRef, + useCallback, + useEffect, + useImperativeHandle, + useMemo, + useRef, + useState, +} from "react"; + +import { cn } from "@/lib/utils"; + +export interface ActionPickerRef { + selectHighlighted: () => void; + moveUp: () => void; + moveDown: () => void; +} + +interface ActionPickerProps { + onSelect: (action: { name: string; prompt: string; mode: "transform" | "explore" }) => void; + onDone: () => void; + externalSearch?: string; + containerStyle?: React.CSSProperties; +} + +const ICONS: Record = { + check: , + minimize: , + languages: , + "pen-line": , + "book-open": , + list: , + search: , + globe: , + zap: , +}; + +const DEFAULT_ACTIONS: { name: string; prompt: string; mode: "transform" | "explore"; icon: string }[] = [ + { name: "Fix grammar", prompt: "Fix the grammar and spelling in the following text. Return only the corrected text, nothing else.\n\n{selection}", mode: "transform", icon: "check" }, + { name: "Make shorter", prompt: "Make the following text more concise while preserving its meaning. Return only the shortened text, nothing else.\n\n{selection}", mode: "transform", icon: "minimize" }, + { name: "Translate", prompt: "Translate the following text to English. If it is already in English, translate it to French. Return only the translation, nothing else.\n\n{selection}", mode: "transform", icon: "languages" }, + { name: "Rewrite", prompt: "Rewrite the following text to improve clarity and readability. Return only the rewritten text, nothing else.\n\n{selection}", mode: "transform", icon: "pen-line" }, + { name: "Summarize", prompt: "Summarize the following text concisely. Return only the summary, nothing else.\n\n{selection}", mode: "transform", icon: "list" }, + { name: "Explain", prompt: "Explain the following text in simple terms:\n\n{selection}", mode: "explore", icon: "book-open" }, + { name: "Ask my knowledge base", prompt: "Search my knowledge base for information related to:\n\n{selection}", mode: "explore", icon: "search" }, + { name: "Look up on the web", prompt: "Search the web for information about:\n\n{selection}", mode: "explore", icon: "globe" }, +]; + +export const ActionPicker = forwardRef( + function ActionPicker({ onSelect, onDone, externalSearch = "", containerStyle }, ref) { + const [highlightedIndex, setHighlightedIndex] = useState(0); + const scrollContainerRef = useRef(null); + const shouldScrollRef = useRef(false); + const itemRefs = useRef>(new Map()); + + const allActions = DEFAULT_ACTIONS; + + const filtered = useMemo(() => { + if (!externalSearch) return allActions; + return allActions.filter((a) => + a.name.toLowerCase().includes(externalSearch.toLowerCase()) + ); + }, [allActions, externalSearch]); + + // Reset highlight when results change + const prevSearchRef = useRef(externalSearch); + if (prevSearchRef.current !== externalSearch) { + prevSearchRef.current = externalSearch; + if (highlightedIndex !== 0) { + setHighlightedIndex(0); + } + } + + const handleSelect = useCallback( + (index: number) => { + const action = filtered[index]; + if (!action) return; + onSelect({ name: action.name, prompt: action.prompt, mode: action.mode }); + onDone(); + }, + [filtered, onSelect, onDone] + ); + + // Auto-scroll highlighted item into view + useEffect(() => { + if (!shouldScrollRef.current) return; + shouldScrollRef.current = false; + + const rafId = requestAnimationFrame(() => { + const item = itemRefs.current.get(highlightedIndex); + const container = scrollContainerRef.current; + if (item && container) { + const itemRect = item.getBoundingClientRect(); + const containerRect = container.getBoundingClientRect(); + if (itemRect.top < containerRect.top || itemRect.bottom > containerRect.bottom) { + item.scrollIntoView({ block: "nearest" }); + } + } + }); + + return () => cancelAnimationFrame(rafId); + }, [highlightedIndex]); + + useImperativeHandle( + ref, + () => ({ + selectHighlighted: () => handleSelect(highlightedIndex), + moveUp: () => { + shouldScrollRef.current = true; + setHighlightedIndex((prev) => (prev > 0 ? prev - 1 : filtered.length - 1)); + }, + moveDown: () => { + shouldScrollRef.current = true; + setHighlightedIndex((prev) => (prev < filtered.length - 1 ? prev + 1 : 0)); + }, + }), + [filtered.length, highlightedIndex, handleSelect] + ); + + if (filtered.length === 0) return null; + + return ( +

+
+ {filtered.map((action, index) => ( + + ))} +
+
+ ); + } +); From c2644aa6a256029bd25916b09b46b32781dfe45f Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Sat, 28 Mar 2026 23:20:10 +0200 Subject: [PATCH 042/163] wire / action picker in Composer with keyboard navigation --- .../components/assistant-ui/thread.tsx | 94 ++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx index 059aaf5a0..efe56ca19 100644 --- a/surfsense_web/components/assistant-ui/thread.tsx +++ b/surfsense_web/components/assistant-ui/thread.tsx @@ -57,6 +57,7 @@ import { import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button"; import { UserMessage } from "@/components/assistant-ui/user-message"; import { SLIDEOUT_PANEL_OPENED_EVENT } from "@/components/layout/ui/sidebar/SidebarSlideOutPanel"; +import { ActionPicker, type ActionPickerRef } from "@/components/new-chat/action-picker"; import { DocumentMentionPicker, type DocumentMentionPickerRef, @@ -298,10 +299,13 @@ const Composer: FC = () => { const [mentionedDocuments, setMentionedDocuments] = useAtom(mentionedDocumentsAtom); const setSidebarDocs = useSetAtom(sidebarSelectedDocumentsAtom); const [showDocumentPopover, setShowDocumentPopover] = useState(false); + const [showActionPicker, setShowActionPicker] = useState(false); const [mentionQuery, setMentionQuery] = useState(""); + const [actionQuery, setActionQuery] = useState(""); const editorRef = useRef(null); const editorContainerRef = useRef(null); const documentPickerRef = useRef(null); + const actionPickerRef = useRef(null); const { search_space_id, chat_id } = useParams(); const aui = useAui(); const hasAutoFocusedRef = useRef(false); @@ -421,9 +425,69 @@ const Composer: FC = () => { } }, [showDocumentPopover]); - // Keyboard navigation for document picker (arrow keys, Enter, Escape) + // Open action picker when / is triggered + const handleActionTrigger = useCallback((query: string) => { + setShowActionPicker(true); + setActionQuery(query); + }, []); + + // Close action picker and reset query + const handleActionClose = useCallback(() => { + if (showActionPicker) { + setShowActionPicker(false); + setActionQuery(""); + } + }, [showActionPicker]); + + // Handle action selection: prepend prompt template and auto-submit + const handleActionSelect = useCallback( + (action: { name: string; prompt: string; mode: "transform" | "explore" }) => { + setShowActionPicker(false); + setActionQuery(""); + + if (editorRef.current) { + const text = editorRef.current.getText(); + // Remove the /query from the text + const slashIndex = text.lastIndexOf("/"); + const userText = slashIndex !== -1 ? text.substring(0, slashIndex).trim() : text; + const finalPrompt = action.prompt.replace("{selection}", userText); + + aui.composer().setText(finalPrompt); + aui.composer().send(); + editorRef.current.clear(); + setMentionedDocuments([]); + setSidebarDocs([]); + } + }, + [aui, setMentionedDocuments, setSidebarDocs] + ); + + // Keyboard navigation for document/action picker (arrow keys, Enter, Escape) const handleKeyDown = useCallback( (e: React.KeyboardEvent) => { + if (showActionPicker) { + if (e.key === "ArrowDown") { + e.preventDefault(); + actionPickerRef.current?.moveDown(); + return; + } + if (e.key === "ArrowUp") { + e.preventDefault(); + actionPickerRef.current?.moveUp(); + return; + } + if (e.key === "Enter") { + e.preventDefault(); + actionPickerRef.current?.selectHighlighted(); + return; + } + if (e.key === "Escape") { + e.preventDefault(); + setShowActionPicker(false); + setActionQuery(""); + return; + } + } if (showDocumentPopover) { if (e.key === "ArrowDown") { e.preventDefault(); @@ -448,7 +512,7 @@ const Composer: FC = () => { } } }, - [showDocumentPopover] + [showDocumentPopover, showActionPicker] ); // Submit message (blocked during streaming, document picker open, or AI responding to another user) @@ -520,6 +584,8 @@ const Composer: FC = () => { placeholder={currentPlaceholder} onMentionTrigger={handleMentionTrigger} onMentionClose={handleMentionClose} + onActionTrigger={handleActionTrigger} + onActionClose={handleActionClose} onChange={handleEditorChange} onDocumentRemove={handleDocumentRemove} onSubmit={handleSubmit} @@ -553,6 +619,30 @@ const Composer: FC = () => { />, document.body )} + {showActionPicker && + typeof document !== "undefined" && + createPortal( + { + setShowActionPicker(false); + setActionQuery(""); + }} + externalSearch={actionQuery} + containerStyle={{ + position: "fixed", + bottom: editorContainerRef.current + ? `${window.innerHeight - editorContainerRef.current.getBoundingClientRect().top + 8}px` + : "200px", + left: editorContainerRef.current + ? `${editorContainerRef.current.getBoundingClientRect().left}px` + : "50%", + zIndex: 50, + }} + />, + document.body + )} From 407059ce84c74185bf5f923f345abbd040568cbc Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Sat, 28 Mar 2026 23:45:11 +0200 Subject: [PATCH 043/163] add action chip in composer with prompt prepend at send time --- .../assistant-ui/inline-mention-editor.tsx | 123 +++++++++++++++++- .../components/assistant-ui/thread.tsx | 38 +++--- 2 files changed, 142 insertions(+), 19 deletions(-) diff --git a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx index 3994de1d5..23a7430af 100644 --- a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx +++ b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx @@ -1,6 +1,6 @@ "use client"; -import { X } from "lucide-react"; +import { Sparkles, X } from "lucide-react"; import { createElement, forwardRef, @@ -34,6 +34,8 @@ export interface InlineMentionEditorRef { statusLabel: string | null, statusKind?: "pending" | "processing" | "ready" | "failed" ) => void; + insertActionChip: (name: string) => void; + getSelectedAction: () => string | null; } interface InlineMentionEditorProps { @@ -42,6 +44,7 @@ interface InlineMentionEditorProps { onMentionClose?: () => void; onActionTrigger?: (query: string) => void; onActionClose?: () => void; + onActionRemove?: () => void; onSubmit?: () => void; onChange?: (text: string, docs: MentionedDocument[]) => void; onDocumentRemove?: (docId: number, docType?: string) => void; @@ -54,6 +57,7 @@ interface InlineMentionEditorProps { // Unique data attribute to identify chip elements const CHIP_DATA_ATTR = "data-mention-chip"; +const ACTION_CHIP_ATTR = "data-action-chip"; const CHIP_ID_ATTR = "data-mention-id"; const CHIP_DOCTYPE_ATTR = "data-mention-doctype"; const CHIP_STATUS_ATTR = "data-mention-status"; @@ -94,6 +98,7 @@ export const InlineMentionEditor = forwardRef { + const chip = document.createElement("span"); + chip.setAttribute(ACTION_CHIP_ATTR, name); + chip.contentEditable = "false"; + chip.className = + "inline-flex items-center gap-1 mx-0.5 px-1.5 py-0.5 rounded-md bg-accent border text-xs font-medium text-foreground select-none cursor-default"; + chip.style.userSelect = "none"; + chip.style.verticalAlign = "baseline"; + + const iconSpan = document.createElement("span"); + iconSpan.className = "flex items-center text-muted-foreground"; + iconSpan.innerHTML = ReactDOMServer.renderToString( + createElement(Sparkles, { className: "h-3 w-3" }) + ); + + const titleSpan = document.createElement("span"); + titleSpan.textContent = name; + + const removeBtn = document.createElement("button"); + removeBtn.type = "button"; + removeBtn.className = + "ml-0.5 flex items-center text-muted-foreground hover:text-foreground transition-colors"; + removeBtn.innerHTML = ReactDOMServer.renderToString( + createElement(X, { className: "h-3 w-3", strokeWidth: 2.5 }) + ); + removeBtn.onclick = (e) => { + e.preventDefault(); + e.stopPropagation(); + chip.remove(); + onActionRemove?.(); + focusAtEnd(); + }; + + chip.appendChild(iconSpan); + chip.appendChild(titleSpan); + chip.appendChild(removeBtn); + + return chip; + }, + [focusAtEnd, onActionRemove] + ); + + const insertActionChip = useCallback( + (name: string) => { + if (!editorRef.current) return; + + // Remove any existing action chip + const existing = editorRef.current.querySelector(`[${ACTION_CHIP_ATTR}]`); + if (existing) existing.remove(); + + // Find and remove the /query text before cursor + const selection = window.getSelection(); + if (selection && selection.rangeCount > 0) { + const range = selection.getRangeAt(0); + const textNode = range.startContainer; + + if (textNode.nodeType === Node.TEXT_NODE) { + const text = textNode.textContent || ""; + const cursorPos = range.startOffset; + + let slashIndex = -1; + for (let i = cursorPos - 1; i >= 0; i--) { + if (text[i] === "/") { + slashIndex = i; + break; + } + } + + if (slashIndex !== -1) { + const beforeSlash = text.slice(0, slashIndex); + const afterCursor = text.slice(cursorPos); + const chip = createActionChipElement(name); + const parent = textNode.parentNode; + + if (parent) { + const beforeNode = document.createTextNode(beforeSlash); + const afterNode = document.createTextNode(` ${afterCursor}`); + parent.insertBefore(beforeNode, textNode); + parent.insertBefore(chip, textNode); + parent.insertBefore(afterNode, textNode); + parent.removeChild(textNode); + + const newRange = document.createRange(); + newRange.setStart(afterNode, 1); + newRange.collapse(true); + selection.removeAllRanges(); + selection.addRange(newRange); + } + return; + } + } + } + + // Fallback: insert at beginning + const chip = createActionChipElement(name); + editorRef.current.insertBefore(chip, editorRef.current.firstChild); + editorRef.current.insertBefore(document.createTextNode(" "), chip.nextSibling); + focusAtEnd(); + }, + [createActionChipElement, focusAtEnd] + ); + + const getSelectedAction = useCallback((): string | null => { + if (!editorRef.current) return null; + const chip = editorRef.current.querySelector(`[${ACTION_CHIP_ATTR}]`); + return chip?.getAttribute(ACTION_CHIP_ATTR) ?? null; + }, []); + // Insert a document chip at the current cursor position const insertDocumentChip = useCallback( (doc: Pick) => { @@ -477,6 +596,8 @@ export const InlineMentionEditor = forwardRef { } }, [showActionPicker]); - // Handle action selection: prepend prompt template and auto-submit + // Pending action prompt stored when user picks an action + const pendingActionRef = useRef<{ name: string; prompt: string; mode: "transform" | "explore" } | null>(null); + const handleActionSelect = useCallback( (action: { name: string; prompt: string; mode: "transform" | "explore" }) => { setShowActionPicker(false); setActionQuery(""); - - if (editorRef.current) { - const text = editorRef.current.getText(); - // Remove the /query from the text - const slashIndex = text.lastIndexOf("/"); - const userText = slashIndex !== -1 ? text.substring(0, slashIndex).trim() : text; - const finalPrompt = action.prompt.replace("{selection}", userText); - - aui.composer().setText(finalPrompt); - aui.composer().send(); - editorRef.current.clear(); - setMentionedDocuments([]); - setSidebarDocs([]); - } + pendingActionRef.current = action; + editorRef.current?.insertActionChip(action.name); }, - [aui, setMentionedDocuments, setSidebarDocs] + [] ); + const handleActionRemove = useCallback(() => { + pendingActionRef.current = null; + }, []); + // Keyboard navigation for document/action picker (arrow keys, Enter, Escape) const handleKeyDown = useCallback( (e: React.KeyboardEvent) => { @@ -520,7 +514,13 @@ const Composer: FC = () => { if (isThreadRunning || isBlockedByOtherUser) { return; } - if (!showDocumentPopover) { + if (!showDocumentPopover && !showActionPicker) { + if (pendingActionRef.current) { + const userText = editorRef.current?.getText() ?? ""; + const finalPrompt = pendingActionRef.current.prompt.replace("{selection}", userText); + aui.composer().setText(finalPrompt); + pendingActionRef.current = null; + } aui.composer().send(); editorRef.current?.clear(); setMentionedDocuments([]); @@ -528,6 +528,7 @@ const Composer: FC = () => { } }, [ showDocumentPopover, + showActionPicker, isThreadRunning, isBlockedByOtherUser, aui, @@ -586,6 +587,7 @@ const Composer: FC = () => { onMentionClose={handleMentionClose} onActionTrigger={handleActionTrigger} onActionClose={handleActionClose} + onActionRemove={handleActionRemove} onChange={handleEditorChange} onDocumentRemove={handleDocumentRemove} onSubmit={handleSubmit} @@ -633,7 +635,7 @@ const Composer: FC = () => { containerStyle={{ position: "fixed", bottom: editorContainerRef.current - ? `${window.innerHeight - editorContainerRef.current.getBoundingClientRect().top + 8}px` + ? `${window.innerHeight - editorContainerRef.current.getBoundingClientRect().top + 12}px` : "200px", left: editorContainerRef.current ? `${editorContainerRef.current.getBoundingClientRect().left}px` From 041401aefc3f09aefa449d1da772b4c27d3ac04a Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Fri, 27 Mar 2026 21:02:36 +0200 Subject: [PATCH 044/163] add custom quick-ask actions: model, migration, schemas, CRUD routes --- .../109_add_quick_ask_actions_table.py | 62 ++++++++++++ surfsense_backend/app/db.py | 29 ++++++ surfsense_backend/app/routes/__init__.py | 2 + .../app/routes/quick_ask_actions_routes.py | 94 +++++++++++++++++++ .../app/schemas/quick_ask_actions.py | 31 ++++++ 5 files changed, 218 insertions(+) create mode 100644 surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py create mode 100644 surfsense_backend/app/routes/quick_ask_actions_routes.py create mode 100644 surfsense_backend/app/schemas/quick_ask_actions.py diff --git a/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py b/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py new file mode 100644 index 000000000..2b8db7cd4 --- /dev/null +++ b/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py @@ -0,0 +1,62 @@ +"""add quick_ask_actions table + +Revision ID: 109 +Revises: 108 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +revision: str = "109" +down_revision: str | None = "108" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.execute(""" + DO $$ BEGIN + CREATE TYPE quick_ask_action_mode AS ENUM ('transform', 'explore'); + EXCEPTION + WHEN duplicate_object THEN null; + END $$; + """) + + conn = op.get_bind() + result = conn.execute( + sa.text("SELECT 1 FROM information_schema.tables WHERE table_name = 'quick_ask_actions'") + ) + if not result.fetchone(): + op.create_table( + "quick_ask_actions", + sa.Column("id", sa.Integer(), autoincrement=True, nullable=False), + sa.Column("user_id", sa.dialects.postgresql.UUID(as_uuid=True), nullable=False), + sa.Column("search_space_id", sa.Integer(), nullable=True), + sa.Column("name", sa.String(200), nullable=False), + sa.Column("prompt", sa.Text(), nullable=False), + sa.Column( + "mode", + sa.Enum("transform", "explore", name="quick_ask_action_mode", create_type=False), + nullable=False, + ), + sa.Column("icon", sa.String(50), nullable=True), + sa.Column( + "created_at", + sa.TIMESTAMP(timezone=True), + nullable=False, + server_default=sa.func.now(), + ), + sa.ForeignKeyConstraint(["user_id"], ["user.id"], ondelete="CASCADE"), + sa.ForeignKeyConstraint(["search_space_id"], ["searchspaces.id"], ondelete="CASCADE"), + sa.PrimaryKeyConstraint("id"), + ) + op.create_index("ix_quick_ask_actions_user_id", "quick_ask_actions", ["user_id"]) + op.create_index("ix_quick_ask_actions_search_space_id", "quick_ask_actions", ["search_space_id"]) + + +def downgrade() -> None: + op.drop_table("quick_ask_actions") + op.execute("DROP TYPE IF EXISTS quick_ask_action_mode") diff --git a/surfsense_backend/app/db.py b/surfsense_backend/app/db.py index 132bd8dae..eaa445223 100644 --- a/surfsense_backend/app/db.py +++ b/surfsense_backend/app/db.py @@ -1722,6 +1722,35 @@ class SearchSpaceInvite(BaseModel, TimestampMixin): ) +class QuickAskActionMode(StrEnum): + TRANSFORM = "transform" + EXPLORE = "explore" + + +class QuickAskAction(BaseModel, TimestampMixin): + __tablename__ = "quick_ask_actions" + + user_id = Column( + UUID(as_uuid=True), + ForeignKey("user.id", ondelete="CASCADE"), + nullable=False, + index=True, + ) + search_space_id = Column( + Integer, + ForeignKey("searchspaces.id", ondelete="CASCADE"), + nullable=True, + index=True, + ) + name = Column(String(200), nullable=False) + prompt = Column(Text, nullable=False) + mode = Column(SQLAlchemyEnum(QuickAskActionMode), nullable=False) + icon = Column(String(50), nullable=True) + + user = relationship("User") + search_space = relationship("SearchSpace") + + if config.AUTH_TYPE == "GOOGLE": class OAuthAccount(SQLAlchemyBaseOAuthAccountTableUUID, Base): diff --git a/surfsense_backend/app/routes/__init__.py b/surfsense_backend/app/routes/__init__.py index f6975b69d..171ee5792 100644 --- a/surfsense_backend/app/routes/__init__.py +++ b/surfsense_backend/app/routes/__init__.py @@ -34,6 +34,7 @@ from .notifications_routes import router as notifications_router from .notion_add_connector_route import router as notion_add_connector_router from .podcasts_routes import router as podcasts_router from .public_chat_routes import router as public_chat_router +from .quick_ask_actions_routes import router as quick_ask_actions_router from .rbac_routes import router as rbac_router from .reports_routes import router as reports_router from .sandbox_routes import router as sandbox_router @@ -85,3 +86,4 @@ router.include_router(composio_router) # Composio OAuth and toolkit management router.include_router(public_chat_router) # Public chat sharing and cloning router.include_router(incentive_tasks_router) # Incentive tasks for earning free pages router.include_router(youtube_router) # YouTube playlist resolution +router.include_router(quick_ask_actions_router) diff --git a/surfsense_backend/app/routes/quick_ask_actions_routes.py b/surfsense_backend/app/routes/quick_ask_actions_routes.py new file mode 100644 index 000000000..6b9868a07 --- /dev/null +++ b/surfsense_backend/app/routes/quick_ask_actions_routes.py @@ -0,0 +1,94 @@ +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + +from app.db import QuickAskAction, User, get_async_session +from app.schemas.quick_ask_actions import ( + QuickAskActionCreate, + QuickAskActionRead, + QuickAskActionUpdate, +) +from app.users import current_active_user + +router = APIRouter(tags=["Quick Ask Actions"]) + + +@router.get("/quick-ask-actions", response_model=list[QuickAskActionRead]) +async def list_actions( + search_space_id: int | None = None, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + query = select(QuickAskAction).where(QuickAskAction.user_id == user.id) + if search_space_id is not None: + query = query.where(QuickAskAction.search_space_id == search_space_id) + query = query.order_by(QuickAskAction.created_at.desc()) + result = await session.execute(query) + return result.scalars().all() + + +@router.post("/quick-ask-actions", response_model=QuickAskActionRead) +async def create_action( + body: QuickAskActionCreate, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + action = QuickAskAction( + user_id=user.id, + search_space_id=body.search_space_id, + name=body.name, + prompt=body.prompt, + mode=body.mode, + icon=body.icon, + ) + session.add(action) + await session.commit() + await session.refresh(action) + return action + + +@router.put("/quick-ask-actions/{action_id}", response_model=QuickAskActionRead) +async def update_action( + action_id: int, + body: QuickAskActionUpdate, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + result = await session.execute( + select(QuickAskAction).where( + QuickAskAction.id == action_id, + QuickAskAction.user_id == user.id, + ) + ) + action = result.scalar_one_or_none() + if not action: + raise HTTPException(status_code=404, detail="Action not found") + + for field, value in body.model_dump(exclude_unset=True).items(): + setattr(action, field, value) + + session.add(action) + await session.commit() + await session.refresh(action) + return action + + +@router.delete("/quick-ask-actions/{action_id}") +async def delete_action( + action_id: int, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + result = await session.execute( + select(QuickAskAction).where( + QuickAskAction.id == action_id, + QuickAskAction.user_id == user.id, + ) + ) + action = result.scalar_one_or_none() + if not action: + raise HTTPException(status_code=404, detail="Action not found") + + await session.delete(action) + await session.commit() + return {"success": True} diff --git a/surfsense_backend/app/schemas/quick_ask_actions.py b/surfsense_backend/app/schemas/quick_ask_actions.py new file mode 100644 index 000000000..90fa716b9 --- /dev/null +++ b/surfsense_backend/app/schemas/quick_ask_actions.py @@ -0,0 +1,31 @@ +from datetime import datetime + +from pydantic import BaseModel, Field + + +class QuickAskActionCreate(BaseModel): + name: str = Field(..., min_length=1, max_length=200) + prompt: str = Field(..., min_length=1) + mode: str = Field(..., pattern="^(transform|explore)$") + icon: str | None = Field(None, max_length=50) + search_space_id: int | None = None + + +class QuickAskActionUpdate(BaseModel): + name: str | None = Field(None, min_length=1, max_length=200) + prompt: str | None = Field(None, min_length=1) + mode: str | None = Field(None, pattern="^(transform|explore)$") + icon: str | None = Field(None, max_length=50) + + +class QuickAskActionRead(BaseModel): + id: int + name: str + prompt: str + mode: str + icon: str | None + search_space_id: int | None + created_at: datetime + + class Config: + from_attributes = True From 11374248d82cbf30dd80d6f2c92a8473ebd2b759 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Sat, 28 Mar 2026 23:51:33 +0200 Subject: [PATCH 045/163] restore custom actions API service and wire to ActionPicker --- .../components/new-chat/action-picker.tsx | 17 +++++- .../types/quick-ask-actions.types.ts | 39 ++++++++++++ .../lib/apis/quick-ask-actions-api.service.ts | 59 +++++++++++++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 surfsense_web/lib/apis/quick-ask-actions-api.service.ts diff --git a/surfsense_web/components/new-chat/action-picker.tsx b/surfsense_web/components/new-chat/action-picker.tsx index d5ef01ae1..4bfac23f4 100644 --- a/surfsense_web/components/new-chat/action-picker.tsx +++ b/surfsense_web/components/new-chat/action-picker.tsx @@ -21,6 +21,8 @@ import { useState, } from "react"; +import type { QuickAskActionRead } from "@/contracts/types/quick-ask-actions.types"; +import { quickAskActionsApiService } from "@/lib/apis/quick-ask-actions-api.service"; import { cn } from "@/lib/utils"; export interface ActionPickerRef { @@ -62,11 +64,24 @@ const DEFAULT_ACTIONS: { name: string; prompt: string; mode: "transform" | "expl export const ActionPicker = forwardRef( function ActionPicker({ onSelect, onDone, externalSearch = "", containerStyle }, ref) { const [highlightedIndex, setHighlightedIndex] = useState(0); + const [customActions, setCustomActions] = useState([]); const scrollContainerRef = useRef(null); const shouldScrollRef = useRef(false); const itemRefs = useRef>(new Map()); - const allActions = DEFAULT_ACTIONS; + useEffect(() => { + quickAskActionsApiService.list().then(setCustomActions).catch(() => {}); + }, []); + + const allActions = useMemo(() => { + const customs = customActions.map((a) => ({ + name: a.name, + prompt: a.prompt, + mode: a.mode as "transform" | "explore", + icon: a.icon || "zap", + })); + return [...DEFAULT_ACTIONS, ...customs]; + }, [customActions]); const filtered = useMemo(() => { if (!externalSearch) return allActions; diff --git a/surfsense_web/contracts/types/quick-ask-actions.types.ts b/surfsense_web/contracts/types/quick-ask-actions.types.ts index f7ee22c0b..eaee09501 100644 --- a/surfsense_web/contracts/types/quick-ask-actions.types.ts +++ b/surfsense_web/contracts/types/quick-ask-actions.types.ts @@ -1,5 +1,44 @@ +import { z } from "zod"; + export type QuickAskActionMode = "transform" | "explore"; +export const quickAskActionRead = z.object({ + id: z.number(), + name: z.string(), + prompt: z.string(), + mode: z.enum(["transform", "explore"]), + icon: z.string().nullable(), + search_space_id: z.number().nullable(), + created_at: z.string(), +}); + +export type QuickAskActionRead = z.infer; + +export const quickAskActionsListResponse = z.array(quickAskActionRead); + +export const quickAskActionCreateRequest = z.object({ + name: z.string().min(1).max(200), + prompt: z.string().min(1), + mode: z.enum(["transform", "explore"]), + icon: z.string().max(50).nullable().optional(), + search_space_id: z.number().nullable().optional(), +}); + +export type QuickAskActionCreateRequest = z.infer; + +export const quickAskActionUpdateRequest = z.object({ + name: z.string().min(1).max(200).optional(), + prompt: z.string().min(1).optional(), + mode: z.enum(["transform", "explore"]).optional(), + icon: z.string().max(50).nullable().optional(), +}); + +export type QuickAskActionUpdateRequest = z.infer; + +export const quickAskActionDeleteResponse = z.object({ + success: z.boolean(), +}); + export interface QuickAskAction { id: string; name: string; diff --git a/surfsense_web/lib/apis/quick-ask-actions-api.service.ts b/surfsense_web/lib/apis/quick-ask-actions-api.service.ts new file mode 100644 index 000000000..ae1c3a360 --- /dev/null +++ b/surfsense_web/lib/apis/quick-ask-actions-api.service.ts @@ -0,0 +1,59 @@ +import { + type QuickAskActionCreateRequest, + type QuickAskActionUpdateRequest, + quickAskActionCreateRequest, + quickAskActionDeleteResponse, + quickAskActionRead, + quickAskActionUpdateRequest, + quickAskActionsListResponse, +} from "@/contracts/types/quick-ask-actions.types"; +import { ValidationError } from "@/lib/error"; +import { baseApiService } from "./base-api.service"; + +class QuickAskActionsApiService { + list = async (searchSpaceId?: number) => { + const params = new URLSearchParams(); + if (searchSpaceId !== undefined) { + params.set("search_space_id", String(searchSpaceId)); + } + const queryString = params.toString(); + const url = queryString + ? `/api/v1/quick-ask-actions?${queryString}` + : "/api/v1/quick-ask-actions"; + + return baseApiService.get(url, quickAskActionsListResponse); + }; + + create = async (request: QuickAskActionCreateRequest) => { + const parsed = quickAskActionCreateRequest.safeParse(request); + if (!parsed.success) { + const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); + throw new ValidationError(`Invalid request: ${errorMessage}`); + } + + return baseApiService.post("/api/v1/quick-ask-actions", quickAskActionRead, { + body: parsed.data, + }); + }; + + update = async (actionId: number, request: QuickAskActionUpdateRequest) => { + const parsed = quickAskActionUpdateRequest.safeParse(request); + if (!parsed.success) { + const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); + throw new ValidationError(`Invalid request: ${errorMessage}`); + } + + return baseApiService.put(`/api/v1/quick-ask-actions/${actionId}`, quickAskActionRead, { + body: parsed.data, + }); + }; + + delete = async (actionId: number) => { + return baseApiService.delete( + `/api/v1/quick-ask-actions/${actionId}`, + quickAskActionDeleteResponse + ); + }; +} + +export const quickAskActionsApiService = new QuickAskActionsApiService(); From c8767272ec849dd3c290c48c24a326016cd69fae Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sun, 29 Mar 2026 03:29:31 +0530 Subject: [PATCH 046/163] feat: enhance OneDrive folder management by adding mimeType handling and integrating DriveFolderTree component for improved UI --- .../app/connectors/onedrive/folder_manager.py | 4 + .../routes/onedrive_add_connector_route.py | 118 +------- .../assistant-ui/connector-popup.tsx | 8 - .../components/composio-drive-config.tsx | 30 ++- .../components/onedrive-config.tsx | 169 +++++++----- ...-folder-tree.tsx => drive-folder-tree.tsx} | 246 ++++++++--------- .../contracts/types/connector.types.ts | 2 +- .../hooks/use-composio-drive-folders.ts | 28 -- surfsense_web/hooks/use-onedrive-picker.ts | 254 ------------------ surfsense_web/lib/query-client/cache-keys.ts | 4 - 10 files changed, 257 insertions(+), 606 deletions(-) rename surfsense_web/components/connectors/{composio-drive-folder-tree.tsx => drive-folder-tree.tsx} (66%) delete mode 100644 surfsense_web/hooks/use-composio-drive-folders.ts delete mode 100644 surfsense_web/hooks/use-onedrive-picker.ts diff --git a/surfsense_backend/app/connectors/onedrive/folder_manager.py b/surfsense_backend/app/connectors/onedrive/folder_manager.py index ad04e12ff..7f286453c 100644 --- a/surfsense_backend/app/connectors/onedrive/folder_manager.py +++ b/surfsense_backend/app/connectors/onedrive/folder_manager.py @@ -24,6 +24,10 @@ async def list_folder_contents( for item in items: item["isFolder"] = is_folder(item) + if item["isFolder"]: + item.setdefault("mimeType", "application/vnd.ms-folder") + else: + item.setdefault("mimeType", item.get("file", {}).get("mimeType", "application/octet-stream")) items.sort(key=lambda x: (not x["isFolder"], x.get("name", "").lower())) diff --git a/surfsense_backend/app/routes/onedrive_add_connector_route.py b/surfsense_backend/app/routes/onedrive_add_connector_route.py index 64f5b2461..19bcbe6ff 100644 --- a/surfsense_backend/app/routes/onedrive_add_connector_route.py +++ b/surfsense_backend/app/routes/onedrive_add_connector_route.py @@ -5,8 +5,7 @@ Endpoints: - GET /auth/onedrive/connector/add - Initiate OAuth - GET /auth/onedrive/connector/callback - Handle OAuth callback - GET /auth/onedrive/connector/reauth - Re-authenticate existing connector -- GET /connectors/{connector_id}/onedrive/folders - List folder contents (legacy custom browser) -- GET /connectors/{connector_id}/onedrive/picker-token - Get SharePoint token for File Picker v8 +- GET /connectors/{connector_id}/onedrive/folders - List folder contents """ import logging @@ -396,121 +395,6 @@ async def list_onedrive_folders( raise HTTPException(status_code=500, detail=f"Failed to list OneDrive contents: {e!s}") from e -@router.get("/connectors/{connector_id}/onedrive/picker-token") -async def get_onedrive_picker_token( - connector_id: int, - resource: str | None = None, - session: AsyncSession = Depends(get_async_session), - user: User = Depends(current_active_user), -): - """Get an access token scoped for the OneDrive File Picker v8. - - The picker requires SharePoint-audience tokens, not Graph tokens. - If *resource* is omitted the user's OneDrive root URL is resolved via - Graph and used as the resource. - """ - try: - result = await session.execute( - select(SearchSourceConnector).filter( - SearchSourceConnector.id == connector_id, - SearchSourceConnector.user_id == user.id, - SearchSourceConnector.connector_type == SearchSourceConnectorType.ONEDRIVE_CONNECTOR, - ) - ) - connector = result.scalars().first() - if not connector: - raise HTTPException(status_code=404, detail="OneDrive connector not found or access denied") - - token_encryption = get_token_encryption() - is_encrypted = connector.config.get("_token_encrypted", False) - - # Resolve the SharePoint base URL when the caller doesn't provide one - if not resource: - access_token = connector.config.get("access_token") - if is_encrypted and access_token: - access_token = token_encryption.decrypt_token(access_token) - - # Refresh the Graph token if it has expired - expires_at_str = connector.config.get("expires_at") - if expires_at_str: - from dateutil.parser import parse as parse_date - if datetime.now(UTC) >= parse_date(expires_at_str): - connector = await refresh_onedrive_token(session, connector) - access_token = connector.config.get("access_token") - if connector.config.get("_token_encrypted") and access_token: - access_token = token_encryption.decrypt_token(access_token) - - async with httpx.AsyncClient() as client: - drive_resp = await client.get( - "https://graph.microsoft.com/v1.0/me/drive/root", - headers={"Authorization": f"Bearer {access_token}"}, - timeout=30.0, - ) - if drive_resp.status_code != 200: - raise HTTPException( - status_code=500, - detail="Failed to resolve OneDrive base URL from Graph API", - ) - from urllib.parse import urlparse - web_url = drive_resp.json().get("webUrl", "") - parsed = urlparse(web_url) - resource = f"{parsed.scheme}://{parsed.hostname}" - - # Exchange the refresh token for a SharePoint-audience token - refresh_token = connector.config.get("refresh_token") - if is_encrypted and refresh_token: - refresh_token = token_encryption.decrypt_token(refresh_token) - if not refresh_token: - raise HTTPException(status_code=400, detail="No refresh token available") - - token_data = { - "client_id": config.MICROSOFT_CLIENT_ID, - "client_secret": config.MICROSOFT_CLIENT_SECRET, - "grant_type": "refresh_token", - "refresh_token": refresh_token, - "scope": f"{resource}/.default", - } - async with httpx.AsyncClient() as client: - token_response = await client.post( - TOKEN_URL, - data=token_data, - headers={"Content-Type": "application/x-www-form-urlencoded"}, - timeout=30.0, - ) - - if token_response.status_code != 200: - error_detail = "Failed to acquire picker token" - try: - error_json = token_response.json() - error_detail = error_json.get("error_description", error_detail) - except Exception: - pass - logger.error("Picker token exchange failed for connector %s: %s", connector_id, error_detail) - raise HTTPException(status_code=400, detail=error_detail) - - token_json = token_response.json() - - # Persist new refresh token when Microsoft rotates it - new_refresh = token_json.get("refresh_token") - if new_refresh: - cfg = dict(connector.config) - cfg["refresh_token"] = token_encryption.encrypt_token(new_refresh) - connector.config = cfg - flag_modified(connector, "config") - await session.commit() - - return { - "access_token": token_json["access_token"], - "base_url": resource, - } - - except HTTPException: - raise - except Exception as e: - logger.error("Error getting OneDrive picker token: %s", str(e), exc_info=True) - raise HTTPException(status_code=500, detail=f"Failed to get picker token: {e!s}") from e - - async def refresh_onedrive_token( session: AsyncSession, connector: SearchSourceConnector ) -> SearchSourceConnector: diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx index b725ab703..14c481960 100644 --- a/surfsense_web/components/assistant-ui/connector-popup.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup.tsx @@ -22,10 +22,6 @@ import { Tabs, TabsContent } from "@/components/ui/tabs"; import type { SearchSourceConnector } from "@/contracts/types/connector.types"; import { useConnectorsSync } from "@/hooks/use-connectors-sync"; import { PICKER_CLOSE_EVENT, PICKER_OPEN_EVENT } from "@/hooks/use-google-picker"; -import { - ONEDRIVE_PICKER_CLOSE_EVENT, - ONEDRIVE_PICKER_OPEN_EVENT, -} from "@/hooks/use-onedrive-picker"; import { cn } from "@/lib/utils"; import { ConnectorDialogHeader } from "./connector-popup/components/connector-dialog-header"; import { ConnectorConnectView } from "./connector-popup/connector-configs/views/connector-connect-view"; @@ -153,13 +149,9 @@ export const ConnectorIndicator = forwardRef setPickerOpen(false); window.addEventListener(PICKER_OPEN_EVENT, onOpen); window.addEventListener(PICKER_CLOSE_EVENT, onClose); - window.addEventListener(ONEDRIVE_PICKER_OPEN_EVENT, onOpen); - window.addEventListener(ONEDRIVE_PICKER_CLOSE_EVENT, onClose); return () => { window.removeEventListener(PICKER_OPEN_EVENT, onOpen); window.removeEventListener(PICKER_CLOSE_EVENT, onClose); - window.removeEventListener(ONEDRIVE_PICKER_OPEN_EVENT, onOpen); - window.removeEventListener(ONEDRIVE_PICKER_CLOSE_EVENT, onClose); }; }, []); diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx index f7f490774..0f6044050 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx @@ -13,7 +13,7 @@ import { } from "lucide-react"; import type { FC } from "react"; import { useCallback, useEffect, useState } from "react"; -import { ComposioDriveFolderTree } from "@/components/connectors/composio-drive-folder-tree"; +import { DriveFolderTree, type SelectedFolder } from "@/components/connectors/drive-folder-tree"; import { Label } from "@/components/ui/label"; import { Select, @@ -23,13 +23,9 @@ import { SelectValue, } from "@/components/ui/select"; import { Switch } from "@/components/ui/switch"; +import { connectorsApiService } from "@/lib/apis/connectors-api.service"; import type { ConnectorConfigProps } from "../index"; -interface SelectedFolder { - id: string; - name: string; -} - interface IndexingOptions { max_files_per_folder: number; incremental_sync: boolean; @@ -102,6 +98,16 @@ export const ComposioDriveConfig: FC = ({ connector, onCon setAuthError(true); }, []); + const fetchItems = useCallback( + async (parentId?: string) => { + return connectorsApiService.listComposioDriveFolders({ + connector_id: connector.id, + parent_id: parentId, + }); + }, + [connector.id] + ); + const [isEditMode] = useState(() => existingFolders.length > 0 || existingFiles.length > 0); const [isFolderTreeOpen, setIsFolderTreeOpen] = useState(!isEditMode); @@ -255,24 +261,28 @@ export const ComposioDriveConfig: FC = ({ connector, onCon )} {isFolderTreeOpen && ( - )}
) : ( - )}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx index 792c3f1c0..250a353cd 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx +++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx @@ -1,6 +1,8 @@ "use client"; import { + ChevronDown, + ChevronRight, File, FileSpreadsheet, FileText, @@ -11,7 +13,7 @@ import { } from "lucide-react"; import type { FC } from "react"; import { useCallback, useEffect, useState } from "react"; -import { Button } from "@/components/ui/button"; +import { DriveFolderTree, type SelectedFolder } from "@/components/connectors/drive-folder-tree"; import { Label } from "@/components/ui/label"; import { Select, @@ -20,17 +22,10 @@ import { SelectTrigger, SelectValue, } from "@/components/ui/select"; -import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; -import { type OneDrivePickerResult, useOneDrivePicker } from "@/hooks/use-onedrive-picker"; +import { connectorsApiService } from "@/lib/apis/connectors-api.service"; import type { ConnectorConfigProps } from "../index"; -interface SelectedItem { - id: string; - name: string; - driveId?: string; -} - interface IndexingOptions { max_files_per_folder: number; incremental_sync: boolean; @@ -43,7 +38,7 @@ const DEFAULT_INDEXING_OPTIONS: IndexingOptions = { include_subfolders: true, }; -function getFileIconFromName(fileName: string, className = "size-3.5 shrink-0") { +function getFileIconFromName(fileName: string, className: string = "size-3.5 shrink-0") { const lowerName = fileName.toLowerCase(); if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls") || lowerName.endsWith(".csv")) { return ; @@ -61,18 +56,39 @@ function getFileIconFromName(fileName: string, className = "size-3.5 shrink-0") } export const OneDriveConfig: FC = ({ connector, onConfigChange }) => { - const existingFolders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; - const existingFiles = (connector.config?.selected_files as SelectedItem[] | undefined) || []; + const existingFolders = + (connector.config?.selected_folders as SelectedFolder[] | undefined) || []; + const existingFiles = (connector.config?.selected_files as SelectedFolder[] | undefined) || []; const existingIndexingOptions = (connector.config?.indexing_options as IndexingOptions | undefined) || DEFAULT_INDEXING_OPTIONS; - const [selectedFolders, setSelectedFolders] = useState(existingFolders); - const [selectedFiles, setSelectedFiles] = useState(existingFiles); + const [selectedFolders, setSelectedFolders] = useState(existingFolders); + const [selectedFiles, setSelectedFiles] = useState(existingFiles); const [indexingOptions, setIndexingOptions] = useState(existingIndexingOptions); + const [authError, setAuthError] = useState(false); + + const isAuthExpired = connector.config?.auth_expired === true || authError; + + const handleAuthError = useCallback(() => { + setAuthError(true); + }, []); + + const fetchItems = useCallback( + async (parentId?: string) => { + return connectorsApiService.listOneDriveFolders({ + connector_id: connector.id, + parent_id: parentId, + }); + }, + [connector.id] + ); + + const [isEditMode] = useState(() => existingFolders.length > 0 || existingFiles.length > 0); + const [isFolderTreeOpen, setIsFolderTreeOpen] = useState(!isEditMode); useEffect(() => { - const folders = (connector.config?.selected_folders as SelectedItem[] | undefined) || []; - const files = (connector.config?.selected_files as SelectedItem[] | undefined) || []; + const folders = (connector.config?.selected_folders as SelectedFolder[] | undefined) || []; + const files = (connector.config?.selected_files as SelectedFolder[] | undefined) || []; const options = (connector.config?.indexing_options as IndexingOptions | undefined) || DEFAULT_INDEXING_OPTIONS; @@ -82,9 +98,9 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh }, [connector.config]); const updateConfig = ( - folders: SelectedItem[], - files: SelectedItem[], - options: IndexingOptions, + folders: SelectedFolder[], + files: SelectedFolder[], + options: IndexingOptions ) => { if (onConfigChange) { onConfigChange({ @@ -96,30 +112,15 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh } }; - const handlePicked = useCallback( - (result: OneDrivePickerResult) => { - const folders = result.folders.map((f) => ({ id: f.id, name: f.name, driveId: f.driveId })); - const files = result.files.map((f) => ({ id: f.id, name: f.name, driveId: f.driveId })); - setSelectedFolders(folders); - setSelectedFiles(files); - updateConfig(folders, files, indexingOptions); - }, - // eslint-disable-next-line react-hooks/exhaustive-deps - [indexingOptions, connector.config], - ); + const handleSelectFolders = (folders: SelectedFolder[]) => { + setSelectedFolders(folders); + updateConfig(folders, selectedFiles, indexingOptions); + }; - const { - openPicker, - loading: pickerLoading, - error: pickerError, - } = useOneDrivePicker({ - connectorId: connector.id, - onPicked: handlePicked, - }); - - const isAuthExpired = - connector.config?.auth_expired === true || - (!!pickerError && pickerError.toLowerCase().includes("authentication expired")); + const handleSelectFiles = (files: SelectedFolder[]) => { + setSelectedFiles(files); + updateConfig(selectedFolders, files, indexingOptions); + }; const handleIndexingOptionChange = (key: keyof IndexingOptions, value: number | boolean) => { const newOptions = { ...indexingOptions, [key]: value }; @@ -128,13 +129,13 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh }; const handleRemoveFolder = (folderId: string) => { - const newFolders = selectedFolders.filter((f) => f.id !== folderId); + const newFolders = selectedFolders.filter((folder) => folder.id !== folderId); setSelectedFolders(newFolders); updateConfig(newFolders, selectedFiles, indexingOptions); }; const handleRemoveFile = (fileId: string) => { - const newFiles = selectedFiles.filter((f) => f.id !== fileId); + const newFiles = selectedFiles.filter((file) => file.id !== fileId); setSelectedFiles(newFiles); updateConfig(selectedFolders, newFiles, indexingOptions); }; @@ -142,13 +143,13 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh const totalSelected = selectedFolders.length + selectedFiles.length; return ( -
+
{/* Folder & File Selection */}

Folder & File Selection

- Select specific folders and/or individual files to index. + Select specific folders and/or individual files to index from your OneDrive.

@@ -159,7 +160,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh const parts: string[] = []; if (selectedFolders.length > 0) { parts.push( - `${selectedFolders.length} folder${selectedFolders.length > 1 ? "s" : ""}`, + `${selectedFolders.length} folder${selectedFolders.length > 1 ? "s" : ""}` ); } if (selectedFiles.length > 0) { @@ -209,23 +210,52 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh
)} - - {isAuthExpired && (

Your OneDrive authentication has expired. Please re-authenticate using the button below.

)} + + {isEditMode ? ( +
+ + {isFolderTreeOpen && ( + + )} +
+ ) : ( + + )}
{/* Indexing Options */} @@ -237,6 +267,7 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh

+ {/* Max files per folder */}
@@ -260,16 +291,27 @@ export const OneDriveConfig: FC = ({ connector, onConfigCh - 50 files - 100 files - 250 files - 500 files - 1000 files + + 50 files + + + 100 files + + + 250 files + + + 500 files + + + 1000 files +
+ {/* Incremental sync toggle */}
+ {/* Include subfolders toggle */}
@@ -372,17 +378,15 @@ export function ComposioDriveFolderTree({ {!isLoadingRoot && rootError && (
- {(rootError instanceof Error ? rootError.message : String(rootError)).includes( - "authentication expired" - ) - ? "Google Drive authentication has expired. Please re-authenticate above." - : "Failed to load Google Drive contents."} + {rootError.message.includes("authentication expired") + ? `${providerName} authentication has expired. Please re-authenticate above.` + : `Failed to load ${providerName} contents.`}
)} {!isLoadingRoot && !rootError && rootItems.length === 0 && (
- No files or folders found in your Google Drive + No files or folders found in your {providerName}
)}
diff --git a/surfsense_web/contracts/types/connector.types.ts b/surfsense_web/contracts/types/connector.types.ts index 82d509a4b..ef089f1f5 100644 --- a/surfsense_web/contracts/types/connector.types.ts +++ b/surfsense_web/contracts/types/connector.types.ts @@ -54,7 +54,7 @@ export const searchSourceConnector = z.object({ export const googleDriveItem = z.object({ id: z.string(), name: z.string(), - mimeType: z.string(), + mimeType: z.string().optional().default("application/octet-stream"), isFolder: z.boolean(), parents: z.array(z.string()).optional(), size: z.coerce.number().optional(), diff --git a/surfsense_web/hooks/use-composio-drive-folders.ts b/surfsense_web/hooks/use-composio-drive-folders.ts deleted file mode 100644 index 31e516286..000000000 --- a/surfsense_web/hooks/use-composio-drive-folders.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { useQuery } from "@tanstack/react-query"; -import { connectorsApiService } from "@/lib/apis/connectors-api.service"; -import { cacheKeys } from "@/lib/query-client/cache-keys"; - -interface UseComposioDriveFoldersOptions { - connectorId: number; - parentId?: string; - enabled?: boolean; -} - -export function useComposioDriveFolders({ - connectorId, - parentId, - enabled = true, -}: UseComposioDriveFoldersOptions) { - return useQuery({ - queryKey: cacheKeys.connectors.composioDrive.folders(connectorId, parentId), - queryFn: async () => { - return connectorsApiService.listComposioDriveFolders({ - connector_id: connectorId, - parent_id: parentId, - }); - }, - enabled: enabled && !!connectorId, - staleTime: 5 * 60 * 1000, // 5 minutes - retry: 2, - }); -} diff --git a/surfsense_web/hooks/use-onedrive-picker.ts b/surfsense_web/hooks/use-onedrive-picker.ts deleted file mode 100644 index d94d7da50..000000000 --- a/surfsense_web/hooks/use-onedrive-picker.ts +++ /dev/null @@ -1,254 +0,0 @@ -"use client"; - -import { useCallback, useEffect, useRef, useState } from "react"; -import { toast } from "sonner"; -import { authenticatedFetch } from "@/lib/auth-utils"; - -export interface OneDrivePickerItem { - id: string; - name: string; - isFolder: boolean; - driveId?: string; -} - -export interface OneDrivePickerResult { - folders: OneDrivePickerItem[]; - files: OneDrivePickerItem[]; -} - -interface UseOneDrivePickerOptions { - connectorId: number; - onPicked: (result: OneDrivePickerResult) => void; -} - -export const ONEDRIVE_PICKER_OPEN_EVENT = "onedrive-picker-open"; -export const ONEDRIVE_PICKER_CLOSE_EVENT = "onedrive-picker-close"; - -async function fetchPickerToken( - connectorId: number, - resource?: string, -): Promise<{ access_token: string; base_url: string }> { - const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000"; - const params = new URLSearchParams(); - if (resource) params.set("resource", resource); - const qs = params.toString(); - const url = `${backendUrl}/api/v1/connectors/${connectorId}/onedrive/picker-token${qs ? `?${qs}` : ""}`; - const response = await authenticatedFetch(url); - if (!response.ok) { - const data = await response.json().catch(() => ({})); - throw new Error(data.detail || `Failed to get picker token (${response.status})`); - } - return response.json(); -} - -export function useOneDrivePicker({ connectorId, onPicked }: UseOneDrivePickerOptions) { - const [loading, setLoading] = useState(false); - const [error, setError] = useState(null); - const onPickedRef = useRef(onPicked); - onPickedRef.current = onPicked; - const openingRef = useRef(false); - const winRef = useRef(null); - const portRef = useRef(null); - const messageHandlerRef = useRef<((e: MessageEvent) => void) | null>(null); - const pollRef = useRef | null>(null); - - const closePicker = useCallback(() => { - window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT)); - if (pollRef.current) { - clearInterval(pollRef.current); - pollRef.current = null; - } - if (messageHandlerRef.current) { - window.removeEventListener("message", messageHandlerRef.current); - messageHandlerRef.current = null; - } - if (winRef.current && !winRef.current.closed) { - winRef.current.close(); - } - winRef.current = null; - portRef.current = null; - openingRef.current = false; - }, []); - - useEffect(() => { - const onEscape = (e: KeyboardEvent) => { - if (e.key === "Escape" && winRef.current) { - closePicker(); - } - }; - window.addEventListener("keydown", onEscape); - return () => { - window.removeEventListener("keydown", onEscape); - closePicker(); - }; - }, [closePicker]); - - const openPicker = useCallback(async () => { - if (openingRef.current) return; - openingRef.current = true; - setLoading(true); - setError(null); - - try { - const { access_token, base_url } = await fetchPickerToken(connectorId); - - const win = window.open("", "OneDrivePicker", "width=1080,height=680"); - if (!win) { - throw new Error("Popup blocked. Please allow popups for this site."); - } - winRef.current = win; - - const channelId = crypto.randomUUID(); - - const pickerConfig = { - sdk: "8.0", - entry: { oneDrive: { files: {} } }, - authentication: {}, - messaging: { - origin: window.location.origin, - channelId, - }, - selection: { mode: "multiple" }, - typesAndSources: { - mode: "all" as const, - pivots: { oneDrive: true, recent: true }, - }, - }; - - const qs = new URLSearchParams({ - filePicker: JSON.stringify(pickerConfig), - locale: navigator.language || "en-us", - }); - const pickerUrl = `${base_url}/_layouts/15/FilePicker.aspx?${qs}`; - - const form = win.document.createElement("form"); - form.setAttribute("action", pickerUrl); - form.setAttribute("method", "POST"); - const input = win.document.createElement("input"); - input.setAttribute("type", "hidden"); - input.setAttribute("name", "access_token"); - input.setAttribute("value", access_token); - form.appendChild(input); - win.document.body.append(form); - form.submit(); - - const handleMessage = (event: MessageEvent) => { - if (event.source !== win) return; - const msg = event.data; - if (msg?.type !== "initialize" || msg.channelId !== channelId) return; - - const port = event.ports[0]; - portRef.current = port; - - port.addEventListener("message", async (portEvent: MessageEvent) => { - const payload = portEvent.data; - if (payload.type !== "command") return; - - port.postMessage({ type: "acknowledge", id: payload.id }); - - const cmd = payload.data; - switch (cmd.command) { - case "authenticate": { - try { - const result = await fetchPickerToken(connectorId, cmd.resource); - port.postMessage({ - type: "result", - id: payload.id, - data: { result: "token", token: result.access_token }, - }); - } catch (err) { - port.postMessage({ - type: "result", - id: payload.id, - data: { - result: "error", - error: { - code: "unableToObtainToken", - message: err instanceof Error ? err.message : "Token error", - }, - }, - }); - } - break; - } - case "pick": { - const items: Record[] = cmd.items || []; - const folders: OneDrivePickerItem[] = []; - const files: OneDrivePickerItem[] = []; - - for (const item of items) { - const isFolder = - item.folder != null || - (typeof item["@odata.type"] === "string" && - (item["@odata.type"] as string).includes("folder")); - const parentRef = item.parentReference as - | { driveId?: string } - | undefined; - const pickerItem: OneDrivePickerItem = { - id: item.id as string, - name: (item.name as string) || "Untitled", - isFolder, - driveId: parentRef?.driveId, - }; - if (isFolder) { - folders.push(pickerItem); - } else { - files.push(pickerItem); - } - } - - onPickedRef.current({ folders, files }); - port.postMessage({ - type: "result", - id: payload.id, - data: { result: "success" }, - }); - closePicker(); - break; - } - case "close": { - closePicker(); - break; - } - default: { - port.postMessage({ - type: "result", - id: payload.id, - data: { - result: "error", - error: { code: "unsupportedCommand", message: cmd.command }, - }, - }); - break; - } - } - }); - - port.start(); - port.postMessage({ type: "activate" }); - }; - - messageHandlerRef.current = handleMessage; - window.addEventListener("message", handleMessage); - - pollRef.current = setInterval(() => { - if (win.closed) { - closePicker(); - } - }, 500); - - window.dispatchEvent(new Event(ONEDRIVE_PICKER_OPEN_EVENT)); - } catch (err) { - openingRef.current = false; - const msg = err instanceof Error ? err.message : "Failed to open OneDrive Picker"; - setError(msg); - toast.error("OneDrive Picker failed", { description: msg }); - console.error("OneDrive Picker error:", err); - window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT)); - } finally { - setLoading(false); - } - }, [connectorId, closePicker]); - - return { openPicker, closePicker, loading, error }; -} diff --git a/surfsense_web/lib/query-client/cache-keys.ts b/surfsense_web/lib/query-client/cache-keys.ts index 883c40a77..17f0e5d1a 100644 --- a/surfsense_web/lib/query-client/cache-keys.ts +++ b/surfsense_web/lib/query-client/cache-keys.ts @@ -79,10 +79,6 @@ export const cacheKeys = { folders: (connectorId: number, parentId?: string) => ["connectors", "google-drive", connectorId, "folders", parentId] as const, }, - composioDrive: { - folders: (connectorId: number, parentId?: string) => - ["connectors", "composio-drive", connectorId, "folders", parentId] as const, - }, }, comments: { byMessage: (messageId: number) => ["comments", "message", messageId] as const, From db49f851baa65232d2686644d75ec96ced7cb90c Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sun, 29 Mar 2026 03:35:07 +0530 Subject: [PATCH 047/163] feat: add ONEDRIVE_FILE mapping to connector-document-mapping and document type enum for improved OneDrive integration --- .../connector-popup/utils/connector-document-mapping.ts | 1 + surfsense_web/contracts/types/document.types.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts index 9bf3b61e4..aaa479fce 100644 --- a/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts +++ b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts @@ -12,6 +12,7 @@ export const CONNECTOR_TO_DOCUMENT_TYPE: Record = { // Direct mappings (connector type matches document type) SLACK_CONNECTOR: "SLACK_CONNECTOR", TEAMS_CONNECTOR: "TEAMS_CONNECTOR", + ONEDRIVE_CONNECTOR: "ONEDRIVE_FILE", NOTION_CONNECTOR: "NOTION_CONNECTOR", GITHUB_CONNECTOR: "GITHUB_CONNECTOR", LINEAR_CONNECTOR: "LINEAR_CONNECTOR", diff --git a/surfsense_web/contracts/types/document.types.ts b/surfsense_web/contracts/types/document.types.ts index 5f19915ab..19c730521 100644 --- a/surfsense_web/contracts/types/document.types.ts +++ b/surfsense_web/contracts/types/document.types.ts @@ -7,6 +7,7 @@ export const documentTypeEnum = z.enum([ "FILE", "SLACK_CONNECTOR", "TEAMS_CONNECTOR", + "ONEDRIVE_FILE", "NOTION_CONNECTOR", "YOUTUBE_VIDEO", "GITHUB_CONNECTOR", From a6ccb7a875a20a221819a2848e97963fae655fad Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Sun, 29 Mar 2026 00:07:08 +0200 Subject: [PATCH 048/163] rename quick-ask-actions to prompts across backend and frontend --- .../alembic/versions/109_add_prompts_table.py | 50 ++++++ .../109_add_quick_ask_actions_table.py | 62 ------- surfsense_backend/app/db.py | 8 +- surfsense_backend/app/routes/__init__.py | 4 +- .../app/routes/prompts_routes.py | 94 +++++++++++ .../app/routes/quick_ask_actions_routes.py | 94 ----------- .../{quick_ask_actions.py => prompts.py} | 6 +- .../app/dashboard/quick-ask/actions.ts | 68 -------- .../app/dashboard/quick-ask/page.tsx | 152 ------------------ .../components/assistant-ui/thread.tsx | 40 ++--- .../{action-picker.tsx => prompt-picker.tsx} | 20 +-- .../contracts/types/prompts.types.ts | 40 +++++ .../types/quick-ask-actions.types.ts | 49 ------ surfsense_web/lib/apis/prompts-api.service.ts | 54 +++++++ .../lib/apis/quick-ask-actions-api.service.ts | 59 ------- 15 files changed, 277 insertions(+), 523 deletions(-) create mode 100644 surfsense_backend/alembic/versions/109_add_prompts_table.py delete mode 100644 surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py create mode 100644 surfsense_backend/app/routes/prompts_routes.py delete mode 100644 surfsense_backend/app/routes/quick_ask_actions_routes.py rename surfsense_backend/app/schemas/{quick_ask_actions.py => prompts.py} (86%) delete mode 100644 surfsense_web/app/dashboard/quick-ask/actions.ts delete mode 100644 surfsense_web/app/dashboard/quick-ask/page.tsx rename surfsense_web/components/new-chat/{action-picker.tsx => prompt-picker.tsx} (90%) create mode 100644 surfsense_web/contracts/types/prompts.types.ts delete mode 100644 surfsense_web/contracts/types/quick-ask-actions.types.ts create mode 100644 surfsense_web/lib/apis/prompts-api.service.ts delete mode 100644 surfsense_web/lib/apis/quick-ask-actions-api.service.ts diff --git a/surfsense_backend/alembic/versions/109_add_prompts_table.py b/surfsense_backend/alembic/versions/109_add_prompts_table.py new file mode 100644 index 000000000..e044839b0 --- /dev/null +++ b/surfsense_backend/alembic/versions/109_add_prompts_table.py @@ -0,0 +1,50 @@ +"""add prompts table + +Revision ID: 109 +Revises: 108 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +revision: str = "109" +down_revision: str | None = "108" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + conn = op.get_bind() + + result = conn.execute( + sa.text("SELECT 1 FROM pg_type WHERE typname = 'prompt_mode'") + ) + if not result.fetchone(): + op.execute("CREATE TYPE prompt_mode AS ENUM ('transform', 'explore')") + + result = conn.execute( + sa.text("SELECT 1 FROM information_schema.tables WHERE table_name = 'prompts'") + ) + if not result.fetchone(): + op.execute(""" + CREATE TABLE prompts ( + id SERIAL PRIMARY KEY, + user_id UUID NOT NULL REFERENCES "user"(id) ON DELETE CASCADE, + search_space_id INTEGER REFERENCES searchspaces(id) ON DELETE CASCADE, + name VARCHAR(200) NOT NULL, + prompt TEXT NOT NULL, + mode prompt_mode NOT NULL, + icon VARCHAR(50), + created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() + ) + """) + op.execute("CREATE INDEX ix_prompts_user_id ON prompts (user_id)") + op.execute("CREATE INDEX ix_prompts_search_space_id ON prompts (search_space_id)") + + +def downgrade() -> None: + op.execute("DROP TABLE IF EXISTS prompts") + op.execute("DROP TYPE IF EXISTS prompt_mode") diff --git a/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py b/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py deleted file mode 100644 index 2b8db7cd4..000000000 --- a/surfsense_backend/alembic/versions/109_add_quick_ask_actions_table.py +++ /dev/null @@ -1,62 +0,0 @@ -"""add quick_ask_actions table - -Revision ID: 109 -Revises: 108 -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -revision: str = "109" -down_revision: str | None = "108" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.execute(""" - DO $$ BEGIN - CREATE TYPE quick_ask_action_mode AS ENUM ('transform', 'explore'); - EXCEPTION - WHEN duplicate_object THEN null; - END $$; - """) - - conn = op.get_bind() - result = conn.execute( - sa.text("SELECT 1 FROM information_schema.tables WHERE table_name = 'quick_ask_actions'") - ) - if not result.fetchone(): - op.create_table( - "quick_ask_actions", - sa.Column("id", sa.Integer(), autoincrement=True, nullable=False), - sa.Column("user_id", sa.dialects.postgresql.UUID(as_uuid=True), nullable=False), - sa.Column("search_space_id", sa.Integer(), nullable=True), - sa.Column("name", sa.String(200), nullable=False), - sa.Column("prompt", sa.Text(), nullable=False), - sa.Column( - "mode", - sa.Enum("transform", "explore", name="quick_ask_action_mode", create_type=False), - nullable=False, - ), - sa.Column("icon", sa.String(50), nullable=True), - sa.Column( - "created_at", - sa.TIMESTAMP(timezone=True), - nullable=False, - server_default=sa.func.now(), - ), - sa.ForeignKeyConstraint(["user_id"], ["user.id"], ondelete="CASCADE"), - sa.ForeignKeyConstraint(["search_space_id"], ["searchspaces.id"], ondelete="CASCADE"), - sa.PrimaryKeyConstraint("id"), - ) - op.create_index("ix_quick_ask_actions_user_id", "quick_ask_actions", ["user_id"]) - op.create_index("ix_quick_ask_actions_search_space_id", "quick_ask_actions", ["search_space_id"]) - - -def downgrade() -> None: - op.drop_table("quick_ask_actions") - op.execute("DROP TYPE IF EXISTS quick_ask_action_mode") diff --git a/surfsense_backend/app/db.py b/surfsense_backend/app/db.py index eaa445223..42282d0d5 100644 --- a/surfsense_backend/app/db.py +++ b/surfsense_backend/app/db.py @@ -1722,13 +1722,13 @@ class SearchSpaceInvite(BaseModel, TimestampMixin): ) -class QuickAskActionMode(StrEnum): +class PromptMode(StrEnum): TRANSFORM = "transform" EXPLORE = "explore" -class QuickAskAction(BaseModel, TimestampMixin): - __tablename__ = "quick_ask_actions" +class Prompt(BaseModel, TimestampMixin): + __tablename__ = "prompts" user_id = Column( UUID(as_uuid=True), @@ -1744,7 +1744,7 @@ class QuickAskAction(BaseModel, TimestampMixin): ) name = Column(String(200), nullable=False) prompt = Column(Text, nullable=False) - mode = Column(SQLAlchemyEnum(QuickAskActionMode), nullable=False) + mode = Column(SQLAlchemyEnum(PromptMode), nullable=False) icon = Column(String(50), nullable=True) user = relationship("User") diff --git a/surfsense_backend/app/routes/__init__.py b/surfsense_backend/app/routes/__init__.py index 171ee5792..1ddc958aa 100644 --- a/surfsense_backend/app/routes/__init__.py +++ b/surfsense_backend/app/routes/__init__.py @@ -34,7 +34,7 @@ from .notifications_routes import router as notifications_router from .notion_add_connector_route import router as notion_add_connector_router from .podcasts_routes import router as podcasts_router from .public_chat_routes import router as public_chat_router -from .quick_ask_actions_routes import router as quick_ask_actions_router +from .prompts_routes import router as prompts_router from .rbac_routes import router as rbac_router from .reports_routes import router as reports_router from .sandbox_routes import router as sandbox_router @@ -86,4 +86,4 @@ router.include_router(composio_router) # Composio OAuth and toolkit management router.include_router(public_chat_router) # Public chat sharing and cloning router.include_router(incentive_tasks_router) # Incentive tasks for earning free pages router.include_router(youtube_router) # YouTube playlist resolution -router.include_router(quick_ask_actions_router) +router.include_router(prompts_router) diff --git a/surfsense_backend/app/routes/prompts_routes.py b/surfsense_backend/app/routes/prompts_routes.py new file mode 100644 index 000000000..ebfe67130 --- /dev/null +++ b/surfsense_backend/app/routes/prompts_routes.py @@ -0,0 +1,94 @@ +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + +from app.db import Prompt, User, get_async_session +from app.schemas.prompts import ( + PromptCreate, + PromptRead, + PromptUpdate, +) +from app.users import current_active_user + +router = APIRouter(tags=["Prompts"]) + + +@router.get("/prompts", response_model=list[PromptRead]) +async def list_prompts( + search_space_id: int | None = None, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + query = select(Prompt).where(Prompt.user_id == user.id) + if search_space_id is not None: + query = query.where(Prompt.search_space_id == search_space_id) + query = query.order_by(Prompt.created_at.desc()) + result = await session.execute(query) + return result.scalars().all() + + +@router.post("/prompts", response_model=PromptRead) +async def create_prompt( + body: PromptCreate, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + prompt = Prompt( + user_id=user.id, + search_space_id=body.search_space_id, + name=body.name, + prompt=body.prompt, + mode=body.mode, + icon=body.icon, + ) + session.add(prompt) + await session.commit() + await session.refresh(prompt) + return prompt + + +@router.put("/prompts/{prompt_id}", response_model=PromptRead) +async def update_prompt( + prompt_id: int, + body: PromptUpdate, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + result = await session.execute( + select(Prompt).where( + Prompt.id == prompt_id, + Prompt.user_id == user.id, + ) + ) + prompt = result.scalar_one_or_none() + if not prompt: + raise HTTPException(status_code=404, detail="Prompt not found") + + for field, value in body.model_dump(exclude_unset=True).items(): + setattr(prompt, field, value) + + session.add(prompt) + await session.commit() + await session.refresh(prompt) + return prompt + + +@router.delete("/prompts/{prompt_id}") +async def delete_prompt( + prompt_id: int, + session: AsyncSession = Depends(get_async_session), + user: User = Depends(current_active_user), +): + result = await session.execute( + select(Prompt).where( + Prompt.id == prompt_id, + Prompt.user_id == user.id, + ) + ) + prompt = result.scalar_one_or_none() + if not prompt: + raise HTTPException(status_code=404, detail="Prompt not found") + + await session.delete(prompt) + await session.commit() + return {"success": True} diff --git a/surfsense_backend/app/routes/quick_ask_actions_routes.py b/surfsense_backend/app/routes/quick_ask_actions_routes.py deleted file mode 100644 index 6b9868a07..000000000 --- a/surfsense_backend/app/routes/quick_ask_actions_routes.py +++ /dev/null @@ -1,94 +0,0 @@ -from fastapi import APIRouter, Depends, HTTPException -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession - -from app.db import QuickAskAction, User, get_async_session -from app.schemas.quick_ask_actions import ( - QuickAskActionCreate, - QuickAskActionRead, - QuickAskActionUpdate, -) -from app.users import current_active_user - -router = APIRouter(tags=["Quick Ask Actions"]) - - -@router.get("/quick-ask-actions", response_model=list[QuickAskActionRead]) -async def list_actions( - search_space_id: int | None = None, - session: AsyncSession = Depends(get_async_session), - user: User = Depends(current_active_user), -): - query = select(QuickAskAction).where(QuickAskAction.user_id == user.id) - if search_space_id is not None: - query = query.where(QuickAskAction.search_space_id == search_space_id) - query = query.order_by(QuickAskAction.created_at.desc()) - result = await session.execute(query) - return result.scalars().all() - - -@router.post("/quick-ask-actions", response_model=QuickAskActionRead) -async def create_action( - body: QuickAskActionCreate, - session: AsyncSession = Depends(get_async_session), - user: User = Depends(current_active_user), -): - action = QuickAskAction( - user_id=user.id, - search_space_id=body.search_space_id, - name=body.name, - prompt=body.prompt, - mode=body.mode, - icon=body.icon, - ) - session.add(action) - await session.commit() - await session.refresh(action) - return action - - -@router.put("/quick-ask-actions/{action_id}", response_model=QuickAskActionRead) -async def update_action( - action_id: int, - body: QuickAskActionUpdate, - session: AsyncSession = Depends(get_async_session), - user: User = Depends(current_active_user), -): - result = await session.execute( - select(QuickAskAction).where( - QuickAskAction.id == action_id, - QuickAskAction.user_id == user.id, - ) - ) - action = result.scalar_one_or_none() - if not action: - raise HTTPException(status_code=404, detail="Action not found") - - for field, value in body.model_dump(exclude_unset=True).items(): - setattr(action, field, value) - - session.add(action) - await session.commit() - await session.refresh(action) - return action - - -@router.delete("/quick-ask-actions/{action_id}") -async def delete_action( - action_id: int, - session: AsyncSession = Depends(get_async_session), - user: User = Depends(current_active_user), -): - result = await session.execute( - select(QuickAskAction).where( - QuickAskAction.id == action_id, - QuickAskAction.user_id == user.id, - ) - ) - action = result.scalar_one_or_none() - if not action: - raise HTTPException(status_code=404, detail="Action not found") - - await session.delete(action) - await session.commit() - return {"success": True} diff --git a/surfsense_backend/app/schemas/quick_ask_actions.py b/surfsense_backend/app/schemas/prompts.py similarity index 86% rename from surfsense_backend/app/schemas/quick_ask_actions.py rename to surfsense_backend/app/schemas/prompts.py index 90fa716b9..c2fd753e6 100644 --- a/surfsense_backend/app/schemas/quick_ask_actions.py +++ b/surfsense_backend/app/schemas/prompts.py @@ -3,7 +3,7 @@ from datetime import datetime from pydantic import BaseModel, Field -class QuickAskActionCreate(BaseModel): +class PromptCreate(BaseModel): name: str = Field(..., min_length=1, max_length=200) prompt: str = Field(..., min_length=1) mode: str = Field(..., pattern="^(transform|explore)$") @@ -11,14 +11,14 @@ class QuickAskActionCreate(BaseModel): search_space_id: int | None = None -class QuickAskActionUpdate(BaseModel): +class PromptUpdate(BaseModel): name: str | None = Field(None, min_length=1, max_length=200) prompt: str | None = Field(None, min_length=1) mode: str | None = Field(None, pattern="^(transform|explore)$") icon: str | None = Field(None, max_length=50) -class QuickAskActionRead(BaseModel): +class PromptRead(BaseModel): id: int name: str prompt: str diff --git a/surfsense_web/app/dashboard/quick-ask/actions.ts b/surfsense_web/app/dashboard/quick-ask/actions.ts deleted file mode 100644 index 984aef2b6..000000000 --- a/surfsense_web/app/dashboard/quick-ask/actions.ts +++ /dev/null @@ -1,68 +0,0 @@ -import type { QuickAskAction } from "@/contracts/types/quick-ask-actions.types"; - -export const DEFAULT_ACTIONS: QuickAskAction[] = [ - { - id: "fix-grammar", - name: "Fix grammar", - prompt: "Fix the grammar and spelling in the following text. Return only the corrected text, nothing else.\n\n{selection}", - mode: "transform", - icon: "check", - group: "transform", - }, - { - id: "make-shorter", - name: "Make shorter", - prompt: "Make the following text more concise while preserving its meaning. Return only the shortened text, nothing else.\n\n{selection}", - mode: "transform", - icon: "minimize", - group: "transform", - }, - { - id: "translate", - name: "Translate", - prompt: "Translate the following text to English. If it is already in English, translate it to French. Return only the translation, nothing else.\n\n{selection}", - mode: "transform", - icon: "languages", - group: "transform", - }, - { - id: "rewrite", - name: "Rewrite", - prompt: "Rewrite the following text to improve clarity and readability. Return only the rewritten text, nothing else.\n\n{selection}", - mode: "transform", - icon: "pen-line", - group: "transform", - }, - { - id: "summarize", - name: "Summarize", - prompt: "Summarize the following text concisely. Return only the summary, nothing else.\n\n{selection}", - mode: "transform", - icon: "list", - group: "transform", - }, - { - id: "explain", - name: "Explain", - prompt: "Explain the following text in simple terms:\n\n{selection}", - mode: "explore", - icon: "book-open", - group: "explore", - }, - { - id: "ask-knowledge-base", - name: "Ask my knowledge base", - prompt: "Search my knowledge base for information related to:\n\n{selection}", - mode: "explore", - icon: "search", - group: "explore", - }, - { - id: "look-up-web", - name: "Look up on the web", - prompt: "Search the web for information about:\n\n{selection}", - mode: "explore", - icon: "globe", - group: "explore", - }, -]; diff --git a/surfsense_web/app/dashboard/quick-ask/page.tsx b/surfsense_web/app/dashboard/quick-ask/page.tsx deleted file mode 100644 index dca398254..000000000 --- a/surfsense_web/app/dashboard/quick-ask/page.tsx +++ /dev/null @@ -1,152 +0,0 @@ -"use client"; - -import { - BookOpen, - Check, - Globe, - Languages, - List, - MessageSquare, - Minimize2, - PenLine, - Search, -} from "lucide-react"; -import { useEffect, useMemo, useState } from "react"; -import { DEFAULT_ACTIONS } from "./actions"; - -const ICONS: Record = { - check: , - minimize: , - languages: , - "pen-line": , - "book-open": , - list: , - search: , - globe: , -}; - -export default function QuickAskPage() { - const [clipboardText, setClipboardText] = useState(""); - const [searchQuery, setSearchQuery] = useState(""); - - useEffect(() => { - window.electronAPI?.getQuickAskText().then((text) => { - if (text) setClipboardText(text); - }); - }, []); - - const navigateToChat = async (prompt: string, mode: string) => { - await window.electronAPI?.setQuickAskMode(mode); - sessionStorage.setItem("quickAskAutoSubmit", "true"); - const encoded = encodeURIComponent(prompt); - window.location.href = `/dashboard?quickAskPrompt=${encoded}`; - }; - - const navigateWithInitialText = async () => { - if (!clipboardText) return; - await window.electronAPI?.setQuickAskMode("explore"); - sessionStorage.setItem("quickAskAutoSubmit", "false"); - sessionStorage.setItem("quickAskInitialText", clipboardText); - window.location.href = `/dashboard?quickAskPrompt=${encodeURIComponent(clipboardText)}`; - }; - - const handleAction = (actionId: string) => { - const action = DEFAULT_ACTIONS.find((a) => a.id === actionId); - if (!action || !clipboardText) return; - const prompt = action.prompt.replace("{selection}", clipboardText); - navigateToChat(prompt, action.mode); - }; - - const transformActions = DEFAULT_ACTIONS.filter((a) => a.group === "transform"); - const exploreActions = DEFAULT_ACTIONS.filter((a) => a.group === "explore"); - - const filteredTransform = useMemo( - () => transformActions.filter((a) => a.name.toLowerCase().includes(searchQuery.toLowerCase())), - [searchQuery] - ); - const filteredExplore = useMemo( - () => exploreActions.filter((a) => a.name.toLowerCase().includes(searchQuery.toLowerCase())), - [searchQuery] - ); - - if (!clipboardText) { - return ( -
-
Loading...
-
- ); - } - - return ( -
-
-
- - setSearchQuery(e.target.value)} - className="flex-1 bg-transparent text-sm outline-none placeholder:text-muted-foreground" - /> -
-
- -
- {filteredTransform.length > 0 && ( - <> -
Transform
-
- {filteredTransform.map((action) => ( - - ))} -
- - )} - - {filteredExplore.length > 0 && ( - <> -
Explore
-
- {filteredExplore.map((action) => ( - - ))} -
- - )} - -
My Actions
-
- Custom actions coming soon -
-
- -
- -
-
- ); -} diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx index d6edc640d..6ff05a252 100644 --- a/surfsense_web/components/assistant-ui/thread.tsx +++ b/surfsense_web/components/assistant-ui/thread.tsx @@ -57,7 +57,7 @@ import { import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button"; import { UserMessage } from "@/components/assistant-ui/user-message"; import { SLIDEOUT_PANEL_OPENED_EVENT } from "@/components/layout/ui/sidebar/SidebarSlideOutPanel"; -import { ActionPicker, type ActionPickerRef } from "@/components/new-chat/action-picker"; +import { PromptPicker, type PromptPickerRef } from "@/components/new-chat/prompt-picker"; import { DocumentMentionPicker, type DocumentMentionPickerRef, @@ -299,13 +299,13 @@ const Composer: FC = () => { const [mentionedDocuments, setMentionedDocuments] = useAtom(mentionedDocumentsAtom); const setSidebarDocs = useSetAtom(sidebarSelectedDocumentsAtom); const [showDocumentPopover, setShowDocumentPopover] = useState(false); - const [showActionPicker, setShowActionPicker] = useState(false); + const [showPromptPicker, setShowPromptPicker] = useState(false); const [mentionQuery, setMentionQuery] = useState(""); const [actionQuery, setActionQuery] = useState(""); const editorRef = useRef(null); const editorContainerRef = useRef(null); const documentPickerRef = useRef(null); - const actionPickerRef = useRef(null); + const promptPickerRef = useRef(null); const { search_space_id, chat_id } = useParams(); const aui = useAui(); const hasAutoFocusedRef = useRef(false); @@ -427,24 +427,24 @@ const Composer: FC = () => { // Open action picker when / is triggered const handleActionTrigger = useCallback((query: string) => { - setShowActionPicker(true); + setShowPromptPicker(true); setActionQuery(query); }, []); // Close action picker and reset query const handleActionClose = useCallback(() => { - if (showActionPicker) { - setShowActionPicker(false); + if (showPromptPicker) { + setShowPromptPicker(false); setActionQuery(""); } - }, [showActionPicker]); + }, [showPromptPicker]); // Pending action prompt stored when user picks an action const pendingActionRef = useRef<{ name: string; prompt: string; mode: "transform" | "explore" } | null>(null); const handleActionSelect = useCallback( (action: { name: string; prompt: string; mode: "transform" | "explore" }) => { - setShowActionPicker(false); + setShowPromptPicker(false); setActionQuery(""); pendingActionRef.current = action; editorRef.current?.insertActionChip(action.name); @@ -459,25 +459,25 @@ const Composer: FC = () => { // Keyboard navigation for document/action picker (arrow keys, Enter, Escape) const handleKeyDown = useCallback( (e: React.KeyboardEvent) => { - if (showActionPicker) { + if (showPromptPicker) { if (e.key === "ArrowDown") { e.preventDefault(); - actionPickerRef.current?.moveDown(); + promptPickerRef.current?.moveDown(); return; } if (e.key === "ArrowUp") { e.preventDefault(); - actionPickerRef.current?.moveUp(); + promptPickerRef.current?.moveUp(); return; } if (e.key === "Enter") { e.preventDefault(); - actionPickerRef.current?.selectHighlighted(); + promptPickerRef.current?.selectHighlighted(); return; } if (e.key === "Escape") { e.preventDefault(); - setShowActionPicker(false); + setShowPromptPicker(false); setActionQuery(""); return; } @@ -506,7 +506,7 @@ const Composer: FC = () => { } } }, - [showDocumentPopover, showActionPicker] + [showDocumentPopover, showPromptPicker] ); // Submit message (blocked during streaming, document picker open, or AI responding to another user) @@ -514,7 +514,7 @@ const Composer: FC = () => { if (isThreadRunning || isBlockedByOtherUser) { return; } - if (!showDocumentPopover && !showActionPicker) { + if (!showDocumentPopover && !showPromptPicker) { if (pendingActionRef.current) { const userText = editorRef.current?.getText() ?? ""; const finalPrompt = pendingActionRef.current.prompt.replace("{selection}", userText); @@ -528,7 +528,7 @@ const Composer: FC = () => { } }, [ showDocumentPopover, - showActionPicker, + showPromptPicker, isThreadRunning, isBlockedByOtherUser, aui, @@ -621,14 +621,14 @@ const Composer: FC = () => { />, document.body )} - {showActionPicker && + {showPromptPicker && typeof document !== "undefined" && createPortal( - { - setShowActionPicker(false); + setShowPromptPicker(false); setActionQuery(""); }} externalSearch={actionQuery} diff --git a/surfsense_web/components/new-chat/action-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx similarity index 90% rename from surfsense_web/components/new-chat/action-picker.tsx rename to surfsense_web/components/new-chat/prompt-picker.tsx index 4bfac23f4..28176524d 100644 --- a/surfsense_web/components/new-chat/action-picker.tsx +++ b/surfsense_web/components/new-chat/prompt-picker.tsx @@ -21,17 +21,17 @@ import { useState, } from "react"; -import type { QuickAskActionRead } from "@/contracts/types/quick-ask-actions.types"; -import { quickAskActionsApiService } from "@/lib/apis/quick-ask-actions-api.service"; +import type { PromptRead } from "@/contracts/types/prompts.types"; +import { promptsApiService } from "@/lib/apis/prompts-api.service"; import { cn } from "@/lib/utils"; -export interface ActionPickerRef { +export interface PromptPickerRef { selectHighlighted: () => void; moveUp: () => void; moveDown: () => void; } -interface ActionPickerProps { +interface PromptPickerProps { onSelect: (action: { name: string; prompt: string; mode: "transform" | "explore" }) => void; onDone: () => void; externalSearch?: string; @@ -61,27 +61,27 @@ const DEFAULT_ACTIONS: { name: string; prompt: string; mode: "transform" | "expl { name: "Look up on the web", prompt: "Search the web for information about:\n\n{selection}", mode: "explore", icon: "globe" }, ]; -export const ActionPicker = forwardRef( - function ActionPicker({ onSelect, onDone, externalSearch = "", containerStyle }, ref) { +export const PromptPicker = forwardRef( + function PromptPicker({ onSelect, onDone, externalSearch = "", containerStyle }, ref) { const [highlightedIndex, setHighlightedIndex] = useState(0); - const [customActions, setCustomActions] = useState([]); + const [customPrompts, setCustomPrompts] = useState([]); const scrollContainerRef = useRef(null); const shouldScrollRef = useRef(false); const itemRefs = useRef>(new Map()); useEffect(() => { - quickAskActionsApiService.list().then(setCustomActions).catch(() => {}); + promptsApiService.list().then(setCustomPrompts).catch(() => {}); }, []); const allActions = useMemo(() => { - const customs = customActions.map((a) => ({ + const customs = customPrompts.map((a) => ({ name: a.name, prompt: a.prompt, mode: a.mode as "transform" | "explore", icon: a.icon || "zap", })); return [...DEFAULT_ACTIONS, ...customs]; - }, [customActions]); + }, [customPrompts]); const filtered = useMemo(() => { if (!externalSearch) return allActions; diff --git a/surfsense_web/contracts/types/prompts.types.ts b/surfsense_web/contracts/types/prompts.types.ts new file mode 100644 index 000000000..a5c895bc9 --- /dev/null +++ b/surfsense_web/contracts/types/prompts.types.ts @@ -0,0 +1,40 @@ +import { z } from "zod"; + +export type PromptMode = "transform" | "explore"; + +export const promptRead = z.object({ + id: z.number(), + name: z.string(), + prompt: z.string(), + mode: z.enum(["transform", "explore"]), + icon: z.string().nullable(), + search_space_id: z.number().nullable(), + created_at: z.string(), +}); + +export type PromptRead = z.infer; + +export const promptsListResponse = z.array(promptRead); + +export const promptCreateRequest = z.object({ + name: z.string().min(1).max(200), + prompt: z.string().min(1), + mode: z.enum(["transform", "explore"]), + icon: z.string().max(50).nullable().optional(), + search_space_id: z.number().nullable().optional(), +}); + +export type PromptCreateRequest = z.infer; + +export const promptUpdateRequest = z.object({ + name: z.string().min(1).max(200).optional(), + prompt: z.string().min(1).optional(), + mode: z.enum(["transform", "explore"]).optional(), + icon: z.string().max(50).nullable().optional(), +}); + +export type PromptUpdateRequest = z.infer; + +export const promptDeleteResponse = z.object({ + success: z.boolean(), +}); diff --git a/surfsense_web/contracts/types/quick-ask-actions.types.ts b/surfsense_web/contracts/types/quick-ask-actions.types.ts deleted file mode 100644 index eaee09501..000000000 --- a/surfsense_web/contracts/types/quick-ask-actions.types.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { z } from "zod"; - -export type QuickAskActionMode = "transform" | "explore"; - -export const quickAskActionRead = z.object({ - id: z.number(), - name: z.string(), - prompt: z.string(), - mode: z.enum(["transform", "explore"]), - icon: z.string().nullable(), - search_space_id: z.number().nullable(), - created_at: z.string(), -}); - -export type QuickAskActionRead = z.infer; - -export const quickAskActionsListResponse = z.array(quickAskActionRead); - -export const quickAskActionCreateRequest = z.object({ - name: z.string().min(1).max(200), - prompt: z.string().min(1), - mode: z.enum(["transform", "explore"]), - icon: z.string().max(50).nullable().optional(), - search_space_id: z.number().nullable().optional(), -}); - -export type QuickAskActionCreateRequest = z.infer; - -export const quickAskActionUpdateRequest = z.object({ - name: z.string().min(1).max(200).optional(), - prompt: z.string().min(1).optional(), - mode: z.enum(["transform", "explore"]).optional(), - icon: z.string().max(50).nullable().optional(), -}); - -export type QuickAskActionUpdateRequest = z.infer; - -export const quickAskActionDeleteResponse = z.object({ - success: z.boolean(), -}); - -export interface QuickAskAction { - id: string; - name: string; - prompt: string; - mode: QuickAskActionMode; - icon: string; - group: "transform" | "explore" | "knowledge" | "custom"; -} diff --git a/surfsense_web/lib/apis/prompts-api.service.ts b/surfsense_web/lib/apis/prompts-api.service.ts new file mode 100644 index 000000000..5c445c02a --- /dev/null +++ b/surfsense_web/lib/apis/prompts-api.service.ts @@ -0,0 +1,54 @@ +import { + type PromptCreateRequest, + type PromptUpdateRequest, + promptCreateRequest, + promptDeleteResponse, + promptRead, + promptUpdateRequest, + promptsListResponse, +} from "@/contracts/types/prompts.types"; +import { ValidationError } from "@/lib/error"; +import { baseApiService } from "./base-api.service"; + +class PromptsApiService { + list = async (searchSpaceId?: number) => { + const params = new URLSearchParams(); + if (searchSpaceId !== undefined) { + params.set("search_space_id", String(searchSpaceId)); + } + const queryString = params.toString(); + const url = queryString ? `/api/v1/prompts?${queryString}` : "/api/v1/prompts"; + + return baseApiService.get(url, promptsListResponse); + }; + + create = async (request: PromptCreateRequest) => { + const parsed = promptCreateRequest.safeParse(request); + if (!parsed.success) { + const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); + throw new ValidationError(`Invalid request: ${errorMessage}`); + } + + return baseApiService.post("/api/v1/prompts", promptRead, { + body: parsed.data, + }); + }; + + update = async (promptId: number, request: PromptUpdateRequest) => { + const parsed = promptUpdateRequest.safeParse(request); + if (!parsed.success) { + const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); + throw new ValidationError(`Invalid request: ${errorMessage}`); + } + + return baseApiService.put(`/api/v1/prompts/${promptId}`, promptRead, { + body: parsed.data, + }); + }; + + delete = async (promptId: number) => { + return baseApiService.delete(`/api/v1/prompts/${promptId}`, promptDeleteResponse); + }; +} + +export const promptsApiService = new PromptsApiService(); diff --git a/surfsense_web/lib/apis/quick-ask-actions-api.service.ts b/surfsense_web/lib/apis/quick-ask-actions-api.service.ts deleted file mode 100644 index ae1c3a360..000000000 --- a/surfsense_web/lib/apis/quick-ask-actions-api.service.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { - type QuickAskActionCreateRequest, - type QuickAskActionUpdateRequest, - quickAskActionCreateRequest, - quickAskActionDeleteResponse, - quickAskActionRead, - quickAskActionUpdateRequest, - quickAskActionsListResponse, -} from "@/contracts/types/quick-ask-actions.types"; -import { ValidationError } from "@/lib/error"; -import { baseApiService } from "./base-api.service"; - -class QuickAskActionsApiService { - list = async (searchSpaceId?: number) => { - const params = new URLSearchParams(); - if (searchSpaceId !== undefined) { - params.set("search_space_id", String(searchSpaceId)); - } - const queryString = params.toString(); - const url = queryString - ? `/api/v1/quick-ask-actions?${queryString}` - : "/api/v1/quick-ask-actions"; - - return baseApiService.get(url, quickAskActionsListResponse); - }; - - create = async (request: QuickAskActionCreateRequest) => { - const parsed = quickAskActionCreateRequest.safeParse(request); - if (!parsed.success) { - const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); - throw new ValidationError(`Invalid request: ${errorMessage}`); - } - - return baseApiService.post("/api/v1/quick-ask-actions", quickAskActionRead, { - body: parsed.data, - }); - }; - - update = async (actionId: number, request: QuickAskActionUpdateRequest) => { - const parsed = quickAskActionUpdateRequest.safeParse(request); - if (!parsed.success) { - const errorMessage = parsed.error.issues.map((issue) => issue.message).join(", "); - throw new ValidationError(`Invalid request: ${errorMessage}`); - } - - return baseApiService.put(`/api/v1/quick-ask-actions/${actionId}`, quickAskActionRead, { - body: parsed.data, - }); - }; - - delete = async (actionId: number) => { - return baseApiService.delete( - `/api/v1/quick-ask-actions/${actionId}`, - quickAskActionDeleteResponse - ); - }; -} - -export const quickAskActionsApiService = new QuickAskActionsApiService(); From 9f5bdb06f3ddb1d377f175e2b8f4f1b9fec0e1ee Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sun, 29 Mar 2026 03:43:50 +0530 Subject: [PATCH 049/163] refactor: update empty state message in FolderTreeView for improved clarity and user guidance --- surfsense_web/components/documents/FolderTreeView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/surfsense_web/components/documents/FolderTreeView.tsx b/surfsense_web/components/documents/FolderTreeView.tsx index d7a82fb0b..9e4619390 100644 --- a/surfsense_web/components/documents/FolderTreeView.tsx +++ b/surfsense_web/components/documents/FolderTreeView.tsx @@ -197,9 +197,9 @@ export function FolderTreeView({ if (treeNodes.length === 0 && folders.length === 0 && documents.length === 0) { return ( -
- -

No documents yet

+
+

No documents found

+

Use the upload button or connect a source above

); } From 8dadf5ab9f83bcf161bbe9b20e4c09c59a6c8f04 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sun, 29 Mar 2026 03:49:52 +0530 Subject: [PATCH 050/163] feat: integrate right panel collapse functionality in DocumentsSidebar for improved mobile experience --- .../components/layout/ui/sidebar/DocumentsSidebar.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx index 1e1e8f982..0baf403a9 100644 --- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx +++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx @@ -18,6 +18,7 @@ import { connectorDialogOpenAtom } from "@/atoms/connector-dialog/connector-dial import { connectorsAtom } from "@/atoms/connectors/connector-query.atoms"; import { deleteDocumentMutationAtom } from "@/atoms/documents/document-mutation.atoms"; import { expandedFolderIdsAtom } from "@/atoms/documents/folder.atoms"; +import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom"; import { openDocumentTabAtom } from "@/atoms/tabs/tabs.atom"; import { CreateFolderDialog } from "@/components/documents/CreateFolderDialog"; import type { DocumentNodeDoc } from "@/components/documents/DocumentNode"; @@ -75,6 +76,7 @@ export function DocumentsSidebar({ const isMobile = !useMediaQuery("(min-width: 640px)"); const searchSpaceId = Number(params.search_space_id); const setConnectorDialogOpen = useSetAtom(connectorDialogOpenAtom); + const setRightPanelCollapsed = useSetAtom(rightPanelCollapsedAtom); const openDocumentTab = useSetAtom(openDocumentTabAtom); const { data: connectors } = useAtomValue(connectorsAtom); const connectorCount = connectors?.length ?? 0; @@ -459,12 +461,16 @@ export function DocumentsSidebar({ useEffect(() => { const handleEscape = (e: KeyboardEvent) => { if (e.key === "Escape" && open) { - onOpenChange(false); + if (isMobile) { + onOpenChange(false); + } else { + setRightPanelCollapsed(true); + } } }; document.addEventListener("keydown", handleEscape); return () => document.removeEventListener("keydown", handleEscape); - }, [open, onOpenChange]); + }, [open, onOpenChange, isMobile, setRightPanelCollapsed]); const documentsContent = ( <> From 37e018e94f4ffde9392c30f0f5d37f2aaa65c9a6 Mon Sep 17 00:00:00 2001 From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com> Date: Sun, 29 Mar 2026 03:50:11 +0530 Subject: [PATCH 051/163] refactor: simplify DialogFooter component by removing unnecessary gap classes for a cleaner layout --- .../app/dashboard/[search_space_id]/team/team-content.tsx | 2 +- surfsense_web/components/documents/CreateFolderDialog.tsx | 2 +- surfsense_web/components/documents/FolderPickerDialog.tsx | 2 +- .../components/layout/providers/LayoutDataProvider.tsx | 2 +- .../components/layout/ui/dialogs/CreateSearchSpaceDialog.tsx | 2 +- .../components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx | 2 +- .../components/layout/ui/sidebar/AllSharedChatsSidebar.tsx | 2 +- surfsense_web/components/ui/alert-dialog.tsx | 2 +- surfsense_web/components/ui/dialog.tsx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx index 09c29735e..087a92877 100644 --- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx +++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx @@ -755,7 +755,7 @@ function CreateInviteDialog({
- + diff --git a/surfsense_web/components/documents/CreateFolderDialog.tsx b/surfsense_web/components/documents/CreateFolderDialog.tsx index 8c2643828..57dce6964 100644 --- a/surfsense_web/components/documents/CreateFolderDialog.tsx +++ b/surfsense_web/components/documents/CreateFolderDialog.tsx @@ -82,7 +82,7 @@ export function CreateFolderDialog({ />
- + + )} +
+ + {showForm && ( +
+

+ {editingId ? "Edit prompt" : "New prompt"} +

+ +
+ + setFormData((p) => ({ ...p, name: e.target.value }))} + placeholder="e.g. Fix grammar" + /> +
+ +
+ +