jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Propagate user_prompt_id to GenerateConentRequest for logging" (#5007)

This commit is contained in:
N. Taylor Mullen 2025-07-27 19:28:20 -07:00 committed by GitHub
parent 9ed351260c
commit bd85070411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 102 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/core/src/code_assist/converter.test.ts
View File

@ -24,12 +24,7 @@ describe('converter', () => {
model: 'gemini-pro',
contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq, 'my-project');
expect(codeAssistReq).toEqual({
model: 'gemini-pro',
project: 'my-project',
@ -42,9 +37,8 @@ describe('converter', () => {
labels: undefined,
safetySettings: undefined,
generationConfig: undefined,
session_id: 'my-session',
session_id: undefined,
},
user_prompt_id: 'my-prompt',
});
});
@ -53,12 +47,7 @@ describe('converter', () => {
model: 'gemini-pro',
contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
undefined,
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq).toEqual({
model: 'gemini-pro',
project: undefined,
@ -71,9 +60,8 @@ describe('converter', () => {
labels: undefined,
safetySettings: undefined,
generationConfig: undefined,
session_id: 'my-session',
session_id: undefined,
},
user_prompt_id: 'my-prompt',
});
});
@ -84,7 +72,6 @@ describe('converter', () => {
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'session-123',
);
@ -102,7 +89,6 @@ describe('converter', () => {
generationConfig: undefined,
session_id: 'session-123',
},
user_prompt_id: 'my-prompt',
});
});
@ -111,12 +97,7 @@ describe('converter', () => {
model: 'gemini-pro',
contents: 'Hello',
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq.request.contents).toEqual([
{ role: 'user', parts: [{ text: 'Hello' }] },
]);
@ -127,12 +108,7 @@ describe('converter', () => {
model: 'gemini-pro',
contents: [{ text: 'Hello' }, { text: 'World' }],
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq.request.contents).toEqual([
{ role: 'user', parts: [{ text: 'Hello' }] },
{ role: 'user', parts: [{ text: 'World' }] },
@ -147,12 +123,7 @@ describe('converter', () => {
systemInstruction: 'You are a helpful assistant.',
},
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq.request.systemInstruction).toEqual({
role: 'user',
parts: [{ text: 'You are a helpful assistant.' }],
@ -168,12 +139,7 @@ describe('converter', () => {
topK: 40,
},
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq.request.generationConfig).toEqual({
temperature: 0.8,
topK: 40,
@ -199,12 +165,7 @@ describe('converter', () => {
responseMimeType: 'application/json',
},
};
const codeAssistReq = toGenerateContentRequest(
genaiReq,
'my-prompt',
'my-project',
'my-session',
);
const codeAssistReq = toGenerateContentRequest(genaiReq);
expect(codeAssistReq.request.generationConfig).toEqual({
temperature: 0.1,
topP: 0.2,

3
packages/core/src/code_assist/converter.ts
View File

@ -32,7 +32,6 @@ import {
export interface CAGenerateContentRequest {
model: string;
project?: string;
user_prompt_id?: string;
request: VertexGenerateContentRequest;
}
@ -116,14 +115,12 @@ export function fromCountTokenResponse(
export function toGenerateContentRequest(
req: GenerateContentParameters,
userPromptId: string,
project?: string,
sessionId?: string,
): CAGenerateContentRequest {
return {
model: req.model,
project,
user_prompt_id: userPromptId,
request: toVertexGenerateContentRequest(req, sessionId),
};
}

70
packages/core/src/code_assist/server.test.ts
View File

@ -14,25 +14,13 @@ vi.mock('google-auth-library');
describe('CodeAssistServer', () => {
it('should be able to be constructed', () => {
const auth = new OAuth2Client();
const server = new CodeAssistServer(
auth,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(auth, 'test-project');
expect(server).toBeInstanceOf(CodeAssistServer);
});
it('should call the generateContent endpoint', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
const mockResponse = {
response: {
candidates: [
@ -50,13 +38,10 @@ describe('CodeAssistServer', () => {
};
vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
const response = await server.generateContent(
{
const response = await server.generateContent({
model: 'test-model',
contents: [{ role: 'user', parts: [{ text: 'request' }] }],
},
'user-prompt-id',
);
});
expect(server.requestPost).toHaveBeenCalledWith(
'generateContent',
@ -70,13 +55,7 @@ describe('CodeAssistServer', () => {
it('should call the generateContentStream endpoint', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
const mockResponse = (async function* () {
yield {
response: {
@ -96,13 +75,10 @@ describe('CodeAssistServer', () => {
})();
vi.spyOn(server, 'requestStreamingPost').mockResolvedValue(mockResponse);
const stream = await server.generateContentStream(
{
const stream = await server.generateContentStream({
model: 'test-model',
contents: [{ role: 'user', parts: [{ text: 'request' }] }],
},
'user-prompt-id',
);
});
for await (const res of stream) {
expect(server.requestStreamingPost).toHaveBeenCalledWith(
@ -116,13 +92,7 @@ describe('CodeAssistServer', () => {
it('should call the onboardUser endpoint', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
const mockResponse = {
name: 'operations/123',
done: true,
@ -144,13 +114,7 @@ describe('CodeAssistServer', () => {
it('should call the loadCodeAssist endpoint', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
const mockResponse = {
currentTier: {
id: UserTierId.FREE,
@ -176,13 +140,7 @@ describe('CodeAssistServer', () => {
it('should return 0 for countTokens', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
const mockResponse = {
totalTokens: 100,
};
@ -197,13 +155,7 @@ describe('CodeAssistServer', () => {
it('should throw an error for embedContent', async () => {
const client = new OAuth2Client();
const server = new CodeAssistServer(
client,
'test-project',
{},
'test-session',
UserTierId.FREE,
);
const server = new CodeAssistServer(client, 'test-project');
await expect(
server.embedContent({
model: 'test-model',

16
packages/core/src/code_assist/server.ts
View File

@ -53,16 +53,10 @@ export class CodeAssistServer implements ContentGenerator {
async generateContentStream(
req: GenerateContentParameters,
userPromptId: string,
): Promise<AsyncGenerator<GenerateContentResponse>> {
const resps = await this.requestStreamingPost<CaGenerateContentResponse>(
'streamGenerateContent',
toGenerateContentRequest(
req,
userPromptId,
this.projectId,
this.sessionId,
),
toGenerateContentRequest(req, this.projectId, this.sessionId),
req.config?.abortSignal,
);
return (async function* (): AsyncGenerator<GenerateContentResponse> {
@ -74,16 +68,10 @@ export class CodeAssistServer implements ContentGenerator {
async generateContent(
req: GenerateContentParameters,
userPromptId: string,
): Promise<GenerateContentResponse> {
const resp = await this.requestPost<CaGenerateContentResponse>(
'generateContent',
toGenerateContentRequest(
req,
userPromptId,
this.projectId,
this.sessionId,
),
toGenerateContentRequest(req, this.projectId, this.sessionId),
req.config?.abortSignal,
);
return fromGenerateContentResponse(resp);

10
packages/core/src/code_assist/setup.test.ts
View File

@ -49,11 +49,8 @@ describe('setupUser', () => {
});
await setupUser({} as OAuth2Client);
expect(CodeAssistServer).toHaveBeenCalledWith(
{},
expect.any(Object),
'test-project',
{},
'',
undefined,
);
});
@ -65,10 +62,7 @@ describe('setupUser', () => {
});
const projectId = await setupUser({} as OAuth2Client);
expect(CodeAssistServer).toHaveBeenCalledWith(
{},
undefined,
{},
'',
expect.any(Object),
undefined,
);
expect(projectId).toEqual({

2
packages/core/src/code_assist/setup.ts
View File

@ -34,7 +34,7 @@ export interface UserData {
*/
export async function setupUser(client: OAuth2Client): Promise<UserData> {
let projectId = process.env.GOOGLE_CLOUD_PROJECT || undefined;
const caServer = new CodeAssistServer(client, projectId, {}, '', undefined);
const caServer = new CodeAssistServer(client, projectId);
const clientMetadata: ClientMetadata = {
ideType: 'IDE_UNSPECIFIED',

32
packages/core/src/core/client.test.ts
View File

@ -209,9 +209,7 @@ describe('Gemini Client (client.ts)', () => {
// We can instantiate the client here since Config is mocked
// and the constructor will use the mocked GoogleGenAI
client = new GeminiClient(
new Config({ sessionId: 'test-session-id' } as never),
);
client = new GeminiClient(new Config({} as never));
mockConfigObject.getGeminiClient.mockReturnValue(client);
await client.initialize(contentGeneratorConfig);
@ -350,8 +348,7 @@ describe('Gemini Client (client.ts)', () => {
await client.generateContent(contents, generationConfig, abortSignal);
expect(mockGenerateContentFn).toHaveBeenCalledWith(
{
expect(mockGenerateContentFn).toHaveBeenCalledWith({
model: 'test-model',
config: {
abortSignal,
@ -360,9 +357,7 @@ describe('Gemini Client (client.ts)', () => {
topP: 1,
},
contents,
},
'test-session-id',
);
});
});
});
@ -381,8 +376,7 @@ describe('Gemini Client (client.ts)', () => {
await client.generateJson(contents, schema, abortSignal);
expect(mockGenerateContentFn).toHaveBeenCalledWith(
{
expect(mockGenerateContentFn).toHaveBeenCalledWith({
model: 'test-model', // Should use current model from config
config: {
abortSignal,
@ -393,9 +387,7 @@ describe('Gemini Client (client.ts)', () => {
responseMimeType: 'application/json',
},
contents,
},
'test-session-id',
);
});
});
it('should allow overriding model and config', async () => {
@ -419,8 +411,7 @@ describe('Gemini Client (client.ts)', () => {
customConfig,
);
expect(mockGenerateContentFn).toHaveBeenCalledWith(
{
expect(mockGenerateContentFn).toHaveBeenCalledWith({
model: customModel,
config: {
abortSignal,
@ -432,9 +423,7 @@ describe('Gemini Client (client.ts)', () => {
responseMimeType: 'application/json',
},
contents,
},
'test-session-id',
);
});
});
});
@ -1017,14 +1006,11 @@ Here are files the user has recently opened, with the most recent at the top:
config: expect.any(Object),
contents,
});
expect(mockGenerateContentFn).toHaveBeenCalledWith(
{
expect(mockGenerateContentFn).toHaveBeenCalledWith({
model: currentModel,
config: expect.any(Object),
contents,
},
'test-session-id',
);
});
});
});

17
packages/core/src/core/client.ts
View File

@ -106,7 +106,7 @@ export class GeminiClient {
private readonly COMPRESSION_PRESERVE_THRESHOLD = 0.3;
private readonly loopDetector: LoopDetectionService;
private lastPromptId: string;
private lastPromptId?: string;
constructor(private config: Config) {
if (config.getProxy()) {
@ -115,7 +115,6 @@ export class GeminiClient {
this.embeddingModel = config.getEmbeddingModel();
this.loopDetector = new LoopDetectionService(config);
this.lastPromptId = this.config.getSessionId();
}
async initialize(contentGeneratorConfig: ContentGeneratorConfig) {
@ -428,8 +427,7 @@ export class GeminiClient {
};
const apiCall = () =>
this.getContentGenerator().generateContent(
{
this.getContentGenerator().generateContent({
model: modelToUse,
config: {
...requestConfig,
@ -438,9 +436,7 @@ export class GeminiClient {
responseMimeType: 'application/json',
},
contents,
},
this.lastPromptId,
);
});
const result = await retryWithBackoff(apiCall, {
onPersistent429: async (authType?: string, error?: unknown) =>
@ -525,14 +521,11 @@ export class GeminiClient {
};
const apiCall = () =>
this.getContentGenerator().generateContent(
{
this.getContentGenerator().generateContent({
model: modelToUse,
config: requestConfig,
contents,
},
this.lastPromptId,
);
});
const result = await retryWithBackoff(apiCall, {
onPersistent429: async (authType?: string, error?: unknown) =>

2
packages/core/src/core/contentGenerator.ts
View File

@ -25,12 +25,10 @@ import { UserTierId } from '../code_assist/types.js';
export interface ContentGenerator {
generateContent(
request: GenerateContentParameters,
userPromptId: string,
): Promise<GenerateContentResponse>;
generateContentStream(
request: GenerateContentParameters,
userPromptId: string,
): Promise<AsyncGenerator<GenerateContentResponse>>;
countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;

14
packages/core/src/core/geminiChat.test.ts
View File

@ -79,14 +79,11 @@ describe('GeminiChat', () => {
await chat.sendMessage({ message: 'hello' }, 'prompt-id-1');
expect(mockModelsModule.generateContent).toHaveBeenCalledWith(
{
expect(mockModelsModule.generateContent).toHaveBeenCalledWith({
model: 'gemini-pro',
contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
config: {},
},
'prompt-id-1',
);
});
});
});
@ -114,14 +111,11 @@ describe('GeminiChat', () => {
await chat.sendMessageStream({ message: 'hello' }, 'prompt-id-1');
expect(mockModelsModule.generateContentStream).toHaveBeenCalledWith(
{
expect(mockModelsModule.generateContentStream).toHaveBeenCalledWith({
model: 'gemini-pro',
contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
config: {},
},
'prompt-id-1',
);
});
});
});

14
packages/core/src/core/geminiChat.ts
View File

@ -286,14 +286,11 @@ export class GeminiChat {
);
}
return this.contentGenerator.generateContent(
{
return this.contentGenerator.generateContent({
model: modelToUse,
contents: requestContents,
config: { ...this.generationConfig, ...params.config },
},
prompt_id,
);
});
};
response = await retryWithBackoff(apiCall, {
@ -396,14 +393,11 @@ export class GeminiChat {
);
}
return this.contentGenerator.generateContentStream(
{
return this.contentGenerator.generateContentStream({
model: modelToUse,
contents: requestContents,
config: { ...this.generationConfig, ...params.config },
},
prompt_id,
);
});
};
// Note: Retrying streams can be complex. If generateContentStream itself doesn't handle retries