koishi-plugin-chatluna-google-gemini-adapter 1.0.0-beta.8 → 1.0.0-rc.0

package/package.json

@@ -1,13 +1,23 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.0.0-beta.8",
-  "main": "lib/index.js",
+  "version": "1.0.0-rc.0",
+  "main": "lib/index.cjs",
+  "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
   "files": [
     "lib",
     "dist"
   ],
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.mjs",
+      "require": "./lib/index.cjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "type": "module",
   "author": "dingyi222666 <dingyi222666@foxmail.com>",
   "repository": {
     "type": "git",
@@ -22,6 +32,20 @@
   "scripts": {
     "build": "atsc -b"
   },
+  "resolutions": {
+    "@langchain/core": "0.3.18",
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.15"
+  },
+  "overrides": {
+    "@langchain/core": "0.3.18",
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.15"
+  },
+  "pnpm": {
+    "overrides": {
+      "@langchain/core": "0.3.18",
+      "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.15"
+    }
+  },
   "engines": {
     "node": ">=18.0.0"
   },
@@ -38,22 +62,23 @@
     "adapter"
   ],
   "dependencies": {
-    "@langchain/core": "^0.1.38",
-    "@streamparser/json": "^0.0.20",
-    "zod": "^3.23.0-canary.20240222T232722",
-    "zod-to-json-schema": "^3.22.4"
+    "@langchain/core": "^0.3.18",
+    "@streamparser/json": "^0.0.21",
+    "zod": "^3.24.0-canary.20241107T043915",
+    "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
-    "atsc": "^2.0.1",
-    "koishi": "^4.17.1"
+    "atsc": "^2.1.0",
+    "koishi": "^4.18.1"
   },
   "peerDependencies": {
-    "koishi": "^4.16.0",
-    "koishi-plugin-chatluna": "^1.0.0-beta.39"
+    "koishi": "^4.18.1",
+    "koishi-plugin-chatluna": "^1.0.0-rc.0"
   },
   "koishi": {
     "description": {
-      "zh": "ChatLuna 的 Google gemini 平台适配器"
+      "zh": "ChatLuna 的 Google Gemini 适配器",
+      "en": "Google Gemini adapter for ChatLuna"
     },
     "service": {
       "required": [

package/lib/client.d.ts

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

package/lib/client.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeminiClient = void 0;
-const client_1 = require("koishi-plugin-chatluna/lib/llm-core/platform/client");
-const model_1 = require("koishi-plugin-chatluna/lib/llm-core/platform/model");
-const types_1 = require("koishi-plugin-chatluna/lib/llm-core/platform/types");
-const error_1 = require("koishi-plugin-chatluna/lib/utils/error");
-const requester_1 = require("./requester");
-class GeminiClient extends client_1.PlatformModelAndEmbeddingsClient {
-    _config;
-    platform = 'gemini';
-    _requester;
-    _models;
-    constructor(ctx, _config, clientConfig) {
-        super(ctx, clientConfig);
-        this._config = _config;
-        this._requester = new requester_1.GeminiRequester(clientConfig);
-    }
-    async init() {
-        await this.getModels();
-    }
-    async refreshModels() {
-        try {
-            const rawModels = await this._requester.getModels();
-            if (!rawModels.length) {
-                throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.MODEL_INIT_ERROR, new Error('No model found'));
-            }
-            return rawModels
-                .map((model) => model.replace('models/', ''))
-                .map((model) => {
-                return {
-                    name: model,
-                    maxTokens: model.includes('vision') ? 12288 : 30720,
-                    type: model.includes('embedding')
-                        ? types_1.ModelType.embeddings
-                        : types_1.ModelType.llm,
-                    functionCall: !model.includes('vision'),
-                    supportMode: ['all']
-                };
-            });
-        }
-        catch (e) {
-            throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.MODEL_INIT_ERROR, e);
-        }
-    }
-    async getModels() {
-        if (this._models) {
-            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];
-        if (info == null) {
-            throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.MODEL_NOT_FOUND);
-        }
-        if (info.type === types_1.ModelType.llm) {
-            return new model_1.ChatLunaChatModel({
-                modelInfo: info,
-                requester: this._requester,
-                model,
-                maxTokens: this._config.maxTokens,
-                timeout: this._config.timeout,
-                temperature: this._config.temperature,
-                maxRetries: this._config.maxRetries,
-                llmType: 'gemini'
-            });
-        }
-        return new model_1.ChatLunaEmbeddings({
-            client: this._requester,
-            maxRetries: this._config.maxRetries
-        });
-    }
-}
-exports.GeminiClient = GeminiClient;

