chore: added multi sessions (#29)

mikita-workspace · May 15, 2023 · b6319c9 · b6319c9
1 parent e9df304
commit b6319c9
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/src/bot.ts b/src/bot.ts
@@ -79,8 +79,12 @@ export const createBot = async () => {
 
   bot.use(
     session({
-      initial: createInitialSessionData,
-      storage: mongo.sessionAdapter,
+      type: 'multi',
+      custom: {
+        storage: mongo.sessionAdapter,
+        initial: createInitialSessionData,
+      },
+      conversation: {},
     }),
   );
 

diff --git a/src/helpers/gpt.helpers.ts b/src/helpers/gpt.helpers.ts
@@ -13,18 +13,20 @@ export const convertGPTMessage = (
 
 export const getGPTAnswer = async (ctx: BotContextType, text = '') => {
   try {
-    ctx.session.messages.push({
+    ctx.session.custom.messages.push({
       gptFormat: convertGPTMessage(text),
       timestamp: Date.now(),
     });
 
-    const response = await openAI.chat(ctx.session.messages.map(({ gptFormat }) => gptFormat));
+    const response = await openAI.chat(
+      ctx.session.custom.messages.map(({ gptFormat }) => gptFormat),
+    );
 
     if (!response) {
       return '';
     }
 
-    ctx.session.messages.push({
+    ctx.session.custom.messages.push({
       gptFormat: convertGPTMessage(response.content, MessageRoles.ASSISTANT),
       timestamp: Date.now(),
     });

diff --git a/src/helpers/session.helpers.ts b/src/helpers/session.helpers.ts
@@ -1,10 +1,9 @@
 import { SessionCsvIds } from '@bot/constants';
 import { SessionModelType, SessionType } from '@bot/types';
 
-export const createInitialSessionData = (): SessionType => ({
+export const createInitialSessionData = (): SessionType['custom'] => ({
   username: null,
   messages: [],
-  conversation: {},
 });
 
 export const mapUserSessionMessages = (userSession: SessionModelType) =>

diff --git a/src/middlewares/normalize.middleware.ts b/src/middlewares/normalize.middleware.ts
@@ -3,13 +3,12 @@ import { BotContextType, GrammyMiddlewareFn } from '@bot/types';
 
 export const normalize = (): GrammyMiddlewareFn<BotContextType> => async (ctx, next) => {
   const username = ctx?.from?.username ?? '';
-  const sessionMessages = ctx.session.messages;
+  const sessionMessages = ctx.session.custom.messages;
 
-  ctx.session.username ??= username;
-  ctx.session.conversation ??= {};
+  ctx.session.custom.username ??= username;
 
   if (sessionMessages.length >= MAX_SESSION_MESSAGES) {
-    ctx.session.messages = sessionMessages.slice(Math.floor(MAX_SESSION_MESSAGES / 2.5));
+    ctx.session.custom.messages = sessionMessages.slice(Math.floor(MAX_SESSION_MESSAGES / 2.5));
   }
 
   return next();

diff --git a/src/models/session.model.ts b/src/models/session.model.ts
@@ -6,7 +6,6 @@ const schema = new Schema<SessionModelType>({
   value: {
     username: { type: String },
     messages: [],
-    conversation: { type: Object, default: {} },
   },
 });
 

diff --git a/src/services/mongo.service.ts b/src/services/mongo.service.ts
@@ -1,14 +1,14 @@
 import { SessionModel, UserModel } from '@bot/models';
 import { logger } from '@bot/services';
-import { IMongo } from '@bot/types';
+import { IMongo, SessionType } from '@bot/types';
 import { fetchCachedData, removeValueFromMemoryCache, setValueToMemoryCache } from '@bot/utils';
 import { ISession, MongoDBAdapter } from '@grammyjs/storage-mongodb';
 import mongoose from 'mongoose';
 
 export class MongoService implements IMongo {
   sessions: mongoose.mongo.Collection<ISession>;
 
-  sessionAdapter: MongoDBAdapter<unknown>;
+  sessionAdapter: MongoDBAdapter<SessionType['custom']>;
 
   constructor() {
     const sessions = mongoose.connection.collection<ISession>('sessions');

diff --git a/src/types/bot.types.ts b/src/types/bot.types.ts
@@ -5,12 +5,13 @@ import { MenuFlavor } from '@grammyjs/menu';
 import { Bot, Context, SessionFlavor } from 'grammy';
 
 export type SessionType = {
-  username: string | null;
-  messages: {
-    gptFormat: { content: string; role: `${MessageRoles}` };
-    timestamp: number;
-  }[];
-  conversation: object;
+  custom: {
+    username: string | null;
+    messages: {
+      gptFormat: { content: string; role: `${MessageRoles}` };
+      timestamp: number;
+    }[];
+  };
 };
 
 export type BotContextType = Context &

diff --git a/src/types/model.types.ts b/src/types/model.types.ts
@@ -12,7 +12,6 @@ export type SessionModelType = {
   key: string;
   value: {
     username: string;
-    messages: SessionType['messages'];
-    conversation: SessionType['conversation'];
+    messages: SessionType['custom']['messages'];
   };
 };