koishi-plugin-chatluna-google-gemini-adapter 1.2.14 → 1.2.16

package/lib/client.d.ts

@@ -1,18 +1,17 @@
 import { Context } from 'koishi';
 import { PlatformModelAndEmbeddingsClient } from 'koishi-plugin-chatluna/llm-core/platform/client';
 import { ClientConfig } from 'koishi-plugin-chatluna/llm-core/platform/config';
-import { ChatHubBaseEmbeddings, ChatLunaChatModel } from 'koishi-plugin-chatluna/llm-core/platform/model';
+import { ChatLunaBaseEmbeddings, ChatLunaChatModel } from 'koishi-plugin-chatluna/llm-core/platform/model';
 import { ModelInfo } from 'koishi-plugin-chatluna/llm-core/platform/types';
 import { Config } from '.';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
-export declare class GeminiClient extends PlatformModelAndEmbeddingsClient {
+export declare class GeminiClient extends PlatformModelAndEmbeddingsClient<ClientConfig> {
     private _config;
+    plugin: ChatLunaPlugin;
     platform: string;
     private _requester;
-    private _models;
-    constructor(ctx: Context, _config: Config, clientConfig: ClientConfig, plugin: ChatLunaPlugin);
-    init(): Promise<void>;
+    get logger(): import("reggol");
+    constructor(ctx: Context, _config: Config, plugin: ChatLunaPlugin);
     refreshModels(): Promise<ModelInfo[]>;
-    getModels(): Promise<ModelInfo[]>;
-    protected _createModel(model: string): ChatLunaChatModel | ChatHubBaseEmbeddings;
+    protected _createModel(model: string): ChatLunaChatModel | ChatLunaBaseEmbeddings;
 }

package/lib/index.cjs

@@ -37,7 +37,7 @@ var require_en_US_schema = __commonJS({
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  Config: () => Config3,
+  Config: () => Config4,
   apply: () => apply,
   inject: () => inject,
   logger: () => logger,
@@ -179,14 +179,10 @@ function extractSystemMessages(messages) {
   return [
     {
       role: "user",
-      parts: [
-        {
-          text: systemMessages.reduce((acc, cur) => {
-            acc.push(...cur.parts);
-            return acc;
-          }, []).map((part) => partAsType(part).text).join("\n\n\n")
-        }
-      ]
+      parts: systemMessages.reduce((acc, cur) => {
+        acc.push(...cur.parts);
+        return acc;
+      }, [])
     },
     modelMessages
   ];
@@ -322,16 +318,14 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends import_api.ModelRequester {
-  constructor(_config, _plugin, _pluginConfig) {
-    super();
-    this._config = _config;
-    this._plugin = _plugin;
+  constructor(ctx, _configPool, _pluginConfig, _plugin) {
+    super(ctx, _configPool, _pluginConfig, _plugin);
     this._pluginConfig = _pluginConfig;
   }
   static {
     __name(this, "GeminiRequester");
   }
-  async *completionStream(params) {
+  async *completionStreamInternal(params) {
     try {
       let model = params.model;
       let enabledThinking = null;
@@ -638,7 +632,7 @@ ${groundingContent}`
     });
   }
   _concatUrl(url) {
-    const apiEndPoint = this._config.apiEndpoint;
+    const apiEndPoint = this._config.value.apiEndpoint;
     let baseURL;
     if (apiEndPoint.endsWith("/")) {
       baseURL = new URL(apiEndPoint + url);
@@ -646,31 +640,32 @@ ${groundingContent}`
       baseURL = new URL(apiEndPoint + "/" + url);
     }
     const searchParams = baseURL.searchParams;
-    searchParams.set("key", this._config.apiKey);
+    searchParams.set("key", this._config.value.apiKey);
     return baseURL.toString();
   }
   _buildHeaders() {
     return {
-      /*  Authorization: `Bearer ${this._config.apiKey}`, */
+      /*  Authorization: `Bearer ${this._config.value.apiKey}`, */
       "Content-Type": "application/json"
     };
   }
-  async init() {
-  }
-  async dispose() {
+  get logger() {
+    return logger;
   }
 };
 
 // src/client.ts
 var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient {
-  constructor(ctx, _config, clientConfig, plugin) {
-    super(ctx, clientConfig);
+  constructor(ctx, _config, plugin) {
+    super(ctx, plugin.platformConfigPool);
     this._config = _config;
-    this.platform = this.config.platform;
+    this.plugin = plugin;
+    this.platform = this._config.platform;
     this._requester = new GeminiRequester(
-      clientConfig,
-      plugin,
-      this._config
+      ctx,
+      plugin.platformConfigPool,
+      this._config,
+      plugin
     );
   }
   static {
@@ -678,9 +673,8 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   }
   platform = "gemini";
   _requester;
-  _models;
-  async init() {
-    await this.getModels();
+  get logger() {
+    return logger;
   }
   async refreshModels() {
     try {
@@ -719,18 +713,8 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR, e);
     }
   }
-  async getModels() {
-    if (this._models && Object.keys(this._models).length > 0) {
-      return Object.values(this._models);
-    }
-    const models = await this.refreshModels();
-    this._models = {};
-    for (const model of models) {
-      this._models[model.name] = model;
-    }
-  }
   _createModel(model) {
-    const info = this._models[model];
+    const info = this._modelInfos[model];
     if (info == null) {
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_NOT_FOUND);
     }
@@ -777,14 +761,12 @@ function apply(ctx, config) {
         };
       });
     });
-    plugin.registerClient(
-      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig, plugin)
-    );
+    plugin.registerClient((ctx2) => new GeminiClient(ctx2, config, plugin));
     await plugin.initClients();
   });
 }
 __name(apply, "apply");
-var Config3 = import_koishi.Schema.intersect([
+var Config4 = import_koishi.Schema.intersect([
   import_chat.ChatLunaPlugin.Config,
   import_koishi.Schema.object({
     platform: import_koishi.Schema.string().default("gemini"),

package/lib/index.mjs

@@ -172,14 +172,10 @@ function extractSystemMessages(messages) {
   return [
     {
       role: "user",
-      parts: [
-        {
-          text: systemMessages.reduce((acc, cur) => {
-            acc.push(...cur.parts);
-            return acc;
-          }, []).map((part) => partAsType(part).text).join("\n\n\n")
-        }
-      ]
+      parts: systemMessages.reduce((acc, cur) => {
+        acc.push(...cur.parts);
+        return acc;
+      }, [])
     },
     modelMessages
   ];
@@ -315,16 +311,14 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends ModelRequester {
-  constructor(_config, _plugin, _pluginConfig) {
-    super();
-    this._config = _config;
-    this._plugin = _plugin;
+  constructor(ctx, _configPool, _pluginConfig, _plugin) {
+    super(ctx, _configPool, _pluginConfig, _plugin);
     this._pluginConfig = _pluginConfig;
   }
   static {
     __name(this, "GeminiRequester");
   }
-  async *completionStream(params) {
+  async *completionStreamInternal(params) {
     try {
       let model = params.model;
       let enabledThinking = null;
@@ -631,7 +625,7 @@ ${groundingContent}`
     });
   }
   _concatUrl(url) {
-    const apiEndPoint = this._config.apiEndpoint;
+    const apiEndPoint = this._config.value.apiEndpoint;
     let baseURL;
     if (apiEndPoint.endsWith("/")) {
       baseURL = new URL(apiEndPoint + url);
@@ -639,31 +633,32 @@ ${groundingContent}`
       baseURL = new URL(apiEndPoint + "/" + url);
     }
     const searchParams = baseURL.searchParams;
-    searchParams.set("key", this._config.apiKey);
+    searchParams.set("key", this._config.value.apiKey);
     return baseURL.toString();
   }
   _buildHeaders() {
     return {
-      /*  Authorization: `Bearer ${this._config.apiKey}`, */
+      /*  Authorization: `Bearer ${this._config.value.apiKey}`, */
       "Content-Type": "application/json"
     };
   }
-  async init() {
-  }
-  async dispose() {
+  get logger() {
+    return logger;
   }
 };
 
 // src/client.ts
 var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
-  constructor(ctx, _config, clientConfig, plugin) {
-    super(ctx, clientConfig);
+  constructor(ctx, _config, plugin) {
+    super(ctx, plugin.platformConfigPool);
     this._config = _config;
-    this.platform = this.config.platform;
+    this.plugin = plugin;
+    this.platform = this._config.platform;
     this._requester = new GeminiRequester(
-      clientConfig,
-      plugin,
-      this._config
+      ctx,
+      plugin.platformConfigPool,
+      this._config,
+      plugin
     );
   }
   static {
@@ -671,9 +666,8 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   }
   platform = "gemini";
   _requester;
-  _models;
-  async init() {
-    await this.getModels();
+  get logger() {
+    return logger;
   }
   async refreshModels() {
     try {
@@ -712,18 +706,8 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
       throw new ChatLunaError2(ChatLunaErrorCode2.MODEL_INIT_ERROR, e);
     }
   }
-  async getModels() {
-    if (this._models && Object.keys(this._models).length > 0) {
-      return Object.values(this._models);
-    }
-    const models = await this.refreshModels();
-    this._models = {};
-    for (const model of models) {
-      this._models[model.name] = model;
-    }
-  }
   _createModel(model) {
-    const info = this._models[model];
+    const info = this._modelInfos[model];
     if (info == null) {
       throw new ChatLunaError2(ChatLunaErrorCode2.MODEL_NOT_FOUND);
     }
@@ -770,14 +754,12 @@ function apply(ctx, config) {
         };
       });
     });
-    plugin.registerClient(
-      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig, plugin)
-    );
+    plugin.registerClient((ctx2) => new GeminiClient(ctx2, config, plugin));
     await plugin.initClients();
   });
 }
 __name(apply, "apply");
-var Config3 = Schema.intersect([
+var Config4 = Schema.intersect([
   ChatLunaPlugin.Config,
   Schema.object({
     platform: Schema.string().default("gemini"),
@@ -810,7 +792,7 @@ var Config3 = Schema.intersect([
 var inject = ["chatluna"];
 var name = "chatluna-google-gemini-adapter";
 export {
-  Config3 as Config,
+  Config4 as Config,
   apply,
   inject,
   logger,

package/lib/requester.d.ts

@@ -1,21 +1,19 @@
 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 { ClientConfig, ClientConfigPool } from 'koishi-plugin-chatluna/llm-core/platform/config';
 import { Config } from '.';
 import { GeminiModelInfo } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
+import { Context } from 'koishi';
 export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
-    private _config;
-    private _plugin;
-    private _pluginConfig;
-    constructor(_config: ClientConfig, _plugin: ChatLunaPlugin, _pluginConfig: Config);
-    completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
+    _pluginConfig: Config;
+    constructor(ctx: Context, _configPool: ClientConfigPool<ClientConfig>, _pluginConfig: Config, _plugin: ChatLunaPlugin);
+    completionStreamInternal(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
     getModels(): Promise<GeminiModelInfo[]>;
     private _post;
     private _get;
     private _concatUrl;
     private _buildHeaders;
-    init(): Promise<void>;
-    dispose(): Promise<void>;
+    get logger(): import("reggol");
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -64,7 +64,8 @@
   "dependencies": {
     "@langchain/core": "^0.3.43",
     "zod": "^3.25.0-canary.20250211T214501",
-    "zod-to-json-schema": "^3.24.5"
+    "zod-to-json-schema": "^3.24.5",
+    "@chatluna/v1-shared-adapter": "^1.0.1"
   },
   "devDependencies": {
     "atsc": "^2.1.0",
@@ -72,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.9"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.10"
   },
   "koishi": {
     "description": {