package/lib/index.js

@@ -1,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.name = exports.inject = exports.Config = exports.apply = exports.logger = void 0;
-const chat_1 = require("koishi-plugin-chatluna/lib/services/chat");
-const koishi_1 = require("koishi");
-const client_1 = require("./client");
-const logger_1 = require("koishi-plugin-chatluna/lib/utils/logger");
-function apply(ctx, config) {
-    const plugin = new chat_1.ChatLunaPlugin(ctx, config, 'gemini');
-    exports.logger = (0, logger_1.createLogger)(ctx, 'chatluna-gemini-adapter');
-    ctx.on('ready', async () => {
-        await plugin.registerToService();
-        await plugin.parseConfig((config) => {
-            return config.apiKeys.map(([apiKey, apiEndpoint]) => {
-                return {
-                    apiKey,
-                    apiEndpoint,
-                    platform: 'gemini',
-                    chatLimit: config.chatTimeLimit,
-                    timeout: config.timeout,
-                    maxRetries: config.maxRetries,
-                    concurrentMaxSize: config.chatConcurrentMaxSize
-                };
-            });
-        });
-        await plugin.registerClient((_, clientConfig) => new client_1.GeminiClient(ctx, config, clientConfig));
-        await plugin.initClients();
-    });
-}
-exports.apply = apply;
-exports.Config = koishi_1.Schema.intersect([
-    chat_1.ChatLunaPlugin.Config,
-    koishi_1.Schema.object({
-        apiKeys: koishi_1.Schema.array(koishi_1.Schema.tuple([
-            koishi_1.Schema.string()
-                .role('secret')
-                .description('Gemini 的 API Key')
-                .required(),
-            koishi_1.Schema.string()
-                .description('请求 Gemini API 的地址')
-                .default('https://generativelanguage.googleapis.com/v1beta')
-        ]))
-            .description('Gemini 的 API Key 和请求地址列表')
-            .default([['', 'https://generativelanguage.googleapis.com/v1beta']])
-    }).description('请求设置'),
-    koishi_1.Schema.object({
-        maxTokens: koishi_1.Schema.number()
-            .description('回复的最大 Token 数（16~32800，必须是16的倍数）（注意如果你目前使用的模型的最大 Token 为 8000 及以上的话才建议设置超过 512 token）')
-            .min(16)
-            .max(128000)
-            .step(16)
-            .default(1024),
-        temperature: koishi_1.Schema.percent()
-            .description('回复温度，越高越随机')
-            .min(0)
-            .max(1)
-            .step(0.1)
-            .default(0.8)
-    }).description('模型设置')
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-]);
-exports.inject = ['chatluna'];
-exports.name = 'chatluna-google-gemini-adapter';

package/lib/requester.d.ts

@@ -1,16 +0,0 @@
-import { EmbeddingsRequester, EmbeddingsRequestParams, ModelRequester, ModelRequestParams } from 'koishi-plugin-chatluna/lib/llm-core/platform/api';
-import { ClientConfig } from 'koishi-plugin-chatluna/lib/llm-core/platform/config';
-import { ChatGenerationChunk } from '@langchain/core/outputs';
-export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
-    private _config;
-    constructor(_config: ClientConfig);
-    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/requester.js

