From 7bcc60e99613970b01cd79b09bc5502ef98d381a Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 13 Jun 2025 01:25:42 -0700 Subject: refactor: Use default centralized Flash & Pro models everywhere (#994) --- packages/cli/src/config/config.ts | 6 ++---- packages/cli/src/utils/modelCheck.test.ts | 2 +- packages/cli/src/utils/modelCheck.ts | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/cli') diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index e5ae8cd9..4fee7499 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -15,6 +15,8 @@ import { ApprovalMode, ContentGeneratorConfig, GEMINI_CONFIG_DIR as GEMINI_DIR, + DEFAULT_GEMINI_MODEL, + DEFAULT_GEMINI_EMBEDDING_MODEL, } from '@gemini-cli/core'; import { Settings } from './settings.js'; import { getEffectiveModel } from '../utils/modelCheck.js'; @@ -34,10 +36,6 @@ const logger = { error: (...args: any[]) => console.error('[ERROR]', ...args), }; -export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-pro-preview-06-05'; -export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-2.5-flash-preview-05-20'; -export const DEFAULT_GEMINI_EMBEDDING_MODEL = 'gemini-embedding-001'; - interface CliArgs { model: string | undefined; sandbox: boolean | string | undefined; diff --git a/packages/cli/src/utils/modelCheck.test.ts b/packages/cli/src/utils/modelCheck.test.ts index 5c6f1808..11e38c01 100644 --- a/packages/cli/src/utils/modelCheck.test.ts +++ b/packages/cli/src/utils/modelCheck.test.ts @@ -9,7 +9,7 @@ import { getEffectiveModel } from './modelCheck.js'; import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, -} from '../config/config.js'; +} from '@gemini-cli/core'; // Mock global fetch global.fetch = vi.fn(); diff --git a/packages/cli/src/utils/modelCheck.ts b/packages/cli/src/utils/modelCheck.ts index 913de8ce..7d7a3b7d 100644 --- a/packages/cli/src/utils/modelCheck.ts +++ b/packages/cli/src/utils/modelCheck.ts @@ -7,7 +7,7 @@ import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, -} from '../config/config.js'; +} from '@gemini-cli/core'; /** * Checks if the default "pro" model is rate-limited and returns a fallback "flash" -- cgit v1.2.3