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.

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:refresh button #8

Merged
merged 1 commit into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/app/api/gemini-vision/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export async function POST(req: Request) {
// console.log(temperature, maxLength, topP, topK);
// console.log(media, media_types);
// console.log(safety_settings);
// console.log("message =================>", message);

const userMessage = message;

Expand Down
6 changes: 1 addition & 5 deletions src/components/ChatContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ export const ChatContainer = () => {
</div>
))}
<div ref={messagesEndRef} />
{loading && (
<div className="mt-6 bg-primary/10 dark:bg-primary/10 px-4 py-4 rounded-lg m-4 justify-start w-16">
<TypingBubble />
</div>
)}
{loading && <TypingBubble />}
</div>
<CommonForm
value={input}
Expand Down
2 changes: 1 addition & 1 deletion src/components/TypingBubble.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";

export const TypingBubble: React.FC = () => {
return (
<div className="flex items-center space-x-1">
<div className="flex items-center space-x-1 mt-6 bg-primary/10 dark:bg-primary/10 px-4 py-4 rounded-lg m-4 justify-start w-16">
<div className="typing-dot bg-primary/50 h-2 w-2 rounded-full animate-typing-bounce" />
<div
className="typing-dot bg-primary/50 h-2 w-2 rounded-full animate-typing-bounce"
Expand Down
74 changes: 48 additions & 26 deletions src/components/VisionContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
"use client";
// componnets/VisionContainer.tsx
import React, { useState, useCallback } from "react";
import { MarkdownViewer } from "@/components/MarkdownViewer";
import { useControlContext } from "@/providers/ControlContext";
import { Card } from "@/components/ui/card";

import { useControlContext } from "@/providers/ControlContext";
import { MarkdownViewer } from "./MarkdownViewer";
import { CommonForm } from "./CommonForm";
import { TypingBubble } from "./TypingBubble";

import { RefreshCcw } from "lucide-react";
import { Button } from "./ui/button";

export const VisionContainer = () => {
const { generalSettings, safetySettings, mediaDataList } =
useControlContext();
Expand All @@ -26,33 +29,24 @@ export const VisionContainer = () => {
);
}, [prompt, mediaDataList]);

const handleSubmitForm = useCallback(
async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();

if (!isFormSubmittable()) return;
setLoading(true);
setUserQuestion(prompt);
setResult("");
setPrompt("");

const makeApiCall = useCallback(
async (message: string) => {
// Filter out any invalid image data
const validMediaData = mediaDataList.filter(
(data) => data.data !== "" && data.mimeType !== ""
);

// If there are no valid images and the prompt is empty, do not proceed
// If there are no valid images and the message is empty, do not proceed
if (validMediaData.length === 0) return;
if (message.trim() === "") return;

const mediaBase64 = validMediaData.map((data) =>
data.data.replace(/^data:(image|video)\/\w+;base64,/, "")
);
const mediaTypes = validMediaData.map((data) => data.mimeType);

// console.log(mediaBase64.length, mediaTypes);

const body = JSON.stringify({
message: prompt,
message,
media: mediaBase64,
media_types: mediaTypes,
general_settings: generalSettings,
Expand Down Expand Up @@ -82,32 +76,60 @@ export const VisionContainer = () => {
accumulator += text;
setResult(accumulator);
}
setLoading(false);
}
} catch (error) {
if (error instanceof Error) {
setResult(`Error: ${error.message}`);
setLoading(false);
}
} finally {
setLoading(false);
}
// };
},
[generalSettings, safetySettings, mediaDataList, prompt]
[mediaDataList, prompt, generalSettings, safetySettings]
);

const handleRefresh = useCallback(() => {
if (!userQuestion) return;
setLoading(true);
setResult("");
makeApiCall(userQuestion);
}, [userQuestion, makeApiCall]);

const handleSubmitForm = useCallback(
async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();

if (!isFormSubmittable()) return;
setLoading(true);
setUserQuestion(prompt);
setResult("");
setPrompt("");

await makeApiCall(prompt);
},
[isFormSubmittable, makeApiCall, prompt]
);

return (
<div className="flex flex-col h-[95vh]">
<Card className="flex flex-col flex-1 overflow-hidden">
{userQuestion && (
<div className="bg-primary/20 p-4">{userQuestion}</div>
<div className="bg-primary/20 p-4 flex space-x-4">
<Button
type={`button`}
variant={`icon`}
onClick={handleRefresh}
disabled={loading}
>
<RefreshCcw className={`w-4 h-4`} />
</Button>

<div>{userQuestion}</div>
</div>
)}
<div className="flex-1 overflow-y-auto p-4">
<MarkdownViewer text={result} />
{loading && (
<div className="mt-6 bg-primary/10 dark:bg-primary/10 px-4 py-4 rounded-lg m-4 justify-start w-16">
<TypingBubble />
</div>
)}
{loading && <TypingBubble />}
{mediaDataList.every(
(media) => media === null || media?.data === ""
) && (
Expand Down
Loading