diff --git a/app/actions.tsx b/app/actions.tsx index 31eb8629..4860d5ce 100644 --- a/app/actions.tsx +++ b/app/actions.tsx @@ -17,6 +17,7 @@ import { inquire, researcher, taskManager, querySuggestor, resolutionSearch } fr // The geospatialTool (if used by agents like researcher) now manages its own MCP client. import { writer } from '@/lib/agents/writer' import { saveChat, getSystemPrompt } from '@/lib/actions/chat' // Added getSystemPrompt +import { retrieveContext } from '@/lib/actions/rag' import { Chat, AIMessage } from '@/lib/types' import { UserMessage } from '@/components/user-message' import { BotMessage } from '@/components/message' @@ -284,6 +285,11 @@ async function submit(formData?: FormData, skip?: boolean) { const userId = 'anonymous' const currentSystemPrompt = (await getSystemPrompt(userId)) || '' + const retrievedContext = await retrieveContext(userInput, aiState.get().chatId) + const augmentedSystemPrompt = retrievedContext.length > 0 + ? `Context: ${retrievedContext.join('\n')}\n${currentSystemPrompt}` + : currentSystemPrompt + async function processEvents() { let action: any = { object: { next: 'proceed' } } if (!skip) action = (await taskManager(messages)) ?? action @@ -320,7 +326,7 @@ async function submit(formData?: FormData, skip?: boolean) { : answer.length === 0 && !errorOccurred ) { const { fullResponse, hasError, toolResponses } = await researcher( - currentSystemPrompt, + augmentedSystemPrompt, uiStream, streamText, messages, @@ -565,14 +571,23 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => { // New messages will store the content array or string directly messageContent = content } + const location = (message as any).locations return { id, component: ( - + <> + + {location && ( + + )} + ) } case 'inquiry': diff --git a/app/api/chat/route.ts b/app/api/chat/route.ts index a8e592ee..7703b101 100644 --- a/app/api/chat/route.ts +++ b/app/api/chat/route.ts @@ -1,11 +1,9 @@ import { NextResponse, NextRequest } from 'next/server'; -import { saveChat, createMessage, NewChat, NewMessage } from '@/lib/actions/chat-db'; +import { saveChat } from '@/lib/actions/chat'; import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; -// import { generateUUID } from '@/lib/utils'; // Assuming generateUUID is in lib/utils as per PR context - not needed for PKs +import { type Chat } from '@/lib/types'; +import { v4 as uuidv4 } from 'uuid'; -// This is a simplified POST handler. PR #533's version might be more complex, -// potentially handling streaming AI responses and then saving. -// For now, this focuses on the database interaction part. export async function POST(request: NextRequest) { try { const userId = await getCurrentUserIdOnServer(); @@ -14,47 +12,35 @@ export async function POST(request: NextRequest) { } const body = await request.json(); - - // Example: Distinguish between creating a new chat vs. adding a message to existing chat - // The actual structure of `body` would depend on client-side implementation. - // Let's assume a simple case: creating a new chat with an initial message. - const { title, initialMessageContent, role = 'user' } = body; + const { title, initialMessageContent, role = 'user' } + = body; if (!initialMessageContent) { return NextResponse.json({ error: 'Initial message content is required' }, { status: 400 }); } - const newChatData: NewChat = { - // id: generateUUID(), // Drizzle schema now has defaultRandom for UUIDs + const newChat: Chat = { + id: uuidv4(), userId: userId, - title: title || 'New Chat', // Default title if not provided - // createdAt: new Date(), // Handled by defaultNow() in schema - visibility: 'private', // Default visibility - }; - - // Use a transaction if creating chat and first message together - // For simplicity here, let's assume saveChat handles chat creation and returns ID, then we create a message. - // A more robust `saveChat` might create the chat and first message in one go. - // The `saveChat` in chat-db.ts is designed to handle this. - - const firstMessage: Omit = { - // id: generateUUID(), // Drizzle schema now has defaultRandom for UUIDs - // chatId is omitted as it will be set by saveChat - userId: userId, - role: role as NewMessage['role'], // Ensure role type matches schema expectation - content: initialMessageContent, - // createdAt: new Date(), // Handled by defaultNow() in schema, not strictly needed here + title: title || 'New Chat', + createdAt: new Date(), + path: '', + messages: [ + { + id: uuidv4(), + role: role, + content: initialMessageContent, + createdAt: new Date(), + } + ] }; - // The saveChat in chat-db.ts is designed to take initial messages. - const savedChatId = await saveChat(newChatData, [firstMessage]); + const savedChatId = await saveChat(newChat, userId); if (!savedChatId) { return NextResponse.json({ error: 'Failed to save chat' }, { status: 500 }); } - // Fetch the newly created chat and message to return (optional, but good for client) - // For now, just return success and the new chat ID. return NextResponse.json({ message: 'Chat created successfully', chatId: savedChatId }, { status: 201 }); } catch (error) { diff --git a/app/api/chats/all/route.ts b/app/api/chats/all/route.ts index d0a3dbb7..8c43e6db 100644 --- a/app/api/chats/all/route.ts +++ b/app/api/chats/all/route.ts @@ -1,8 +1,6 @@ -// Content for app/api/chats/all/route.ts import { NextResponse } from 'next/server'; -import { clearHistory as dbClearHistory } from '@/lib/actions/chat-db'; +import { clearChats } from '@/lib/actions/chat'; import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; -import { revalidatePath } from 'next/cache'; // For revalidating after clearing export async function DELETE() { try { @@ -11,26 +9,18 @@ export async function DELETE() { return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); } - const success = await dbClearHistory(userId); - if (success) { - revalidatePath('/'); // Revalidate home or relevant pages - revalidatePath('/search'); // Revalidate search path - return NextResponse.json({ message: 'History cleared successfully' }, { status: 200 }); - } else { - // This case might be redundant if dbClearHistory throws an error on failure, - // but kept for explicitness if it returns false for "no error but nothing done". - return NextResponse.json({ error: 'Failed to clear history' }, { status: 500 }); + const result = await clearChats(userId); + if (result && 'error' in result) { + return NextResponse.json({ error: result.error }, { status: 500 }); } + + return NextResponse.json({ message: 'History cleared successfully' }, { status: 200 }); + } catch (error) { console.error('Error clearing history via API:', error); let errorMessage = 'Internal Server Error clearing history'; if (error instanceof Error && error.message) { - // Use the error message from dbClearHistory if available (e.g., "User ID is required") - // This depends on dbClearHistory actually throwing or returning specific error messages. - // The current dbClearHistory in chat.ts returns {error: ...} which won't be caught here as an Error instance directly. - // However, the dbClearHistory in chat-db.ts returns boolean. - // Let's assume if dbClearHistory from chat-db.ts (which returns boolean) fails, it's a generic 500. - // If it were to throw, that would be caught. + errorMessage = error.message } return NextResponse.json({ error: errorMessage }, { status: 500 }); } diff --git a/app/api/chats/route.ts b/app/api/chats/route.ts index 91903e13..026b7bee 100644 --- a/app/api/chats/route.ts +++ b/app/api/chats/route.ts @@ -1,5 +1,5 @@ import { NextResponse, NextRequest } from 'next/server'; -import { getChatsPage } from '@/lib/actions/chat-db'; +import { getChats } from '@/lib/actions/chat'; import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; export async function GET(request: NextRequest) { @@ -9,24 +9,8 @@ export async function GET(request: NextRequest) { return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); } - const { searchParams } = new URL(request.url); - - const DEFAULT_LIMIT = 20; - const MAX_LIMIT = 100; - const DEFAULT_OFFSET = 0; - - let limit = parseInt(searchParams.get('limit') || '', 10); - if (isNaN(limit) || limit < 1 || limit > MAX_LIMIT) { - limit = DEFAULT_LIMIT; - } - - let offset = parseInt(searchParams.get('offset') || '', 10); - if (isNaN(offset) || offset < 0) { - offset = DEFAULT_OFFSET; - } - - const result = await getChatsPage(userId, limit, offset); - return NextResponse.json(result); + const chats = await getChats(userId); + return NextResponse.json({ chats }); } catch (error) { console.error('Error fetching chats:', error); return NextResponse.json({ error: 'Internal Server Error fetching chats' }, { status: 500 }); diff --git a/app/search/[id]/page.tsx b/app/search/[id]/page.tsx index 8db74186..00a927ec 100644 --- a/app/search/[id]/page.tsx +++ b/app/search/[id]/page.tsx @@ -1,71 +1,46 @@ import { notFound, redirect } from 'next/navigation'; import { Chat } from '@/components/chat'; -import { getChat, getChatMessages } from '@/lib/actions/chat'; // Added getChatMessages +import { getChat, getChatMessages } from '@/lib/actions/chat'; import { AI } from '@/app/actions'; import { MapDataProvider } from '@/components/map/map-data-context'; -import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; // For server-side auth -import type { AIMessage } from '@/lib/types'; // For AIMessage type -import type { Message as DrizzleMessage } from '@/lib/actions/chat-db'; // For DrizzleMessage type +import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; +import type { AIMessage } from '@/lib/types'; export const maxDuration = 60; export interface SearchPageProps { - params: Promise<{ id: string }>; // Keep as is for now + params: Promise<{ id: string }>; } export async function generateMetadata({ params }: SearchPageProps) { - const { id } = await params; // Keep as is for now - // TODO: Metadata generation might need authenticated user if chats are private - // For now, assuming getChat can be called or it handles anon access for metadata appropriately - const userId = await getCurrentUserIdOnServer(); // Attempt to get user for metadata - const chat = await getChat(id, userId || 'anonymous'); // Pass userId or 'anonymous' if none + const { id } = await params; + const chat = await getChat(id); return { title: chat?.title?.toString().slice(0, 50) || 'Search', }; } export default async function SearchPage({ params }: SearchPageProps) { - const { id } = await params; // Keep as is for now + const { id } = await params; const userId = await getCurrentUserIdOnServer(); if (!userId) { - // If no user, redirect to login or show appropriate page - // For now, redirecting to home, but a login page would be better. redirect('/'); } - const chat = await getChat(id, userId); + const chat = await getChat(id); if (!chat) { - // If chat doesn't exist or user doesn't have access (handled by getChat) notFound(); } - // Fetch messages for the chat - const dbMessages: DrizzleMessage[] = await getChatMessages(chat.id); - - // Transform DrizzleMessages to AIMessages - const initialMessages: AIMessage[] = dbMessages.map((dbMsg): AIMessage => { - return { - id: dbMsg.id, - role: dbMsg.role as AIMessage['role'], // Cast role, ensure AIMessage['role'] includes all dbMsg.role possibilities - content: dbMsg.content, - createdAt: dbMsg.createdAt ? new Date(dbMsg.createdAt) : undefined, - // 'type' and 'name' are not in the basic Drizzle 'messages' schema. - // These would be undefined unless specific logic is added to derive them. - // For instance, if a message with role 'tool' should have a 'name', - // or if some messages have a specific 'type' based on content or other flags. - // This mapping assumes standard user/assistant messages primarily. - }; - }); + const initialMessages = await getChatMessages(chat.id); return ( @@ -73,4 +48,4 @@ export default async function SearchPage({ params }: SearchPageProps) { ); -} \ No newline at end of file +} diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx index b0bf2166..b8181ac5 100644 --- a/components/chat-panel.tsx +++ b/components/chat-panel.tsx @@ -3,7 +3,6 @@ import { useEffect, useState, useRef, ChangeEvent, forwardRef, useImperativeHandle } from 'react' import type { AI, UIState } from '@/app/actions' import { useUIState, useActions } from 'ai/rsc' -// Removed import of useGeospatialToolMcp as it's no longer used/available import { cn } from '@/lib/utils' import { UserMessage } from './user-message' import { Button } from './ui/button' @@ -15,16 +14,17 @@ interface ChatPanelProps { messages: UIState input: string setInput: (value: string) => void + chatId: string + shareableLink: string } export interface ChatPanelRef { handleAttachmentClick: () => void; } -export const ChatPanel = forwardRef(({ messages, input, setInput }, ref) => { +export const ChatPanel = forwardRef(({ messages, input, setInput, chatId, shareableLink }, ref) => { const [, setMessages] = useUIState() const { submit, clearChat } = useActions() - // Removed mcp instance as it's no longer passed to submit const [isMobile, setIsMobile] = useState(false) const [selectedFile, setSelectedFile] = useState(null) const inputRef = useRef(null) @@ -37,7 +37,6 @@ export const ChatPanel = forwardRef(({ messages, i } })); - // Detect mobile layout useEffect(() => { const checkMobile = () => { setIsMobile(window.innerWidth <= 1024) @@ -116,7 +115,6 @@ export const ChatPanel = forwardRef(({ messages, i inputRef.current?.focus() }, []) - // New chat button (appears when there are messages) if (messages.length > 0 && !isMobile) { return (
(({ messages, i
(null); + const [onlineUsers, setOnlineUsers] = useState([]); + const [chatData, setChatData] = useState(null); const handleAttachment = () => { chatPanelRef.current?.handleAttachmentClick(); }; + useEffect(() => { + async function fetchChatData() { + if (id) { + const chat = await getChat(id); + setChatData(chat); + } + } + fetchChatData(); + }, [id]); + useEffect(() => { setShowEmptyScreen(messages.length === 0) }, [messages]) useEffect(() => { - // Check if device is mobile const checkMobile = () => { setIsMobile(window.innerWidth < 768) } - - // Initial check checkMobile() - - // Add event listener for window resize window.addEventListener('resize', checkMobile) - - // Cleanup return () => window.removeEventListener('resize', checkMobile) }, []) @@ -62,36 +69,62 @@ export function Chat({ id }: ChatProps) { useEffect(() => { if (aiState.messages[aiState.messages.length - 1]?.type === 'response') { - // Refresh the page to chat history updates router.refresh() } }, [aiState, router]) - // Get mapData to access drawnFeatures const { mapData } = useMapData(); - // useEffect to call the server action when drawnFeatures changes useEffect(() => { if (id && mapData.drawnFeatures && mapData.drawnFeatures.length > 0) { - console.log('Chat.tsx: drawnFeatures changed, calling updateDrawingContext', mapData.drawnFeatures); updateDrawingContext(id, mapData.drawnFeatures); } }, [id, mapData.drawnFeatures]); - // Mobile layout + useEffect(() => { + if (!id) return; + + const supabase = getSupabaseBrowserClient(); + const channel = supabase.channel(`chat-${id}`); + + const subscription = channel + .on('postgres_changes', { event: 'INSERT', schema: 'public', table: 'messages', filter: `chat_id=eq.${id}` }, + (payload) => { + const newMessage = payload.new as AIMessage; + if (!messages.some((m: AIMessage) => m.id === newMessage.id)) { + setMessages((prevMessages: AIMessage[]) => [...prevMessages, newMessage]); + } + }) + .on('presence', { event: 'sync' }, () => { + const newState = channel.presenceState(); + const users = Object.keys(newState).map(key => (newState[key][0] as any).user_id); + setOnlineUsers(users); + }) + .subscribe(async (status) => { + if (status === 'SUBSCRIBED') { + await channel.track({ user_id: 'user-placeholder', online_at: new Date().toISOString() }); + } + }); + + return () => { + supabase.removeChannel(channel); + }; + }, [id, messages, setMessages]); + + if (isMobile) { return ( - {/* Add Provider */} +
- {activeView ? : } + {activeView ? : }
- +
{showEmptyScreen ? ( @@ -109,14 +142,12 @@ export function Chat({ id }: ChatProps) { ); } - // Desktop layout return ( - {/* Add Provider */} +
- {/* This is the new div for scrolling */}
- + {showEmptyScreen ? ( { @@ -129,9 +160,9 @@ export function Chat({ id }: ChatProps) {
- {activeView ? : } + {activeView ? : }
diff --git a/components/history-item.tsx b/components/history-item.tsx index 4040e3f8..52203945 100644 --- a/components/history-item.tsx +++ b/components/history-item.tsx @@ -3,11 +3,11 @@ import React from 'react' import Link from 'next/link' import { usePathname } from 'next/navigation' -import type { Chat as DrizzleChat } from '@/lib/actions/chat-db'; +import { type Chat } from '@/lib/types'; import { cn } from '@/lib/utils' type HistoryItemProps = { - chat: DrizzleChat & { path: string }; + chat: Chat & { path: string }; } const formatDateWithTime = (date: Date | string) => { diff --git a/components/history-list.tsx b/components/history-list.tsx index 5713bd2e..1943ff82 100644 --- a/components/history-list.tsx +++ b/components/history-list.tsx @@ -2,31 +2,13 @@ import React, { cache } from 'react'; import HistoryItem from './history-item'; import { ClearHistory } from './clear-history'; import { getChats } from '@/lib/actions/chat'; - -// Define the type for the chat data returned by getChats -type ChatData = { - userId: string; - id: string; - title: string; - createdAt: Date; - visibility: string | null; -}; - -// Define the Chat type expected by HistoryItem -type Chat = { - userId: string; - id: string; - title: string; - createdAt: Date; - visibility: string | null; - path: string; -}; +import { type Chat } from '@/lib/types'; type HistoryListProps = { userId?: string; }; -const loadChats = cache(async (userId?: string): Promise => { +const loadChats = cache(async (userId?: string): Promise => { return await getChats(userId); }); @@ -52,12 +34,12 @@ export async function HistoryList({ userId }: HistoryListProps) { No search history
) : ( - chats.map((chat: ChatData) => ( + chats.map((chat: Chat) => ( )) diff --git a/components/settings/components/settings.tsx b/components/settings/components/settings.tsx index a4cc0ec9..be9eccaa 100644 --- a/components/settings/components/settings.tsx +++ b/components/settings/components/settings.tsx @@ -10,15 +10,13 @@ import { Button } from "@/components/ui/button" import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card" import { FormProvider, UseFormReturn } from "react-hook-form"; import React from "react"; import { Loader2, Save, RotateCcw } from "lucide-react" -// Or, if the file does not exist, create it as shown below. import { SystemPromptForm } from "./system-prompt-form" import { ModelSelectionForm } from "./model-selection-form" import { UserManagementForm } from './user-management-form'; import { Form } from "@/components/ui/form" import { useToast } from "@/components/ui/hooks/use-toast" -import { getSystemPrompt, saveSystemPrompt } from "../../../lib/actions/chat" // Added import +import { getSystemPrompt, saveSystemPrompt } from "../../../lib/actions/chat" -// Define the form schema const settingsFormSchema = z.object({ systemPrompt: z .string() @@ -35,31 +33,28 @@ const settingsFormSchema = z.object({ z.object({ id: z.string(), email: z.string().email(), - role: z.enum(["admin", "editor", "viewer"]), + role: z.enum(["owner", "collaborator"]), }), ), newUserEmail: z.string().email().optional(), - newUserRole: z.enum(["admin", "editor", "viewer"]).optional(), + newUserRole: z.enum(["owner", "collaborator"]).optional(), }) export type SettingsFormValues = z.infer -// Default values const defaultValues: Partial = { systemPrompt: "You are a planetary copilot, an AI assistant designed to help users with information about planets, space exploration, and astronomy. Provide accurate, educational, and engaging responses about our solar system and beyond.", selectedModel: "gpt-4o", - users: [ - { id: "1", email: "admin@example.com", role: "admin" }, - { id: "2", email: "user@example.com", role: "editor" }, - ], + users: [], } interface SettingsProps { initialTab?: string; + chatId: string; } -export function Settings({ initialTab = "system-prompt" }: SettingsProps) { +export function Settings({ initialTab = "system-prompt", chatId }: SettingsProps) { const { toast } = useToast() const router = useRouter() const [isLoading, setIsLoading] = useState(false) @@ -69,7 +64,6 @@ export function Settings({ initialTab = "system-prompt" }: SettingsProps) { setCurrentTab(initialTab); }, [initialTab]); - // TODO: Replace 'anonymous' with actual user ID from session/auth context const userId = 'anonymous'; const form = useForm({ @@ -91,27 +85,21 @@ export function Settings({ initialTab = "system-prompt" }: SettingsProps) { setIsLoading(true) try { - // Save the system prompt const saveResult = await saveSystemPrompt(userId, data.systemPrompt); if (saveResult?.error) { throw new Error(saveResult.error); } - // Simulate other API calls if necessary or remove if only saving system prompt for this form - await new Promise((resolve) => setTimeout(resolve, 200)) // Shorter delay now + await new Promise((resolve) => setTimeout(resolve, 200)) console.log("Submitted data (including system prompt):", data) - // Success notification toast({ title: "Settings updated", description: "Your settings have been saved successfully.", }) - // Refresh the page to reflect changes - // router.refresh(); // Consider if refresh is needed or if optimistic update is enough } catch (error: any) { - // Error notification toast({ title: "Something went wrong", description: error.message || "Your settings could not be saved. Please try again.", @@ -166,7 +154,7 @@ export function Settings({ initialTab = "system-prompt" }: SettingsProps) { - + diff --git a/components/settings/components/user-management-form.tsx b/components/settings/components/user-management-form.tsx index 2f9521df..79ee6106 100644 --- a/components/settings/components/user-management-form.tsx +++ b/components/settings/components/user-management-form.tsx @@ -9,14 +9,15 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@ import { FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"; import { Trash2, Edit3, UserPlus, Loader2 } from 'lucide-react'; import { useToast } from '@/components/ui/hooks/use-toast'; -import { addUser } from '@/lib/actions/users'; +import { inviteUserToChat } from '@/lib/actions/collaboration'; import type { SettingsFormValues } from './settings'; interface UserManagementFormProps { form: UseFormReturn; + chatId: string; } -export function UserManagementForm({ form }: UserManagementFormProps) { +export function UserManagementForm({ form, chatId }: UserManagementFormProps) { const { fields, append, remove } = useFieldArray({ control: form.control, name: "users", @@ -24,15 +25,10 @@ export function UserManagementForm({ form }: UserManagementFormProps) { const { toast } = useToast(); const [isAddingUser, setIsAddingUser] = useState(false); - // const watchNewUserEmail = form.watch("newUserEmail", ""); // Not strictly needed for logic below - // const watchNewUserRole = form.watch("newUserRole", "viewer"); // Not strictly needed for logic below - const handleAddUser = async () => { setIsAddingUser(true); const newUserEmail = form.getValues("newUserEmail"); - const newUserRole = form.getValues("newUserRole") || "viewer"; // Ensure role has a default - // Client-side validation first if (!newUserEmail) { form.setError("newUserEmail", { type: "manual", message: "Email is required." }); setIsAddingUser(false); @@ -43,27 +39,22 @@ export function UserManagementForm({ form }: UserManagementFormProps) { setIsAddingUser(false); return; } - // Client-side check if user already exists in the local list - if (fields.some(user => user.email === newUserEmail)) { - form.setError("newUserEmail", { type: "manual", message: "User with this email already exists locally." }); - setIsAddingUser(false); - return; - } - // Clear any previous local errors for newUserEmail if client checks pass + form.clearErrors("newUserEmail"); try { - const result = await addUser('default-user', { email: newUserEmail, role: newUserRole }); + const result = await inviteUserToChat(chatId, newUserEmail); if (result.error) { toast({ title: 'Error adding user', description: result.error, variant: 'destructive' }); - form.setError("newUserEmail", { type: "manual", message: result.error }); // Show server error on field - } else if (result.user) { - toast({ title: 'User Added', description: `${result.user.email} was successfully added.` }); - append(result.user); // Add user with ID from server + form.setError("newUserEmail", { type: "manual", message: result.error }); + } else { + toast({ title: 'User Invited', description: `${newUserEmail} was successfully invited.` }); + // We don't append here because the user needs to accept the invite. + // We can add a "pending invitations" section in the future. form.resetField("newUserEmail"); - form.resetField("newUserRole"); // Or set to default: form.setValue("newUserRole", "viewer"); - form.clearErrors("newUserEmail"); // Clear any previous errors + form.resetField("newUserRole"); + form.clearErrors("newUserEmail"); } } catch (error) { console.error("Failed to add user:", error); @@ -77,7 +68,7 @@ export function UserManagementForm({ form }: UserManagementFormProps) { User Management - Add, remove, or edit user access and roles. + Invite users to collaborate on this chat.
@@ -99,7 +90,7 @@ export function UserManagementForm({ form }: UserManagementFormProps) { ( Role @@ -110,9 +101,8 @@ export function UserManagementForm({ form }: UserManagementFormProps) { - Admin - Editor - Viewer + Owner + Collaborator @@ -122,7 +112,7 @@ export function UserManagementForm({ form }: UserManagementFormProps) {
diff --git a/components/settings/settings-view.tsx b/components/settings/settings-view.tsx index 5f9e16ff..a5cb815a 100644 --- a/components/settings/settings-view.tsx +++ b/components/settings/settings-view.tsx @@ -5,7 +5,7 @@ import { useProfileToggle, ProfileToggleEnum } from "@/components/profile-toggle import { Button } from "@/components/ui/button" import { Minus } from "lucide-react" -export default function SettingsView() { +export default function SettingsView({ chatId }: { chatId: string }) { const { toggleProfileSection, activeView } = useProfileToggle(); const initialTab = activeView === ProfileToggleEnum.Security ? "user-management" : "system-prompt"; @@ -28,7 +28,7 @@ export default function SettingsView() {
}> - +
) diff --git a/components/sidebar/chat-history-client.tsx b/components/sidebar/chat-history-client.tsx index eeb959b3..0fc75f84 100644 --- a/components/sidebar/chat-history-client.tsx +++ b/components/sidebar/chat-history-client.tsx @@ -1,9 +1,7 @@ 'use client'; import React, { useEffect, useState, useTransition } from 'react'; -import Link from 'next/link'; -import { usePathname, useRouter } from 'next/navigation'; -import { cn } from '@/lib/utils'; +import { useRouter } from 'next/navigation'; import { Button } from '@/components/ui/button'; import { AlertDialog, @@ -18,15 +16,14 @@ import { } from '@/components/ui/alert-dialog'; import { toast } from 'sonner'; import { Spinner } from '@/components/ui/spinner'; -import HistoryItem from '@/components/history-item'; // Adjust path if HistoryItem is moved or renamed -import type { Chat as DrizzleChat } from '@/lib/actions/chat-db'; // Use the Drizzle-based Chat type +import HistoryItem from '@/components/history-item'; +import { type Chat } from '@/lib/types'; interface ChatHistoryClientProps { - // userId is no longer passed as prop; API route will use authenticated user } export function ChatHistoryClient({}: ChatHistoryClientProps) { - const [chats, setChats] = useState([]); + const [chats, setChats] = useState([]); const [isLoading, setIsLoading] = useState(true); const [error, setError] = useState(null); const [isClearPending, startClearTransition] = useTransition(); @@ -38,13 +35,12 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) { setIsLoading(true); setError(null); try { - // API route /api/chats uses getCurrentUserId internally - const response = await fetch('/api/chats?limit=50&offset=0'); // Example limit/offset + const response = await fetch('/api/chats'); if (!response.ok) { const errorData = await response.json(); throw new Error(errorData.error || `Failed to fetch chats: ${response.statusText}`); } - const data: { chats: DrizzleChat[], nextOffset: number | null } = await response.json(); + const data: { chats: Chat[] } = await response.json(); setChats(data.chats); } catch (err) { if (err instanceof Error) { @@ -64,10 +60,7 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) { const handleClearHistory = async () => { startClearTransition(async () => { try { - // We need a new API endpoint for clearing history - // Example: DELETE /api/chats (or POST /api/clear-history) - // This endpoint will call clearHistory(userId) from chat-db.ts - const response = await fetch('/api/chats/all', { // Placeholder for the actual clear endpoint + const response = await fetch('/api/chats/all', { method: 'DELETE', }); @@ -77,11 +70,9 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) { } toast.success('History cleared'); - setChats([]); // Clear chats from UI + setChats([]); setIsAlertDialogOpen(false); - router.refresh(); // Refresh to reflect changes, potentially redirect if on a chat page - // Consider redirecting to '/' if current page is a chat that got deleted. - // The old clearChats action did redirect('/'); + router.refresh(); } catch (err) { if (err instanceof Error) { toast.error(err.message); @@ -103,7 +94,6 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) { } if (error) { - // Optionally provide a retry button return (

Error loading chat history: {error}

@@ -120,8 +110,6 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) {
) : ( chats.map((chat) => ( - // Assuming HistoryItem is adapted for DrizzleChat and expects chat.id and chat.title - // Also, chat.path will need to be constructed, e.g., `/search/${chat.id}` )) )} diff --git a/drizzle.config.ts b/drizzle.config.ts deleted file mode 100644 index 1a530f03..00000000 --- a/drizzle.config.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { Config } from 'drizzle-kit'; -import * as dotenv from 'dotenv'; - -dotenv.config({ path: '.env.local' }); - -if (!process.env.DATABASE_URL) { - throw new Error('DATABASE_URL environment variable is not set'); -} - -export default { - schema: './lib/db/schema.ts', - out: './drizzle/migrations', - dialect: 'postgresql', - dbCredentials: { - url: process.env.DATABASE_URL, // Changed from connectionString to url - }, - verbose: true, - strict: true, -} satisfies Config; diff --git a/jules-scratch/verification/verify_chat_creation.py b/jules-scratch/verification/verify_chat_creation.py new file mode 100644 index 00000000..6fae3413 --- /dev/null +++ b/jules-scratch/verification/verify_chat_creation.py @@ -0,0 +1,24 @@ +from playwright.sync_api import sync_playwright, expect + +def run(playwright): + browser = playwright.chromium.launch(headless=True) + page = browser.new_page() + page.goto("http://localhost:3000/", timeout=60000) + + # Wait for the main loading overlay to disappear + page.wait_for_selector('div[class*="z-[9999]"]', state='hidden', timeout=60000) + + # Fill the chat input and submit + chat_input = page.locator('textarea[placeholder="Explore"]') + chat_input.wait_for(state='visible', timeout=30000) + chat_input.fill("Hello, this is a test message.") + page.locator('button[aria-label="Send message"]').click() + + # Verify that the user's message appears in the chat + user_message = page.locator('div.user-message:has-text("Hello, this is a test message.")') + expect(user_message).to_be_visible(timeout=30000) + + browser.close() + +with sync_playwright() as playwright: + run(playwright) diff --git a/jules-scratch/verification/verify_share_button.py b/jules-scratch/verification/verify_share_button.py new file mode 100644 index 00000000..040baf06 --- /dev/null +++ b/jules-scratch/verification/verify_share_button.py @@ -0,0 +1,31 @@ +from playwright.sync_api import sync_playwright + +def run(playwright): + browser = playwright.chromium.launch(headless=True) + page = browser.new_page() + # Increase timeout to 60s + page.goto("http://localhost:3000/", timeout=60000) + + # Wait for the main loading overlay to disappear + page.wait_for_selector('div[class*="z-[9999]"]', state='hidden', timeout=60000) + + # Click the button to reveal the chat panel + open_chat_button = page.locator('button[aria-label="Open chat"]') + open_chat_button.wait_for(state='visible', timeout=30000) + open_chat_button.click() + + # Wait for the Share button to be visible and click it + share_button = page.locator('button:has-text("Share")') + share_button.wait_for(state='visible', timeout=30000) + share_button.click() + + # Wait for the dialog to appear before taking a screenshot + page.wait_for_selector('div[role="dialog"]', state='visible', timeout=10000) + + # Take a screenshot of the share dialog + page.screenshot(path="jules-scratch/verification/verification.png") + + browser.close() + +with sync_playwright() as playwright: + run(playwright) diff --git a/lib/actions/chat-db.ts b/lib/actions/chat-db.ts deleted file mode 100644 index 4f0559ec..00000000 --- a/lib/actions/chat-db.ts +++ /dev/null @@ -1,223 +0,0 @@ -import { db } from '@/lib/db'; -import { chats, messages, users } from '@/lib/db/schema'; -import { eq, desc, and, sql, asc } from 'drizzle-orm'; // Added asc -import { alias } from 'drizzle-orm/pg-core'; -import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; // We'll use this to ensure user-specific actions - -// Define types based on our schema for better type safety -// These would ideally be generated by Drizzle Kit or defined in a central types location in a larger app -export type Chat = typeof chats.$inferSelect; -export type Message = typeof messages.$inferSelect; -export type User = typeof users.$inferSelect; -export type NewChat = typeof chats.$inferInsert; -export type NewMessage = typeof messages.$inferInsert; - -/** - * Retrieves a specific chat by its ID, ensuring it belongs to the current user - * or is public. - * @param id - The ID of the chat to retrieve. - * @param userId - The ID of the user requesting the chat. - * @returns The chat object if found and accessible, otherwise null. - */ -export async function getChat(id: string, userId: string): Promise { - if (!userId) { - console.warn('getChat called without userId'); - // Potentially allow fetching public chats if userId is null for anonymous users - const result = await db.select().from(chats).where(and(eq(chats.id, id), eq(chats.visibility, 'public'))).limit(1); - return result[0] || null; - } - - const result = await db.select() - .from(chats) - .where( - and( - eq(chats.id, id), - sql`${chats.userId} = ${userId} OR ${chats.visibility} = 'public'` - ) - ) - .limit(1); - return result[0] || null; -} - -/** - * Retrieves a paginated list of chats for a given user. - * @param userId - The ID of the user whose chats to retrieve. - * @param limit - The maximum number of chats to return. - * @param offset - The number of chats to skip (for pagination). - * @returns An object containing the list of chats and the next offset. - */ -export async function getChatsPage( - userId: string, - limit: number = 20, - offset: number = 0 -): Promise<{ chats: Chat[]; nextOffset: number | null }> { - if (!userId) { - console.error('getChatsPage called without userId.'); - return { chats: [], nextOffset: null }; - } - const result = await db - .select() - .from(chats) - .where(eq(chats.userId, userId)) - .orderBy(desc(chats.createdAt)) - .limit(limit) - .offset(offset); - - let nextOffset: number | null = null; - if (result.length === limit) { - nextOffset = offset + limit; - } - - return { chats: result, nextOffset }; -} - -/** - * Saves a chat and its messages. If the chat exists, it updates it. - * This function should handle both creating new chats and appending messages. - * The PR implies complex logic for saving, including message IDs. - * This is a simplified version; PR #533 might have more granular message saving. - * @param chatData - The chat data to save. - * @param messagesData - An array of messages to save with the chat. - * @returns The saved chat ID. - */ -export async function saveChat(chatData: NewChat, messagesData: Omit[]): Promise { - if (!chatData.userId) { - console.error('Cannot save chat without a userId'); - return null; - } - - // Transaction to ensure atomicity - return db.transaction(async (tx) => { - let chatId = chatData.id; - - if (chatId) { // If chat ID is provided, assume update or append messages - const existingChat = await tx.select({ id: chats.id }).from(chats).where(eq(chats.id, chatId)).limit(1); - if (!existingChat.length) { - // Chat doesn't exist, so create it - const newChatResult = await tx.insert(chats).values(chatData).returning({ id: chats.id }); - chatId = newChatResult[0].id; - } else { - // Optionally update chat metadata here if needed, e.g., title - if (chatData.title) { - await tx.update(chats).set({ title: chatData.title }).where(eq(chats.id, chatId)); - } - } - } else { // No chat ID, create new chat - const newChatResult = await tx.insert(chats).values(chatData).returning({ id: chats.id }); - chatId = newChatResult[0].id; - } - - if (!chatId) { - // console.error('Failed to establish chatId within transaction.'); // Optional: for server logs - throw new Error('Failed to establish chatId for chat operation.'); - } - - // Save messages - if (messagesData && messagesData.length > 0) { - const messagesToInsert = messagesData.map(msg => ({ - ...msg, - chatId: chatId!, // Ensure chatId is set for all messages - userId: msg.userId || chatData.userId!, // Ensure userId is set - })); - await tx.insert(messages).values(messagesToInsert); - } - return chatId; - }); -} - - -/** - * Creates a single message within a chat. - * PR #533 has commits like "feat: Add message update and trailing deletion logic", - * suggesting more granular message operations. This is a basic create. - * @param messageData - The message data to save. - * @returns The created message object or null if error. - */ -export async function createMessage(messageData: NewMessage): Promise { - if (!messageData.chatId || !messageData.userId || !messageData.role || !messageData.content) { - console.error('Missing required fields for creating a message.'); - return null; - } - try { - const result = await db.insert(messages).values(messageData).returning(); - return result[0] || null; - } catch (error) { - console.error('Error creating message:', error); - return null; - } -} - -/** - * Deletes a specific chat and its associated messages (due to cascade delete). - * @param id - The ID of the chat to delete. - * @param userId - The ID of the user requesting deletion, for authorization. - * @returns True if deletion was successful, false otherwise. - */ -export async function deleteChat(id: string, userId: string): Promise { - if (!userId) { - console.error('deleteChat called without userId.'); - return false; - } - try { - const result = await db - .delete(chats) - .where(and(eq(chats.id, id), eq(chats.userId, userId))) // Ensure user owns the chat - .returning({ id: chats.id }); - return result.length > 0; - } catch (error) { - console.error('Error deleting chat:', error); - return false; - } -} - -/** - * Clears the chat history for a given user (deletes all their chats). - * @param userId - The ID of the user whose chat history to clear. - * @returns True if history was cleared, false otherwise. - */ -export async function clearHistory(userId: string): Promise { - if (!userId) { - console.error('clearHistory called without userId.'); - return false; - } - try { - // This will also delete associated messages due to cascade delete constraint - await db.delete(chats).where(eq(chats.userId, userId)); - return true; - } catch (error) { - console.error('Error clearing history:', error); - return false; - } -} - -/** - * Retrieves all messages for a given chat ID, ordered by creation time. - * @param chatId - The ID of the chat whose messages to retrieve. - * @returns An array of message objects. - */ -export async function getMessagesByChatId(chatId: string): Promise { - if (!chatId) { - console.warn('getMessagesByChatId called without chatId'); - return []; - } - try { - const result = await db - .select() - .from(messages) - .where(eq(messages.chatId, chatId)) - .orderBy(asc(messages.createdAt)); // Order messages chronologically - return result; - } catch (error) { - console.error(`Error fetching messages for chat ${chatId}:`, error); - return []; - } -} - -// More granular functions might be needed based on PR #533 specifics: -// - updateMessage(messageId: string, updates: Partial): Promise -// - deleteMessage(messageId: string, userId: string): Promise -// - deleteTrailingMessages(chatId: string, lastKeptMessageId: string): Promise -// These are placeholders for now and can be implemented if subsequent steps show they are directly part of PR #533's changes. -// The PR mentions "feat: Add message update and trailing deletion logic" and "refactor(chat): Adjust message edit logic". - -console.log('Chat DB actions loaded. Ensure getCurrentUserId() is correctly implemented for server-side usage if applicable.'); diff --git a/lib/actions/chat.ts b/lib/actions/chat.ts index 6c6ece14..73210185 100644 --- a/lib/actions/chat.ts +++ b/lib/actions/chat.ts @@ -2,223 +2,150 @@ import { revalidatePath } from 'next/cache' import { redirect } from 'next/navigation' -import { type Chat as OldChatType, type AIMessage } from '@/lib/types' // Added AIMessage, OldChatType for transition +import { type Chat, type AIMessage } from '@/lib/types' import { - getChatsPage as dbGetChatsPage, - getChat as dbGetChat, - clearHistory as dbClearHistory, - saveChat as dbSaveChat, - createMessage as dbCreateMessage, - getMessagesByChatId as dbGetMessagesByChatId, // Added - type Chat as DrizzleChat, - type Message as DrizzleMessage, // Added - type NewChat as DbNewChat, - type NewMessage as DbNewMessage -} from '@/lib/actions/chat-db' -import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user' // For operations needing current user - -// TODO: Migrate Redis-based functions below (saveSystemPrompt, getSystemPrompt) if needed. -// const redis = new Redis({ -// url: process.env.UPSTASH_REDIS_REST_URL?.trim() || '', -// token: process.env.UPSTASH_REDIS_REST_TOKEN || '' -// }) - -export async function getChats(userId?: string | null): Promise { + saveChat as supabaseSaveChat, + getMessagesByChatId as supabaseGetMessagesByChatId, + saveSystemPrompt as supabaseSaveSystemPrompt, + getSystemPrompt as supabaseGetSystemPrompt, + saveDrawing as supabaseSaveDrawing, + createMessage as supabaseCreateMessage, +} from '@/lib/supabase/persistence' +import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user' +import { getSupabaseServerClient } from '../supabase/client' + +export async function getChats(userId?: string | null): Promise { if (!userId) { - console.warn('getChats called without userId, returning empty array.') - return [] + const userId = await getCurrentUserIdOnServer(); + if (!userId) { + console.warn('getChats called without userId, returning empty array.') + return [] + } } - try { - // Using a default limit and offset for now - const { chats } = await dbGetChatsPage(userId, 20, 0) - return chats - } catch (error) { - console.error('Error fetching chats from DB:', error) + const supabase = getSupabaseServerClient() + const { data, error } = await supabase + .from('chats') + .select('*') + + if (error) { + console.error('Error fetching chats from Supabase:', error) return [] } + + return (data as Chat[]) || [] } -export async function getChat(id: string, userId: string): Promise { - // userId is now mandatory for dbGetChat to check ownership or public status +export async function getChat(id: string): Promise { + const userId = await getCurrentUserIdOnServer(); if (!userId) { - console.warn('getChat called without userId.') - // Optionally, could try to fetch only public chat if that's a use case - // return await dbGetChat(id, ''); // Pass empty or a specific marker for anonymous - return null; - } - try { - const chat = await dbGetChat(id, userId) - return chat - } catch (error) { - console.error(`Error fetching chat ${id} from DB:`, error) + console.warn('getChat called without authenticated user.') + return null + } + + const supabase = getSupabaseServerClient() + const { data, error } = await supabase + .from('chats') + .select('*, chat_participants!inner(*)') + .eq('id', id) + .single() + + if (error) { + console.error(`Error fetching chat ${id} from Supabase:`, error) return null } + + // Final check to ensure the user is a participant + if (data && data.chat_participants.some((p: { user_id: string }) => p.user_id === userId)) { + return data as Chat; + } + + return null; } -/** - * Retrieves all messages for a specific chat. - * @param chatId The ID of the chat. - * @returns A promise that resolves to an array of DrizzleMessage objects. - */ -export async function getChatMessages(chatId: string): Promise { +export async function getChatMessages(chatId: string): Promise { if (!chatId) { - console.warn('getChatMessages called without chatId'); - return []; + console.warn('getChatMessages called without chatId') + return [] } - try { - return dbGetMessagesByChatId(chatId); - } catch (error) { - console.error(`Error fetching messages for chat ${chatId} in getChatMessages:`, error); - return []; + const { data, error } = await supabaseGetMessagesByChatId(chatId) + if (error) { + return [] } + return data || [] } export async function clearChats( - userId?: string | null // Changed to optional, will try to get current user if not provided -): Promise<{ error?: string } | void> { // void for success + userId?: string | null +): Promise<{ error?: string } | void> { const currentUserId = userId || (await getCurrentUserIdOnServer()) if (!currentUserId) { console.error('clearChats: No user ID provided or found.') return { error: 'User ID is required to clear chats' } } - try { - const success = await dbClearHistory(currentUserId) - if (!success) { - return { error: 'Failed to clear chats from database.' } - } - // Revalidation and redirect should ideally be handled by the caller (e.g., Server Action, API route) - // For now, keeping them as they were, but this makes the function less reusable. - revalidatePath('/') - redirect('/') - } catch (error) { - console.error('Error clearing chats from DB:', error) + const supabase = getSupabaseServerClient() + const { error } = await supabase.from('chats').delete().eq('user_id', currentUserId) + + if (error) { + console.error('Error clearing chats from Supabase:', error) return { error: 'Failed to clear chat history' } } + + revalidatePath('/') + redirect('/') } -export async function saveChat(chat: OldChatType, userId: string): Promise { - // This function now maps the old Chat type to new Drizzle types - // and calls the new dbSaveChat function. +export async function saveChat(chat: Chat, userId: string): Promise { if (!userId && !chat.userId) { console.error('saveChat: userId is required either as a parameter or in chat object.') - return null; - } - const effectiveUserId = userId || chat.userId; - - const newChatData: DbNewChat = { - id: chat.id, // Keep existing ID if present (for updates) - userId: effectiveUserId, - title: chat.title || 'Untitled Chat', - createdAt: chat.createdAt ? new Date(chat.createdAt) : new Date(), // Ensure Date object - visibility: 'private', // Default or map from old chat if available - // sharePath: chat.sharePath, // sharePath is not in new schema by default - }; - - const newMessagesData: Omit[] = chat.messages.map(msg => ({ - id: msg.id, // Keep existing ID - userId: effectiveUserId, // Ensure messages have a userId - role: msg.role, // Allow all AIMessage roles to pass through - content: typeof msg.content === 'object' ? JSON.stringify(msg.content) : msg.content, - createdAt: msg.createdAt ? new Date(msg.createdAt) : new Date(), - // attachments: (msg as any).attachments, // If AIMessage had attachments - // type: (msg as any).type // If AIMessage had a type - })); - - try { - const savedChatId = await dbSaveChat(newChatData, newMessagesData); - return savedChatId; - } catch (error) { - console.error('Error saving chat to DB:', error); - return null; + return null } -} + const effectiveUserId = userId || chat.userId -// TODO: Re-evaluate sharing functionality with Supabase if needed. -// PR #533 removes the share page, so these are likely deprecated for now. -// export async function getSharedChat(id: string) { -// // This would need to be reimplemented using dbGetChat with public visibility logic -// // const chat = await dbGetChat(id, ''); // Need a way to signify public access -// // if (!chat || chat.visibility !== 'public') { // Assuming 'public' visibility for shared -// // return null; -// // } -// // return chat; -// console.warn("getSharedChat is deprecated and needs reimplementation with new DB structure."); -// return null; -// } - -// export async function shareChat(id: string, userId: string) { -// // This would involve updating a chat's visibility to 'public' in the DB -// // and potentially creating a unique share link if `sharePath` is not just derived. -// // const chat = await dbGetChat(id, userId); -// // if (!chat) { -// // return null; -// // } -// // // Update chat visibility to public -// // // const updatedChat = await db.update(chatsTable).set({ visibility: 'public' }).where(eq(chatsTable.id, id)).returning(); -// // // return updatedChat[0]; -// console.warn("shareChat is deprecated and needs reimplementation with new DB structure."); -// return null; -// } + const { data, error } = await supabaseSaveChat(chat, effectiveUserId) + + if (error) { + return null + } + return data +} export async function updateDrawingContext(chatId: string, drawnFeatures: any[]) { 'use server'; console.log('[Action] updateDrawingContext called for chatId:', chatId); - const userId = await getCurrentUserIdOnServer(); // Essential for creating a user-associated message + const userId = await getCurrentUserIdOnServer(); if (!userId) { console.error('updateDrawingContext: Could not get current user ID. User must be authenticated.'); return { error: 'User not authenticated' }; } - // The old version fetched the whole chat. Now we just create a new message. - // The AIMessage type might be from '@/lib/types' and need mapping to DbNewMessage - const newDrawingMessage: Omit = { - // id: `drawnData-${Date.now().toString()}`, // Let DB generate UUID - userId: userId, - role: 'data' as 'user' | 'assistant' | 'system' | 'tool' | 'data', // Cast 'data' if not in standard roles - content: JSON.stringify(drawnFeatures), // Store features as stringified JSON - // type: 'drawing_context', // This field is not in the Drizzle 'messages' schema. - // If `type` is important, the schema needs to be updated or content needs to reflect it. - // For now, we'll assume 'content' holds the necessary info and role='data' signifies it. - createdAt: new Date(), - }; - - try { - // We need to ensure the message is associated with the chat. - // dbCreateMessage requires chatId. - const messageToSave: DbNewMessage = { - ...newDrawingMessage, - chatId: chatId, - }; - const savedMessage = await dbCreateMessage(messageToSave); - if (!savedMessage) { - throw new Error('Failed to save drawing context message.'); - } - console.log('Drawing context message added to chat:', chatId, 'messageId:', savedMessage.id); - return { success: true, messageId: savedMessage.id }; - } catch (error) { - console.error('updateDrawingContext: Error saving drawing context message:', error); - return { error: 'Failed to save drawing context message' }; + const { data: locationData, error: drawingError } = await supabaseSaveDrawing(chatId, userId, { features: drawnFeatures }); + + if (drawingError || !locationData) { + return { error: 'Failed to save drawing' }; } -} -// TODO: These Redis-based functions for system prompt need to be migrated -// if their functionality is still required and intended to use the new DB. -// For now, they are left as is, but will likely fail if Redis config is removed. -// @ts-ignore - Ignoring Redis import error for now as it might be removed or replaced -import { Redis } from '@upstash/redis'; // This will cause issues if REDIS_URL is not configured. -const redis = new Redis({ - url: process.env.UPSTASH_REDIS_REST_URL?.trim() || '', - token: process.env.UPSTASH_REDIS_REST_TOKEN || '' -}); + const { data: messageData, error: messageError } = await supabaseCreateMessage({ + chat_id: chatId, + user_id: userId, + role: 'user', + content: 'A drawing has been made.', + location_id: locationData.id, + }); + if (messageError) { + return { error: 'Failed to create message for drawing' }; + } + + return { success: true, messageId: messageData?.id }; +} export async function saveSystemPrompt( userId: string, prompt: string -): Promise<{ success?: boolean; error?: string }> { +): Promise<{ success?: boolean; error?:string }> { if (!userId) { return { error: 'User ID is required' } } @@ -227,13 +154,11 @@ export async function saveSystemPrompt( return { error: 'Prompt is required' } } - try { - await redis.set(`system_prompt:${userId}`, prompt) - return { success: true } - } catch (error) { - console.error('saveSystemPrompt: Error saving system prompt:', error) + const { error } = await supabaseSaveSystemPrompt(userId, prompt) + if (error) { return { error: 'Failed to save system prompt' } } + return { success: true } } export async function getSystemPrompt( @@ -244,11 +169,9 @@ export async function getSystemPrompt( return null } - try { - const prompt = await redis.get(`system_prompt:${userId}`) - return prompt - } catch (error) { - console.error('getSystemPrompt: Error retrieving system prompt:', error) + const { data, error } = await supabaseGetSystemPrompt(userId) + if (error) { return null } + return data } diff --git a/lib/actions/collaboration.ts b/lib/actions/collaboration.ts new file mode 100644 index 00000000..31878856 --- /dev/null +++ b/lib/actions/collaboration.ts @@ -0,0 +1,51 @@ +'use server' + +import { getSupabaseServerClient } from '@/lib/supabase/client' +import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user' + +export async function inviteUserToChat(chatId: string, email: string): Promise<{ error?: string }> { + const supabase = getSupabaseServerClient() + const inviterId = await getCurrentUserIdOnServer() + + if (!inviterId) { + return { error: 'You must be logged in to invite users.' } + } + + // Check if the inviter is the owner of the chat + const { data: ownerData, error: ownerError } = await supabase + .from('chat_participants') + .select('role') + .eq('chat_id', chatId) + .eq('user_id', inviterId) + .single() + + if (ownerError || ownerData?.role !== 'owner') { + return { error: 'You do not have permission to invite users to this chat.' } + } + + // Get the user ID of the person being invited + const { data: userData, error: userError } = await supabase + .from('users') + .select('id') + .eq('email', email) + .single() + + if (userError || !userData) { + return { error: 'Could not find a user with that email address.' } + } + + // Add the user to the chat_participants table + const { error: insertError } = await supabase + .from('chat_participants') + .insert({ chat_id: chatId, user_id: userData.id, role: 'collaborator' }) + + if (insertError) { + console.error('Error inviting user to chat:', insertError) + if (insertError.code === '23505') { // unique constraint violation + return { error: 'User is already in this chat.' }; + } + return { error: 'Failed to invite user to the chat.' } + } + + return {} +} diff --git a/lib/actions/rag.ts b/lib/actions/rag.ts new file mode 100644 index 00000000..4fac68ee --- /dev/null +++ b/lib/actions/rag.ts @@ -0,0 +1,34 @@ +'use server' + +import { getSupabaseServerClient } from '@/lib/supabase/client' + +export async function retrieveContext( + query: string, + chatId?: string, + location?: any +): Promise { + const supabase = getSupabaseServerClient() + + // 1. Generate embedding for the query + const { data: embeddingData, error: embeddingError } = await supabase.rpc('generate_embedding', { input: query }) + if (embeddingError || !embeddingData) { + console.error('Error generating query embedding:', embeddingError) + return [] + } + const queryEmbedding = embeddingData as number[] + + // 2. Perform hybrid search + const geoFilter = location ? `POINT(${location.longitude} ${location.latitude})` : undefined + const { data: searchData, error: searchError } = await supabase.rpc('hybrid_search', { + query_emb: queryEmbedding, + geo_filter: geoFilter, + chat_id_filter: chatId, + }) + + if (searchError) { + console.error('Error performing hybrid search:', searchError) + return [] + } + + return searchData.map((result: any) => result.content_snippet) +} diff --git a/lib/actions/users.ts b/lib/actions/users.ts deleted file mode 100644 index 417eb9c3..00000000 --- a/lib/actions/users.ts +++ /dev/null @@ -1,120 +0,0 @@ -// File: lib/actions/users.ts -'use server'; - -import { revalidatePath } from 'next/cache'; - -// This is a placeholder for a database or other storage. -// In a real application, you would interact with your database here. - -// Define UserRole and User types -export type UserRole = "admin" | "editor" | "viewer"; - -export interface User { - id: string; - email: string; - role: UserRole; -} - -let usersStore: Record> = { - 'default-user': [ // Simulate a default user having some initial users - { id: '1', email: 'admin@example.com', role: 'admin' }, - { id: '2', email: 'editor@example.com', role: 'editor' }, - ], -}; - -// Simulate a delay to mimic network latency -const simulateDBDelay = () => new Promise(resolve => setTimeout(resolve, 500)); - -export async function getUsers(userId: string = 'default-user'): Promise<{ users: User[] }> { - await simulateDBDelay(); - if (!usersStore[userId]) { - usersStore[userId] = []; - } - console.log(`[Action: getUsers] Fetched users for ${userId}:`, usersStore[userId]); - return { users: usersStore[userId] }; -} - -export async function addUser(userId: string = 'default-user', newUser: { email: string; role: UserRole }): Promise<{ user?: User; error?: string }> { - await simulateDBDelay(); - if (!usersStore[userId]) { - usersStore[userId] = []; - } - - // Check if user already exists (simple check, real DB would handle this better) - if (usersStore[userId].some(user => user.email === newUser.email)) { - console.warn(`[Action: addUser] User ${newUser.email} already exists for ${userId}`); - return { error: 'User with this email already exists.' }; - } - - const userToAdd: User = { ...newUser, id: Math.random().toString(36).substr(2, 9) }; - usersStore[userId].push(userToAdd); - console.log(`[Action: addUser] Added user ${newUser.email} for ${userId}:`, userToAdd); - revalidatePath('/settings'); // Assuming settings page path, adjust if needed - return { user: userToAdd }; -} - -export async function updateUserRole(userId: string = 'default-user', userEmail: string, newRole: UserRole): Promise<{ user?: User; error?: string }> { - await simulateDBDelay(); - if (!usersStore[userId]) { - return { error: 'User list not found.' }; - } - - const userIndex = usersStore[userId].findIndex(user => user.email === userEmail); - if (userIndex === -1) { - console.warn(`[Action: updateUserRole] User ${userEmail} not found for ${userId}`); - return { error: 'User not found.' }; - } - - usersStore[userId][userIndex].role = newRole; - console.log(`[Action: updateUserRole] Updated role for ${userEmail} to ${newRole} for ${userId}`); - revalidatePath('/settings'); - return { user: usersStore[userId][userIndex] }; -} - -export async function removeUser(userId: string = 'default-user', userEmail: string): Promise<{ success?: boolean; error?: string }> { - await simulateDBDelay(); - if (!usersStore[userId]) { - return { error: 'User list not found.' }; - } - - const initialLength = usersStore[userId].length; - usersStore[userId] = usersStore[userId].filter(user => user.email !== userEmail); - - if (usersStore[userId].length === initialLength) { - console.warn(`[Action: removeUser] User ${userEmail} not found for ${userId}`); - return { error: 'User not found.' }; - } - - console.log(`[Action: removeUser] Removed user ${userEmail} for ${userId}`); - revalidatePath('/settings'); - return { success: true }; -} - -// Example of how the settings form might use these actions (conceptual) -export async function updateSettingsAndUsers( - userId: string = 'default-user', - formData: { users: Array & { id?: string }> } // Looser type for incoming, stricter for store -): Promise<{ success: boolean; message?: string; users?: User[] }> { - // formData would contain systemPrompt, selectedModel, and the users array - console.log('[Action: updateSettingsAndUsers] Received data:', formData); - - // Simulate saving systemPrompt and selectedModel - // ... (logic for other settings) - - // For users, the frontend form already constructs the 'users' array. - // Here, we could compare the incoming users list with the stored one - // and make granular calls to addUser, updateUserRole, removeUser if needed, - // or simply replace the user list if that's the desired behavior. - // For simplicity in this simulation, let's assume the form sends the complete new user list. - - await simulateDBDelay(); - usersStore[userId] = formData.users.map((u): User => ({ - id: u.id || Math.random().toString(36).substr(2, 9), - email: u.email, - role: u.role, // Assumes u.role is already UserRole, validation should occur before this action - })); - - console.log(`[Action: updateSettingsAndUsers] Updated users for ${userId}:`, usersStore[userId]); - revalidatePath('/settings'); - return { success: true, message: 'Settings and users updated successfully.', users: usersStore[userId] }; -} diff --git a/lib/db/index.ts b/lib/db/index.ts deleted file mode 100644 index 0283d9a3..00000000 --- a/lib/db/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { drizzle } from 'drizzle-orm/node-postgres'; -import { Pool, type PoolConfig } from 'pg'; // Uses Pool from pg, import PoolConfig -import * as dotenv from 'dotenv'; -import * as schema from './schema'; - -dotenv.config({ path: '.env.local' }); - -if (!process.env.DATABASE_URL) { - throw new Error('DATABASE_URL environment variable is not set for Drizzle client'); -} - -const poolConfig: PoolConfig = { - connectionString: process.env.DATABASE_URL, -}; - -// Conditionally apply SSL for Supabase URLs -if (process.env.DATABASE_URL && process.env.DATABASE_URL.includes('supabase.co')) { - poolConfig.ssl = { - rejectUnauthorized: false, - }; -} - -const pool = new Pool(poolConfig); - -export const db = drizzle(pool, { schema, logger: process.env.NODE_ENV === 'development' }); diff --git a/lib/db/schema.ts b/lib/db/schema.ts deleted file mode 100644 index 870339a0..00000000 --- a/lib/db/schema.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { pgTable, text, timestamp, uuid, varchar, jsonb, boolean } from 'drizzle-orm/pg-core'; -import { relations } from 'drizzle-orm'; - -// Users Table (assuming Supabase Auth uses its own users table, -// but a local reference might be used or this could be a public profile table) -// For now, let's assume a simple users table if PR #533 implies one in schema.ts -// If PR #533 relies purely on Supabase Auth's user IDs without a separate 'users' table managed by Drizzle for chat context, -// then this table might be simpler or not needed. Given the PR title focuses on chat migration, -// we'll include a basic one that can be referenced by chats and messages. -export const users = pgTable('users', { - id: uuid('id').primaryKey().defaultRandom(), // Assuming Supabase user IDs are UUIDs - // email: text('email'), // Supabase handles this in auth.users - // Other profile fields if necessary -}); - -export const chats = pgTable('chats', { - id: uuid('id').primaryKey().defaultRandom(), - userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), // References a user ID - title: varchar('title', { length: 256 }).notNull().default('Untitled Chat'), - createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(), - // RLS in Supabase will use policies, but marking public visibility can be a column - visibility: varchar('visibility', { length: 50 }).default('private'), // e.g., 'private', 'public' - // any other metadata for the chat -}); - -export const messages = pgTable('messages', { - id: uuid('id').primaryKey().defaultRandom(), - chatId: uuid('chat_id').notNull().references(() => chats.id, { onDelete: 'cascade' }), - userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), // Who sent the message - role: varchar('role', { length: 50 }).notNull(), // e.g., 'user', 'assistant', 'system', 'tool' - content: text('content').notNull(), - createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(), - // attachments: jsonb('attachments'), // As per PR commit: "feat: remove updatedAt and add attachments field to messages" - // toolName: varchar('tool_name', { length: 100 }), // If messages can be from tools - // toolCallId: varchar('tool_call_id', {length: 100}), // if tracking specific tool calls - // type: varchar('type', { length: 50 }) // As per app/actions.tsx AIMessage type -}); - -// Relations -export const usersRelations = relations(users, ({ many }) => ({ - chats: many(chats), - messages: many(messages), -})); - -export const chatsRelations = relations(chats, ({ one, many }) => ({ - user: one(users, { - fields: [chats.userId], - references: [users.id], - }), - messages: many(messages), -})); - -export const messagesRelations = relations(messages, ({ one }) => ({ - chat: one(chats, { - fields: [messages.chatId], - references: [chats.id], - }), - user: one(users, { - fields: [messages.userId], - references: [users.id], - }), -})); diff --git a/lib/supabase/browser-client.ts b/lib/supabase/browser-client.ts new file mode 100644 index 00000000..3a1a6b70 --- /dev/null +++ b/lib/supabase/browser-client.ts @@ -0,0 +1,10 @@ +'use client' + +import { createBrowserClient } from '@supabase/ssr' + +export function getSupabaseBrowserClient() { + return createBrowserClient( + process.env.NEXT_PUBLIC_SUPABASE_URL!, + process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY! + ) +} diff --git a/lib/supabase/client.ts b/lib/supabase/client.ts index 4d6bf33a..b48e6ae9 100644 --- a/lib/supabase/client.ts +++ b/lib/supabase/client.ts @@ -1,41 +1,27 @@ -import { createClient } from '@supabase/supabase-js'; +import { createServerClient, type CookieOptions } from '@supabase/ssr' +import { cookies } from 'next/headers' -const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL; -const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; +export function getSupabaseServerClient() { + const cookieStore = cookies() -if (!supabaseUrl) { - throw new Error('NEXT_PUBLIC_SUPABASE_URL environment variable is not set.'); + return createServerClient( + process.env.NEXT_PUBLIC_SUPABASE_URL!, + process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!, + { + cookies: { + async get(name: string) { + const store = await cookieStore + return store.get(name)?.value + }, + async set(name: string, value: string, options: CookieOptions) { + const store = await cookieStore + store.set({ name, value, ...options }) + }, + async remove(name: string, options: CookieOptions) { + const store = await cookieStore + store.set({ name, value: '', ...options }) + }, + }, + } + ) } -if (!supabaseAnonKey) { - throw new Error('NEXT_PUBLIC_SUPABASE_ANON_KEY environment variable is not set.'); -} - -// Supabase client for client-side usage (e.g., in React components) -// This client uses the public anon key. -export const supabase = createClient(supabaseUrl, supabaseAnonKey); - -// It's generally recommended to handle server-side Supabase operations -// (like those requiring service_role or auth admin tasks) in dedicated server-side modules or API routes. -// If you need a server-side client for specific auth-related tasks using the service role key, -// it should be initialized carefully and only used in secure server environments. -// For example, a function to get a service role client: -// import { SupabaseClient } from '@supabase/supabase-js'; -// let _serviceRoleClient: SupabaseClient | null = null; -// export const getSupabaseServiceRoleClient = (): SupabaseClient => { -// if (_serviceRoleClient) return _serviceRoleClient; -// const serviceKey = process.env.SUPABASE_SERVICE_ROLE_KEY; -// if (!serviceKey) { -// throw new Error('SUPABASE_SERVICE_ROLE_KEY environment variable is not set.'); -// } -// _serviceRoleClient = createClient(supabaseUrl, serviceKey, { -// auth: { -// autoRefreshToken: false, -// persistSession: false, -// }, -// }); -// return _serviceRoleClient; -// }; -// However, for many server-side Next.js operations (like in Route Handlers or Server Actions), -// you might use the Supabase Server Client (@supabase/ssr) which is designed for Next.js and handles sessions. -// For now, the PR seems to focus on Drizzle for DB and basic Supabase client for auth interactions. -// We will stick to the basic client and can expand if @supabase/ssr is intended by PR #533. diff --git a/lib/supabase/persistence.ts b/lib/supabase/persistence.ts new file mode 100644 index 00000000..31244d6f --- /dev/null +++ b/lib/supabase/persistence.ts @@ -0,0 +1,115 @@ +'use server' + +import { getSupabaseServerClient } from '@/lib/supabase/client' +import { type Chat, type AIMessage } from '@/lib/types' +import { PostgrestError } from '@supabase/supabase-js' + +export async function saveChat(chat: Chat, userId: string): Promise<{ data: string | null; error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const messagesToInsert = chat.messages.map(message => ({ + id: message.id, + role: message.role, + content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content), + createdAt: message.createdAt ? new Date(message.createdAt).toISOString() : new Date().toISOString(), + })) + + const { data, error } = await supabase.rpc('save_chat_with_messages', { + chat_id: chat.id, + user_id: userId, + title: chat.title, + messages: messagesToInsert, + }) + + if (error) { + console.error('Error saving chat with messages:', error) + return { data: null, error } + } + + return { data: data as string, error: null } +} + +export async function getMessagesByChatId(chatId: string): Promise<{ data: any[] | null; error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const { data, error } = await supabase + .from('messages') + .select('*, locations(*)') + .eq('chat_id', chatId) + .order('created_at', { ascending: true }) + + if (error) { + console.error('Error fetching messages:', error) + return { data: null, error } + } + + return { data: data, error: null } +} + +export async function saveSystemPrompt(userId: string, prompt: string): Promise<{ error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const { error } = await supabase + .from('system_prompts') + .upsert({ user_id: userId, prompt: prompt, updated_at: new Date().toISOString() }, { onConflict: 'user_id' }) + + if (error) { + console.error('Error saving system prompt:', error) + } + + return { error } +} + +export async function getSystemPrompt(userId: string): Promise<{ data: string | null; error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const { data, error } = await supabase + .from('system_prompts') + .select('prompt') + .eq('user_id', userId) + .single() + + if (error) { + console.error('Error getting system prompt:', error) + return { data: null, error } + } + + return { data: data.prompt, error: null } +} + +export async function saveDrawing( + chatId: string, + userId: string, + geojson: any, + name?: string +): Promise<{ data: { id: string } | null; error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const { data, error } = await supabase + .from('locations') + .insert({ + chat_id: chatId, + user_id: userId, + geojson: geojson, + name: name, + }) + .select('id') + .single() + + if (error) { + console.error('Error saving drawing:', error) + return { data: null, error } + } + + return { data: data, error: null } +} + +export async function createMessage(messageData: { + chat_id: string, + user_id: string, + role: 'user' | 'assistant' | 'system' | 'tool', + content: string, + location_id?: string +}): Promise<{ data: AIMessage | null; error: PostgrestError | null }> { + const supabase = getSupabaseServerClient() + const { data, error } = await supabase.from('messages').insert(messageData).select().single(); + if (error) { + console.error('Error creating message:', error); + } + return { data: data as AIMessage, error }; +} diff --git a/supabase/migrations/0000_init.sql b/supabase/migrations/0000_init.sql new file mode 100644 index 00000000..1aa14df1 --- /dev/null +++ b/supabase/migrations/0000_init.sql @@ -0,0 +1,172 @@ +-- Enable necessary extensions +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; +CREATE EXTENSION IF NOT EXISTS "postgis"; +CREATE EXTENSION IF NOT EXISTS "vector"; + +-- Users Table (assuming Supabase Auth's public.users table exists) +-- We'll add RLS policies to it. +ALTER TABLE public.users ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Enable read access for all users" ON public.users FOR SELECT USING (true); +CREATE POLICY "Enable insert for authenticated users only" ON public.users FOR INSERT TO authenticated WITH CHECK (true); +CREATE POLICY "Enable update for users based on email" ON public.users FOR UPDATE USING (auth.uid() = id) WITH CHECK (auth.uid() = id); + +-- Chats Table +CREATE TABLE public.chats ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + title TEXT NOT NULL DEFAULT 'Untitled Chat', + visibility TEXT DEFAULT 'private' CHECK (visibility IN ('private', 'public')), + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); +ALTER TABLE public.chats ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Users can manage their own chats" ON public.chats FOR ALL USING (auth.uid() = user_id); + +-- Messages Table +CREATE TABLE public.messages ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + chat_id UUID NOT NULL REFERENCES public.chats(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + role TEXT NOT NULL CHECK (role IN ('user', 'assistant', 'system', 'tool')), + content TEXT NOT NULL, + embedding VECTOR(1536), + location_id UUID, -- Defer FK constraint until locations table is created + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); +ALTER TABLE public.messages ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Users can manage messages in their own chats" ON public.messages FOR ALL USING ( + (SELECT user_id FROM public.chats WHERE id = chat_id) = auth.uid() +); + +-- System Prompts Table +CREATE TABLE public.system_prompts ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + prompt TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); +ALTER TABLE public.system_prompts ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Users can manage their own system prompts" ON public.system_prompts FOR ALL USING (auth.uid() = user_id); + +-- Locations Table (for drawings/map states) +CREATE TABLE public.locations ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + chat_id UUID REFERENCES public.chats(id) ON DELETE CASCADE, + geojson JSONB NOT NULL, + geometry GEOMETRY(GEOMETRY, 4326), + name TEXT, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); +ALTER TABLE public.locations ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Users can manage their own locations" ON public.locations FOR ALL USING (auth.uid() = user_id); +CREATE INDEX locations_geometry_idx ON public.locations USING GIST (geometry); + +-- Now, add the foreign key constraint from messages to locations +ALTER TABLE public.messages +ADD CONSTRAINT fk_location +FOREIGN KEY (location_id) +REFERENCES public.locations(id) +ON DELETE SET NULL; + +-- Visualizations Table +CREATE TABLE public.visualizations ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + chat_id UUID REFERENCES public.chats(id) ON DELETE CASCADE, + type TEXT NOT NULL DEFAULT 'map_layer', + data JSONB NOT NULL, + geometry GEOMETRY(GEOMETRY, 4326), + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); +ALTER TABLE public.visualizations ENABLE ROW LEVEL SECURITY; +CREATE POLICY "Users can manage their own visualizations" ON public.visualizations FOR ALL USING (auth.uid() = user_id); +CREATE INDEX visualizations_geometry_idx ON public.visualizations USING GIST (geometry) WHERE geometry IS NOT NULL; + +-- PL/pgSQL function to generate embeddings +CREATE OR REPLACE FUNCTION generate_embedding(input TEXT) +RETURNS VECTOR(1536) +LANGUAGE plpgsql +AS $$ +DECLARE + embedding VECTOR(1536); +BEGIN + -- This is a placeholder for the actual Supabase embedding function call. + -- In a real Supabase project, you would use the http extension or a direct call + -- to the embedding endpoint. For now, we'll return a zero vector. + SELECT ARRAY_FILL(0, ARRAY[1536])::VECTOR INTO embedding; + RETURN embedding; +END; +$$; + +-- PL/pgSQL function for hybrid search +CREATE OR REPLACE FUNCTION hybrid_search( + query_emb VECTOR(1536), + geo_filter TEXT, + chat_id_filter UUID DEFAULT NULL +) +RETURNS TABLE (content_snippet TEXT, similarity FLOAT) +LANGUAGE plpgsql +AS $$ +BEGIN + RETURN QUERY + SELECT + LEFT(m.content, 500) as content_snippet, + (m.embedding <=> query_emb)::FLOAT as similarity + FROM public.messages m + LEFT JOIN public.locations l ON m.location_id = l.id + WHERE + (chat_id_filter IS NULL OR m.chat_id = chat_id_filter) AND + (m.embedding <=> query_emb) < 0.8 + AND (geo_filter IS NULL OR ST_DWithin(l.geometry, ST_GeomFromText(geo_filter, 4326), 1000)) + ORDER BY similarity + LIMIT 5; +END; +$$; + +CREATE OR REPLACE FUNCTION save_chat_with_messages(chat_id UUID, user_id UUID, title TEXT, messages JSONB) +RETURNS UUID +LANGUAGE plpgsql +AS $$ +DECLARE + new_chat_id UUID; + message JSONB; +BEGIN + INSERT INTO public.chats (id, user_id, title) + VALUES (chat_id, user_id, title) + RETURNING id INTO new_chat_id; + + INSERT INTO public.chat_participants (chat_id, user_id, role) + VALUES (new_chat_id, user_id, 'owner'); + + FOR message IN SELECT * FROM jsonb_array_elements(messages) + LOOP + INSERT INTO public.messages (id, chat_id, user_id, role, content, created_at) + VALUES ( + (message->>'id')::UUID, + new_chat_id, + user_id, + message->>'role', + message->>'content', + (message->>'createdAt')::TIMESTAMPTZ + ); + END LOOP; + + RETURN new_chat_id; +END; +$$; + +CREATE OR REPLACE FUNCTION populate_geometry_from_geojson() +RETURNS TRIGGER +LANGUAGE plpgsql +AS $$ +BEGIN + NEW.geometry = ST_GeomFromGeoJSON(NEW.geojson); + RETURN NEW; +END; +$$; + +CREATE TRIGGER populate_geometry_trigger +BEFORE INSERT OR UPDATE ON public.locations +FOR EACH ROW +EXECUTE FUNCTION populate_geometry_from_geojson(); diff --git a/supabase/migrations/0001_realtime_collaboration.sql b/supabase/migrations/0001_realtime_collaboration.sql new file mode 100644 index 00000000..ac50fe58 --- /dev/null +++ b/supabase/migrations/0001_realtime_collaboration.sql @@ -0,0 +1,70 @@ +-- supabase/migrations/0001_realtime_collaboration.sql + +-- 1. Create the chat_participants table +CREATE TABLE public.chat_participants ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + chat_id UUID NOT NULL REFERENCES public.chats(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES public.users(id) ON DELETE CASCADE, + role TEXT NOT NULL DEFAULT 'collaborator' CHECK (role IN ('owner', 'collaborator')), + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + UNIQUE (chat_id, user_id) +); + +ALTER TABLE public.chat_participants ENABLE ROW LEVEL SECURITY; + +-- 2. Add RLS policies for chat_participants +CREATE POLICY "Chat participants can be viewed by other participants" ON public.chat_participants +FOR SELECT USING ( + chat_id IN ( + SELECT chat_id FROM public.chat_participants WHERE user_id = auth.uid() + ) +); + +CREATE POLICY "Chat owners can manage participants" ON public.chat_participants +FOR ALL USING ( + (SELECT role FROM public.chat_participants WHERE chat_id = chat_participants.chat_id AND user_id = auth.uid()) = 'owner' +); + + +-- 3. Update chats table for shareable links +ALTER TABLE public.chats +ADD COLUMN shareable_link_id UUID UNIQUE DEFAULT gen_random_uuid(); + +-- 4. Update RLS policies on chats table +-- Drop the old policy first +DROP POLICY "Users can manage their own chats" ON public.chats; + +-- Create new policies +CREATE POLICY "Users can select chats they are a part of" ON public.chats +FOR SELECT USING ( + EXISTS ( + SELECT 1 FROM public.chat_participants + WHERE chat_participants.chat_id = chats.id AND chat_participants.user_id = auth.uid() + ) +); + +CREATE POLICY "Chat owners can update and delete their chats" ON public.chats +FOR UPDATE, DELETE USING ( + (SELECT role FROM public.chat_participants WHERE chat_id = chats.id AND user_id = auth.uid()) = 'owner' +); + +-- 5. Update RLS policies on messages table +-- Drop the old policy first +DROP POLICY "Users can manage messages in their own chats" ON public.messages; + +-- Create new policies +CREATE POLICY "Users can select messages in chats they are a part of" ON public.messages +FOR SELECT USING ( + EXISTS ( + SELECT 1 FROM public.chat_participants + WHERE chat_participants.chat_id = messages.chat_id AND chat_participants.user_id = auth.uid() + ) +); + +CREATE POLICY "Users can insert messages in chats they are a part of" ON public.messages +FOR INSERT WITH CHECK ( + EXISTS ( + SELECT 1 FROM public.chat_participants + WHERE chat_participants.chat_id = messages.chat_id AND chat_participants.user_id = auth.uid() + ) +);