Skip to content
Open
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
28 changes: 26 additions & 2 deletions packages/app/server/src/providers/GeminiProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { getCostPerToken } from '../services/AccountingService';
import { LlmTransactionMetadata, Transaction } from '../types';
import { BaseProvider } from './BaseProvider';
import { ProviderType } from './ProviderType';
import { GeminiImageGenerationToolPricing } from '@merit-systems/echo-typescript-sdk';
import { Decimal } from '@prisma/client/runtime/library';
import { env } from '../env';

interface GeminiUsage {
Expand All @@ -14,7 +16,11 @@ interface GeminiUsage {
interface GeminiCandidate {
content: {
parts: Array<{
text: string;
text?: string;
inlineData?: {
mimeType: string;
data: string; // base64 encoded
};
}>;
};
finishReason?: string;
Expand Down Expand Up @@ -131,6 +137,7 @@ export class GeminiProvider extends BaseProvider {
let candidatesTokens = 0;
let totalTokens = 0;
let providerId = 'gemini-response';
let imageCost = new Decimal(0);

if (this.getIsStream()) {
const usage = parseSSEGeminiFormat(data);
Expand All @@ -152,6 +159,23 @@ export class GeminiProvider extends BaseProvider {
totalTokens = parsed.usageMetadata.totalTokenCount || 0;
}


if (parsed?.candidates) {
for (const candidate of parsed.candidates) {
for (const part of candidate.content?.parts || []) {
if (part.inlineData && part.inlineData.mimeType?.startsWith('image/')) {

imageCost = imageCost.plus(
new Decimal(GeminiImageGenerationToolPricing.cost_per_image)
);
logger.info(
`Gemini image generation detected: ${part.inlineData.mimeType}`
);
}
}
}
}

// Try to get a unique identifier from the response
// Gemini doesn't return an ID like OpenAI, so we'll generate one based on content
if (parsed?.candidates && parsed.candidates.length > 0) {
Expand Down Expand Up @@ -179,7 +203,7 @@ export class GeminiProvider extends BaseProvider {
this.getModel(),
promptTokens,
candidatesTokens
),
).plus(imageCost),
status: 'success',
};

Expand Down
1 change: 1 addition & 0 deletions packages/app/server/src/services/AccountingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
GroqModels,
OpenAIImageModels,
SupportedOpenAIResponseToolPricing,
GeminiImageGenerationToolPricing,
SupportedModel,
SupportedImageModel,
SupportedVideoModel,
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/ts/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export type {
ImageGenerationQualityPricing,
ImageGenerationModelPricing,
ImageGenerationPricing,
GeminiImageGenerationPricing,
CodeInterpreterPricing,
FileSearchPricing,
WebSearchModelPricing,
Expand All @@ -37,6 +38,7 @@ export {
SupportedOpenAIResponseTools,
SupportedOpenAIResponseToolPricing,
} from './supported-models/responses/openai';
export { GeminiImageGenerationToolPricing } from './supported-models/tools/gemini';
export { OpenAIModels } from './supported-models/chat/openai';
export type { OpenAIModel } from './supported-models/chat/openai';
export { AnthropicModels } from './supported-models/chat/anthropic';
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/ts/src/supported-models/tools/gemini.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { GeminiImageGenerationPricing } from '../types';

export const GeminiImageGenerationToolPricing: GeminiImageGenerationPricing = {
cost_per_image: 0.039,
};
5 changes: 5 additions & 0 deletions packages/sdk/ts/src/supported-models/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,13 @@ export interface ImageGenerationModelPricing {
high: ImageGenerationQualityPricing;
}

export interface GeminiImageGenerationPricing {
cost_per_image: number;
}

export interface ImageGenerationPricing {
gpt_image_1: ImageGenerationModelPricing;
gemini_flash_image?: GeminiImageGenerationPricing;
}

export interface CodeInterpreterPricing {
Expand Down
56 changes: 56 additions & 0 deletions packages/tests/provider-smoke/gemini-generate-image.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import {
createEchoGoogle,
GeminiModels,
} from '@merit-systems/echo-typescript-sdk';
import { generateText } from 'ai';
import { beforeAll, describe, expect, it } from 'vitest';
import {
ECHO_APP_ID,
assertEnv,
baseRouterUrl,
getApiErrorDetails,
getToken,
} from './test-helpers';

beforeAll(assertEnv);

const GEMINI_IMAGE_MODELS = [
'gemini-2.5-flash-image',
'gemini-2.5-flash-image-preview',
] as const;

describe.concurrent('Gemini generateText with image generation', () => {
const google = createEchoGoogle(
{ appId: ECHO_APP_ID!, baseRouterUrl },
getToken
);

for (const model_id of GEMINI_IMAGE_MODELS) {
it(`Gemini image ${model_id}`, async () => {
try {
const result = await generateText({
model: google(model_id),
prompt: 'Generate a simple blue circle',
});


expect(result).toBeDefined();


const imageFile = result.files?.find(file =>
file.mediaType?.startsWith('image/')
);

expect(imageFile).toBeDefined();
expect(imageFile?.mediaType).toMatch(/^image\//);
expect(imageFile?.base64).toBeDefined();
expect(imageFile?.base64?.length).toBeGreaterThan(0);
} catch (err) {
const details = getApiErrorDetails(err);
throw new Error(
`[generateText with image] Gemini ${model_id} failed: ${details}`
);
}
});
}
});
Loading