-
-
Notifications
You must be signed in to change notification settings - Fork 51
feat(adapter-gemini): 支持 camelCase 媒体字段配置 #892
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
Open
Sor85
wants to merge
1
commit into
ChatLunaLab:v1-dev
Choose a base branch
from
Sor85:feat/gemini-camelcase-media-fields
base: v1-dev
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.
+61
−9
Open
Changes from all commits
Commits
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
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 |
|---|---|---|
|
|
@@ -223,9 +223,7 @@ async function processGeminiImageContent( | |
| const mineType = url.match(/^data:([^;]+);base64,/)?.[1] ?? 'image/jpeg' | ||
| const data = url.replace(/^data:image\/\w+;base64,/, '') | ||
|
|
||
| return { | ||
| inline_data: { data, mime_type: mineType } | ||
| } | ||
| return createGeminiInlineDataPart(plugin, data, mineType) | ||
| } | ||
|
|
||
| type GeminiFileLikeContent = MessageContentComplex & | ||
|
|
@@ -254,18 +252,56 @@ function isGeminiFileLikeContent( | |
| ) | ||
| } | ||
|
|
||
| type GeminiInlineDataContent = MessageContentComplex & { | ||
| inline_data?: { | ||
| data: string | ||
| mime_type?: string | ||
| mimeType?: string | ||
| } | ||
| inlineData?: { | ||
| data: string | ||
| mime_type?: string | ||
| mimeType?: string | ||
| } | ||
| } | ||
|
|
||
| function isGeminiInlineDataContent( | ||
| part: MessageContentComplex | ||
| ): part is GeminiInlineDataContent { | ||
| return ( | ||
| part != null && | ||
| typeof part === 'object' && | ||
| ('inline_data' in part || 'inlineData' in part) | ||
| ) | ||
| } | ||
|
|
||
| function createGeminiInlineDataPart( | ||
| plugin: ChatLunaPlugin, | ||
| data: string, | ||
| mimeType: string | ||
| ) { | ||
| const config = plugin.config as Config | ||
| const blob = { | ||
| data, | ||
| [config.useCamelCaseMimeType ? 'mimeType' : 'mime_type']: mimeType | ||
| } | ||
|
|
||
| return { | ||
| [config.useCamelCaseInlineData ? 'inlineData' : 'inline_data']: blob | ||
| } | ||
| } | ||
|
|
||
| async function processGeminiFileLikeContent( | ||
| plugin: ChatLunaPlugin, | ||
| part: GeminiFileLikeContent | ||
| ) { | ||
| try { | ||
| const { buffer, mimeType } = await fetchFileLikeUrl(plugin, part) | ||
| return { | ||
| inline_data: { | ||
| data: buffer.toString('base64'), | ||
| mime_type: mimeType | ||
| } | ||
| } | ||
| return createGeminiInlineDataPart( | ||
| plugin, | ||
| buffer.toString('base64'), | ||
| mimeType | ||
| ) | ||
| } catch (e) { | ||
| logger.warn(`Failed to fetch ${part.type}`, e) | ||
| return null | ||
|
|
@@ -288,6 +324,14 @@ async function processGeminiContentParts( | |
| if (isGeminiFileLikeContent(part)) { | ||
| return await processGeminiFileLikeContent(plugin, part) | ||
| } | ||
| if (isGeminiInlineDataContent(part)) { | ||
| const inline = part.inline_data ?? part.inlineData | ||
| return createGeminiInlineDataPart( | ||
| plugin, | ||
| inline.data, | ||
| inline.mime_type ?? inline.mimeType | ||
| ) | ||
| } | ||
|
Comment on lines
+327
to
+334
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 在 if (isGeminiInlineDataContent(part)) {
const inline = part.inline_data ?? part.inlineData
if (inline?.data != null) {
return createGeminiInlineDataPart(
plugin,
inline.data,
inline.mime_type ?? inline.mimeType ?? 'image/jpeg'
)
}
} |
||
| return part as any | ||
| }) | ||
| ) | ||
|
|
||
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.
这里的翻译使用了“大写”,但实际上
inlineData和mimeType是驼峰命名(camelCase)而非全大写(UPPERCASE)。建议将其修改为“驼峰式”,以保证描述的准确性。