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

Fix: Resize image before conversation and save history #1116

Merged
merged 3 commits into from
Sep 25, 2024
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
18 changes: 7 additions & 11 deletions frontend/src/components/QuestionInput/QuestionInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Send from '../../assets/Send.svg'
import styles from './QuestionInput.module.css'
import { ChatMessage } from '../../api'
import { AppStateContext } from '../../state/AppProvider'
import { resizeImage } from '../../utils/resizeImage'

interface Props {
onSend: (question: ChatMessage['content'], id?: string) => void
Expand All @@ -32,17 +33,12 @@ export const QuestionInput = ({ onSend, disabled, placeholder, clearOnSend, conv
};

const convertToBase64 = async (file: Blob) => {
const reader = new FileReader();

reader.readAsDataURL(file);

reader.onloadend = () => {
setBase64Image(reader.result as string);
};

reader.onerror = (error) => {
console.error('Error: ', error);
};
try {
const resizedBase64 = await resizeImage(file, 800, 800);
setBase64Image(resizedBase64);
} catch (error) {
console.error('Error:', error);
}
};

const sendQuestion = () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/chat/Chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ const Chat = () => {
}
const noContentError = appStateContext.state.currentChat.messages.find(m => m.role === ERROR)

if (typeof noContentError?.content === "string" && !noContentError?.content.includes(NO_CONTENT_ERROR)) {
if (!noContentError) {
saveToDB(appStateContext.state.currentChat.messages, appStateContext.state.currentChat.id)
.then(res => {
if (!res.ok) {
Expand Down
70 changes: 40 additions & 30 deletions frontend/src/utils/resizeImage.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,47 @@
export const resizeImage = (file: Blob, maxWidth: number, maxHeight: number) => {
const img = new Image()
const reader = new FileReader()

reader.readAsDataURL(file)
reader.onloadend = () => {
img.src = reader.result as string
img.onload = () => {
const canvas = document.createElement('canvas')
const ctx = canvas.getContext('2d')

let { width, height } = img

if (width > maxWidth || height > maxHeight) {
if (width > height) {
height *= maxWidth / width
width = maxWidth
} else {
width *= maxHeight / height
height = maxHeight
export const resizeImage = (file: Blob, maxWidth: number, maxHeight: number): Promise<string> => {
return new Promise((resolve, reject) => {
const img = new Image()
const reader = new FileReader()

reader.readAsDataURL(file)
reader.onloadend = () => {
img.src = reader.result as string
img.onload = () => {
const canvas = document.createElement('canvas')
const ctx = canvas.getContext('2d')

let { width, height } = img

// Calculate the new dimensions
if (width > maxWidth || height > maxHeight) {
if (width > height) {
height = (maxWidth / width) * height
width = maxWidth
} else {
width = (maxHeight / height) * width
height = maxHeight
}
}

canvas.width = width
canvas.height = height

if (ctx) {
ctx.drawImage(img, 0, 0, width, height)
}

// Convert the canvas to a base64 string
const resizedBase64 = canvas.toDataURL('image/jpeg', 0.8)
resolve(resizedBase64)
}

canvas.width = width
canvas.height = height
if (ctx) {
ctx.drawImage(img, 0, 0, width, height)
img.onerror = error => {
reject('Error loading image: ' + error)
}
}

const resizedBase64 = canvas.toDataURL('image/jpeg', 0.8)
return resizedBase64
reader.onerror = error => {
reject('Error reading file: ' + error)
}
}
reader.onerror = error => {
console.error('Error: ', error)
}
})
}
26 changes: 13 additions & 13 deletions static/assets/index-59f36d49.js → static/assets/index-c5246876.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" type="image/x-icon" href="{{ favicon }}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ title }}</title>
<script type="module" crossorigin src="/assets/index-59f36d49.js"></script>
<script type="module" crossorigin src="/assets/index-c5246876.js"></script>
<link rel="stylesheet" href="/assets/index-65ec62ea.css">
</head>
<body>
Expand Down
Loading