koishi-plugin-chatluna-google-gemini-adapter 1.3.0-alpha.8 → 1.3.0-alpha.9

package/lib/client.d.ts

@@ -5,6 +5,7 @@ import { ChatLunaBaseEmbeddings, ChatLunaChatModel } from 'koishi-plugin-chatlun
 import { ModelInfo } from 'koishi-plugin-chatluna/llm-core/platform/types';
 import { Config } from '.';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
+import { RunnableConfig } from '@langchain/core/runnables';
 export declare class GeminiClient extends PlatformModelAndEmbeddingsClient<ClientConfig> {
     private _config;
     plugin: ChatLunaPlugin;
@@ -12,6 +13,6 @@ export declare class GeminiClient extends PlatformModelAndEmbeddingsClient<Clien
     private _requester;
     get logger(): import("reggol");
     constructor(ctx: Context, _config: Config, plugin: ChatLunaPlugin);
-    refreshModels(): Promise<ModelInfo[]>;
+    refreshModels(config?: RunnableConfig): Promise<ModelInfo[]>;
     protected _createModel(model: string): ChatLunaChatModel | ChatLunaBaseEmbeddings;
 }

package/lib/index.cjs

@@ -51,7 +51,7 @@ var import_koishi = require("koishi");
 // src/client.ts
 var import_client = require("koishi-plugin-chatluna/llm-core/platform/client");
 var import_model = require("koishi-plugin-chatluna/llm-core/platform/model");
-var import_types = require("koishi-plugin-chatluna/llm-core/platform/types");
+var import_types2 = require("koishi-plugin-chatluna/llm-core/platform/types");
 var import_error2 = require("koishi-plugin-chatluna/utils/error");
 
 // src/requester.ts
@@ -66,7 +66,7 @@ var import_stream = require("koishi-plugin-chatluna/utils/stream");
 var import_zod_to_json_schema = require("zod-to-json-schema");
 var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
 var import_string = require("koishi-plugin-chatluna/utils/string");
-var import_zod = require("zod");
+var import_types = require("@langchain/core/utils/types");
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -287,7 +287,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
   const parameters = (0, import_v1_shared_adapter.removeAdditionalProperties)(
-    tool.schema instanceof import_zod.ZodSchema ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
+    (0, import_types.isZodSchemaV3)(tool.schema) ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -522,12 +522,17 @@ var GeminiRequester = class extends import_api.ModelRequester {
       "error when calling gemini embeddings, Result: " + JSON.stringify(data)
     );
   }
-  async getModels() {
+  async getModels(config) {
     try {
-      const response = await this._get("models");
+      const response = await this._get("models", {
+        signal: config?.signal
+      });
       const data = await this._parseModelsResponse(response);
       return this._filterAndTransformModels(data.models);
     } catch (e) {
+      if (e instanceof import_error.ChatLunaError) {
+        throw e;
+      }
       const error = new Error(
         "error when listing gemini models, Error: " + e.message
       );
@@ -849,11 +854,12 @@ ${groundingContent}`
       ...params
     });
   }
-  _get(url) {
+  _get(url, params = {}) {
     const requestUrl = this._concatUrl(url);
     return this._plugin.fetch(requestUrl, {
       method: "GET",
-      headers: this._buildHeaders()
+      headers: this._buildHeaders(),
+      ...params
     });
   }
   _concatUrl(url) {
@@ -901,9 +907,9 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   get logger() {
     return logger;
   }
-  async refreshModels() {
+  async refreshModels(config) {
     try {
-      const rawModels = await this._requester.getModels();
+      const rawModels = await this._requester.getModels(config);
       if (!rawModels.length) {
         throw new import_error2.ChatLunaError(
           import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR,
@@ -915,10 +921,10 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
         const info = {
           name: model.name,
           maxTokens: model.inputTokenLimit,
-          type: model.name.includes("embedding") ? import_types.ModelType.embeddings : import_types.ModelType.llm,
+          type: model.name.includes("embedding") ? import_types2.ModelType.embeddings : import_types2.ModelType.llm,
           capabilities: [
-            import_types.ModelCapabilities.ImageInput,
-            import_types.ModelCapabilities.ToolCall
+            import_types2.ModelCapabilities.ImageInput,
+            import_types2.ModelCapabilities.ToolCall
           ]
         };
         if (model.name.includes("gemini-2.5") && !model.name.includes("pro") && !model.name.includes("image")) {
@@ -937,6 +943,9 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
       }
       return models;
     } catch (e) {
+      if (e instanceof import_error2.ChatLunaError) {
+        throw e;
+      }
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR, e);
     }
   }
@@ -945,7 +954,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
     if (info == null) {
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_NOT_FOUND);
     }
-    if (info.type === import_types.ModelType.llm) {
+    if (info.type === import_types2.ModelType.llm) {
       return new import_model.ChatLunaChatModel({
         modelInfo: info,
         requester: this._requester,
@@ -974,8 +983,7 @@ function apply(ctx, config) {
   const plugin = new import_chat.ChatLunaPlugin(ctx, config, config.platform);
   logger = (0, import_logger.createLogger)(ctx, "chatluna-gemini-adapter");
   ctx.on("ready", async () => {
-    plugin.registerToService();
-    await plugin.parseConfig((config2) => {
+    plugin.parseConfig((config2) => {
       return config2.apiKeys.map(([apiKey, apiEndpoint]) => {
         return {
           apiKey,

package/lib/index.mjs

@@ -63,7 +63,7 @@ import {
   isMessageContentImageUrl,
   isMessageContentText
 } from "koishi-plugin-chatluna/utils/string";
-import { ZodSchema } from "zod";
+import { isZodSchemaV3 } from "@langchain/core/utils/types";
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -284,7 +284,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
   const parameters = removeAdditionalProperties(
-    tool.schema instanceof ZodSchema ? zodToJsonSchema(tool.schema, {
+    isZodSchemaV3(tool.schema) ? zodToJsonSchema(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -519,12 +519,17 @@ var GeminiRequester = class extends ModelRequester {
       "error when calling gemini embeddings, Result: " + JSON.stringify(data)
     );
   }
-  async getModels() {
+  async getModels(config) {
     try {
-      const response = await this._get("models");
+      const response = await this._get("models", {
+        signal: config?.signal
+      });
       const data = await this._parseModelsResponse(response);
       return this._filterAndTransformModels(data.models);
     } catch (e) {
+      if (e instanceof ChatLunaError) {
+        throw e;
+      }
       const error = new Error(
         "error when listing gemini models, Error: " + e.message
       );
@@ -846,11 +851,12 @@ ${groundingContent}`
       ...params
     });
   }
