@wabot-dev/framework 0.1.0-beta.31 → 0.1.0-beta.33

package/dist/src/addon/chat-bot/claude/ClaudeChatAdapter.js

@@ -94,12 +94,13 @@ class ClaudeChatAdapter {
         };
     }
     mapResponse(response) {
+        let chatItem;
         const content = response.content[0];
         if (content.type === 'text') {
-            return { type: 'botMessage', botMessage: { text: content.text } };
+            chatItem = { type: 'botMessage', botMessage: { text: content.text } };
         }
         else if (content.type === 'tool_use') {
-            return {
+            chatItem = {
                 type: 'functionCall',
                 functionCall: {
                     id: content.id,
@@ -111,6 +112,17 @@ class ClaudeChatAdapter {
         else {
             throw new Error('Not supported Claude Response');
         }
+        let usage;
+        if (response.usage) {
+            usage = {
+                inputTokens: response.usage.input_tokens,
+                outputTokens: response.usage.output_tokens,
+            };
+        }
+        else {
+            throw new Error('Unable to found usage info');
+        }
+        return { chatItem, usage };
     }
 }
 

package/dist/src/addon/chat-bot/deepseek/DeepSeekChatAdapter.js

@@ -102,12 +102,13 @@ class DeepSeekChatAdapter {
         };
     }
     mapResponse(response) {
+        let chatItem;
         const { tool_calls: responseFunctionCall, content: responseText } = response.choices?.[0]?.message ?? {};
         if (responseText) {
-            return { type: 'botMessage', botMessage: { text: responseText } };
+            chatItem = { type: 'botMessage', botMessage: { text: responseText } };
         }
         else if (responseFunctionCall && responseFunctionCall[0]?.type === 'function') {
-            return {
+            chatItem = {
                 type: 'functionCall',
                 functionCall: {
                     id: responseFunctionCall[0].id,
@@ -119,6 +120,17 @@ class DeepSeekChatAdapter {
         else {
             throw new Error('Not supported DeepSeek Response');
         }
+        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');
+        }
+        return { chatItem, usage };
     }
 }
 

package/dist/src/addon/chat-bot/openia/OpenaiChatAdapter.js

@@ -77,12 +77,12 @@ class OpenaiChatAdapter {
         };
     }
     mapResponse(response) {
-        let newItem;
+        let chatItem;
         if (response.output_text) {
-            newItem = { type: 'botMessage', botMessage: { text: response.output_text } };
+            chatItem = { type: 'botMessage', botMessage: { text: response.output_text } };
         }
         else if (response.output && response.output[0]?.type == 'function_call') {
-            newItem = {
+            chatItem = {
                 type: 'functionCall',
                 functionCall: {
                     id: response.output[0].call_id,
@@ -94,7 +94,17 @@ class OpenaiChatAdapter {
         else {
             throw new Error('Not supported OpenIA Response');
         }
-        return newItem;
+        let usage;
+        if (response.usage) {
+            usage = {
+                inputTokens: response.usage.input_tokens,
+                outputTokens: response.usage.output_tokens,
+            };
+        }
+        else {
+            throw new Error('Unable to found usage info');
+        }
+        return { chatItem, usage };
     }
 }
 

package/dist/src/addon/chat-controller/whatsapp/WhatsAppReceiverByDevConnection.js

@@ -1,9 +1,9 @@
 import { __decorate, __metadata } from 'tslib';
 import { Logger } from '../../../core/logger/Logger.js';
 import { WhatsAppReceiver } from './WhatsAppReceiver.js';
-import { singleton } from 'tsyringe';
 import { WabotDevConnection } from './WabotDevConnection.js';
 import { devListentEvent } from './WabotDevSocketContracts.js';
+import { singleton } from '../../../core/injection/index.js';
 
 let WhatsAppReceiverByDevConnection = class WhatsAppReceiverByDevConnection extends WhatsAppReceiver {
     wabotDevConnection;

package/dist/src/addon/chat-controller/whatsapp/WhatsAppReceiverByWebHook.js

@@ -1,9 +1,9 @@
 import { __decorate, __metadata } from 'tslib';
 import { Logger } from '../../../core/logger/Logger.js';
 import { WhatsAppReceiver } from './WhatsAppReceiver.js';
-import { singleton } from 'tsyringe';
 import { ExpressProvider } from '../../../feature/express/ExpressProvider.js';
 import { WhatsAppRepository } from './WhatsAppRepository.js';
+import { singleton } from '../../../core/injection/index.js';
 
 let WhatsAppReceiverByWebHook = class WhatsAppReceiverByWebHook extends WhatsAppReceiver {
     expressProvider;

package/dist/src/core/env/Env.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata } from 'tslib';
-import { singleton } from 'tsyringe';
+import { singleton } from '../injection/index.js';
 
 let Env = class Env {
     envType;

package/dist/src/feature/chat-bot/ChatAdapter.js

@@ -1,6 +1,6 @@
 class ChatAdapter {
     nextItem(req) {
-        throw new Error("Method not implemented.");
+        throw new Error('Method not implemented.');
     }
 }
 

package/dist/src/feature/chat-bot/ChatBot.js

@@ -28,7 +28,7 @@ class ChatBot {
         }
         const systemPrompt = await this.mindset.systemPrompt();
         const tools = this.mindset.tools();
-        const newItemData = await this.adapter.nextItem({
+        const { chatItem: newItemData } = await this.adapter.nextItem({
             model: 'gpt',
             systemPrompt,
             tools,

package/dist/src/feature/express/ExpressProvider.js

@@ -1,9 +1,9 @@
 import { __decorate, __metadata } from 'tslib';
 import { HttpServerProvider } from '../http/HttpServerProvider.js';
 import express from 'express';
-import { singleton } from 'tsyringe';
 import bodyParser from 'body-parser';
 import { Logger } from '../../core/logger/Logger.js';
+import { singleton } from '../../core/injection/index.js';
 
 let ExpressProvider = class ExpressProvider {
     httpServerProvider;

package/dist/src/feature/http/HttpServerProvider.js

@@ -1,7 +1,7 @@
 import { __decorate } from 'tslib';
+import { singleton } from '../../core/injection/index.js';
 import { Logger } from '../../core/logger/Logger.js';
 import { Server } from 'http';
-import { singleton } from 'tsyringe';
 
 let HttpServerProvider = class HttpServerProvider {
     server = null;

package/dist/src/feature/socket/SocketServerProvider.js

@@ -1,8 +1,8 @@
 import { __decorate, __metadata } from 'tslib';
+import { singleton } from '../../core/injection/index.js';
 import { Logger } from '../../core/logger/Logger.js';
 import { HttpServerProvider } from '../http/HttpServerProvider.js';
 import { Server } from 'socket.io';
-import { singleton } from 'tsyringe';
 
 let SocketServerProvider = class SocketServerProvider {
     httpServerProvider;

package/dist/src/index.d.ts

@@ -514,18 +514,27 @@ type IFunctionCallItem = {
 type IChatItem = IBotMessageItem | IHumanMessageItem | IFunctionCallItem;
 type IChatItemType = (typeof chatItemTypeOptions)[number];
 
+interface ILanguageModelUsage {
+    inputTokens: number;
+    outputTokens: number;
+}
+
 interface IChatAdapterNextItemReq {
     model: string;
     systemPrompt: string;
     tools: IMindsetTool[];
     prevItems: IChatItem[];
 }
+interface IChatAdapterNextItemRes {
+    chatItem: IChatItem;
+    usage: ILanguageModelUsage;
+}
 interface IChatAdapter {
-    nextItem(req: IChatAdapterNextItemReq): Promise<IChatItem>;
+    nextItem(req: IChatAdapterNextItemReq): Promise<IChatAdapterNextItemRes>;
 }
 
 declare class ChatAdapter implements IChatAdapter {
-    nextItem(req: IChatAdapterNextItemReq): Promise<IChatItem>;
+    nextItem(req: IChatAdapterNextItemReq): Promise<IChatAdapterNextItemRes>;
 }
 
 type IChatItemData = IEntityData & IChatItem;
@@ -798,7 +807,7 @@ declare class ClaudeChatAdapter implements IChatAdapter {
     private anthropic;
     private logger;
     constructor();
-    nextItem(req: IChatAdapterNextItemReq): Promise<IChatItem>;
+    nextItem(req: IChatAdapterNextItemReq): Promise<IChatAdapterNextItemRes>;
     private mapChatItems;
     private mapHumanMessage;
     private mapBotMessage;
@@ -811,7 +820,7 @@ declare class DeepSeekChatAdapter implements IChatAdapter {
     private deepSeek;
     private logger;
     constructor();
-    nextItem(req: IChatAdapterNextItemReq): Promise<IChatItem>;
+    nextItem(req: IChatAdapterNextItemReq): Promise<IChatAdapterNextItemRes>;
     private mapChatItems;
     private mapHumanMessage;
     private mapBotMessage;
@@ -823,7 +832,7 @@ declare class DeepSeekChatAdapter implements IChatAdapter {
 declare class OpenaiChatAdapter implements IChatAdapter {
     private openai;
     private logger;
-    nextItem(req: IChatAdapterNextItemReq): Promise<IChatItem>;
+    nextItem(req: IChatAdapterNextItemReq): Promise<IChatAdapterNextItemRes>;
     private mapChatItems;
     private mapConectionMessage;
     private mapBotMessage;
@@ -1279,4 +1288,4 @@ interface IValidateMaxOptions {
 }
 declare function validateMax(value: any, options: IValidateMaxOptions): IValidationResult<any>;
 
-export { Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatAdapter, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, Entity, Env, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemReq, 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 IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, get, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, param, post, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, scoped, singleton, socket, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };
+export { Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatAdapter, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, Entity, Env, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemReq, type IChatAdapterNextItemRes, 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 IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, get, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, param, post, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, scoped, singleton, socket, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.1.0-beta.31",
+  "version": "0.1.0-beta.33",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",