Merge pull request 'master' (#16) from master into prod
Reviewed-on: #16
This commit is contained in:
commit
d3d92f56ee
2
.gitignore
vendored
2
.gitignore
vendored
@ -117,3 +117,5 @@ GitHub.sublime-settings
|
|||||||
!.vscode/launch.json
|
!.vscode/launch.json
|
||||||
!.vscode/extensions.json
|
!.vscode/extensions.json
|
||||||
.history
|
.history
|
||||||
|
|
||||||
|
local_platform.json
|
||||||
|
@ -4,4 +4,5 @@ WORKDIR /usr/src/app
|
|||||||
COPY requirements.txt requirements.txt
|
COPY requirements.txt requirements.txt
|
||||||
RUN pip install -r requirements.txt
|
RUN pip install -r requirements.txt
|
||||||
COPY . .
|
COPY . .
|
||||||
ENTRYPOINT ["python", "entrypoint.py"]
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
ENTRYPOINT ["python", "main.py"]
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
class Base:
|
class Daemon:
|
||||||
def execute(self):
|
def execute(self):
|
||||||
raise NotImplemented
|
raise NotImplemented
|
||||||
|
@ -20,6 +20,8 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
|
|||||||
if bot['type'] == 'telegram':
|
if bot['type'] == 'telegram':
|
||||||
token = bot['secrets']['telegram_token']
|
token = bot['secrets']['telegram_token']
|
||||||
self.process_telegram(token, payload['body'])
|
self.process_telegram(token, payload['body'])
|
||||||
|
else:
|
||||||
|
print('Unknown bot type:', bot['type'])
|
||||||
|
|
||||||
def process_telegram(self, token, payload):
|
def process_telegram(self, token, payload):
|
||||||
try:
|
try:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import telebot
|
import telebot
|
||||||
import multiprocessing
|
import threading
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from daemons import base
|
from daemons import base
|
||||||
@ -9,34 +9,39 @@ from utils import queues
|
|||||||
|
|
||||||
class Daemon(base.Daemon):
|
class Daemon(base.Daemon):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.telegram_pollers: dict[str, dict[str, multiprocessing.Process|None]] = {}
|
self.telegram_bots: dict[str, dict[str, telebot.TeleBot|None]] = {}
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
bots = platform.platform_client.get_config('bots')
|
while True:
|
||||||
for project_name, project in bots.items():
|
bots = platform.platform_client.get_config('bots')
|
||||||
if project_name not in self.telegram_pollers:
|
for project_name, project in bots.items():
|
||||||
self.telegram_pollers[project_name] = {}
|
if project_name not in self.telegram_bots:
|
||||||
for bot_name, bot_info in project.items():
|
self.telegram_bots[project_name] = {}
|
||||||
if bot_name not in self.telegram_pollers[project_name]:
|
for bot_name, bot_info in project.items():
|
||||||
self.telegram_pollers[project_name][bot_name] = None
|
if bot_name not in self.telegram_bots[project_name]:
|
||||||
process = self.telegram_pollers[project_name][bot_name]
|
self.telegram_bots[project_name][bot_name] = None
|
||||||
if bot_info.get('poll_enabled'):
|
bot = self.telegram_bots[project_name][bot_name]
|
||||||
if process is not None and process.is_alive:
|
if bot_info.get('poll_enabled'):
|
||||||
continue
|
if bot is not None:
|
||||||
new_process = multiprocessing.Process(target=self.start_polling, args=[bot_info['secrets']['telegram_token'], bot_info['queue']])
|
print(f'process for {project_name} {bot_name} is alive')
|
||||||
new_process.start()
|
continue
|
||||||
self.telegram_pollers[project_name][bot_name] = new_process
|
print(f'starting process for {project_name} {bot_name}')
|
||||||
else:
|
bot = telebot.TeleBot(bot_info['secrets']['telegram_token'])
|
||||||
if process is None:
|
self.start_polling(bot, bot_info['queue'])
|
||||||
continue
|
self.telegram_bots[project_name][bot_name] = bot
|
||||||
if process.is_alive:
|
print(f'started process for {project_name} {bot_name}')
|
||||||
process.terminate()
|
else:
|
||||||
self.telegram_pollers[project_name][bot_name] = None
|
if bot is None:
|
||||||
time.sleep(10)
|
print(f'process for {project_name} {bot_name} is not alive')
|
||||||
|
continue
|
||||||
|
print(f'terminating process for {project_name} {bot_name}')
|
||||||
|
bot.stop_bot()
|
||||||
|
self.telegram_bots[project_name][bot_name] = None
|
||||||
|
print(f'terminated process for {project_name} {bot_name}')
|
||||||
|
time.sleep(10)
|
||||||
|
|
||||||
def start_polling(telegram_token, queue):
|
def start_polling(self, bot: telebot.TeleBot, queue: str):
|
||||||
bot = telebot.TeleBot(telegram_token)
|
|
||||||
@bot.message_handler()
|
@bot.message_handler()
|
||||||
def do_action(message):
|
def do_action(message: telebot.types.Message):
|
||||||
queues.set_task(queue, message.json, 1)
|
queues.set_task(queue, message.json, 1)
|
||||||
bot.polling()
|
threading.Thread(target=bot.polling).start()
|
||||||
|
20
main.py
20
main.py
@ -2,14 +2,16 @@ import sys
|
|||||||
|
|
||||||
|
|
||||||
arg = sys.argv[-1]
|
arg = sys.argv[-1]
|
||||||
|
# arg = 'poll'
|
||||||
|
|
||||||
if arg == "poll":
|
if __name__ == '__main__':
|
||||||
print("poll is starting")
|
if arg == "poll":
|
||||||
from daemons.poll import Daemon
|
print("poll is starting")
|
||||||
elif arg == 'mailbox':
|
from daemons.poll import Daemon
|
||||||
print("mailbox is starting")
|
elif arg == 'mailbox':
|
||||||
from daemons.mailbox import Daemon
|
print("mailbox is starting")
|
||||||
else:
|
from daemons.mailbox import Daemon
|
||||||
raise ValueError(f"Unknown param {arg}")
|
else:
|
||||||
|
raise ValueError(f"Unknown param {arg}")
|
||||||
|
|
||||||
Daemon().execute()
|
Daemon().execute()
|
||||||
|
6
requirements.txt
Normal file
6
requirements.txt
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
certifi==2024.8.30
|
||||||
|
charset-normalizer==3.4.0
|
||||||
|
idna==3.10
|
||||||
|
pyTelegramBotAPI==4.1.1
|
||||||
|
requests==2.32.3
|
||||||
|
urllib3==2.2.3
|
@ -88,6 +88,6 @@ class PlatformClient:
|
|||||||
|
|
||||||
platform_client = PlatformClient(
|
platform_client = PlatformClient(
|
||||||
'Botalka',
|
'Botalka',
|
||||||
os.getenv('STAGE'),
|
os.getenv('STAGE', 'local'),
|
||||||
need_poll=True,
|
need_poll=True,
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user