-
Notifications
You must be signed in to change notification settings - Fork 3.9k
fix: support gemini-3.1-flash-image-preview image generation in chat #13335
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
cherry-ai-bot
wants to merge
4
commits into
main
Choose a base branch
from
fix/gemini-3-1-flash-image-preview-13332
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.
+209
−117
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
44a149a
fix: support gemini-3.1-flash-image-preview image generation in chat
ccb4e53
refactor: remove openrouter image model special-casing
8c6302c
style: format vision model patterns
f80ee46
test: fix type error in PluginBuilder test for non-openrouter provide…
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
169 changes: 169 additions & 0 deletions
169
src/renderer/src/aiCore/plugins/__tests__/PluginBuilder.test.ts
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,169 @@ | ||
| import type { Assistant, Model, Provider } from '@renderer/types' | ||
| import { SystemProviderIds } from '@renderer/types' | ||
| import { describe, expect, it, vi } from 'vitest' | ||
|
|
||
| import { buildPlugins } from '../PluginBuilder' | ||
|
|
||
| vi.mock('@logger', () => ({ | ||
| loggerService: { | ||
| withContext: () => ({ | ||
| debug: vi.fn(), | ||
| error: vi.fn(), | ||
| warn: vi.fn(), | ||
| info: vi.fn() | ||
| }) | ||
| } | ||
| })) | ||
|
|
||
| vi.mock('@renderer/hooks/useSettings', () => ({ | ||
| getEnableDeveloperMode: vi.fn(() => false) | ||
| })) | ||
|
|
||
| vi.mock('@renderer/config/models', () => ({ | ||
| isGemini3Model: vi.fn(() => false), | ||
| isQwen35Model: vi.fn(() => false), | ||
| isSupportedThinkingTokenQwenModel: vi.fn(() => false) | ||
| })) | ||
|
|
||
| vi.mock('@renderer/utils/provider', () => ({ | ||
| isOllamaProvider: vi.fn(() => false), | ||
| isSupportEnableThinkingProvider: vi.fn(() => false) | ||
| })) | ||
|
|
||
| vi.mock('@cherrystudio/ai-core/built-in/plugins', () => ({ | ||
| createPromptToolUsePlugin: vi.fn(() => ({ name: 'promptToolUse' })), | ||
| webSearchPlugin: vi.fn(() => ({ name: 'webSearch' })) | ||
| })) | ||
|
|
||
| vi.mock('../anthropicCachePlugin', () => ({ | ||
| createAnthropicCachePlugin: vi.fn(() => ({ name: 'anthropicCache' })) | ||
| })) | ||
|
|
||
| vi.mock('../noThinkPlugin', () => ({ | ||
| createNoThinkPlugin: vi.fn(() => ({ name: 'noThink' })) | ||
| })) | ||
|
|
||
| vi.mock('../openrouterGenerateImagePlugin', () => ({ | ||
| createOpenrouterGenerateImagePlugin: vi.fn(() => ({ name: 'openrouterGenerateImage' })) | ||
| })) | ||
|
|
||
| vi.mock('../openrouterReasoningPlugin', () => ({ | ||
| createOpenrouterReasoningPlugin: vi.fn(() => ({ name: 'openrouterReasoning' })) | ||
| })) | ||
|
|
||
| vi.mock('../qwenThinkingPlugin', () => ({ | ||
| createQwenThinkingPlugin: vi.fn(() => ({ name: 'qwenThinking' })) | ||
| })) | ||
|
|
||
| vi.mock('../reasoningExtractionPlugin', () => ({ | ||
| createReasoningExtractionPlugin: vi.fn(() => ({ name: 'reasoningExtraction' })) | ||
| })) | ||
|
|
||
| vi.mock('../searchOrchestrationPlugin', () => ({ | ||
| searchOrchestrationPlugin: vi.fn(() => ({ name: 'searchOrchestration' })) | ||
| })) | ||
|
|
||
| vi.mock('../simulateStreamingPlugin', () => ({ | ||
| createSimulateStreamingPlugin: vi.fn(() => ({ name: 'simulateStreaming' })) | ||
| })) | ||
|
|
||
| vi.mock('../skipGeminiThoughtSignaturePlugin', () => ({ | ||
| createSkipGeminiThoughtSignaturePlugin: vi.fn(() => ({ name: 'skipGeminiThoughtSignature' })) | ||
| })) | ||
|
|
||
| vi.mock('../telemetryPlugin', () => ({ | ||
| createTelemetryPlugin: vi.fn(() => ({ name: 'telemetry' })) | ||
| })) | ||
|
|
||
| vi.mock('../../utils/reasoning', () => ({ | ||
| getReasoningTagName: vi.fn(() => 'think') | ||
| })) | ||
|
|
||
| function createAssistant(): Assistant { | ||
| return { | ||
| id: 'assistant-1', | ||
| name: 'Test Assistant', | ||
| prompt: '', | ||
| topics: [], | ||
| type: 'assistant', | ||
| settings: {} | ||
| } | ||
| } | ||
|
|
||
| function createModel(provider = SystemProviderIds.openrouter): Model { | ||
| return { | ||
| id: 'google/gemini-2.5-flash-image-preview', | ||
| name: 'Gemini 2.5 Flash Image', | ||
| provider | ||
| } as Model | ||
| } | ||
|
|
||
| function createProvider(id = SystemProviderIds.openrouter): Provider { | ||
| return { | ||
| id, | ||
| name: 'Test Provider', | ||
| type: id === SystemProviderIds.openrouter ? 'openai' : 'google' | ||
| } as Provider | ||
| } | ||
|
|
||
| describe('PluginBuilder', () => { | ||
| it('mounts openrouterGenerateImage plugin when provider is openrouter and generate image is enabled', () => { | ||
| const plugins = buildPlugins({ | ||
| provider: createProvider(), | ||
| model: createModel(), | ||
| config: { | ||
| assistant: createAssistant(), | ||
| streamOutput: true, | ||
| enableReasoning: false, | ||
| isPromptToolUse: false, | ||
| isSupportedToolUse: false, | ||
| isImageGenerationEndpoint: false, | ||
| enableWebSearch: false, | ||
| enableGenerateImage: true, | ||
| enableUrlContext: false | ||
| } | ||
| }) | ||
|
|
||
| expect(plugins.map((plugin) => plugin.name)).toContain('openrouterGenerateImage') | ||
| }) | ||
|
|
||
| it('does not mount openrouterGenerateImage plugin when generate image is disabled', () => { | ||
| const plugins = buildPlugins({ | ||
| provider: createProvider(), | ||
| model: createModel(), | ||
| config: { | ||
| assistant: createAssistant(), | ||
| streamOutput: true, | ||
| enableReasoning: false, | ||
| isPromptToolUse: false, | ||
| isSupportedToolUse: false, | ||
| isImageGenerationEndpoint: false, | ||
| enableWebSearch: false, | ||
| enableGenerateImage: false, | ||
| enableUrlContext: false | ||
| } | ||
| }) | ||
|
|
||
| expect(plugins.map((plugin) => plugin.name)).not.toContain('openrouterGenerateImage') | ||
| }) | ||
|
|
||
| it('does not mount openrouterGenerateImage plugin for non-openrouter providers', () => { | ||
| const plugins = buildPlugins({ | ||
| provider: { ...createProvider(SystemProviderIds.openrouter), id: 'gemini' } as any, | ||
| model: createModel(SystemProviderIds.openrouter), | ||
| config: { | ||
| assistant: createAssistant(), | ||
| streamOutput: true, | ||
| enableReasoning: false, | ||
| isPromptToolUse: false, | ||
| isSupportedToolUse: false, | ||
| isImageGenerationEndpoint: false, | ||
| enableWebSearch: false, | ||
| enableGenerateImage: true, | ||
| enableUrlContext: false | ||
| } | ||
| }) | ||
|
|
||
| expect(plugins.map((plugin) => plugin.name)).not.toContain('openrouterGenerateImage') | ||
| }) | ||
| }) |
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 |
|---|---|---|
| @@ -1,16 +1,5 @@ | ||
| import type { Model, Provider } from '@renderer/types' | ||
| import { isSystemProvider, SystemProviderIds } from '@renderer/types' | ||
|
|
||
| export function buildGeminiGenerateImageParams(): Record<string, any> { | ||
| return { | ||
| responseModalities: ['TEXT', 'IMAGE'] | ||
| } | ||
| } | ||
|
|
||
| export function isOpenRouterGeminiGenerateImageModel(model: Model, provider: Provider): boolean { | ||
| return ( | ||
| model.id.includes('gemini-2.5-flash-image') && | ||
| isSystemProvider(provider) && | ||
| provider.id === SystemProviderIds.openrouter | ||
| ) | ||
| } |
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
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.
Uh oh!
There was an error while loading. Please reload this page.