Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added support for attached images #14

Merged
merged 1 commit into from
Feb 7, 2025
Merged

feat: added support for attached images #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 79 additions & 5 deletions src/components/ChatMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,88 @@ import type { Message } from "@/types/conversation";
import { MessageAvatar } from "./MessageAvatar";
import { parseMarkdownContent } from "@/utils/markdownUtils";
import { getMessageChainType } from "@/utils/messageUtils";
import { useApi } from "@/contexts/ApiContext";

interface Props {
message: Message;
previousMessage?: Message | null;
nextMessage?: Message | null;
conversationId: string;
}

export const ChatMessage: FC<Props> = ({ message, previousMessage, nextMessage }) => {
export const ChatMessage: FC<Props> = ({ message, previousMessage, nextMessage, conversationId }) => {
const { baseUrl } = useApi();
const [parsedContent, setParsedContent] = useState("");
const content = message.content || (message.role === "assistant" ? "Thinking..." : "");

const renderFiles = () => {
if (!message.files?.length) return null;

return (
<div className="mt-2 space-y-2">
{message.files.map((filename) => {
// Remove any parent directory references and normalize path
const sanitizedPath = filename.split('/').filter(part => part !== '..').join('/');
const fileUrl = `${baseUrl}/api/conversations/${conversationId}/files/${sanitizedPath}`;
const isImage = /\.(jpg|jpeg|png|gif|webp)$/i.test(filename);

// Get just the filename without path for display
const displayName = sanitizedPath.split('/').pop() || sanitizedPath;

if (isImage) {
return (
<div key={filename} className="max-w-md">
<a
href={fileUrl}
target="_blank"
rel="noopener noreferrer"
className="block cursor-zoom-in"
title="Click to view full size"
>
<div className="relative">
<img
src={fileUrl}
alt={displayName}
className="rounded-md border border-border hover:opacity-90 transition-opacity"
onError={(e) => {
const img = e.currentTarget;
const errorDiv = img.parentElement?.querySelector('.error-message');
if (errorDiv) {
if (img.src.includes('..')) {
errorDiv.textContent = "⚠️ Cannot access files outside the workspace";
} else {
errorDiv.textContent = "⚠️ Failed to load image";
}
errorDiv.classList.remove('hidden');
}
img.classList.add('hidden');
}}
/>
<div className="error-message hidden p-4 text-sm text-red-600 dark:text-red-400 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md"></div>
</div>
</a>
<div className="text-xs text-muted-foreground mt-1">{displayName}</div>
</div>
);
}

return (
<div key={filename} className="text-sm">
<a
href={fileUrl}
target="_blank"
rel="noopener noreferrer"
className="text-blue-500 hover:underline"
>
📎 {displayName}
</a>
</div>
);
})}
</div>
);
};

useEffect(() => {
let isMounted = true;
const processContent = async () => {
Expand Down Expand Up @@ -84,10 +155,13 @@ export const ChatMessage: FC<Props> = ({ message, previousMessage, nextMessage }
/>
<div className="md:px-12">
<div className={messageClasses}>
<div
className="chat-message prose prose-sm dark:prose-invert prose-pre:overflow-x-auto prose-pre:max-w-[calc(100vw-16rem)] px-3 py-1.5"
dangerouslySetInnerHTML={{ __html: parsedContent }}
/>
<div className="px-3 py-1.5">
<div
className="chat-message prose prose-sm dark:prose-invert prose-pre:overflow-x-auto prose-pre:max-w-[calc(100vw-16rem)]"
dangerouslySetInnerHTML={{ __html: parsedContent }}
/>
{renderFiles()}
</div>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/ConversationContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ export const ConversationContent: FC<Props> = ({ conversation }) => {
message={msg}
previousMessage={previousMessage}
nextMessage={nextMessage}
conversationId={conversation.name}
/>
);
})}
Expand Down
15 changes: 12 additions & 3 deletions src/components/__tests__/ChatMessage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@ import { ChatMessage } from "../ChatMessage";
import '@testing-library/jest-dom';
import type { Message } from "@/types/conversation";

// Mock the ApiContext
jest.mock("@/contexts/ApiContext", () => ({
useApi: () => ({
baseUrl: "http://localhost:5000"
})
}));

describe("ChatMessage", () => {
const testConversationId = "test-conversation";

it("renders user message", () => {
const message: Message = {
role: "user",
content: "Hello!",
timestamp: new Date().toISOString(),
};

render(<ChatMessage message={message} />);
render(<ChatMessage message={message} conversationId={testConversationId} />);
expect(screen.getByText("Hello!")).toBeInTheDocument();
});

Expand All @@ -22,7 +31,7 @@ describe("ChatMessage", () => {
timestamp: new Date().toISOString(),
};

render(<ChatMessage message={message} />);
render(<ChatMessage message={message} conversationId={testConversationId} />);
expect(screen.getByText("Hi there!")).toBeInTheDocument();
});

Expand All @@ -33,7 +42,7 @@ describe("ChatMessage", () => {
timestamp: new Date().toISOString(),
};

const { container } = render(<ChatMessage message={message} />);
const { container } = render(<ChatMessage message={message} conversationId={testConversationId} />);
const messageElement = container.querySelector('.font-mono');
expect(messageElement).toBeInTheDocument();
});
Expand Down