abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 16:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce generate content interface (#755)

Browse Source
This commit is contained in:
Tommaso Sciortino
2025-06-05 13:26:38 -07:00
committed by GitHub
parent 2ebf2fbc82
commit e59e18251b
5 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,10 +32,11 @@ import {
logApiResponse,
logApiError,
} from '../telemetry/index.js';
import { ContentGenerator } from './contentGenerator.js';
export class GeminiClient {
private chat: Promise<GeminiChat>;
private client: GoogleGenAI;
private contentGenerator: ContentGenerator;
private model: string;
private generateContentConfig: GenerateContentConfig = {
temperature: 0,
@@ -48,7 +49,7 @@ export class GeminiClient {
const apiKeyFromConfig = config.getApiKey();
const vertexaiFlag = config.getVertexAI();
this.client = new GoogleGenAI({
const googleGenAI = new GoogleGenAI({
apiKey: apiKeyFromConfig === '' ? undefined : apiKeyFromConfig,
vertexai: vertexaiFlag,
httpOptions: {
@@ -57,6 +58,7 @@ export class GeminiClient {
},
},
});
this.contentGenerator = googleGenAI.models;
this.model = config.getModel();
this.chat = this.startChat();
}
@@ -148,8 +150,7 @@ export class GeminiClient {
const systemInstruction = getCoreSystemPrompt(userMemory);
return new GeminiChat(
this.client,
this.client.models,
this.contentGenerator,
this.model,
{
systemInstruction,
@@ -285,7 +286,7 @@ export class GeminiClient {
let inputTokenCount = 0;
try {
const { totalTokens } = await this.client.models.countTokens({
const { totalTokens } = await this.contentGenerator.countTokens({
model,
contents,
});
@@ -300,7 +301,7 @@ export class GeminiClient {
this._logApiRequest(model, inputTokenCount);
const apiCall = () =>
this.client.models.generateContent({
this.contentGenerator.generateContent({
model,
config: {
...requestConfig,
@@ -400,7 +401,7 @@ export class GeminiClient {
let inputTokenCount = 0;
try {
const { totalTokens } = await this.client.models.countTokens({
const { totalTokens } = await this.contentGenerator.countTokens({
model: modelToUse,
contents,
});
@@ -415,7 +416,7 @@ export class GeminiClient {
this._logApiRequest(modelToUse, inputTokenCount);
const apiCall = () =>
this.client.models.generateContent({
this.contentGenerator.generateContent({
model: modelToUse,
config: requestConfig,
contents,
@@ -453,8 +454,7 @@ export class GeminiClient {
const chat = await this.chat;
const history = chat.getHistory(true); // Get curated history
// Count tokens using the models module from the GoogleGenAI client instance
const { totalTokens } = await this.client.models.countTokens({
const { totalTokens } = await this.contentGenerator.countTokens({
model: this.model,
contents: history,
});