PersonalPublic/gpt_chat_bot
1
0
Fork 0
mirror of https://github.com/Balshgit/gpt_chat_bot.git synced 2025-12-16 21:20:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

add queue tests

Browse Source
This commit is contained in:
Dmitry Afanasyev
2023-09-22 02:39:17 +03:00
committed by GitHub
parent 010a228380
commit 1ecf95631d
16 changed files with 212 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/core/bot.py
View File

@@ -1,6 +1,5 @@
import asyncio
import os
import time
from asyncio import Queue, sleep
from dataclasses import dataclass
from functools import cached_property
@@ -10,18 +9,17 @@ from fastapi import Request, Response
from telegram import Update
from telegram.ext import Application, CommandHandler, ContextTypes
from app.constants import API_PREFIX
from settings.config import Settings
from settings.config import AppSettings
class BotApplication:
def __init__(self, settings: Settings, start_with_webhook: bool = False) -> None:
def __init__(self, settings: AppSettings) -> None:
self.application: Application = ( # type: ignore
Application.builder().token(token=settings.TELEGRAM_API_TOKEN).build()
)
self.add_handlers()
self.settings = settings
self.start_with_webhook = start_with_webhook
self.start_with_webhook = settings.START_WITH_WEBHOOK
async def set_webhook(self) -> None:
await self.application.initialize()
@@ -39,11 +37,7 @@ class BotApplication:
await update.message.reply_text(
"Help!",
disable_notification=True,
api_kwargs={
"text": "Hello World",
"date": int(time.time()) + 30,
"schedule_date": int(time.time()) + 30,
},
api_kwargs={"text": "Hello World"},
)
return None
@@ -60,25 +54,20 @@ class BotApplication:
@cached_property
def webhook_url(self) -> str:
return os.path.join(
self.settings.WEBHOOK_HOST.strip("/"),
API_PREFIX.strip("/"),
self.settings.URL_PREFIX.strip("/"),
self.settings.TELEGRAM_API_TOKEN.strip("/"),
)
return os.path.join(self.settings.DOMAIN.strip("/"), self.settings.bot_webhook_url.strip("/"))
@dataclass
class BotQueue:
bot_app: Application # type: ignore[type-arg]
bot_app: BotApplication
queue: Queue = asyncio.Queue() # type: ignore[type-arg]
async def put_updates_on_queue(self, request: Request) -> Response:
"""
Listen {URL_PREFIX}/{TELEGRAM_WEB_TOKEN} path and proxy post request to bot
Listen /{URL_PREFIX}/{API_PREFIX}/{TELEGRAM_WEB_TOKEN} path and proxy post request to bot
"""
data = await request.json()
tg_update = Update.de_json(data=data, bot=self.bot_app.bot)
tg_update = Update.de_json(data=data, bot=self.bot_app.application.bot)
self.queue.put_nowait(tg_update)
return Response(status_code=HTTPStatus.ACCEPTED)
@@ -86,6 +75,5 @@ class BotQueue:
async def get_updates_from_queue(self) -> None:
while True:
update = await self.queue.get()
print(update)
await self.bot_app.process_update(update)
await self.bot_app.application.process_update(update)
await sleep(0)