koishi-plugin-chatluna-google-gemini-adapter 1.0.0-beta.15 → 1.0.0-beta.17

package/lib/index.cjs

@@ -42,7 +42,6 @@ var import_outputs = require("@langchain/core/outputs");
 var import_json = require("@streamparser/json");
 var import_api = require("koishi-plugin-chatluna/llm-core/platform/api");
 var import_error = require("koishi-plugin-chatluna/utils/error");
-var import_request = require("koishi-plugin-chatluna/utils/request");
 var import_sse = require("koishi-plugin-chatluna/utils/sse");
 var import_stream = require("koishi-plugin-chatluna/utils/stream");
 
@@ -247,9 +246,10 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends import_api.ModelRequester {
-  constructor(_config) {
+  constructor(_config, _plugin) {
     super();
     this._config = _config;
+    this._plugin = _plugin;
   }
   static {
     __name(this, "GeminiRequester");
@@ -468,7 +468,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
       }
     }
     const body = JSON.stringify(data);
-    return (0, import_request.chatLunaFetch)(requestUrl, {
+    return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),
       method: "POST",
@@ -477,7 +477,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
   }
   _get(url) {
     const requestUrl = this._concatUrl(url);
-    return (0, import_request.chatLunaFetch)(requestUrl, {
+    return this._plugin.fetch(requestUrl, {
       method: "GET",
       headers: this._buildHeaders()
     });
@@ -503,10 +503,10 @@ var GeminiRequester = class extends import_api.ModelRequester {
 
 // src/client.ts
 var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient {
-  constructor(ctx, _config, clientConfig) {
+  constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
-    this._requester = new GeminiRequester(clientConfig);
+    this._requester = new GeminiRequester(clientConfig, plugin);
   }
   static {
     __name(this, "GeminiClient");
@@ -596,7 +596,7 @@ function apply(ctx, config) {
       });
     });
     await plugin.registerClient(
-      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig)
+      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig, plugin)
     );
     await plugin.initClients();
   });

package/lib/index.d.ts

@@ -86,7 +86,8 @@ export function messageTypeToGeminiRole(type: MessageType): ChatCompletionRespon
 export function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
 export class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
     private _config;
-    constructor(_config: ClientConfig);
+    private _plugin;
+    constructor(_config: ClientConfig, _plugin: ChatLunaPlugin);
     completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
     getModels(): Promise<string[]>;
@@ -102,7 +103,7 @@ export class GeminiClient extends PlatformModelAndEmbeddingsClient {
     platform: string;
     private _requester;
     private _models;
-    constructor(ctx: Context, _config: Config, clientConfig: ClientConfig);
+    constructor(ctx: Context, _config: Config, clientConfig: ClientConfig, plugin: ChatLunaPlugin);
     init(): Promise<void>;
     refreshModels(): Promise<ModelInfo[]>;
     getModels(): Promise<ModelInfo[]>;

package/lib/index.mjs

@@ -30,7 +30,6 @@ import {
   ChatLunaError,
   ChatLunaErrorCode
 } from "koishi-plugin-chatluna/utils/error";
-import { chatLunaFetch } from "koishi-plugin-chatluna/utils/request";
 import { sse } from "koishi-plugin-chatluna/utils/sse";
 import { readableStreamToAsyncIterable } from "koishi-plugin-chatluna/utils/stream";
 
@@ -240,9 +239,10 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends ModelRequester {
-  constructor(_config) {
+  constructor(_config, _plugin) {
     super();
     this._config = _config;
+    this._plugin = _plugin;
   }
   static {
     __name(this, "GeminiRequester");
@@ -461,7 +461,7 @@ var GeminiRequester = class extends ModelRequester {
       }
     }
     const body = JSON.stringify(data);
-    return chatLunaFetch(requestUrl, {
+    return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),
       method: "POST",
@@ -470,7 +470,7 @@ var GeminiRequester = class extends ModelRequester {
   }
   _get(url) {
     const requestUrl = this._concatUrl(url);
-    return chatLunaFetch(requestUrl, {
+    return this._plugin.fetch(requestUrl, {
       method: "GET",
       headers: this._buildHeaders()
     });
@@ -496,10 +496,10 @@ var GeminiRequester = class extends ModelRequester {
 
 // src/client.ts
 var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
-  constructor(ctx, _config, clientConfig) {
+  constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
-    this._requester = new GeminiRequester(clientConfig);
+    this._requester = new GeminiRequester(clientConfig, plugin);
   }
   static {
     __name(this, "GeminiClient");
@@ -589,7 +589,7 @@ function apply(ctx, config) {
       });
     });
     await plugin.registerClient(
-      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig)
+      (_, clientConfig) => new GeminiClient(ctx, config, clientConfig, plugin)
     );
     await plugin.initClients();
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.17",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -48,18 +48,18 @@
     "adapter"
   ],
   "dependencies": {
-    "@langchain/core": "^0.2.8",
+    "@langchain/core": "^0.2.17",
     "@streamparser/json": "^0.0.21",
-    "zod": "^3.24.0-canary.20240523T174819",
+    "zod": "^3.24.0-canary.20240701T200529",
     "zod-to-json-schema": "^3.23.1"
   },
   "devDependencies": {
     "atsc": "^2.1.0",
-    "koishi": "^4.17.9"
+    "koishi": "^4.17.10"
   },
   "peerDependencies": {
     "koishi": "^4.17.9",
-    "koishi-plugin-chatluna": "^1.0.0-beta.54"
+    "koishi-plugin-chatluna": "^1.0.0-beta.58"
   },
   "koishi": {
     "description": {