Skip to content

Fix: match only gemini-1.<digit> in isGemini1Model (adk-python parity) #617

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.

Sign up for GitHub

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
AmaadMartin wants to merge 1 commit into
base: main
Choose a base branch
from
+76 −1
Open

Fix: match only gemini-1.<digit> in isGemini1Model (adk-python parity) #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion core/src/utils/model_name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import {getBooleanEnvVar} from './env_aware_utils.js';
const MODEL_NAME_PATTERN =
'^projects/[^/]+/locations/[^/]+/publishers/[^/]+/models/(.+)$';

const GEMINI_1_MODEL_PATTERN = /^gemini-1\.\d+/;

/**
* Extract the actual model name from either simple or path-based format.
*
Expand Down Expand Up @@ -68,7 +70,7 @@ function parseVersion(versionString: string): ParsedVersion {
export function isGemini1Model(modelString: string): boolean {
const modelName = extractModelName(modelString);

return modelName.startsWith('gemini-1');
return GEMINI_1_MODEL_PATTERN.test(modelName);
}

/**
Expand Down
73 changes: 73 additions & 0 deletions core/test/utils/model_name_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,79 @@

import {isGemini2OrAbove, isGemini3xFlashLive} from '@google/adk';
import {describe, expect, it} from 'vitest';
import {isGemini1Model, isGeminiModel} from '../../src/utils/model_name.js';

describe('isGemini1Model', () => {
const gemini1Models = [
'gemini-1.5-flash',
'gemini-1.0-pro',
'gemini-1.5-pro-preview',
'gemini-1.9-experimental',
'projects/265104255505/locations/us-central1/publishers/google/models/gemini-1.5-flash',
'projects/12345/locations/us-east1/publishers/google/models/gemini-1.0-pro-preview',
];

describe('valid models', () => {
for (const model of gemini1Models) {
it(`should return true for model: ${model}`, () => {
expect(isGemini1Model(model)).toBe(true);
});
}
});

describe('invalid models', () => {
const invalidModels = [
// A double-digit major must not be read as Gemini 1.x.
'gemini-10.0-pro',
// The dotted minor version is mandatory.
'gemini-1',
'gemini-1-pro',
'gemini-1.',
'gemini-1x-foo',
'gemini-2.5-flash',
'claude-3-sonnet',
// Present but not anchored at the start of the model name.
'my-gemini-1.5-model',
'',
'projects/265104255505/locations/us-central1/publishers/google/models/gemini-2.5-flash',
];

for (const model of invalidModels) {
it(`should return false for model: ${model || '<empty string>'}`, () => {
expect(isGemini1Model(model)).toBe(false);
});
}
});

describe('classification invariants', () => {
const allModels = [
...gemini1Models,
'gemini-10.0-pro',
'gemini-1',
'gemini-1-pro',
'gemini-2.5-flash',
'gemini-3-pro-preview',
'claude-3-sonnet',
'',
];

it('should never classify a model as both Gemini 1.x and Gemini 2.0+', () => {
expect(
allModels.filter(
(model) => isGemini1Model(model) && isGemini2OrAbove(model),
),
).toEqual([]);
});

it('should classify every Gemini 1.x model as a Gemini model', () => {
expect(
allModels.filter(
(model) => isGemini1Model(model) && !isGeminiModel(model),
),
).toEqual([]);
});
});
});

describe('isGemini2OrAbove', () => {
describe('valid models', () => {
Expand Down
Loading