save

app/project/[projectId]/page.tsx

@@ -1,6 +1,8 @@
 import MediaGrid from '@/components/project/MediaGrid';
 import { fetchProjectMedia } from '@/lib/fetch/clef';
 import { Suspense } from 'react';
+import Loading from '../loading';
+import Chat from '@/components/project/Chat';
 
 interface PageProps {
 	params: {
@@ -11,24 +13,16 @@ interface PageProps {
 export default async function Page({ params }: PageProps) {
 	const { projectId } = params;
 
+	const mediaList = await fetchProjectMedia({ projectId: Number(projectId) });
+
 	return (
 		<div className="pb-[150px] pt-4 md:pt-10 h-full">
 			<div className="flex h-full">
 				<div className="w-1/2 relative border-r border-gray-300 overflow-auto">
-					<Suspense
-						fallback={
-							<div className="flex justify-center items-center size-full text-sm">
-								Loading media...
-							</div>
-						}
-					>
-						<MediaGrid projectId={Number(projectId)} />
-					</Suspense>
+					<MediaGrid mediaList={mediaList} />
 				</div>
 				<div className="w-1/2 relative overflow-auto">
-					{/* <ChatList messages={messages} /> */}
-					{/* <ChatScrollAnchor trackVisibility={isLoading} /> */}
-					Chat
+					<Chat mediaList={mediaList} />
 				</div>
 			</div>
 		</div>

app/project/layout.tsx

@@ -1,4 +1,6 @@
 import ProjectListSideBar from '@/components/sidebar/ProjectListSideBar';
+import { Suspense } from 'react';
+import Loading from './loading';
 
 interface ChatLayoutProps {
 	children: React.ReactNode;
@@ -7,10 +9,19 @@ interface ChatLayoutProps {
 export default async function Layout({ children }: ChatLayoutProps) {
 	return (
 		<div className="relative flex h-[calc(100vh_-_theme(spacing.16))] overflow-hidden">
-			<ProjectListSideBar />
-			<div className="group w-full overflow-auto pl-0 animate-in duration-300 ease-in-out peer-[[data-state=open]]:lg:pl-[250px] peer-[[data-state=open]]:xl:pl-[300px]">
-				{children}
+			<div
+				data-state="open"
+				className="peer absolute inset-y-0 z-30 hidden border-r bg-muted duration-300 ease-in-out translate-x-0 lg:flex lg:w-[250px] xl:w-[300px] h-full flex-col dark:bg-zinc-950 overflow-auto py-2"
+			>
+				<Suspense fallback={<Loading />}>
+					<ProjectListSideBar />
+				</Suspense>
 			</div>
+			<Suspense fallback={<Loading />}>
+				<div className="group w-full overflow-auto pl-0 animate-in duration-300 ease-in-out peer-[[data-state=open]]:lg:pl-[250px] peer-[[data-state=open]]:xl:pl-[300px]">
+					{children}
+				</div>
+			</Suspense>
 		</div>
 	);
 }

app/project/loading.tsx

@@ -0,0 +1,9 @@
+import { IconLoading } from '@/components/ui/Icons';
+
+export default async function Loading() {
+	return (
+		<div className="flex justify-center items-center size-full text-sm">
+			<IconLoading />
+		</div>
+	);
+}

components/chat/ChatList.tsx

@@ -12,7 +12,7 @@ export function ChatList({ messages }: ChatList) {
 	return (
 		<div className="relative mx-auto max-w-3xl px-8 pr-12">
 			{messages
-				// .filter(message => message.role !== 'system')
+				.filter(message => message.role !== 'system')
 				.map((message, index) => (
 					<div key={index}>
 						<ChatMessage message={message} />

components/chat/PromptForm.tsx

@@ -72,7 +72,7 @@ export function PromptForm({
 					rows={1}
 					value={input}
 					onChange={e => setInput(e.target.value)}
-					placeholder="Ask questions about all or selected the images."
+					placeholder="Ask questions about the images."
 					spellCheck={false}
 					className="min-h-[60px] w-full resize-none bg-transparent px-4 py-[1.3rem] focus-within:outline-none sm:text-sm"
 				/>

components/project/Chat.tsx

@@ -0,0 +1,34 @@
+'use client';
+
+import { MediaDetails } from '@/lib/fetch/clef';
+import useChatWithMedia from '@/lib/hooks/useChatWithMedia';
+import React from 'react';
+import { ChatList } from '../chat/ChatList';
+import { ChatScrollAnchor } from '../chat/ChatScrollAnchor';
+import { ChatPanel } from '../chat/ChatPanel';
+
+export interface ChatProps {
+	mediaList: MediaDetails[];
+}
+
+const Chat: React.FC<ChatProps> = ({ mediaList }) => {
+	const { messages, append, reload, stop, isLoading, input, setInput } =
+		useChatWithMedia(mediaList);
+	return (
+		<>
+			<ChatList messages={messages} />
+			<ChatScrollAnchor trackVisibility={isLoading} />
+			<ChatPanel
+				isLoading={isLoading}
+				stop={stop}
+				append={append}
+				reload={reload}
+				messages={messages}
+				input={input}
+				setInput={setInput}
+			/>
+		</>
+	);
+};
+
+export default Chat;

components/project/MediaGrid.tsx

@@ -1,12 +1,14 @@
-import { fetchProjectMedia } from '@/lib/fetch/clef';
+import { MediaDetails } from '@/lib/fetch/clef';
 import MediaTile from './MediaTile';
 
-export default async function MediaGrid({ projectId }: { projectId: number }) {
-	const mediaList = await fetchProjectMedia({ projectId });
-
+export default function MediaGrid({
+	mediaList,
+}: {
+	mediaList: MediaDetails[];
+}) {
 	return (
 		<div className="relative size-full p-6 max-w-3xl mx-auto">
-			<div className="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3 gap-4">
+			<div className="columns-1 sm:columns-1 md:columns-2 lg:columns-2 xl:columns:3 gap-4 [&>img:not(:first-child)]:mt-4">
 				{mediaList.map(media => (
 					<MediaTile key={media.id} media={media} />
 				))}

components/project/MediaTile.tsx

@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import Image from 'next/image';
 import {
@@ -13,26 +11,32 @@ export interface MediaTileProps {
 	media: MediaDetails;
 }
 
-const MediaTile: React.FC<MediaTileProps> = ({ media }) => {
-	const { url: imageSrc, id, name } = media;
+export default function MediaTile({ media }: MediaTileProps) {
+	const {
+		url,
+		thumbnails,
+		id,
+		name,
+		properties: { width, height },
+	} = media;
+	// const imageSrc = thumbnails.length ? thumbnails[thumbnails.length - 1] : url;
+	const imageSrc = url;
 	return (
 		<Tooltip>
 			<TooltipTrigger asChild>
-				<div className="relative rounded-xl overflow-hidden shadow-md cursor-pointer transition-transform hover:scale-105 box-content">
-					<Image
-						src={imageSrc}
-						draggable={false}
-						alt="dataset images"
-						width={500}
-						height={500}
-						objectFit="cover"
-						className="rounded-xl"
-					/>
-				</div>
+				<Image
+					src={imageSrc}
+					draggable={false}
+					alt="dataset images"
+					width={width}
+					height={height}
+					className="w-full h-auto relative rounded-xl overflow-hidden shadow-md cursor-pointer transition-transform hover:scale-105 box-content"
+				/>
 			</TooltipTrigger>
-			<TooltipContent>{name}</TooltipContent>
+			<TooltipContent>
+				<p>{name}</p>
+				<p className="font-light text-xs">{`${width} x ${height}`}</p>
+			</TooltipContent>
 		</Tooltip>
 	);
-};
-
-export default MediaTile;
+}

components/sidebar/ProjectCard.tsx

@@ -5,6 +5,7 @@ import { format } from 'date-fns';
 import Link from 'next/link';
 import { useParams } from 'next/navigation';
 import { cn } from '@/lib/utils';
+import Chip from '../ui/Chip';
 
 export interface ProjectCardProps {
 	projectInfo: ProjectBaseInfo;
@@ -15,6 +16,7 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ projectInfo }) => {
 		id,
 		name,
 		created_at,
+		label_type,
 		organization: { name: orgName },
 	} = projectInfo;
 
@@ -29,7 +31,7 @@ const ProjectCard: React.FC<ProjectCardProps> = ({ projectInfo }) => {
 			)}
 			href={`/project/${id}`}
 		>
-			<div>
+			<div className="overflow-hidden">
 				<p className="text-xs text-gray-500">{orgName}</p>
 				<p className="text-sm font-medium text-black mb-1">{name}</p>
 				<p className="text-xs text-gray-500">{formattedDate}</p>

components/sidebar/ProjectListSideBar.tsx

@@ -1,7 +1,4 @@
-import { auth } from '@/auth';
 import { fetchRecentProjectList } from '@/lib/fetch/clef';
-import { redirect } from 'next/navigation';
-import { v5 as uuidV5 } from 'uuid';
 import ProjectCard from './ProjectCard';
 
 export interface ProjectListSideBarProps {}
@@ -9,14 +6,11 @@ export interface ProjectListSideBarProps {}
 const ProjectListSideBar: React.FC<ProjectListSideBarProps> = async () => {
 	const recentProjects = await fetchRecentProjectList();
 	return (
-		<div
-			data-state="open"
-			className="peer absolute inset-y-0 z-30 hidden border-r bg-muted duration-300 ease-in-out translate-x-0 lg:flex lg:w-[250px] xl:w-[300px] h-full flex-col dark:bg-zinc-950 overflow-auto py-2"
-		>
+		<>
 			{recentProjects.map(project => (
 				<ProjectCard key={project.id} projectInfo={project} />
 			))}
-		</div>
+		</>
 	);
 };
 

components/ui/Chip.tsx

@@ -0,0 +1,29 @@
+import { cn } from '@/lib/utils';
+
+export interface ChipProps {
+	label?: string;
+	value: string;
+	color?: 'gray' | 'blue';
+	className?: string;
+}
+
+const Chip: React.FC<ChipProps> = ({
+	label,
+	value,
+	color = 'gray',
+	className,
+}) => {
+	return (
+		<div
+			className={cn(
+				`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-${color}-100 text-${color}-800 mr-1`,
+				className,
+			)}
+		>
+			{label && <span className="font-medium">{label} :</span>}
+			<span>{value}</span>
+		</div>
+	);
+};
+
+export default Chip;

components/ui/Icons.tsx

@@ -507,6 +507,27 @@ function IconChevronUpDown({
 	);
 }
 
+function IconLoading({ className, ...props }: React.ComponentProps<'svg'>) {
+	return (
+		<svg
+			aria-hidden="true"
+			className="size-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+			viewBox="0 0 100 101"
+			fill="none"
+			xmlns="http://www.w3.org/2000/svg"
+		>
+			<path
+				d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+				fill="currentColor"
+			/>
+			<path
+				d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+				fill="currentFill"
+			/>
+		</svg>
+	);
+}
+
 export {
 	IconEdit,
 	IconNextChat,
@@ -536,4 +557,5 @@ export {
 	IconExternalLink,
 	IconChevronUpDown,
 	IconGoogle,
+	IconLoading,
 };

lib/fetch/clef.ts

@@ -25,7 +25,7 @@ const clefApiBuilder = <Params extends object | void, Resp>(path: string) => {
 			bucket: 'fake_bucket',
 		};
 
-		const baseURL = `https://app.dev.landing.ai/${path}`;
+		const baseURL = `https://app.landing.ai/${path}`;
 
 		// Create a URL object with query params
 		const url = new URL(baseURL);
@@ -55,6 +55,7 @@ export type ProjectBaseInfo = {
 	id: number;
 	name: string;
 	created_at: Date;
+	label_type: string;
 	organization: {
 		id: number;
 		name: string;
@@ -77,7 +78,7 @@ export type MediaDetails = {
 	path: string;
 	url: string;
 	projectId: number;
-	thumbnails: [string, string, string];
+	thumbnails: string[];
 	properties: {
 		width: number;
 		height: number;

lib/hooks/useChatWithDataset.ts

@@ -98,7 +98,7 @@ const useChatWithDataset = () => {
 			...message,
 			// @ts-ignore this is extra fields
 			dataset: selectedDataset,
-		} satisfies MessageWithSelectedDataset);
+		} as MessageWithSelectedDataset);
 	};
 
 	return {

lib/hooks/useChatWithMedia.ts

@@ -0,0 +1,87 @@
+import { useChat, type Message } from 'ai/react';
+import { toast } from 'react-hot-toast';
+import { useEffect, useState } from 'react';
+import { MediaDetails } from '../fetch/clef';
+import { MessageWithSelectedDataset } from '../types';
+
+const useChatWithMedia = (mediaList: MediaDetails[]) => {
+	const {
+		messages,
+		append,
+		reload,
+		stop,
+		isLoading,
+		input,
+		setInput,
+		setMessages,
+	} = useChat({
+		sendExtraMessageFields: true,
+		onResponse(response) {
+			if (response.status !== 200) {
+				toast.error(response.statusText);
+			}
+		},
+		initialMessages: [
+			{
+				id: 'system',
+				content: `For the full conversation, user have provided the following images: ${mediaList.map(media => media.name)}. Please help reply to user regarding these images`,
+				dataset: mediaList,
+				role: 'system',
+			},
+		] as MessageWithSelectedDataset[],
+	});
+
+	const [loadingDots, setLoadingDots] = useState('');
+
+	useEffect(() => {
+		let loadingInterval: NodeJS.Timeout;
+
+		if (isLoading) {
+			loadingInterval = setInterval(() => {
+				setLoadingDots(prevMessage => {
+					switch (prevMessage) {
+						case '':
+							return '.';
+						case '.':
+							return '..';
+						case '..':
+							return '...';
+						case '...':
+							return '';
+						default:
+							return '';
+					}
+				});
+			}, 500);
+		}
+
+		return () => {
+			clearInterval(loadingInterval);
+		};
+	}, [isLoading]);
+
+	const assistantLoadingMessage = {
+		id: 'loading',
+		content: loadingDots,
+		role: 'assistant',
+	};
+
+	const messageWithLoading =
+		isLoading &&
+		messages.length &&
+		messages[messages.length - 1].role !== 'assistant'
+			? [...messages, assistantLoadingMessage]
+			: messages;
+
+	return {
+		messages: messageWithLoading as MessageWithSelectedDataset[],
+		append,
+		reload,
+		stop,
+		isLoading,
+		input,
+		setInput,
+	};
+};
+
+export default useChatWithMedia;

lib/types.ts

@@ -20,10 +20,10 @@ export type ServerActionResult<Result> = Promise<
 
 export type DatasetImageEntity = {
 	url: string;
-	selected: boolean;
+	selected?: boolean;
 	name: string;
 };
 
-export type MessageWithSelectedDataset = (Message | CreateMessage) & {
+export type MessageWithSelectedDataset = Message & {
 	dataset: DatasetImageEntity[];
 };