-
Notifications
You must be signed in to change notification settings - Fork 0
use streaming API route to driectly upload to backend without nextjs server loads, use rich color toasts #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| import { auth } from "@/lib/auth"; | ||
| import { prisma } from "@/lib/prisma"; | ||
| import { headers } from "next/headers"; | ||
| import { NextRequest, NextResponse } from "next/server"; | ||
| import { revalidatePath } from "next/cache"; | ||
|
|
||
| const BACKEND_API_BASE = | ||
| process.env.BACKEND_API_BASE ?? "http://127.0.0.1:8000/api/v1"; | ||
|
|
||
| /** | ||
| * Streaming upload proxy – authenticates the user, verifies chat | ||
| * ownership, then pipes the raw request body directly to the Python | ||
| * backend without buffering the file into Node.js memory. | ||
| */ | ||
| export async function POST(request: NextRequest) { | ||
| // 1. Authenticate | ||
| const session = await auth.api.getSession({ | ||
| headers: await headers(), | ||
| }); | ||
|
|
||
| if (!session) { | ||
| return NextResponse.json({ error: "Unauthorized" }, { status: 401 }); | ||
| } | ||
|
|
||
| // 2. Read chatId from query params | ||
| const chatId = request.nextUrl.searchParams.get("chatId"); | ||
|
|
||
|
alvinsjoy marked this conversation as resolved.
|
||
| if (!chatId) { | ||
| return NextResponse.json( | ||
| { error: "chatId query parameter is required" }, | ||
| { status: 400 }, | ||
| ); | ||
| } | ||
|
|
||
| // 3. Verify chat ownership | ||
| const chat = await prisma.chat.findUnique({ | ||
| where: { id: chatId }, | ||
| }); | ||
|
|
||
| if (!chat || chat.userId !== session.user.id) { | ||
| return NextResponse.json( | ||
| { error: "Chat not found or unauthorized" }, | ||
| { status: 403 }, | ||
| ); | ||
| } | ||
|
|
||
| // 4. Stream the request body directly to the Python backend. | ||
| // The verified chatId is passed as a query param so the backend | ||
| // derives the target chat solely from the server-verified value. | ||
| const contentType = request.headers.get("content-type"); | ||
| const backendUrl = `${BACKEND_API_BASE}/ingest?chat_id=${encodeURIComponent(chatId)}`; | ||
|
|
||
| let backendResponse: Response; | ||
| try { | ||
| backendResponse = await fetch(backendUrl, { | ||
| method: "POST", | ||
| body: request.body, | ||
| headers: { | ||
| ...(contentType ? { "Content-Type": contentType } : {}), | ||
| }, | ||
| // @ts-expect-error -- Node 18+ supports duplex for streaming request bodies | ||
| duplex: "half", | ||
| }); | ||
| } catch (error) { | ||
| console.error("Python ingestion transport error:", error); | ||
| return NextResponse.json({ error: "Backend unavailable" }, { status: 502 }); | ||
| } | ||
|
|
||
| if (!backendResponse.ok) { | ||
| const errText = await backendResponse.text(); | ||
| console.error("Python ingestion error:", errText); | ||
| return NextResponse.json( | ||
| { error: "Backend processing failed", detail: errText }, | ||
|
alvinsjoy marked this conversation as resolved.
|
||
| { status: backendResponse.status }, | ||
| ); | ||
| } | ||
|
|
||
| let result; | ||
| try { | ||
| result = await backendResponse.json(); | ||
| } catch { | ||
| console.error("Failed to parse Python backend response as JSON"); | ||
| return NextResponse.json( | ||
| { error: "Invalid response from backend" }, | ||
| { status: 502 }, | ||
| ); | ||
| } | ||
|
|
||
| // 5. Increment document count in Prisma | ||
| await prisma.chat.update({ | ||
| where: { id: chatId }, | ||
| data: { | ||
| documentCount: { increment: 1 }, | ||
| updatedAt: new Date(), | ||
| }, | ||
| }); | ||
|
|
||
| revalidatePath("/chat"); | ||
|
|
||
| return NextResponse.json({ success: true, result }); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| import React, { useState, useRef, useEffect } from "react"; | ||
| import { useRouter } from "next/navigation"; | ||
|
|
||
| import { Send, FileUp, Paperclip, File, X } from "lucide-react"; | ||
| import { Send, FileUp, Paperclip, File, X, Loader2 } from "lucide-react"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { Card } from "@/components/ui/card"; | ||
| import { Input } from "@/components/ui/input"; | ||
|
|
@@ -19,11 +19,7 @@ import { | |
| } from "@/lib/date-format"; | ||
| // Import shared types | ||
| import type { Chat as ChatModel, Message } from "@/lib/types"; | ||
| import { | ||
| sendMessageAction, | ||
| uploadDocumentAction, | ||
| deleteDocumentAction, | ||
| } from "@/lib/actions/chat"; | ||
| import { sendMessageAction, deleteDocumentAction } from "@/lib/actions/chat"; | ||
| import { toast } from "sonner"; | ||
| import { Greeting } from "@/components/greeting"; | ||
|
|
||
|
|
@@ -41,6 +37,7 @@ interface UploadedDocument { | |
| name: string; | ||
| size: string; | ||
| filename: string; | ||
| uploading?: boolean; | ||
| } | ||
|
|
||
| export function ChatArea({ | ||
|
|
@@ -97,6 +94,9 @@ export function ChatArea({ | |
| } | ||
| } catch (error) { | ||
| console.error("Failed to send message:", error); | ||
| toast.error("Failed to send message", { | ||
| description: "Could not reach the server. Please try again.", | ||
| }); | ||
| } finally { | ||
| setIsGenerating(false); | ||
| // Removed router.refresh() because the Server Action handles revalidation natively! | ||
|
|
@@ -120,14 +120,14 @@ export function ChatArea({ | |
| const files = e.target.files; | ||
| if (!files || files.length === 0) return; | ||
|
|
||
| const MAX_SIZE_BYTES = 1 * 1024 * 1024; // 1 MB | ||
| const MAX_SIZE_BYTES = 50 * 1024 * 1024; // 50 MB | ||
|
|
||
| // Filter out oversized files and show a toast for each rejected one | ||
| const validFiles: File[] = []; | ||
| for (const file of Array.from(files)) { | ||
| if (file.size > MAX_SIZE_BYTES) { | ||
| toast.error(`"${file.name}" is too large`, { | ||
| description: `Files must be under 1 MB. This file is ${(file.size / (1024 * 1024)).toFixed(2)} MB.`, | ||
| description: `Files must be under ${(MAX_SIZE_BYTES / (1024 * 1024)).toFixed(2)} MB. This file is ${(file.size / (1024 * 1024)).toFixed(2)} MB.`, | ||
| }); | ||
| } else { | ||
| validFiles.push(file); | ||
|
|
@@ -148,6 +148,7 @@ export function ChatArea({ | |
| name: file.name, | ||
| size: (file.size / 1024).toFixed(2) + " KB", | ||
| filename: file.name, | ||
| uploading: true, | ||
| } satisfies UploadedDocument, | ||
| })); | ||
|
|
||
|
|
@@ -156,25 +157,45 @@ export function ChatArea({ | |
| ...uploadQueue.map((item) => item.optimisticDocument), | ||
| ]); | ||
|
|
||
| // Upload to backend | ||
| // Upload to backend via streaming API route | ||
| for (const { file, optimisticDocument } of uploadQueue) { | ||
| const formData = new FormData(); | ||
| formData.append("file", file); | ||
| formData.append("chat_id", currentChat?.id || "default-chat"); | ||
|
|
||
| try { | ||
| const result = await uploadDocumentAction(formData); | ||
| console.log("File uploaded successfully:", result); | ||
| const uploadPromise = fetch( | ||
| `/api/upload?chatId=${encodeURIComponent(currentChat?.id || "default-chat")}`, | ||
| { method: "POST", body: formData }, | ||
| ).then(async (response) => { | ||
| if (!response.ok) { | ||
| const err = await response.json().catch(() => ({})); | ||
| throw new Error(err.error || "Upload failed"); | ||
| } | ||
|
Comment on lines
+170
to
+173
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Preserve backend failure detail in toast errors. Only 💡 Suggested tweak- if (!response.ok) {
- const err = await response.json().catch(() => ({}));
- throw new Error(err.error || "Upload failed");
- }
+ if (!response.ok) {
+ const err = await response.json().catch(() => null);
+ const message =
+ err?.detail?.message ??
+ err?.detail ??
+ err?.error ??
+ `Upload failed (${response.status})`;
+ throw new Error(message);
+ }🤖 Prompt for AI Agents |
||
| return response.json(); | ||
| }); | ||
|
|
||
| // Trigger navigation refresh to update document count in layout | ||
| router.refresh(); | ||
| } catch (error) { | ||
| console.error("Error uploading file:", error); | ||
| // Remove failed document from optimistic UI. | ||
| setDocuments((prev) => | ||
| prev.filter((d) => d.id !== optimisticDocument.id), | ||
| ); | ||
| toast.error(`Failed to upload "${file.name}"`); | ||
| toast.promise(uploadPromise, { | ||
| loading: `Uploading "${file.name}"...`, | ||
| success: () => { | ||
| setDocuments((prev) => | ||
| prev.map((d) => | ||
| d.id === optimisticDocument.id ? { ...d, uploading: false } : d, | ||
| ), | ||
| ); | ||
| router.refresh(); | ||
| return `"${file.name}" uploaded successfully`; | ||
| }, | ||
| error: (err) => { | ||
| setDocuments((prev) => | ||
| prev.filter((d) => d.id !== optimisticDocument.id), | ||
| ); | ||
| return `Failed to upload "${file.name}": ${err.message}`; | ||
| }, | ||
| }); | ||
|
|
||
| await uploadPromise; | ||
| } catch { | ||
| console.error("Failed to upload file"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -193,6 +214,9 @@ export function ChatArea({ | |
| router.refresh(); | ||
| } catch (error) { | ||
| console.error("Failed to delete document from collection:", error); | ||
| toast.error(`Failed to remove "${doc.name}"`, { | ||
| description: "Could not delete the document. Please try again.", | ||
| }); | ||
| } | ||
| } | ||
| }; | ||
|
|
@@ -260,7 +284,11 @@ export function ChatArea({ | |
| key={doc.id} | ||
| className="group flex items-center gap-2 rounded-lg bg-accent px-3 py-1.5 text-sm" | ||
| > | ||
| <File className="size-4 text-muted-foreground" /> | ||
| {doc.uploading ? ( | ||
| <Loader2 className="size-4 text-muted-foreground animate-spin" /> | ||
| ) : ( | ||
| <File className="size-4 text-muted-foreground" /> | ||
| )} | ||
| <span className="max-w-50 truncate text-accent-foreground"> | ||
| {doc.name} | ||
| </span> | ||
|
|
@@ -321,7 +349,10 @@ export function ChatArea({ | |
| {showDateDivider && ts !== null && ( | ||
| <div className="my-2 flex items-center gap-1"> | ||
| <Separator className="flex-1" /> | ||
| <span className="min-w-max text-xs font-semibold text-muted-foreground" suppressHydrationWarning> | ||
| <span | ||
| className="min-w-max text-xs font-semibold text-muted-foreground" | ||
| suppressHydrationWarning | ||
| > | ||
| {formatChatLongDate(ts)} | ||
| </span> | ||
| <Separator className="flex-1" /> | ||
|
|
@@ -378,7 +409,9 @@ export function ChatArea({ | |
| {message.role === "assistant" ? "AI" : "You"} | ||
| </span> | ||
| {ts !== null ? ( | ||
| <span suppressHydrationWarning>{formatChatTime(ts)}</span> | ||
| <span suppressHydrationWarning> | ||
| {formatChatTime(ts)} | ||
| </span> | ||
| ) : ( | ||
| <span>{message.timestamp}</span> | ||
| )} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.