OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
refactor: refactor upload utils replacing customevent (#1578)
Mike Fortmanc2c10ca21d98
diff --git a/frontend/app/chat/page.tsx b/frontend/app/chat/page.tsxindex 524cc991d..8e1675a43 100644--- a/frontend/app/chat/page.tsx+++ b/frontend/app/chat/page.tsx@@ -588,93 +588,6 @@ function ChatPage() {}}, [placeholderConversation, currentConversationId]);- // Listen for file upload events from navigation- useEffect(() => {- const handleFileUploadStart = (event: CustomEvent) => {- const { filename } = event.detail;- console.log("Chat page received file upload start event:", filename);-- setLoading(true);- setIsUploading(true);- setUploadedFile(null); // Clear previous file- };-- const handleFileUploaded = (event: CustomEvent) => {- const { result } = event.detail;- console.log("Chat page received file upload event:", result);-- setUploadedFile(null); // Clear file after upload-- // Update the response ID for this endpoint- if (result.response_id) {- setPreviousResponseIds((prev) => ({- ...prev,- [endpoint]: result.response_id,- }));- }- };-- const handleFileUploadComplete = () => {- console.log("Chat page received file upload complete event");- setLoading(false);- setIsUploading(false);- };-- const handleFileUploadError = (event: CustomEvent) => {- const { filename, error } = event.detail;- console.log(- "Chat page received file upload error event:",- filename,- error,- );-- // Replace the last message with error message- const errorMessage: Message = {- role: "assistant",- content: `❌ Upload failed for **${filename}**: ${error}`,- timestamp: new Date(),- };- setMessages((prev) => [...prev.slice(0, -1), errorMessage]);- setUploadedFile(null); // Clear file on error- };-- window.addEventListener(- "fileUploadStart",- handleFileUploadStart as EventListener,- );- window.addEventListener(- "fileUploaded",- handleFileUploaded as EventListener,- );- window.addEventListener(- "fileUploadComplete",- handleFileUploadComplete as EventListener,- );- window.addEventListener(- "fileUploadError",- handleFileUploadError as EventListener,- );-- return () => {- window.removeEventListener(- "fileUploadStart",- handleFileUploadStart as EventListener,- );- window.removeEventListener(- "fileUploaded",- handleFileUploaded as EventListener,- );- window.removeEventListener(- "fileUploadComplete",- handleFileUploadComplete as EventListener,- );- window.removeEventListener(- "fileUploadError",- handleFileUploadError as EventListener,- );- };- }, [endpoint, setPreviousResponseIds, setLoading]);-// Check onboarding completion// Check if onboarding is complete (current_step >= 4 means complete)diff --git a/frontend/lib/upload-utils.ts b/frontend/lib/upload-utils.tsindex 68605ac93..e8b928383 100644--- a/frontend/lib/upload-utils.ts+++ b/frontend/lib/upload-utils.ts@@ -32,94 +32,6 @@ export async function duplicateCheck(return response.json();}-export async function uploadFileForContext(- file: File,-): Promise<UploadFileResult> {- window.dispatchEvent(- new CustomEvent("fileUploadStart", {- detail: { filename: file.name },- }),- );-- try {- const formData = new FormData();- formData.append("file", file);-- const uploadResponse = await fetch("/api/upload_context", {- method: "POST",- body: formData,- });-- let payload: unknown;- try {- payload = await uploadResponse.json();- } catch (_error) {- throw new Error("Upload failed: unable to parse server response");- }-- const uploadJson =- typeof payload === "object" && payload !== null ? payload : {};-- if (!uploadResponse.ok) {- const errorMessage =- (uploadJson as { error?: string }).error || "Upload failed";- throw new Error(errorMessage);- }-- const fileId =- (uploadJson as { response_id?: string }).response_id || "uploaded";- const filePath =- (uploadJson as { filename?: string }).filename || file.name;- const pages = (uploadJson as { pages?: number }).pages;- const contentLength = (uploadJson as { content_length?: number })- .content_length;- const confirmation = (uploadJson as { confirmation?: string }).confirmation;-- const result: UploadFileResult = {- fileId,- filePath,- run: null,- deletion: null,- unified: false,- raw: uploadJson,- };-- window.dispatchEvent(- new CustomEvent("fileUploaded", {- detail: {- file,- result: {- file_id: fileId,- file_path: filePath,- filename: filePath,- pages: pages,- content_length: contentLength,- confirmation: confirmation,- response_id: fileId,- run: null,- deletion: null,- unified: false,- },- },- }),- );-- return result;- } catch (error) {- window.dispatchEvent(- new CustomEvent("fileUploadError", {- detail: {- filename: file.name,- error: error instanceof Error ? error.message : "Upload failed",- },- }),- );- throw error;- } finally {- window.dispatchEvent(new CustomEvent("fileUploadComplete"));- }-}-export async function uploadFiles(files: File[],replace = false,@@ -160,10 +72,16 @@ export async function uploadFiles(return { taskId, fileCount };}+export interface UploadFileCallbacks {+ onComplete?: () => void;+ onError?: (filename: string, error: string) => void;+}+export async function uploadFile(file: File,replace = false,createFilter = false,+ callbacks?: UploadFileCallbacks,): Promise<UploadFileResult> {try {const formData = new FormData();@@ -243,16 +161,20 @@ export async function uploadFile(return result;} catch (error) {- window.dispatchEvent(- new CustomEvent("fileUploadError", {- detail: {- filename: file.name,- error: error instanceof Error ? error.message : "Upload failed",- },- }),- );+ try {+ callbacks?.onError?.(+ file.name,+ error instanceof Error ? error.message : "Upload failed",+ );+ } catch (cbErr) {+ console.warn("uploadFile: onError callback threw", cbErr);+ }throw error;} finally {- window.dispatchEvent(new CustomEvent("fileUploadComplete"));+ try {+ callbacks?.onComplete?.();+ } catch (cbErr) {+ console.warn("uploadFile: onComplete callback threw", cbErr);+ }}}