feat(*): fix subtraction tokens and mi

brgman · brgman · commit c9509b6f97c9 · 2024-05-11T21:53:21.000+02:00
diff --git a/README.md b/README.md
@@ -24,4 +24,10 @@ quiz_requests
 В будущем дать возможность отправлять все новые запросы из таждой таблицы на обработку, в порядке их сохранения.
 В будущем не отправлять больше 5 запросов подряд в Mi. и посмотреть ограничения по OpenAI.
 
-Проверить с Максимом как ведет себя бот если 2 пользователя делают одновременно одинаковые действия, пересеаются ли реквизиты.
+Проверить с Максимом как ведет себя бот если 2 пользователя делают одновременно одинаковые действия, пересеаются ли реквизиты.
+
+Баги
+при выбранном миджорни нужно менять режим если выбрана кнопка смены режима
+в конверторе не падает огибка
+в конверторе если долго статус wokr тоже сбрасывать как refund
+перенести переводы в таблицы
diff --git a/bot/commands/admin/refundTokensIfError.js b/bot/commands/admin/refundTokensIfError.js
@@ -1,6 +1,6 @@
 import { INITIAL_SESSION } from '../../constants/index.js'
 import { db } from '../../db/index.js'
-import { Sequelize } from 'sequelize'
+import { Op, Sequelize } from 'sequelize'
 import { ct } from '../../utils/createTranslate.js'
 
 export const refundTokensIfError = bot => {
@@ -16,7 +16,7 @@ export const refundTokensIfError = bot => {
       }
       msg['ctx'] = INITIAL_SESSION
       try {
-        const errors = await db.convertor_requests.findAll({ where: { status: 'error' } })
+        const errors = await db.convertor_requests.findAll({ where: { [Op.or]: [{ status: 'work' }, { status: 'error' }] } })
 
         if (errors.length) {
           errors.map(async error => {
diff --git a/bot/commands/keyboard/my_account.js b/bot/commands/keyboard/my_account.js
@@ -9,6 +9,7 @@ import { referralLevelCreator } from '../../utils/payments/referralLevelCreator.
 import { keyboardQuiz } from './quiz.js'
 import Stripe from 'stripe'
 import { createFullName } from '../../utils/createFullName.js'
+import { numberWithSpaces } from '../../utils/numberWithSpaces.js'
 
 dotenv.config({ path: '../.env' })
 
@@ -97,7 +98,7 @@ export const keyboardMyAccount = async (bot, msg, prevMessageForEdit, prevLevel,
 
     eventEmitter.on(`get_first_level_A_${msgId}`, async function() {
       await bot.editMessageText(
-        t('account', { tokens, paid_days }),
+        t('account', { tokens: numberWithSpaces(tokens), paid_days }),
         {
           message_id: accountMessage.message_id,
           chat_id: chatId,
@@ -218,7 +219,7 @@ Payok - оплачивайте следующими способами:
       }).then(res => {
         clearTimeout(timeout)
         bot.editMessageText(
-          changeDescription ? changeDescription : t('account', { tokens, paid_days }),
+          changeDescription ? changeDescription : t('account', { tokens: numberWithSpaces(tokens), paid_days }),
           {
             message_id: accountMessage.message_id,
             chat_id: chatId,
diff --git a/bot/commands/modes/chatGPT.js b/bot/commands/modes/chatGPT.js
@@ -67,8 +67,8 @@ export const modeChatGPT = async (bot, msg, qweryOptions) => {
     const tokenCounts = await calculationOfNumberOfTokens(textSum)
 
     await db.subscriber.update(
-      { tokens: Sequelize.literal(`tokens - ${tokenCounts.length}`) },
-      { where: { user_id: chatID } }
+      { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
+      { where: { chat_id: chatID } }
     )
 
     if (!response) {
diff --git a/bot/commands/modes/midjourney.js b/bot/commands/modes/midjourney.js
@@ -1,11 +1,14 @@
 import { Midjourney } from 'midjourney'
 import { saveAndSendPhoto, saveAndSendPreloaderPhoto } from '../../utils/saveAndSendPhoto.js'
 import { loaderOn } from '../../utils/loader.js'
-import { TYPE_RESPONSE_MJ } from '../../constants/index.js'
+import { REQUEST_TYPES_COST, TYPE_RESPONSE_MJ } from '../../constants/index.js'
 import { upscale } from './midjourney/upscale.js'
 import events from 'events'
 import { variation } from './midjourney/variation.js'
 import dotenv from 'dotenv'
+import { calculationOfNumberOfTokens } from '../../utils/checkTokens.js'
+import { db } from '../../db/index.js'
+import { Sequelize } from 'sequelize'
 
 dotenv.config()
 
@@ -84,6 +87,13 @@ export const modeMidjourney = async (bot, sudoUser, msg, match) => {
 
     const prevMessage = await saveAndSendPhoto(imgUrl, imgDir, filePath, chatID, bot, options, TYPE_RESPONSE_MJ.PHOTO, waiting)
 
+    const tokenCounts = await calculationOfNumberOfTokens(' ', REQUEST_TYPES_COST.MIDJOURNEY)
+
+    await db.subscriber.update(
+      { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
+      { where: { chat_id: chatID } }
+    )
+
     for (let i = 1; i < 5; i++) {
       eventEmitter.on(`V${i}++${waiting.message_id}`, async function(query) {
         await variation(prompt, Imagine, client, query, bot, chatID, prevMessage.message_id, userMessageId)
diff --git a/bot/commands/modes/midjourney/upscale.js b/bot/commands/modes/midjourney/upscale.js
@@ -17,10 +17,10 @@ export const upscale = async (Variation, client, query, bot, chatID, prevMessage
   let waiting = await loaderOn(0, bot, chatID)
 
   try {
-    if (prevMessageId)
-      await bot.deleteMessage(chatID, prevMessageId).catch(() => {
-        console.log('🔺 upscale | error remove loader ', prevMessageId)
-      })
+    // if (prevMessageId)
+    //   await bot.deleteMessage(chatID, prevMessageId).catch(() => {
+    //     console.log('🔺 upscale | error remove loader ', prevMessageId)
+    //   })
 
     const upscaleLabel = query.data
     const selectedL = upscaleLabel.split('+')[0]
diff --git a/bot/commands/modes/midjourney/variation.js b/bot/commands/modes/midjourney/variation.js
@@ -10,10 +10,10 @@ export const variation = async (prompt, Imagine, client, query, bot, chatID, pre
     let waiting = await loaderOn(0, bot, chatID)
 
   try {
-    if (prevMessageId)
-      await bot.deleteMessage(chatID, prevMessageId).catch(() => {
-        console.log("🔺 variation | error remove loader ", prevMessageId)
-      })
+    // if (prevMessageId)
+    //   await bot.deleteMessage(chatID, prevMessageId).catch(() => {
+    //     console.log("🔺 variation | error remove loader ", prevMessageId)
+    //   })
 
     const { id: chat_id, title: chat_name } = query.message.chat
     const { message_id } = query.message
diff --git a/bot/commands/modes/modeDalle.js b/bot/commands/modes/modeDalle.js
@@ -2,9 +2,12 @@ import dotenv from 'dotenv'
 import { saveAndSendPhoto } from '../../utils/saveAndSendPhoto.js'
 import { sudoChecker } from '../../utils/sudoChecker.js'
 import { spinnerOn } from '../../utils/spinner.js'
-import { TYPE_RESPONSE_MJ } from '../../constants/index.js'
+import { REQUEST_TYPES_COST, TYPE_RESPONSE_MJ } from '../../constants/index.js'
 import { loaderOn } from '../../utils/loader.js'
 import { OpenAI } from '../../utils/openAi.js'
+import { calculationOfNumberOfTokens } from '../../utils/checkTokens.js'
+import { db } from '../../db/index.js'
+import { Sequelize } from 'sequelize'
 
 dotenv.config()
 
@@ -45,6 +48,13 @@ export const modeDalle = async (bot, sudoUser, msg, match) => {
 
     const response = await openAi.image(prompt)
 
+    const tokenCounts = await calculationOfNumberOfTokens(' ', REQUEST_TYPES_COST.DALLE)
+
+    await db.subscriber.update(
+      { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
+      { where: { chat_id: chatID } }
+    )
+
     const imgUrl = response
     const imgDir = './dalle'
     const filePath = `${imgDir}/${userMessageId}.png`
diff --git a/bot/commands/onMessageDocument.js b/bot/commands/onMessageDocument.js
@@ -9,9 +9,11 @@ import { formats, formatsConvertor } from '../constants/formatsConterter.js'
 import { stepperOn } from '../utils/stepper.js'
 import { sleep } from '../utils/sleep.js'
 import { db } from '../db/index.js'
-import { Op } from 'sequelize'
+import { Op, Sequelize } from 'sequelize'
 import { nanoid } from 'nanoid'
 import { ct } from '../utils/createTranslate.js'
+import { calculationOfNumberOfTokens } from '../utils/checkTokens.js'
+import { REQUEST_TYPES_COST } from '../constants/index.js'
 
 // TODO: определять тип файла от типа в meta telegram
 
@@ -126,7 +128,12 @@ export const onMessageDocument = async (bot, msg) => {
           price_tokens: settings['cost_converter']
         })
 
-        console.log('createTask', createTask)
+        const tokenCounts = await calculationOfNumberOfTokens(' ', REQUEST_TYPES_COST.CONVERTOR)
+
+        await db.subscriber.update(
+          { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
+          { where: { chat_id: msg.from.id } }
+        )
 
         await bot.deleteMessage(msg.from.id, msg.message.message_id).catch((error) => console.log('error dm', error))
         const waiting = await stepperOn(bot, msg, 0) // верочтно логичнее будет сохранить прошлое сообщение msg.message.message_id
diff --git a/bot/commands/textToSpeech.js b/bot/commands/textToSpeech.js
@@ -1,6 +1,10 @@
 import fs from 'fs'
 import { OpenAI } from '../utils/openAi.js'
 import { spinnerOn } from '../utils/spinner.js'
+import { calculationOfNumberOfTokens } from '../utils/checkTokens.js'
+import { REQUEST_TYPES_COST } from '../constants/index.js'
+import { db } from '../db/index.js'
+import { Sequelize } from 'sequelize'
 
 export const textToSpeech = async (bot, chatID, msg, prompt, voice) => {
   let spinner = await spinnerOn(bot, chatID, null, 'modeDalle')
@@ -13,6 +17,13 @@ export const textToSpeech = async (bot, chatID, msg, prompt, voice) => {
     const ttsPathFile = await openAi.textToSpeech(prompt, msg, voice)
     const stream = fs.createReadStream(ttsPathFile)
 
+    const tokenCounts = await calculationOfNumberOfTokens(prompt, REQUEST_TYPES_COST.TTS)
+
+    await db.subscriber.update(
+      { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
+      { where: { chat_id: chatID } }
+    )
+
     await bot.sendAudio(chatID, stream, {
       reply_to_message_id: msg.message_id
     })
diff --git a/bot/utils/numberWithSpaces.js b/bot/utils/numberWithSpaces.js
@@ -0,0 +1,3 @@
+export function numberWithSpaces(x) {
+  return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ".");
+}

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ export const modeChatGPT = async (bot, msg, qweryOptions) => {`
`67`	`67`	`const tokenCounts = await calculationOfNumberOfTokens(textSum)`
`68`	`68`
`69`	`69`	`await db.subscriber.update(`
`70`		- { tokens: Sequelize.literal(`tokens - ${tokenCounts.length}`) },
`71`		`- { where: { user_id: chatID } }`
	`70`	+ { tokens: Sequelize.literal(`tokens - ${tokenCounts}`) },
	`71`	`+ { where: { chat_id: chatID } }`
`72`	`72`	`)`
`73`	`73`
`74`	`74`	`if (!response) {`