koishi-plugin-chatluna-google-gemini-adapter 1.1.0-beta.1 → 1.1.0-beta.2

package/lib/client.d.ts

@@ -0,0 +1,18 @@
+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 { 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 {
+    private _config;
+    platform: string;
+    private _requester;
+    private _models;
+    constructor(ctx: Context, _config: Config, clientConfig: ClientConfig, plugin: ChatLunaPlugin);
+    init(): Promise<void>;
+    refreshModels(): Promise<ModelInfo[]>;
+    getModels(): Promise<ModelInfo[]>;
+    protected _createModel(model: string): ChatLunaChatModel | ChatHubBaseEmbeddings;
+}

package/lib/index.cjs

@@ -412,6 +412,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
           }
         }
       };
+      await (0, import_sse.checkResponse)(response);
       (0, import_sse.sse)(
         response,
         async (rawData) => {

package/lib/index.d.ts

@@ -1,136 +1,15 @@
-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 { 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';
-import { ChatHubBaseEmbeddings, ChatLunaChatModel } from 'koishi-plugin-chatluna/llm-core/platform/model';
-import { ModelInfo } from 'koishi-plugin-chatluna/llm-core/platform/types';
-export let logger: Logger;
-export function apply(ctx: Context, config: Config): void;
-export interface Config extends ChatLunaPlugin.Config {
-    apiKeys: [string, string][];
-    maxTokens: number;
-    temperature: number;
-    googleSearch: boolean;
-    searchThreshold: number;
-    groundingContentDisplay: boolean;
-}
-export const Config: Schema<Config>;
-export const inject: string[];
-export const name = "chatluna-google-gemini-adapter";
-export interface ChatCompletionResponseMessage {
-    role: string;
-    parts?: ChatPart[];
-}
-export type ChatPart = ChatMessagePart | ChatUploadDataPart | ChatFunctionCallingPart | ChatFunctionResponsePart;
-export type ChatMessagePart = {
-    text: string;
-    thought?: boolean;
-};
-export type ChatUploadDataPart = {
-    inline_data: {
-        mime_type: string;
-        data?: string;
-    };
-};
-export type ChatFunctionCallingPart = {
-    functionCall: {
-        name: string;
-        args?: any;
-    };
-};
-export type ChatFunctionResponsePart = {
-    functionResponse: {
-        name: string;
-        response: any;
-    };
-};
-export interface ChatResponse {
-    candidates: {
-        content: ChatCompletionResponseMessage;
-        groundingMetadata: {
-            searchEntryPoint: {
-                renderedContent: string;
-            };
-            groundingChunks: {
-                web: {
-                    uri: string;
-                    title: string;
-                };
-            }[];
-            groundingSupports: {
-                segment: {
-                    endIndex: number;
-                    text: string;
-                };
-                groundingChunkIndices: number[];
-                confidenceScores: number[];
-            }[];
-            webSearchQueries: string[];
-        };
-        finishReason: string;
-        index: number;
-        safetyRatings: {
-            category: string;
-            probability: string;
-        }[];
-    }[];
-    promptFeedback: {
-        safetyRatings: {
-            category: string;
-            probability: string;
-        }[];
-    };
-}
-export interface ChatCompletionFunction {
-    name: string;
-    description?: string;
-    parameters?: {
-        [key: string]: any;
-    };
-}
-export interface ChatCompletionMessageFunctionCall {
-    name: string;
-    args?: any;
-}
-export interface CreateEmbeddingResponse {
-    embeddings: {
-        values: number[];
-    }[];
-}
-export type ChatCompletionResponseMessageRoleEnum = 'system' | 'model' | 'user' | 'function';
-export function langchainMessageToGeminiMessage(messages: BaseMessage[], model?: string): Promise<ChatCompletionResponseMessage[]>;
-export function partAsType<T extends ChatPart>(part: ChatPart): T;
-export function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
-export function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
-export function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
-export function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
-export class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
-    private _config;
-    private _plugin;
-    private _pluginConfig;
-    constructor(_config: ClientConfig, _plugin: ChatLunaPlugin, _pluginConfig: Config);
-    completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
-    embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
-    getModels(): Promise<string[]>;
-    private _post;
-    private _get;
-    private _concatUrl;
-    private _buildHeaders;
-    init(): Promise<void>;
-    dispose(): Promise<void>;
-}
-export class GeminiClient extends PlatformModelAndEmbeddingsClient {
-    private _config;
-    platform: string;
-    private _requester;
-    private _models;
-    constructor(ctx: Context, _config: Config, clientConfig: ClientConfig, plugin: ChatLunaPlugin);
-    init(): Promise<void>;
-    refreshModels(): Promise<ModelInfo[]>;
-    getModels(): Promise<ModelInfo[]>;
-    protected _createModel(model: string): ChatLunaChatModel | ChatHubBaseEmbeddings;
-}
+import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
+import { Context, Logger, Schema } from 'koishi';
+export declare let logger: Logger;
+export declare function apply(ctx: Context, config: Config): void;
+export interface Config extends ChatLunaPlugin.Config {
+    apiKeys: [string, string][];
+    maxTokens: number;
+    temperature: number;
+    googleSearch: boolean;
+    searchThreshold: number;
+    groundingContentDisplay: boolean;
+}
+export declare const Config: Schema<Config>;
+export declare const inject: string[];
+export declare const name = "chatluna-google-gemini-adapter";

package/lib/index.mjs

@@ -48,7 +48,7 @@ import {
   ChatLunaError,
   ChatLunaErrorCode
 } from "koishi-plugin-chatluna/utils/error";
-import { sse } from "koishi-plugin-chatluna/utils/sse";
+import { checkResponse, sse } from "koishi-plugin-chatluna/utils/sse";
 import { readableStreamToAsyncIterable } from "koishi-plugin-chatluna/utils/stream";
 
 // src/utils.ts
@@ -406,6 +406,7 @@ var GeminiRequester = class extends ModelRequester {
           }
         }
       };
