koishi-plugin-chatluna-google-gemini-adapter 1.2.0-alpha.6 → 1.2.1

package/lib/index.cjs

@@ -589,9 +589,14 @@ ${groundingContent}`
           "error when listing gemini models, Result:" + JSON.stringify(data)
         );
       }
-      return data.models.map((model) => model.name).filter(
-        (model) => model.includes("gemini") || model.includes("gemma") || model.includes("embedding")
-      );
+      return data.models.filter(
+        (model) => model.name.includes("gemini") || model.name.includes("gemma") || model.name.includes("embedding")
+      ).map((model) => {
+        return {
+          ...model,
+          name: model.name.replace("models/", "")
+        };
+      });
     } catch (e) {
       const error = new Error(
         "error when listing gemini models, Result: " + JSON.stringify(data)
@@ -672,36 +677,24 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   }
   async refreshModels() {
     try {
-      let rawModels = await this._requester.getModels();
+      const rawModels = await this._requester.getModels();
       if (!rawModels.length) {
         throw new import_error2.ChatLunaError(
           import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      rawModels = rawModels.map((model) => model.replace("models/", ""));
       const models = [];
       for (const model of rawModels) {
         const info = {
-          name: model,
-          maxTokens: ((model2) => {
-            if (model2.includes("gemini-1.5-pro")) {
-              return 1048576;
-            }
-            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro") || model2.includes("gemini-2.5-pro")) {
-              return 2097152;
-            }
-            if (model2.includes("gemini-1.0-pro")) {
-              return 30720;
-            }
-            return 1048576;
-          })(model),
-          type: model.includes("embedding") ? import_types.ModelType.embeddings : import_types.ModelType.llm,
-          functionCall: !model.includes("vision"),
+          name: model.name,
+          maxTokens: model.inputTokenLimit,
+          type: model.name.includes("embedding") ? import_types.ModelType.embeddings : import_types.ModelType.llm,
+          functionCall: !model.name.includes("vision"),
           supportMode: ["all"]
         };
-        if (model.includes("gemini-2.5")) {
-          if (!model.includes("-thinking")) {
+        if (model.name.includes("gemini-2.5")) {
+          if (!model.name.includes("-thinking")) {
             models.push(
               { ...info, name: model + "-no-thinking" },
               { ...info, name: model + "-thinking" },
@@ -720,7 +713,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
     }
   }
   async getModels() {
-    if (this._models) {
+    if (this._models && Object.keys(this._models).length > 0) {
       return Object.values(this._models);
     }
     const models = await this.refreshModels();

package/lib/index.mjs

@@ -572,9 +572,14 @@ ${groundingContent}`
           "error when listing gemini models, Result:" + JSON.stringify(data)
         );
       }
-      return data.models.map((model) => model.name).filter(
-        (model) => model.includes("gemini") || model.includes("gemma") || model.includes("embedding")
-      );
+      return data.models.filter(
+        (model) => model.name.includes("gemini") || model.name.includes("gemma") || model.name.includes("embedding")
+      ).map((model) => {
+        return {
+          ...model,
+          name: model.name.replace("models/", "")
+        };
+      });
     } catch (e) {
       const error = new Error(
         "error when listing gemini models, Result: " + JSON.stringify(data)
@@ -655,36 +660,24 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   }
   async refreshModels() {
     try {
-      let rawModels = await this._requester.getModels();
+      const rawModels = await this._requester.getModels();
       if (!rawModels.length) {
         throw new ChatLunaError2(
           ChatLunaErrorCode2.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      rawModels = rawModels.map((model) => model.replace("models/", ""));
       const models = [];
       for (const model of rawModels) {
         const info = {
-          name: model,
-          maxTokens: ((model2) => {
-            if (model2.includes("gemini-1.5-pro")) {
-              return 1048576;
-            }
-            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro") || model2.includes("gemini-2.5-pro")) {
-              return 2097152;
-            }
-            if (model2.includes("gemini-1.0-pro")) {
-              return 30720;
-            }
-            return 1048576;
-          })(model),
-          type: model.includes("embedding") ? ModelType.embeddings : ModelType.llm,
-          functionCall: !model.includes("vision"),
+          name: model.name,
+          maxTokens: model.inputTokenLimit,
+          type: model.name.includes("embedding") ? ModelType.embeddings : ModelType.llm,
+          functionCall: !model.name.includes("vision"),
           supportMode: ["all"]
         };
-        if (model.includes("gemini-2.5")) {
-          if (!model.includes("-thinking")) {
+        if (model.name.includes("gemini-2.5")) {
+          if (!model.name.includes("-thinking")) {
             models.push(
               { ...info, name: model + "-no-thinking" },
               { ...info, name: model + "-thinking" },
@@ -703,7 +696,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
     }
   }
   async getModels() {
-    if (this._models) {
+    if (this._models && Object.keys(this._models).length > 0) {
       return Object.values(this._models);
     }
     const models = await this.refreshModels();

package/lib/requester.d.ts

@@ -2,6 +2,7 @@ import { ChatGenerationChunk } from '@langchain/core/outputs';
 import { EmbeddingsRequester, EmbeddingsRequestParams, ModelRequester, ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
 import { ClientConfig } from 'koishi-plugin-chatluna/llm-core/platform/config';
 import { Config } from '.';
+import { GeminiModelInfo } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
     private _config;
@@ -10,7 +11,7 @@ export declare class GeminiRequester extends ModelRequester implements Embedding
     constructor(_config: ClientConfig, _plugin: ChatLunaPlugin, _pluginConfig: Config);
     completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
-    getModels(): Promise<string[]>;
+    getModels(): Promise<GeminiModelInfo[]>;
     private _post;
     private _get;
     private _concatUrl;

package/lib/types.d.ts

@@ -85,3 +85,16 @@ export interface CreateEmbeddingResponse {
     }[];
 }
 export type ChatCompletionResponseMessageRoleEnum = 'system' | 'model' | 'user' | 'function';
+export interface GeminiModelInfo {
+    name: string;
+    version: string;
+    displayName: string;
+    description: string;
+    inputTokenLimit: number;
+    outputTokenLimit: number;
+    supportedGenerationMethods: string[];
+    temperature: number;
+    topP: number;
+    topK: number;
+    maxTemperature: number;
+}

package/lib/utils.d.ts

@@ -8,4 +8,4 @@ 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 convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.0-alpha.6",
+  "version": "1.2.1",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -72,7 +72,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.2.0-alpha.1"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.1"
   },
   "koishi": {
     "description": {