Merge pull request #248 from harmony-one/dev

Dev to Master Merge (9/05)

Author: meepface

src/bot.ts

@@ -1,4 +1,4 @@
-import {TranslateBot} from "./modules/translate/TranslateBot";
+import { TranslateBot } from "./modules/translate/TranslateBot";
 
 require("events").EventEmitter.defaultMaxListeners = 30;
 import express from "express";
@@ -98,8 +98,8 @@ function createInitialSessionData(): BotSessionData {
     },
     translate: {
       languages: [],
-      enable: false
-    }
+      enable: false,
+    },
   };
 }
 
@@ -270,21 +270,23 @@ const onMessage = async (ctx: OnMessageContext) => {
       const price = translateBot.getEstimatedPrice(ctx);
       const isPaid = await payments.pay(ctx, price);
 
-      if(isPaid) {
-        const response = await translateBot.onEvent(ctx, (reason?: string) => {
-          payments.refundPayment(reason, ctx, price);
-        }).catch((e) => {
-          payments.refundPayment(e.message || "Unknown error", ctx, price);
-          return {next: false};
-        });
+      if (isPaid) {
+        const response = await translateBot
+          .onEvent(ctx, (reason?: string) => {
+            payments.refundPayment(reason, ctx, price);
+          })
+          .catch((e) => {
+            payments.refundPayment(e.message || "Unknown error", ctx, price);
+            return { next: false };
+          });
 
         if (!response.next) {
           return;
         }
       }
     }
 
-    if (openAiBot.isSupportedEvent(ctx)) {
+    if (await openAiBot.isSupportedEvent(ctx)) {
       if (ctx.session.openAi.imageGen.isEnabled) {
         const price = openAiBot.getEstimatedPrice(ctx);
         const isPaid = await payments.pay(ctx, price!);
@@ -438,15 +440,15 @@ bot.command("love", (ctx) => {
   });
 });
 
-bot.command('stop', (ctx) => {
+bot.command("stop", (ctx) => {
   logger.info("/stop command");
   ctx.session.openAi.chatGpt.chatConversation = [];
   ctx.session.openAi.chatGpt.usage = 0;
-  ctx.session.openAi.chatGpt.price = 0;  
+  ctx.session.openAi.chatGpt.price = 0;
   ctx.session.translate.enable = false;
-  ctx.session.translate.languages = []
-  ctx.session.oneCountry.lastDomain = ""
-})
+  ctx.session.translate.languages = [];
+  ctx.session.oneCountry.lastDomain = "";
+});
 // bot.command("memo", (ctx) => {
 //   ctx.reply(MEMO.text, {
 //     parse_mode: "Markdown",

src/config.ts

@@ -26,10 +26,6 @@ export default {
     ? parseInt(process.env.SESSION_TIMEOUT)
     : 48, // in hours
   openAi: {
-    maxTokens:
-      (process.env.OPENAI_MAX_TOKENS &&
-        parseInt(process.env.OPENAI_MAX_TOKENS)) ||
-      800, // telegram messages has a char limit
     dalle: {
       isEnabled: Boolean(parseInt(process.env.IMAGE_GEN_ENABLED || "1")),
       telegramFileUrl: "https://api.telegram.org/file/bot",
@@ -48,6 +44,11 @@ export default {
       },
     },
     chatGpt: {
+      maxTokens:
+        (process.env.OPENAI_MAX_TOKENS &&
+          parseInt(process.env.OPENAI_MAX_TOKENS)) ||
+        800, // telegram messages has a char limit
+      wordLimit: 50,
       wordCountBetween: process.env.WORD_COUNT_BETWEEN
         ? parseInt(process.env.WORD_COUNT_BETWEEN)
         : 100,
@@ -64,13 +65,13 @@ export default {
       prefixes: {
         chatPrefix: process.env.ASK_PREFIX
           ? process.env.ASK_PREFIX.split(",")
-          : ["a.","?",">","."],
+          : ["a.", "?", ">", "."],
         dallePrefix: process.env.DALLE_PREFIX
           ? process.env.DALLE_PREFIX.split(",")
           : ["d."],
         newPrefix: process.env.NEW_PREFIX
           ? process.env.NEW_PREFIX.split(",")
-          : ["n."],
+          : ["n.", ".."],
       },
       minimumBalance: process.env.MIN_BALANCE
         ? parseInt(process.env.MIN_BALANCE)

src/database/stats.service.ts

@@ -18,6 +18,12 @@ export interface BotPaymentLog {
   amountCredits: number
 }
 
+export interface EngagementByCommand {
+  command: string,
+  commandCount: string,
+  oneAmount: string,
+}
+
 export class StatsService {
   public writeLog(log: BotPaymentLog) {
     let paymentLog = new BotLog()
@@ -87,6 +93,25 @@ export class StatsService {
     return rows.length ? +rows[0].count : 0
   }
 
+  public async getUserEngagementByCommand(daysPeriod = 7): Promise<EngagementByCommand[]> {
+    const currentTime = moment();
+    const dateStart = moment()
+      .tz('America/Los_Angeles')
+      .set({ hour: 0, minute: 0, second: 0 })
+      .subtract(daysPeriod,'days')
+      .unix()
+
+    const dateEnd = currentTime.unix();
+
+    const rows = await logRepository.createQueryBuilder('logs')
+      .select('logs.command, count(logs.command) as "commandCount", SUM(logs.amountOne) as "oneAmount"')
+      .where(`logs.createdAt BETWEEN TO_TIMESTAMP(${dateStart}) and TO_TIMESTAMP(${dateEnd})`)
+      .groupBy('logs.command')
+      .orderBy('"commandCount"', 'DESC').execute();
+
+    return rows;
+  }
+
   public addCommandStat({tgUserId, rawMessage, command}: {tgUserId: number, rawMessage: string, command: string}) {
     const stat = new StatBotCommand();
 

src/modules/open-ai/api/openAi.ts

@@ -17,6 +17,7 @@ import {
   DalleGPTModel,
   DalleGPTModels,
 } from "../types";
+import { getMessageExtras } from "../helpers";
 
 const openai = new OpenAI({
   apiKey: config.openAiKey,
@@ -98,7 +99,7 @@ export async function chatCompletion(
   try {
     const payload = {
       model: model,
-      max_tokens: limitTokens ? config.openAi.maxTokens : undefined,
+      max_tokens: limitTokens ? config.openAi.chatGpt.maxTokens : undefined,
       temperature: config.openAi.dalle.completions.temperature,
       messages: conversation,
     };
@@ -134,12 +135,15 @@ export const streamChatCompletion = async (
     const wordCountMinimum = config.openAi.chatGpt.wordCountBetween;
     return new Promise<string>(async (resolve, reject) => {
       try {
+        // const extras = getMessageExtras({
+        //   topicId: ctx.message?.message_thread_id
+        // })
         const stream = await openai.chat.completions.create({
           model: model,
           messages:
             conversation as OpenAI.Chat.Completions.CreateChatCompletionRequestMessage[],
           stream: true,
-          max_tokens: limitTokens ? config.openAi.maxTokens : undefined,
+          max_tokens: limitTokens ? config.openAi.chatGpt.maxTokens : undefined,
           temperature: config.openAi.dalle.completions.temperature,
         });
         let wordCount = 0;
@@ -157,6 +161,9 @@ export const streamChatCompletion = async (
             completion = completion.replaceAll("..", "");
             completion += "..";
             wordCount = 0;
+            // const extras = getMessageExtras({
+            //   topicId: ctx.message?.message_thread_id
+            // })
             await ctx.api
               .editMessageText(ctx.chat?.id!, msgId, completion)
               .catch(async (e: any) => {