@wabot-dev/framework 0.2.0-beta.15 → 0.2.0-beta.16

package/dist/src/addon/chat-bot/anthropic/AnthropicChatAdapter.js

@@ -96,24 +96,6 @@ let AnthropicChatAdapter = class AnthropicChatAdapter {
         };
     }
     mapResponse(response) {
-        let chatItem;
-        const content = response.content[0];
-        if (content.type === 'text') {
-            chatItem = { type: 'botMessage', botMessage: { text: content.text } };
-        }
-        else if (content.type === 'tool_use') {
-            chatItem = {
-                type: 'functionCall',
-                functionCall: {
-                    id: content.id,
-                    name: content.name,
-                    arguments: JSON.stringify(content.input),
-                },
-            };
-        }
-        else {
-            throw new Error('Not supported Claude Response');
-        }
         let usage;
         if (response.usage) {
             usage = {
@@ -124,7 +106,23 @@ let AnthropicChatAdapter = class AnthropicChatAdapter {
         else {
             throw new Error('Unable to found usage info');
         }
-        return { nextItems: [chatItem], usage };
+        const nextItems = [];
+        for (const content of response.content) {
+            if (content.type === 'text' && content.text) {
+                nextItems.push({ type: 'botMessage', botMessage: { text: content.text } });
+            }
+            else if (content.type === 'tool_use') {
+                nextItems.push({
+                    type: 'functionCall',
+                    functionCall: {
+                        id: content.id,
+                        name: content.name,
+                        arguments: JSON.stringify(content.input),
+                    },
+                });
+            }
+        }
+        return { usage, nextItems };
     }
 };
 AnthropicChatAdapter = __decorate([

package/dist/src/addon/chat-bot/google/GoogleChatAdapter.js

@@ -2,122 +2,133 @@ import { __decorate, __metadata } from 'tslib';
 import { Env } from '../../../core/env/Env.js';
 import { singleton } from '../../../core/injection/index.js';
 import { Logger } from '../../../core/logger/Logger.js';
-import OpenAI from 'openai';
+import { Random } from '../../../core/random/Random.js';
+import { GoogleGenAI } from '@google/genai';
 
 let GoogleChatAdapter = class GoogleChatAdapter {
-    env;
-    openai;
-    logger = new Logger('wabot:google-chat-adapter');
+    ai;
+    logger = new Logger('wabot:google-chat-adapter-v2');
     constructor(env) {
-        this.env = env;
-        const apiKey = this.env.requireString('GOOGLE_API_KEY');
-        this.openai = new OpenAI({
-            apiKey,
-            baseURL: 'https://generativelanguage.googleapis.com/v1beta/openai/',
-        });
+        this.ai = new GoogleGenAI({ apiKey: env.requireString('GOOGLE_API_KEY') });
     }
     async nextItems(req) {
-        const messages = [];
-        messages.push({ role: 'system', content: req.systemPrompt });
-        messages.push(...this.mapChatItems(req.prevItems));
-        const tools = req.tools.map((x) => this.mapTool(x));
-        const request = {
+        const contents = [];
+        contents.push({ role: 'user', parts: [{ text: req.systemPrompt }] });
+        contents.push(...this.mapChatItems(req.prevItems));
+        const functionDeclarations = req.tools.map((x) => this.mapTool(x));
+        const response = await this.ai.models.generateContent({
             model: req.model,
-            messages,
-            tools,
-        };
-        const response = await this.openai.chat.completions.create(request);
+            contents,
+            config: { tools: [{ functionDeclarations }] },
+        });
         return this.mapResponse(response);
     }
     mapChatItems(chatItems) {
-        const messages = [];
+        const contents = [];
         for (const chatItem of chatItems) {
             switch (chatItem.type) {
                 case 'humanMessage':
-                    messages.push(this.mapHumanMessage(chatItem.humanMessage));
+                    contents.push(this.mapHumanMessage(chatItem.humanMessage));
                     break;
                 case 'botMessage':
-                    messages.push(this.mapBotMessage(chatItem.botMessage));
+                    contents.push(this.mapBotMessage(chatItem.botMessage));
                     break;
                 case 'functionCall':
-                    messages.push(...this.mapFunctionCall(chatItem.functionCall));
+                    contents.push(...this.mapFunctionCall(chatItem.functionCall));
                     break;
             }
         }
-        return messages;
+        return contents;
     }
     mapHumanMessage(item) {
         if (!item.text) {
             throw new Error('User message content is empty');
         }
-        return { role: 'user', content: item.text };
+        return { role: 'user', parts: [{ text: item.text }] };
     }
     mapBotMessage(item) {
         if (!item.text) {
             throw new Error('Bot message content is empty');
         }
-        return { role: 'assistant', content: item.text };
+        return { role: 'model', parts: [{ text: item.text }] };
     }
     mapFunctionCall(item) {
         return [
+            {
+                role: 'model',
+                parts: [
+                    {
+                        functionCall: {
+                            id: item.id,
+                            name: item.name,
+                            args: JSON.parse(item.arguments ?? '{}'),
+                        },
+                    },
+                ],
+            },
             {
                 role: 'function',
-                name: item.id,
-                content: item.result ?? 'No result',
+                parts: [
+                    {
+                        functionResponse: {
+                            id: item.id,
+                            name: item.name,
+                            response: { output: item.result ?? '' },
+                        },
+                    },
+                ],
             },
         ];
     }
     mapTool(tool) {
         return {
-            type: 'function',
-            function: {
-                name: tool.name,
-                description: tool.description,
-                parameters: {
-                    type: 'object',
-                    properties: tool.parameters.reduce((prev, param) => ({
-                        ...prev,
-                        [param.name]: {
-                            type: param.type,
-                            description: param.description,
-                        },
-                    }), {}),
-                    required: tool.parameters.map((param) => param.name),
-                    additionalProperties: false,
-                }
+            name: tool.name,
+            description: tool.description,
+            parametersJsonSchema: {
+                type: 'object',
+                properties: tool.parameters.reduce((prev, param) => ({
+                    ...prev,
+                    [param.name]: { type: param.type, description: param.description },
+                }), {}),
+                required: tool.parameters.map((param) => param.name),
+                additionalProperties: false,
             },
         };
     }
     mapResponse(response) {
-        let chatItem;
-        const { tool_calls: responseFunctionCall, content: responseText } = response.choices?.[0]?.message ?? {};
-        if (responseText) {
-            chatItem = { type: 'botMessage', botMessage: { text: responseText } };
+        if (!response.candidates || !response.candidates.length) {
+            throw new Error('No candidates in response');
         }
-        else if (responseFunctionCall && responseFunctionCall[0]?.type === 'function') {
-            chatItem = {
-                type: 'functionCall',
-                functionCall: {
-                    id: responseFunctionCall[0].id,
-                    name: responseFunctionCall[0].function.name,
-                    arguments: responseFunctionCall[0].function.arguments,
-                },
-            };
+        if (!response.usageMetadata ||
+            !response.usageMetadata.promptTokenCount ||
+            !response.usageMetadata.candidatesTokenCount) {
+            throw new Error('Not usage metadata');
         }
-        else {
-            throw new Error('Not supported Gemini Response');
+        const content = response.candidates.find((x) => x.content)?.content;
+        if (!content) {
+            throw new Error('Candidates has no content');
         }
-        let usage;
-        if (response.usage) {
-            usage = {
-                inputTokens: response.usage.prompt_tokens,
-                outputTokens: response.usage.completion_tokens,
-            };
-        }
-        else {
-            throw new Error('Unable to found usage info');
+        const nextItems = [];
+        for (const part of content.parts ?? []) {
+            if (part.text) {
+                nextItems.push({ type: 'botMessage', botMessage: { text: part.text } });
+            }
+            if (part.functionCall) {
+                const { id, name, args } = part.functionCall;
+                if (!name) {
+                    throw new Error('invalid function call');
+                }
+                nextItems.push({
+                    type: 'functionCall',
+                    functionCall: { id: id ?? Random.alphaNumericLowerCase(10), name, arguments: args && JSON.stringify(args) },
+                });
+            }
         }
-        return { nextItems: [chatItem], usage };
+        let usage = {
+            inputTokens: response.usageMetadata.promptTokenCount,
+            outputTokens: response.usageMetadata.candidatesTokenCount,
+        };
+        return { usage, nextItems };
     }
 };
 GoogleChatAdapter = __decorate([

package/dist/src/index.d.ts

@@ -1197,10 +1197,12 @@ declare class DeepSeekChatAdapter implements IChatAdapter {
     private mapResponse;
 }
 
+interface GoogleChatAdapterV2Options {
+    apiKey?: string;
+}
 declare class GoogleChatAdapter implements IChatAdapter {
-    private env;
-    private openai;
-    private logger;
+    private ai;
+    private readonly logger;
     constructor(env: Env);
     nextItems(req: IChatAdapterNextItemsReq): Promise<IChatAdapterNextItemsRes>;
     private mapChatItems;
@@ -1623,4 +1625,4 @@ declare function HtmlModule(options: IHtmlModuleOptions): {
     new (): {};
 };
 
-export { AnthropicChatAdapter, ApiKey, ApiKeyGuardMiddleware, ApiKeyHandshakeGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemsReq, type IChatAdapterNextItemsRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHandshakeMiddleware, type IHandshakeMiddlewareMetadata, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateInputShape, type IValidateIsInOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtHandshakeGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketChannelReceivedMessage, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyGuard, apiKeyHandshakeGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, handshakeMiddlewares, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, jwtHandshakeGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, onSocketEvent, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketController, telegram, validateAndTransform, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };
+export { AnthropicChatAdapter, ApiKey, ApiKeyGuardMiddleware, ApiKeyHandshakeGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, type GoogleChatAdapterV2Options, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemsReq, type IChatAdapterNextItemsRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHandshakeMiddleware, type IHandshakeMiddlewareMetadata, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateInputShape, type IValidateIsInOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtHandshakeGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketChannelReceivedMessage, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyGuard, apiKeyHandshakeGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, handshakeMiddlewares, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, jwtHandshakeGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, onSocketEvent, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketController, telegram, validateAndTransform, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.2.0-beta.15",
+  "version": "0.2.0-beta.16",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "rollup --config rollup.config.ts --configPlugin typescript && tsup --dts-only --format esm --out-dir dist/src src/index.ts",
     "test:units": "node --import @yucacodes/ts/src/custom-import.mjs  --test './src/**/*.unit.test.ts'",
-    "test:integration": "node --import @yucacodes/ts/src/custom-import.mjs  --test './src/**/*.integration.test.ts'",
+    "test:integration": "node --import ./env.mjs --import @yucacodes/ts/src/custom-import.mjs  --test './src/**/*.integration.test.ts'",
     "fmt": "prettier --write .",
     "fmt:check": "prettier --check .",
     "types:check": "tsc --noEmit",
@@ -37,10 +37,10 @@
     "@types/big.js": "^6.2.2",
     "@types/debug": "^4.1.12",
     "@types/express": "^5.0.1",
-    "@types/jsonwebtoken": "^9.0.10",
-    "@types/pg": "^8.11.14",
     "@types/html-to-text": "^9.0.4",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "22.14.1",
+    "@types/pg": "^8.11.14",
     "@yucacodes/ts": "^0.0.4",
     "big.js": "^7.0.1",
     "body-parser": "^2.2.0",