Reorganize files in Telegram messaging API and bot

Move files to `src` directory, separating project dependencies and files
from source code

.gitignore

@@ -5,3 +5,5 @@ venv/
 
 data/
 config/
+
+.env

apis/telemsg/requirements.txt

@@ -1,2 +1,3 @@
 flask
+gunicorn
 python-telegram-bot>=12.0.0b1

apis/telemsg/run.sh

@@ -1,2 +1,6 @@
 #!/bin/bash
-gunicorn -b 127.0.0.1:5001 app:app
+set -a
+source .env
+set +a
+
+gunicorn -b 127.0.0.1:5001 --chdir src app:app

apis/telemsg/app.py → apis/telemsg/src/app.py

@@ -1,10 +1,10 @@
+import os
 from flask import Flask, request
 from operator import itemgetter
 from bot import send_message
 
 app = Flask(__name__)
-with open('admin.txt', 'r') as f:
-    ADMIN_ID = int(f.read().strip())
+ADMIN_ID = os.environ.get('TELEGRAM_ADMIN_ID')
 
 
 @app.route('/message', methods=['POST'])

apis/telemsg/bot.py → apis/telemsg/src/bot.py

@@ -1,13 +1,13 @@
+import os
 from telegram.ext import Updater
 from telegram.error import BadRequest, Unauthorized
 
-with open('token.txt', 'r') as f:
-    token = f.read().strip()
+TOKEN = os.environ.get('TELEGRAM_TOKEN')
+updater = Updater(token=TOKEN)
+bot = updater.dispatcher.bot
 
 
 def send_message(chat_id: int, text: str):
-    updater = Updater(token=token)
-    bot = updater.dispatcher.bot
     try:
         bot.send_message(chat_id=chat_id, text=text)
         return True

hosts/telebot/requirements.txt

@@ -1 +1,2 @@
 python-telegram-bot>=12.0.0b1
+requests

hosts/telebot/src/bot/config.py

@@ -0,0 +1,10 @@
+import os
+
+WEB_API_HOST = os.environ.get('WEB_API_HOST', 'localhost')
+WEB_API_PORT = os.environ.get('WEB_API_PORT', 5000)
+
+DB_API_HOST = os.environ.get('DB_API_HOST', 'localhost')
+DB_API_PORT = os.environ.get('DB_API_PORT', 8001)
+
+TELEMSG_API_HOST = os.environ.get('TELEMSG_API_HOST', 'localhost')
+TELEMSG_API_PORT = os.environ.get('TELEMSG_API_PORT', 5001)

hosts/telebot/bot/handlers/conv/feedback.py → hosts/telebot/src/bot/handlers/conv/feedback.py

@@ -3,7 +3,7 @@
 from telegram.ext import ConversationHandler, CommandHandler, MessageHandler, Filters
 from enum import Enum
 
-from ...config import TELE_API_HOST, TELE_API_PORT
+from ...config import TELEMSG_API_HOST, TELEMSG_API_PORT
 from ..logging import logger, log_command_in_db
 
 COMMAND_NAME = 'feedback'
@@ -44,7 +44,7 @@ def cancel(update, context):
 
 
 def message_admin(chat_id, text):
-    url = f'http://{TELE_API_HOST}:{TELE_API_PORT}/message/admin'
+    url = f'http://{TELEMSG_API_HOST}:{TELEMSG_API_PORT}/message/admin'
     headers = {'Content-Type': 'application/json'}
     data = json.dumps({'chat_id': chat_id, 'text': text})
     req = requests.post(url, headers=headers, data=data)

hosts/telebot/main.py → hosts/telebot/src/main.py

@@ -1,10 +1,12 @@
+import os
 from bot import Bot
 
+TOKEN = os.environ.get('TELEGRAM_TOKEN')
+
+
 
 def main():
-    with open('token.txt', 'r') as f:
-        token = f.read().strip()
-    bot = Bot(token)
+    bot = Bot(TOKEN)
     bot.add_handlers()
     bot.start()
 

hosts/telebot/message.py → hosts/telebot/src/message.py

@@ -1,10 +1,11 @@
+import os
 from bot import Bot
 
+TOKEN = os.environ.get('TELEGRAM_TOKEN')
+
 
 def main():
-    with open('token.txt', 'r') as f:
-        token = f.read().strip()
-    bot = Bot(token)
+    bot = Bot(TOKEN)
 
     chat_id = int(input('Enter chat ID: '))
     text = input('Enter message: ')