@@ -1,259 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeminiRequester = void 0;
-const api_1 = require("koishi-plugin-chatluna/lib/llm-core/platform/api");
-const messages_1 = require("@langchain/core/messages");
-const outputs_1 = require("@langchain/core/outputs");
-const error_1 = require("koishi-plugin-chatluna/lib/utils/error");
-const sse_1 = require("koishi-plugin-chatluna/lib/utils/sse");
-const utils_1 = require("./utils");
-const request_1 = require("koishi-plugin-chatluna/lib/utils/request");
-const _1 = require(".");
-const json_1 = require("@streamparser/json");
-const stream_1 = require("koishi-plugin-chatluna/lib/utils/stream");
-class GeminiRequester extends api_1.ModelRequester {
-    _config;
-    constructor(_config) {
-        super();
-        this._config = _config;
-    }
-    async *completionStream(params) {
-        try {
-            const response = await this._post(`models/${params.model}:streamGenerateContent`, {
-                contents: await (0, utils_1.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'
-                    }
-                ],
-                generationConfig: {
-                    stopSequences: params.stop,
-                    temperature: params.temperature,
-                    maxOutputTokens: params.model.includes('vision')
-                        ? undefined
-                        : params.maxTokens,
-                    topP: params.topP
-                },
-                tools: !params.model.includes('vision') && params.tools != null
-                    ? {
-                        functionDeclarations: (0, utils_1.formatToolsToGeminiAITools)(params.tools)
-                    }
-                    : undefined
-            }, {
-                signal: params.signal
-            });
-            let errorCount = 0;
-            const stream = new TransformStream();
-            const iterable = (0, stream_1.readableStreamToAsyncIterable)(stream.readable);
-            const jsonParser = new json_1.JSONParser();
-            const writable = stream.writable.getWriter();
-            jsonParser.onEnd = async () => {
-                await writable.close();
-            };
-            jsonParser.onValue = async ({ value }) => {
-                const transformValue = value;
-                if (transformValue.candidates && transformValue.candidates[0]) {
-                    const parts = transformValue.candidates[0].content.parts;
-                    if (parts.length < 1) {
-                        throw new Error(JSON.stringify(value));
-                    }
-                    for (const part of parts) {
-                        await writable.write(part);
-                    }
-                }
-            };
-            await (0, sse_1.sse)(response, async (rawData) => {
-                jsonParser.write(rawData);
-                return true;
-            }, 10);
-            let content = '';
-            let isVisionModel = params.model.includes('vision');
-            const functionCall = {
-                name: '',
-                args: '',
-                arguments: ''
-            };
-            for await (const chunk of iterable) {
-                const messagePart = (0, utils_1.partAsType)(chunk);
-                const chatFunctionCallingPart = (0, utils_1.partAsType)(chunk);
-                if (messagePart.text) {
-                    content += messagePart.text;
-                    // match /w*model:
-                    if (isVisionModel && /\s*model:\s*/.test(content)) {
-                        isVisionModel = false;
-                        content = content.replace(/\s*model:\s*/, '');
-                    }
-                }
-                if (chatFunctionCallingPart.functionCall) {
-                    const deltaFunctionCall = chatFunctionCallingPart.functionCall;
-                    if (deltaFunctionCall) {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        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 =
-                            functionCall.name + (deltaFunctionCall.name ?? '');
-                        functionCall.arguments = deltaFunctionCall.args;
-                    }
-                }
-                try {
-                    const messageChunk = new messages_1.AIMessageChunk(content);
-                    messageChunk.additional_kwargs = {
-                        function_call: functionCall.name.length > 0
-                            ? {
-                                name: functionCall.name,
-                                arguments: functionCall.args,
-                                args: functionCall.arguments
-                            }
-                            : undefined
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    };
-                    messageChunk.content = content;
-                    const generationChunk = new outputs_1.ChatGenerationChunk({
-                        message: messageChunk,
-                        text: messageChunk.content
-                    });
-                    yield generationChunk;
-                    content = messageChunk.content;
-                }
-                catch (e) {
-                    if (errorCount > 5) {
-                        _1.logger.error('error with chunk', chunk);
-                        throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.API_REQUEST_FAILED, e);
-                    }
-                    else {
-                        errorCount++;
-                        continue;
-                    }
-                }
-            }
-        }
-        catch (e) {
-            if (e instanceof error_1.ChatLunaError) {
-                throw e;
-            }
-            else {
-                throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.API_REQUEST_FAILED, e);
-            }
-        }
-    }
-    async embeddings(params) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let data;
-        try {
-            const response = await this._post(`models/${params.model}:embedContent`, {
-                model: `models/${params.model}`,
-                content: {
-                    parts: [
-                        {
-                            text: params.input
-                        }
-                    ]
-                }
-            });
-            data = await response.text();
-            data = JSON.parse(data);
-            if (data.embedding && data.embedding.values?.length > 0) {
-                return data.embedding.values;
-            }
-            throw new Error('error when calling gemini embeddings, Result: ' +
-                JSON.stringify(data));
-        }
-        catch (e) {
-            const error = new Error('error when calling gemini embeddings, Result: ' +
-                JSON.stringify(data));
-            error.stack = e.stack;
-            error.cause = e.cause;
-            _1.logger.debug(e);
-            throw new error_1.ChatLunaError(error_1.ChatLunaErrorCode.API_REQUEST_FAILED, error);
-        }
-    }
-    async getModels() {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let data;
-        try {
-            const response = await this._get('models');
-            data = await response.text();
-            data = JSON.parse(data);
-            if (!data.models || !data.models.length) {
-                throw new Error('error when listing gemini models, Result:' +
-                    JSON.stringify(data));
-            }
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            return data.models
-                .map((model) => model.name)
-                .filter((model) => model.includes('gemini') || model.includes('embedding'));
-        }
-        catch (e) {
-            const error = new Error('error when listing gemini models, Result: ' +
-                JSON.stringify(data));
-            error.stack = e.stack;
-            error.cause = e.cause;
-            throw error;
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    _post(url, data, params = {}) {
-        const requestUrl = this._concatUrl(url);
-        for (const key in data) {
-            if (data[key] === undefined) {
-                delete data[key];
-            }
-        }
-        const body = JSON.stringify(data);
-        return (0, request_1.chatLunaFetch)(requestUrl, {
-            body,
-            headers: this._buildHeaders(),
-            method: 'POST',
-            ...params
-        });
-    }
-    _get(url) {
-        const requestUrl = this._concatUrl(url);
-        return (0, request_1.chatLunaFetch)(requestUrl, {
-            method: 'GET',
-            headers: this._buildHeaders()
-        });
-    }
-    _concatUrl(url) {
-        const apiEndPoint = this._config.apiEndpoint;
-        // match the apiEndPoint ends with '/v1' or '/v1/' using regex
-        if (apiEndPoint.endsWith('/')) {
-            return apiEndPoint + url + `?key=${this._config.apiKey}`;
-        }
-        return apiEndPoint + '/' + url + `?key=${this._config.apiKey}`;
-    }
-    _buildHeaders() {
-        return {
-            /*  Authorization: `Bearer ${this._config.apiKey}`, */
-            'Content-Type': 'application/json'
-        };
-    }
-    async init() { }
-    async dispose() { }
-}
-exports.GeminiRequester = GeminiRequester;

package/lib/types.d.ts

@@ -1,60 +0,0 @@
-export interface ChatCompletionResponseMessage {
-    role: string;
-    parts?: ChatPart[];
-}
-export type ChatPart = ChatMessagePart | ChatUploadDataPart | ChatFunctionCallingPart | ChatFunctionResponsePart;
-export type ChatMessagePart = {
-    text: string;
-};
-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;
-        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 {
-    embedding: {
-        values: number[];
-    };
-}
-export type ChatCompletionResponseMessageRoleEnum = 'system' | 'model' | 'user' | 'function';

package/lib/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/utils.d.ts

@@ -1,9 +0,0 @@
-import { AIMessageChunk, BaseMessage, ChatMessageChunk, HumanMessageChunk, MessageType, SystemMessageChunk } from '@langchain/core/messages';
-import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart } from './types';
-import { StructuredTool } from '@langchain/core/tools';
-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[]): ChatCompletionFunction[];
-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;