MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-10 22:21:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

only use customtoolmodel for api key users (#132)

Browse Source 
* only use customtoolmodel for api key users

* use displaystring for showing model in about
This commit is contained in:
Sehoon Shon
2026-02-19 13:18:32 -05:00
parent ed8f7f6766
commit a2d831f1d7
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/cli/src/ui/components/AboutBox.tsx
View File

@@ -9,6 +9,7 @@ import { Box, Text } from 'ink';
import { theme } from '../semantic-colors.js';
import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
import { useSettings } from '../contexts/SettingsContext.js';
import { getDisplayString } from '@google/gemini-cli-core';
interface AboutBoxProps {
cliVersion: string;
@@ -79,7 +80,9 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
</Text>
</Box>
<Box>
<Text color={theme.text.primary}>{modelVersion}</Text>
<Text color={theme.text.primary}>
{getDisplayString(modelVersion)}
</Text>
</Box>
</Box>
<Box flexDirection="row">

2
packages/cli/src/ui/components/ModelDialog.tsx
View File

@@ -45,7 +45,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
const useGemini31 = config?.getGemini31LaunchedSync?.() ?? false;
const selectedAuthType = settings.merged.security.auth.selectedType;
const useCustomToolModel =
useGemini31 && selectedAuthType !== AuthType.USE_VERTEX_AI;
useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
const manualModelSelected = useMemo(() => {
const manualModels = [

2
packages/cli/src/ui/components/StatsDisplay.tsx
View File

@@ -415,7 +415,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
const useGemini3_1 = config.getGemini31LaunchedSync?.() ?? false;
const useCustomToolModel =
useGemini3_1 &&
config.getContentGeneratorConfig().authType !== AuthType.USE_VERTEX_AI;
config.getContentGeneratorConfig().authType === AuthType.USE_GEMINI;
const pooledRemaining = quotaStats?.remaining;
const pooledLimit = quotaStats?.limit;
const pooledResetTime = quotaStats?.resetTime;

3
packages/core/src/routing/strategies/classifierStrategy.test.ts
View File

@@ -18,6 +18,7 @@ import {
DEFAULT_GEMINI_MODEL,
DEFAULT_GEMINI_MODEL_AUTO,
PREVIEW_GEMINI_MODEL_AUTO,
PREVIEW_GEMINI_3_1_MODEL,
PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
} from '../../config/models.js';
import { promptIdContext } from '../../utils/promptIdContext.js';
@@ -364,7 +365,7 @@ describe('ClassifierStrategy', () => {
mockBaseLlmClient,
);
expect(decision?.model).toBe(PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL);
expect(decision?.model).toBe(PREVIEW_GEMINI_3_1_MODEL);
});
it('should route to PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL when Gemini 3.1 is launched and auth is USE_GEMINI', async () => {

2
packages/core/src/routing/strategies/classifierStrategy.ts
View File

@@ -173,7 +173,7 @@ export class ClassifierStrategy implements RoutingStrategy {
const useGemini3_1 = (await config.getGemini31Launched?.()) ?? false;
const useCustomToolModel =
useGemini3_1 &&
config.getContentGeneratorConfig().authType !== AuthType.USE_VERTEX_AI;
config.getContentGeneratorConfig().authType === AuthType.USE_GEMINI;
const selectedModel = resolveClassifierModel(
model,
routerResponse.model_choice,

2
packages/core/src/routing/strategies/numericalClassifierStrategy.test.ts
View File

@@ -560,7 +560,7 @@ describe('NumericalClassifierStrategy', () => {
mockBaseLlmClient,
);
expect(decision?.model).toBe(PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL);
expect(decision?.model).toBe(PREVIEW_GEMINI_3_1_MODEL);
});
it('should route to PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL when Gemini 3.1 is launched and auth is USE_GEMINI', async () => {
vi.mocked(mockConfig.getGemini31Launched).mockResolvedValue(true);

2
packages/core/src/routing/strategies/numericalClassifierStrategy.ts
View File

@@ -186,7 +186,7 @@ export class NumericalClassifierStrategy implements RoutingStrategy {
const useGemini3_1 = (await config.getGemini31Launched?.()) ?? false;
const useCustomToolModel =
useGemini3_1 &&
config.getContentGeneratorConfig().authType !== AuthType.USE_VERTEX_AI;
config.getContentGeneratorConfig().authType === AuthType.USE_GEMINI;
const selectedModel = resolveClassifierModel(
model,
modelAlias,