-  _get(url) {
+  _get(url, params = {}) {
     const requestUrl = this._concatUrl(url);
     return this._plugin.fetch(requestUrl, {
       method: "GET",
-      headers: this._buildHeaders()
+      headers: this._buildHeaders(),
+      ...params
     });
   }
   _concatUrl(url) {
@@ -898,9 +904,9 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   get logger() {
     return logger;
   }
-  async refreshModels() {
+  async refreshModels(config) {
     try {
-      const rawModels = await this._requester.getModels();
+      const rawModels = await this._requester.getModels(config);
       if (!rawModels.length) {
         throw new ChatLunaError2(
           ChatLunaErrorCode2.MODEL_INIT_ERROR,
@@ -934,6 +940,9 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
       }
       return models;
     } catch (e) {
+      if (e instanceof ChatLunaError2) {
+        throw e;
+      }
       throw new ChatLunaError2(ChatLunaErrorCode2.MODEL_INIT_ERROR, e);
     }
   }
@@ -971,8 +980,7 @@ function apply(ctx, config) {
   const plugin = new ChatLunaPlugin(ctx, config, config.platform);
   logger = createLogger(ctx, "chatluna-gemini-adapter");
   ctx.on("ready", async () => {
-    plugin.registerToService();
-    await plugin.parseConfig((config2) => {
+    plugin.parseConfig((config2) => {
       return config2.apiKeys.map(([apiKey, apiEndpoint]) => {
         return {
           apiKey,

package/lib/requester.d.ts

@@ -5,6 +5,7 @@ import { Config } from '.';
 import { GeminiModelInfo } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { Context } from 'koishi';
+import { RunnableConfig } from '@langchain/core/runnables';
 export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
     _pluginConfig: Config;
     constructor(ctx: Context, _configPool: ClientConfigPool<ClientConfig>, _pluginConfig: Config, _plugin: ChatLunaPlugin);
@@ -15,7 +16,7 @@ export declare class GeminiRequester extends ModelRequester implements Embedding
     private _prepareEmbeddingsInput;
     private _createEmbeddingsRequest;
     private _processEmbeddingsResponse;
-    getModels(): Promise<GeminiModelInfo[]>;
+    getModels(config?: RunnableConfig): Promise<GeminiModelInfo[]>;
     private _parseModelsResponse;
     private _filterAndTransformModels;
     private _processResponse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.3.0-alpha.8",
+  "version": "1.3.0-alpha.9",
   "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.8",
+    "@chatluna/v1-shared-adapter": "^1.0.9",
     "@langchain/core": "0.3.62",
     "zod": "3.25.76",
     "zod-to-json-schema": "^3.24.5"
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.40",
+    "koishi-plugin-chatluna": "^1.3.0-alpha.42",
     "koishi-plugin-chatluna-storage-service": "^0.0.9"
   },
   "peerDependenciesMeta": {