koishi-plugin-chatluna-google-gemini-adapter 1.1.0-alpha.4 → 1.1.0-alpha.5

package/lib/index.cjs

@@ -333,143 +333,6 @@ var GeminiRequester = class extends import_api.ModelRequester {
   static {
     __name(this, "GeminiRequester");
   }
-  async completion(params) {
-    try {
-      const response = await this._post(
-        `models/${params.model}`,
-        {
-          contents: await langchainMessageToGeminiMessage(
-            params.input,
-            params.model
-          ),
-          safetySettings: [
-            {
-              category: "HARM_CATEGORY_HARASSMENT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-              threshold: "BLOCK_NONE"
-            }
-          ],
-          generationConfig: {
-            stopSequences: params.stop,
-            temperature: params.temperature,
-            maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
-            topP: params.topP
-            // thinkingConfig: { includeThoughts: true }
-          },
-          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
-            params.tools ?? [],
-            this._pluginConfig,
-            params.model
-          ) : void 0
-        },
-        {
-          signal: params.signal
-        }
-      );
-      const rawResponse = await response.text();
-      let parsedResponse;
-      try {
-        parsedResponse = JSON.parse(rawResponse);
-      } catch (e) {
-        logger.error("error with parse json", rawResponse);
-        throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-      let groundingContent = "";
-      let currentGroudingIndex = 0;
-      let reasoningContent = "";
-      let content = "";
-      const functionCall = {
-        name: "",
-        args: "",
-        arguments: ""
-      };
-      const part = parsedResponse.candidates[0].content;
-      const messagePart = partAsType(part.parts[0]);
-      const chatFunctionCallingPart = partAsType(
-        part.parts[0]
-      );
-      if (messagePart.text) {
-        if (messagePart.thought) {
-          reasoningContent = messagePart.text;
-        }
-        content = messagePart.text;
-      }
-      const deltaFunctionCall = chatFunctionCallingPart.functionCall;
-      if (deltaFunctionCall) {
-        let args = deltaFunctionCall.args?.input ?? deltaFunctionCall.args;
-        try {
-          let parsedArgs = JSON.parse(args);
-          if (typeof parsedArgs !== "string") {
-            args = parsedArgs;
-          }
-          parsedArgs = JSON.parse(args);
-          if (typeof parsedArgs !== "string") {
-            args = parsedArgs;
-          }
-        } catch (e) {
-        }
-        functionCall.args = JSON.stringify(args);
-        functionCall.name = deltaFunctionCall.name;
-        functionCall.arguments = deltaFunctionCall.args;
-      }
-      for (const source of parsedResponse.candidates[0].groundingMetadata?.groundingChunks ?? []) {
-        groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
-`;
-      }
-      try {
-        const messageChunk = new import_messages2.AIMessageChunk(content);
-        messageChunk.additional_kwargs = {
-          function_call: functionCall.name.length > 0 ? {
-            name: functionCall.name,
-            arguments: functionCall.args,
-            args: functionCall.arguments
-          } : void 0
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        };
-        messageChunk.content = content;
-        if (groundingContent.length > 0) {
-          logger.debug(`grounding content: ${groundingContent}`);
-          if (this._pluginConfig.groundingContentDisplay) {
-            messageChunk.content += `
-
-${groundingContent}`;
-          }
-        }
-        if (reasoningContent.length > 0) {
-          logger.debug(`reasoning content: ${reasoningContent}`);
-        }
-        const generationChunk = new import_outputs.ChatGenerationChunk({
-          message: messageChunk,
-          text: messageChunk.content
-        });
-        return generationChunk;
-      } catch (e) {
-        logger.error("error with", parsedResponse);
-        throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-    } catch (e) {
-      if (e instanceof import_error.ChatLunaError) {
-        throw e;
-      } else {
-        throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-    }
-  }
   async *completionStream(params) {
     try {
       const response = await this._post(

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { Context, Logger, Schema } from 'koishi';
 import { AIMessageChunk, BaseMessage, ChatMessageChunk, HumanMessageChunk, MessageType, SystemMessageChunk } from '@langchain/core/messages';
 import { StructuredTool } from '@langchain/core/tools';
-import { ChatGeneration, ChatGenerationChunk } from '@langchain/core/outputs';
+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 { PlatformModelAndEmbeddingsClient } from 'koishi-plugin-chatluna/llm-core/platform/client';
@@ -113,7 +113,6 @@ export class GeminiRequester extends ModelRequester implements EmbeddingsRequest
     private _plugin;
     private _pluginConfig;
     constructor(_config: ClientConfig, _plugin: ChatLunaPlugin, _pluginConfig: Config);
-    completion(params: ModelRequestParams): Promise<ChatGeneration>;
     completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
     getModels(): Promise<string[]>;

package/lib/index.mjs

@@ -327,143 +327,6 @@ var GeminiRequester = class extends ModelRequester {
   static {
     __name(this, "GeminiRequester");
   }
-  async completion(params) {
-    try {
-      const response = await this._post(
-        `models/${params.model}`,
-        {
-          contents: await langchainMessageToGeminiMessage(
-            params.input,
-            params.model
-          ),
-          safetySettings: [
-            {
-              category: "HARM_CATEGORY_HARASSMENT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: "BLOCK_NONE"
-            },
-            {
-              category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-              threshold: "BLOCK_NONE"
-            }
-          ],
-          generationConfig: {
-            stopSequences: params.stop,
-            temperature: params.temperature,
-            maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
-            topP: params.topP
-            // thinkingConfig: { includeThoughts: true }
-          },
-          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
-            params.tools ?? [],
-            this._pluginConfig,
-            params.model
-          ) : void 0
-        },
-        {
-          signal: params.signal
-        }
-      );
-      const rawResponse = await response.text();
-      let parsedResponse;
-      try {
-        parsedResponse = JSON.parse(rawResponse);
-      } catch (e) {
-        logger.error("error with parse json", rawResponse);
-        throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-      let groundingContent = "";
-      let currentGroudingIndex = 0;
-      let reasoningContent = "";
-      let content = "";
-      const functionCall = {
-        name: "",
-        args: "",
-        arguments: ""
-      };
-      const part = parsedResponse.candidates[0].content;
-      const messagePart = partAsType(part.parts[0]);
-      const chatFunctionCallingPart = partAsType(
-        part.parts[0]
-      );
-      if (messagePart.text) {
-        if (messagePart.thought) {
-          reasoningContent = messagePart.text;
-        }
-        content = messagePart.text;
-      }
-      const deltaFunctionCall = chatFunctionCallingPart.functionCall;
-      if (deltaFunctionCall) {
-        let args = deltaFunctionCall.args?.input ?? deltaFunctionCall.args;
-        try {
-          let parsedArgs = JSON.parse(args);
-          if (typeof parsedArgs !== "string") {
-            args = parsedArgs;
-          }
-          parsedArgs = JSON.parse(args);
-          if (typeof parsedArgs !== "string") {
-            args = parsedArgs;
-          }
-        } catch (e) {
-        }
-        functionCall.args = JSON.stringify(args);
-        functionCall.name = deltaFunctionCall.name;
-        functionCall.arguments = deltaFunctionCall.args;
-      }
-      for (const source of parsedResponse.candidates[0].groundingMetadata?.groundingChunks ?? []) {
-        groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
-`;
-      }
-      try {
-        const messageChunk = new AIMessageChunk2(content);
-        messageChunk.additional_kwargs = {
-          function_call: functionCall.name.length > 0 ? {
-            name: functionCall.name,
-            arguments: functionCall.args,
-            args: functionCall.arguments
-          } : void 0
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        };
-        messageChunk.content = content;
-        if (groundingContent.length > 0) {
-          logger.debug(`grounding content: ${groundingContent}`);
-          if (this._pluginConfig.groundingContentDisplay) {
-            messageChunk.content += `
-
-${groundingContent}`;
-          }
-        }
-        if (reasoningContent.length > 0) {
-          logger.debug(`reasoning content: ${reasoningContent}`);
-        }
-        const generationChunk = new ChatGenerationChunk({
-          message: messageChunk,
-          text: messageChunk.content
-        });
-        return generationChunk;
-      } catch (e) {
-        logger.error("error with", parsedResponse);
-        throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-    } catch (e) {
-      if (e instanceof ChatLunaError) {
-        throw e;
-      } else {
-        throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
-      }
-    }
-  }
   async *completionStream(params) {
     try {
       const response = await this._post(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.1.0-alpha.4",
+  "version": "1.1.0-alpha.5",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",