+      await checkResponse(response);
       sse(
         response,
         async (rawData) => {

package/lib/requester.d.ts

@@ -0,0 +1,20 @@
+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 { Config } from '.';
+import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
+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>;
+    embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
+    getModels(): Promise<string[]>;
+    private _post;
+    private _get;
+    private _concatUrl;
+    private _buildHeaders;
+    init(): Promise<void>;
+    dispose(): Promise<void>;
+}

package/lib/types.d.ts

@@ -0,0 +1,81 @@
+export interface ChatCompletionResponseMessage {
+    role: string;
+    parts?: ChatPart[];
+}
+export type ChatPart = ChatMessagePart | ChatUploadDataPart | ChatFunctionCallingPart | ChatFunctionResponsePart;
+export type ChatMessagePart = {
+    text: string;
+    thought?: boolean;
+};
+export type ChatUploadDataPart = {
+    inline_data: {
+        mime_type: string;
+        data?: string;
+    };
+};
+export type ChatFunctionCallingPart = {
+    functionCall: {
+        name: string;
+        args?: any;
+    };
+};
+export type ChatFunctionResponsePart = {
+    functionResponse: {
+        name: string;
+        response: any;
+    };
+};
+export interface ChatResponse {
+    candidates: {
+        content: ChatCompletionResponseMessage;
+        groundingMetadata: {
+            searchEntryPoint: {
+                renderedContent: string;
+            };
+            groundingChunks: {
+                web: {
+                    uri: string;
+                    title: string;
+                };
+            }[];
+            groundingSupports: {
+                segment: {
+                    endIndex: number;
+                    text: string;
+                };
+                groundingChunkIndices: number[];
+                confidenceScores: number[];
+            }[];
+            webSearchQueries: string[];
+        };
+        finishReason: string;
+        index: number;
+        safetyRatings: {
+            category: string;
+            probability: string;
+        }[];
+    }[];
+    promptFeedback: {
+        safetyRatings: {
+            category: string;
+            probability: string;
+        }[];
+    };
+}
+export interface ChatCompletionFunction {
+    name: string;
+    description?: string;
+    parameters?: {
+        [key: string]: any;
+    };
+}
+export interface ChatCompletionMessageFunctionCall {
+    name: string;
+    args?: any;
+}
+export interface CreateEmbeddingResponse {
+    embeddings: {
+        values: number[];
+    }[];
+}
+export type ChatCompletionResponseMessageRoleEnum = 'system' | 'model' | 'user' | 'function';

package/lib/utils.d.ts

@@ -0,0 +1,10 @@
+import { AIMessageChunk, BaseMessage, ChatMessageChunk, HumanMessageChunk, MessageType, SystemMessageChunk } from '@langchain/core/messages';
+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 partAsType<T extends ChatPart>(part: ChatPart): T;
+export declare function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
+export declare function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
+export declare function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.4",
-    "koishi-plugin-chatluna": "^1.1.0-beta.1"
+    "koishi-plugin-chatluna": "^1.1.0-beta.14"
   },
   "koishi": {
     "description": {