-
Notifications
You must be signed in to change notification settings - Fork 421
image-attachment-support #1760
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
Draft
yujonglee
wants to merge
2
commits into
main
Choose a base branch
from
yl-branch-27
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
image-attachment-support #1760
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import type { FileUIPart } from "ai"; | ||
|
|
||
| import { readChatAttachmentAsDataURL } from "../components/chat/attachments/storage"; | ||
| import type { HyprUIMessage } from "./types"; | ||
|
|
||
| export async function resolveChatFileReferences( | ||
| messages: HyprUIMessage[], | ||
| chatGroupId?: string, | ||
| ): Promise<HyprUIMessage[]> { | ||
| const resolved: HyprUIMessage[] = []; | ||
|
|
||
| for (const message of messages) { | ||
| const resolvedParts = await Promise.all( | ||
| message.parts.map(async (part) => { | ||
| if (part.type === "data-chat-file") { | ||
| if (!chatGroupId) { | ||
| return part; | ||
| } | ||
|
|
||
| const dataUrl = await readChatAttachmentAsDataURL( | ||
| chatGroupId, | ||
| part.data.attachmentId, | ||
| ); | ||
|
|
||
| if (!dataUrl) { | ||
| return part; | ||
| } | ||
|
|
||
| return { | ||
| type: "file", | ||
| filename: part.data.filename, | ||
| mediaType: part.data.mediaType, | ||
| url: dataUrl, | ||
| } satisfies FileUIPart; | ||
| } | ||
|
|
||
| if (part.type === "file" && part.url.startsWith("blob:")) { | ||
| return part; | ||
| } | ||
|
|
||
| return part; | ||
| }), | ||
| ); | ||
|
|
||
| resolved.push({ | ||
| ...message, | ||
| parts: resolvedParts, | ||
| }); | ||
| } | ||
|
|
||
| return resolved; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import { ATTACHMENT_SIZE_LIMIT } from "../../../shared/attachments/constants"; | ||
| import { | ||
| createAttachmentStorage, | ||
| ManifestCorruptionError, | ||
| type ManifestEntry, | ||
| } from "../../../shared/attachments/storage"; | ||
|
|
||
| export type PersistedChatAttachment = ManifestEntry & { | ||
| filePath: string; | ||
| fileUrl: string; | ||
| }; | ||
|
|
||
| export { ManifestCorruptionError }; | ||
|
|
||
| const chatStorage = createAttachmentStorage<ManifestEntry>({ | ||
| getBasePath: (groupId: string) => `hyprnote/chat/${groupId}`, | ||
| entityName: "chat group", | ||
| maxSize: ATTACHMENT_SIZE_LIMIT, | ||
| includeTitle: false, | ||
| }); | ||
|
|
||
| export async function loadChatAttachments( | ||
| groupId: string, | ||
| ): Promise<PersistedChatAttachment[]> { | ||
| return await chatStorage.load(groupId); | ||
| } | ||
|
|
||
| export async function saveChatAttachment( | ||
| groupId: string, | ||
| file: File, | ||
| attachmentId = crypto.randomUUID(), | ||
| ): Promise<PersistedChatAttachment> { | ||
| return await chatStorage.save(groupId, file, {}, attachmentId); | ||
| } | ||
|
|
||
| export async function removeChatAttachment( | ||
| groupId: string, | ||
| attachmentId: string, | ||
| ) { | ||
| return await chatStorage.remove(groupId, attachmentId); | ||
| } | ||
|
|
||
| export async function removeChatGroupAttachments(groupId: string) { | ||
| return await chatStorage.removeAll(groupId); | ||
| } | ||
|
|
||
| export async function readChatAttachmentAsDataURL( | ||
| groupId: string, | ||
| attachmentId: string, | ||
| ): Promise<string | null> { | ||
| return await chatStorage.readAsDataURL(groupId, attachmentId); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Guard against attachment resolution failures so sends still succeed
Right now, if
resolveChatFileReferencesthrows (e.g.,readChatAttachmentAsDataURLfails),sendMessageswill reject and the whole send will fail, even though we could safely fall back to the original messages without resolved files.To keep chat more robust (and consistent with the more defensive session attachment resolver), consider wrapping the resolver in a try/catch and defaulting back to
options.messageson error:This preserves the new attachment support while avoiding a hard failure path when resolution misbehaves.
Also applies to: 25-29, 43-45
🤖 Prompt for AI Agents