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

package/lib/index.cjs

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __commonJS = (cb, mod) => function __require() {
@@ -20,14 +18,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/locales/zh-CN.schema.yml
@@ -181,7 +171,10 @@ function extractSystemMessages(messages) {
   }
   const systemMessages = messages.slice(
     0,
-    messages.indexOf(lastSystemMessage)
+    messages.indexOf(lastSystemMessage) + 1
+  );
+  const modelMessages = messages.slice(
+    messages.indexOf(lastSystemMessage) + 1
   );
   return [
     {
@@ -195,7 +188,7 @@ function extractSystemMessages(messages) {
         }
       ]
     },
-    messages.slice(messages.indexOf(lastSystemMessage))
+    modelMessages
   ];
 }
 __name(extractSystemMessages, "extractSystemMessages");
@@ -328,7 +321,6 @@ function messageTypeToGeminiRole(type) {
 __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
-var import_promises = __toESM(require("fs/promises"), 1);
 var GeminiRequester = class extends import_api.ModelRequester {
   constructor(_config, _plugin, _pluginConfig) {
     super();
@@ -398,7 +390,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
               includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          systemInstruction: systemInstruction != null ? systemInstruction : void 0,
+          system_instruction: systemInstruction != null ? systemInstruction : void 0,
           tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContext ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
@@ -631,7 +623,6 @@ ${groundingContent}`
       }
     }
     const body = JSON.stringify(data);
-    import_promises.default.writeFile("./request.json", body);
     return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),

package/lib/index.mjs

@@ -164,7 +164,10 @@ function extractSystemMessages(messages) {
   }
   const systemMessages = messages.slice(
     0,
-    messages.indexOf(lastSystemMessage)
+    messages.indexOf(lastSystemMessage) + 1
+  );
+  const modelMessages = messages.slice(
+    messages.indexOf(lastSystemMessage) + 1
   );
   return [
     {
@@ -178,7 +181,7 @@ function extractSystemMessages(messages) {
         }
       ]
     },
-    messages.slice(messages.indexOf(lastSystemMessage))
+    modelMessages
   ];
 }
 __name(extractSystemMessages, "extractSystemMessages");
@@ -311,7 +314,6 @@ function messageTypeToGeminiRole(type) {
 __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
-import fs from "fs/promises";
 var GeminiRequester = class extends ModelRequester {
   constructor(_config, _plugin, _pluginConfig) {
     super();
@@ -381,7 +383,7 @@ var GeminiRequester = class extends ModelRequester {
               includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          systemInstruction: systemInstruction != null ? systemInstruction : void 0,
+          system_instruction: systemInstruction != null ? systemInstruction : void 0,
           tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContext ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
@@ -614,7 +616,6 @@ ${groundingContent}`
       }
     }
     const body = JSON.stringify(data);
-    fs.writeFile("./request.json", body);
     return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),

package/lib/utils.d.ts

@@ -3,10 +3,7 @@ import { StructuredTool } from '@langchain/core/tools';
 import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart } from './types';
 import { Config } from '.';
 export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], model?: string): Promise<ChatCompletionResponseMessage[]>;
-export declare function extractSystemMessages(messages: ChatCompletionResponseMessage[]): [
-    ChatCompletionResponseMessage,
-    ChatCompletionResponseMessage[]
-];
+export declare function extractSystemMessages(messages: ChatCompletionResponseMessage[]): [ChatCompletionResponseMessage, ChatCompletionResponseMessage[]];
 export declare function partAsType<T extends ChatPart>(part: ChatPart): T;
 export declare function partAsTypeCheck<T extends ChatPart>(part: ChatPart, check: (part: ChatPart & unknown) => boolean): T | undefined;
 export declare function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.11",
+  "version": "1.2.14",
   "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.3.0-alpha.7"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.9"
   },
   "koishi": {
     "description": {