koishi-plugin-chatluna-google-gemini-adapter 1.2.19 → 1.2.21

package/lib/requester.d.ts

@@ -1,4 +1,4 @@
-import { ChatGenerationChunk } from '@langchain/core/outputs';
+import { ChatGeneration, ChatGenerationChunk } from '@langchain/core/outputs';
 import { EmbeddingsRequester, EmbeddingsRequestParams, ModelRequester, ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
 import { ClientConfig, ClientConfigPool } from 'koishi-plugin-chatluna/llm-core/platform/config';
 import { Config } from '.';
@@ -8,9 +8,27 @@ import { Context } from 'koishi';
 export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
     _pluginConfig: Config;
     constructor(ctx: Context, _configPool: ClientConfigPool<ClientConfig>, _pluginConfig: Config, _plugin: ChatLunaPlugin);
+    completion(params: ModelRequestParams): Promise<ChatGeneration>;
     completionStreamInternal(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
+    completionInternal(params: ModelRequestParams): Promise<ChatGeneration>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
+    private _prepareEmbeddingsInput;
+    private _createEmbeddingsRequest;
+    private _processEmbeddingsResponse;
     getModels(): Promise<GeminiModelInfo[]>;
+    private _parseModelsResponse;
+    private _filterAndTransformModels;
+    private _processResponse;
+    private _processResponseStream;
+    private _createStreamContext;
+    private _setupStreamTransform;
+    private _createTransformStream;
+    private _processCandidateChunk;
+    private _processChunks;
+    private _processChunk;
+    private _updateFunctionCall;
+    private _handleFinalContent;
+    private _createMessageChunk;
     private _post;
     private _get;
     private _concatUrl;

package/lib/types.d.ts

@@ -67,6 +67,14 @@ export interface ChatResponse {
             probability: string;
         }[];
     };
+    usageMetadata: {
+        promptTokenCount: number;
+        cachedContentTokenCount: number;
+        candidatesTokenCount: number;
+        toolUsePromptTokenCount: number;
+        thoughtsTokenCount: number;
+        totalTokenCount: number;
+    };
 }
 export interface ChatCompletionFunction {
     name: string;

package/lib/utils.d.ts

@@ -1,7 +1,8 @@
 import { AIMessageChunk, BaseMessage, ChatMessageChunk, HumanMessageChunk, MessageType, SystemMessageChunk } from '@langchain/core/messages';
 import { StructuredTool } from '@langchain/core/tools';
-import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart } from './types';
+import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart, ChatResponse } from './types';
 import { Config } from '.';
+import { ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
 export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], model?: string): Promise<ChatCompletionResponseMessage[]>;
 export declare function extractSystemMessages(messages: ChatCompletionResponseMessage[]): [ChatCompletionResponseMessage, ChatCompletionResponseMessage[]];
 export declare function partAsType<T extends ChatPart>(part: ChatPart): T;
@@ -9,4 +10,46 @@ export declare function partAsTypeCheck<T extends ChatPart>(part: ChatPart, chec
 export declare function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
 export declare function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
 export declare function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
+export declare function prepareModelConfig(params: ModelRequestParams, pluginConfig: Config): {
+    model: string;
+    enabledThinking: boolean;
+    thinkingBudget: number;
+    imageGeneration: boolean;
+};
+export declare function createSafetySettings(model: string): {
+    category: string;
+    threshold: string;
+}[];
+export declare function createGenerationConfig(params: ModelRequestParams, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): {
+    stopSequences: string | string[];
+    temperature: number;
+    maxOutputTokens: number;
+    topP: number;
+    responseModalities: string[];
+    thinkingConfig: {
+        thinkingBudget: number;
+        includeThoughts: boolean;
+    };
+};
+export declare function createChatGenerationParams(params: ModelRequestParams, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
+    contents: ChatCompletionResponseMessage[];
+    safetySettings: {
+        category: string;
+        threshold: string;
+    }[];
+    generationConfig: {
+        stopSequences: string | string[];
+        temperature: number;
+        maxOutputTokens: number;
+        topP: number;
+        responseModalities: string[];
+        thinkingConfig: {
+            thinkingBudget: number;
+            includeThoughts: boolean;
+        };
+    };
+    system_instruction: ChatCompletionResponseMessage;
+    tools: Record<string, any>;
+}>;
 export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
+export declare function isChatResponse(response: any): response is ChatResponse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -62,7 +62,7 @@
     "adapter"
   ],
   "dependencies": {
-    "@chatluna/v1-shared-adapter": "^1.0.2",
+    "@chatluna/v1-shared-adapter": "^1.0.4",
     "@langchain/core": "^0.3.43",
     "zod": "^3.25.0-canary.20250211T214501",
     "zod-to-json-schema": "^3.24.5"
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.13"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.16"
   },
   "koishi": {
     "description": {