telegram_libs 0.1.21__py3-none-any.whl → 0.1.22__py3-none-any.whl

telegram_libs/constants.py

@@ -5,6 +5,7 @@ required_constants = []
 BOTS_AMOUNT = os.getenv("BOTS_AMOUNT")
 MONGO_URI = os.getenv("MONGO_URI")
 SUBSCRIPTION_DB_NAME = os.getenv("SUBSCRIPTION_DB_NAME")
+LOGS_DB_NAME = os.getenv("LOGS_DB_NAME", "logs")
 DEBUG = os.getenv("DEBUG", "False").lower() in ("true", "1", "yes")
 
 required_constants.append(("BOTS_AMOUNT", BOTS_AMOUNT))

telegram_libs/error.py

@@ -1,9 +1,11 @@
 from logging import getLogger
 from telegram import Update
 from telegram.ext import ContextTypes
+from telegram_libs.logger import BotLogger
 
 logger = getLogger(__name__)
 
 
-async def error_handler(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    logger.error(f"Update {update} caused error {context.error}")
+async def error_handler(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger, bot_name: str) -> None:
+    logger.error(f"Update {update} caused error {context.error}")
+    bot_logger.log_action(update.effective_user.id, "error_handler", bot_name, context.error)

telegram_libs/handlers.py

@@ -17,28 +17,29 @@ from telegram_libs.support import (
 )
 from telegram_libs.utils import more_bots_list_command
 from telegram_libs.error import error_handler
+from telegram_libs.logger import BotLogger
 
 
 def register_subscription_handlers(
-    app: Application, mongo_manager: MongoManager
+    app: Application, mongo_manager: MongoManager, bot_logger: BotLogger
 ) -> None:
     """Register subscription-related handlers."""
-    app.add_handler(CallbackQueryHandler(subscription_callback, pattern="^sub_"))
-    app.add_handler(CommandHandler("subscribe", partial(subscribe_command, mongo_manager=mongo_manager)))
+    app.add_handler(CallbackQueryHandler(partial(subscription_callback, bot_logger=bot_logger), pattern="^sub_"))
+    app.add_handler(CommandHandler("subscribe", partial(subscribe_command, mongo_manager=mongo_manager, bot_logger=bot_logger)))
     app.add_handler(CommandHandler("status", partial(check_subscription_command, mongo_manager=mongo_manager)))
 
     # Payment handlers
     app.add_handler(PreCheckoutQueryHandler(precheckout_handler))
-    app.add_handler(MessageHandler(filters.SUCCESSFUL_PAYMENT, partial(successful_payment, mongo_manager=mongo_manager)))
+    app.add_handler(MessageHandler(filters.SUCCESSFUL_PAYMENT, partial(successful_payment, mongo_manager=mongo_manager, bot_logger=bot_logger)))
 
 
-def register_support_handlers(app: Application, bot_name: str) -> None:
+def register_support_handlers(app: Application, bot_name: str, bot_logger: BotLogger) -> None:
     """Register support handlers for the bot"""
-    app.add_handler(CommandHandler("support", handle_support_command))
+    app.add_handler(CommandHandler("support", partial(handle_support_command, bot_logger=bot_logger)))
     app.add_handler(
         MessageHandler(
             filters.TEXT & ~filters.COMMAND & SupportFilter(),
-            partial(_handle_user_response, bot_name=bot_name),
+            partial(_handle_user_response, bot_name=bot_name, bot_logger=bot_logger),
         )
     )
 
@@ -47,10 +48,11 @@ def register_common_handlers(
     app: Application, bot_name: str, mongo_manager: MongoManager
 ) -> None:
     """Register common handlers for the bot"""
+    bot_logger = BotLogger()
     app.add_handler(CommandHandler("more", more_bots_list_command))
     
-    register_support_handlers(app, bot_name)
-    register_subscription_handlers(app, mongo_manager)
+    register_support_handlers(app, bot_name, bot_logger)
+    register_subscription_handlers(app, mongo_manager, bot_logger)
     
     # Error handler
-    app.add_error_handler(error_handler)
+    app.add_error_handler(partial(error_handler, bot_logger=bot_logger, bot_name=bot_name))

telegram_libs/logger.py

@@ -0,0 +1,26 @@
+from datetime import datetime
+from telegram_libs.mongo import MongoManager
+from telegram_libs.constants import DEBUG, LOGS_DB_NAME
+
+
+class BotLogger:
+    def __init__(self):
+        self.mongo_manager = MongoManager(mongo_database_name=LOGS_DB_NAME)
+        self.logs_collection = (
+            self.mongo_manager.client[LOGS_DB_NAME]["logs_test"]
+            if DEBUG
+            else self.mongo_manager.client[LOGS_DB_NAME]["logs"]
+        )
+
+    def log_action(
+        self, user_id: int, action_type: str, bot_name: str, details: dict = None
+    ) -> None:
+        """Log a user action to the database."""
+        log_entry = {
+            "user_id": user_id,
+            "action_type": action_type,
+            "bot_name": bot_name,
+            "timestamp": datetime.now().isoformat(),
+            "details": details or {},
+        }
+        self.logs_collection.insert_one(log_entry) 

telegram_libs/payment.py

@@ -6,6 +6,7 @@ from telegram_libs.translation import t
 from telegram_libs.subscription import add_subscription_payment
 from telegram_libs.utils import get_user_info
 from telegram_libs.mongo import MongoManager
+from telegram_libs.logger import BotLogger
 
 logger = getLogger(__name__)
 
@@ -33,12 +34,14 @@ async def precheckout_handler(update: Update, context: ContextTypes.DEFAULT_TYPE
             logger.error(f"Error sending pre-checkout error: {e2}")
 
 
-async def successful_payment(update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager) -> None:
+async def successful_payment(update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager, bot_logger: BotLogger) -> None:
     """Handle successful payments"""
     user_info = get_user_info(update, mongo_manager)
     user_id = user_info["user_id"]
     lang = user_info["lang"]
     payment_info = update.message.successful_payment
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "successful_payment", bot_name, {"payload": payment_info.invoice_payload, "amount": payment_info.total_amount, "currency": payment_info.currency})
     logger.info(f"Payment info received: {payment_info}")
 
     # Determine which plan was purchased

telegram_libs/subscription.py

@@ -5,6 +5,7 @@ from telegram_libs.constants import SUBSCRIPTION_DB_NAME, DEBUG, BOTS_AMOUNT
 from telegram_libs.mongo import MongoManager
 from telegram_libs.utils import get_user_info
 from telegram_libs.translation import t
+from telegram_libs.logger import BotLogger
 
 
 # Define the subscription database and collection
@@ -89,10 +90,13 @@ async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboard
 
 
 async def subscription_callback(
-    update: Update, context: ContextTypes.DEFAULT_TYPE
+    update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger
 ) -> None:
     """Handle subscription button clicks"""
     query = update.callback_query
+    user_id = query.from_user.id
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "subscription_button_click", bot_name, {"plan": query.data})
     await query.answer()
     plan = query.data
 
@@ -142,11 +146,14 @@ async def subscription_callback(
 
 
 async def subscribe_command(
-    update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager
+    update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager, bot_logger: BotLogger
 ) -> None:
     """Show subscription options"""
     user_info = get_user_info(update, mongo_manager)
+    user_id = user_info["user_id"]
     lang = user_info["lang"]
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "subscribe_command", bot_name)
 
     reply_markup = await get_subscription_keyboard(update, lang)
 

telegram_libs/support.py

@@ -6,6 +6,7 @@ from telegram.ext.filters import BaseFilter
 from telegram_libs.mongo import MongoManager
 from telegram_libs.constants import DEBUG, SUBSCRIPTION_DB_NAME
 from telegram_libs.translation import t
+from telegram_libs.logger import BotLogger
 
 
 SUPPORT_WAITING = "support_waiting"
@@ -13,17 +14,22 @@ SUPPORT_WAITING = "support_waiting"
 mongo_manager_instance = MongoManager(mongo_database_name=SUBSCRIPTION_DB_NAME) # Use an existing or create a new MongoManager instance
 
 
-async def handle_support_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+async def handle_support_command(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger) -> None:
     """Support command handler"""
+    user_id = update.effective_user.id
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "support_command", bot_name)
     await update.message.reply_text(
         t("support.message", update.effective_user.language_code, common=True)
     )
     context.user_data[SUPPORT_WAITING] = True
     
 
-async def _handle_user_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str) -> None:
+async def _handle_user_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str, bot_logger: BotLogger) -> None:
     """Handle user's support message"""
+    user_id = update.effective_user.id
     if context.user_data.get(SUPPORT_WAITING):
+        bot_logger.log_action(user_id, "support_message_sent", bot_name, {"message": update.message.text})
         db_name = "support"
         collection_name = "support" if not DEBUG else "support_test"
         message_key = "support.response"

telegram_libs/utils.py

@@ -4,11 +4,11 @@ from telegram import (
     InlineKeyboardMarkup,
 )
 from telegram import Update
-from telegram.ext import ContextTypes, Application, CommandHandler, CallbackQueryHandler
+from telegram.ext import ContextTypes
 from telegram_libs.constants import BOTS_AMOUNT
 from telegram_libs.translation import t
-from telegram_libs.support import register_support_handlers
 from telegram_libs.mongo import MongoManager
+from telegram_libs.logger import BotLogger
 
 
 basicConfig(
@@ -47,7 +47,10 @@ async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboard
     ]
     
 
-async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger) -> None:
+    user_id = update.effective_user.id
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "more_bots_list_command", bot_name)
     message = """Here is the list of all bots: 
 
 
@@ -73,8 +76,3 @@ def get_user_info(update: Update, mongo_manager: MongoManager) -> dict:
         "lang": user_data.get("language", "en"),
         **user_data,
     }
-
-def register_common_handlers(application: Application, bot_name: str) -> None:
-    """Register common handlers to the application."""
-    application.add_handler(CommandHandler("more", more_bots_list_command))
-    register_support_handlers(application, bot_name)

{telegram_libs-0.1.21.dist-info → telegram_libs-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: telegram_libs
-Version: 0.1.21
+Version: 0.1.22
 Summary: Common libraries for Telegram bots
 Author: Andrey Gritsaenko gricaenko.95a@gmail.com
 Requires-Python: >=3.11,<4.0

telegram_libs-0.1.22.dist-info/RECORD

@@ -0,0 +1,17 @@
+telegram_libs/__init__.py,sha256=xrsD5r6ZiJxPapHf1UhQ61z2gHtCCWrzW0CZHvlvXRc,82
+telegram_libs/constants.py,sha256=cGQBM1z3jmh00pHQlBP-SbbPqKGOxlCRVUsrsThkWCU,655
+telegram_libs/error.py,sha256=uomabeEiSP4v4AEpKYbi_gR0l3G003sio6lKl72AinY,453
+telegram_libs/handlers.py,sha256=uiXJGkwF8BZhaiWVYq1IYOc3OKAIowRR2Q0iv3REsZY,2385
+telegram_libs/locales/en.json,sha256=4VVkME7lCKW6ZjkopaoA6Uq3DLbEVkWacGei3GNSXFM,843
+telegram_libs/locales/ru.json,sha256=LYI6rAlwdNLaTGgkrALn31Lt7jC3SZteei8P_i7ZpQI,1208
+telegram_libs/logger.py,sha256=oikvkZMk2kOLvQI9hVMUGMCoSnOPf_fhMvv2SbO-STo,891
+telegram_libs/mongo.py,sha256=urUvtIamU_WAqf1S6fDiX4ZOzOaTuRph-ovACKIAjlM,2519
+telegram_libs/payment.py,sha256=PSoagCTUt4xad-39kVYc2tcFgaPMQsP9eplCVqI9hnc,3661
+telegram_libs/subscription.py,sha256=PFgoWKgjRrjzBjK-AMrESt_7aFk0pa8Qr_Wl1aQIoW8,6430
+telegram_libs/support.py,sha256=a3BA7g3seVBUMasv65SzxebLayLigA069wvDcStYbCM,2748
+telegram_libs/translation.py,sha256=8Kb2cgqKKZH4X_i2Le0V_K1imZdoaCzYAca831DOBig,2049
+telegram_libs/utils.py,sha256=wgkFCziQq4F3z-2AFMirgyY-EDu9D863vQy2ZkjPZSg,2605
+telegram_libs-0.1.22.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
+telegram_libs-0.1.22.dist-info/METADATA,sha256=YCO340LDQxpqHfo9FMmNLwulB4zNOmR4YyxhgpqKo_g,804
+telegram_libs-0.1.22.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+telegram_libs-0.1.22.dist-info/RECORD,,

telegram_libs-0.1.21.dist-info/RECORD

@@ -1,16 +0,0 @@
-telegram_libs/__init__.py,sha256=xrsD5r6ZiJxPapHf1UhQ61z2gHtCCWrzW0CZHvlvXRc,82
-telegram_libs/constants.py,sha256=7-L1uK9UKCVAZNKYnqmM4B18JDxfxHMpZgTIjh0rATg,606
-telegram_libs/error.py,sha256=YtI2qCweDmANzPp3jae6yNzMQMtC9Z5TIeZ2-utGi_4,270
-telegram_libs/handlers.py,sha256=5c8jRL4eEC4UyCugi5SaoUM7zEbgPHZum9i6Jh8WswM,2059
-telegram_libs/locales/en.json,sha256=4VVkME7lCKW6ZjkopaoA6Uq3DLbEVkWacGei3GNSXFM,843
-telegram_libs/locales/ru.json,sha256=LYI6rAlwdNLaTGgkrALn31Lt7jC3SZteei8P_i7ZpQI,1208
-telegram_libs/mongo.py,sha256=urUvtIamU_WAqf1S6fDiX4ZOzOaTuRph-ovACKIAjlM,2519
-telegram_libs/payment.py,sha256=CCB7xtODlR_0o3layVjtE9hhHxJTZ3mhptDPDqfqYSg,3381
-telegram_libs/subscription.py,sha256=0ubzbDeyENMAdB2shH9qgH_eNzxr_zRsYgkhjolZqHo,6047
-telegram_libs/support.py,sha256=UCgJPLJdQUfsbKTIIsNfOpP9CCdw5GjlcSl6aBwNw1U,2378
-telegram_libs/translation.py,sha256=8Kb2cgqKKZH4X_i2Le0V_K1imZdoaCzYAca831DOBig,2049
-telegram_libs/utils.py,sha256=OuFcSZ8LEqfDlW5F5t-R7qpjfBwmrRGfsbgIWdh23OI,2772
-telegram_libs-0.1.21.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
-telegram_libs-0.1.21.dist-info/METADATA,sha256=RiSQv1QF5-3sXUxKgK4ciHtyQNVN9STRVMKbkkOmlCE,804
-telegram_libs-0.1.21.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-telegram_libs-0.1.21.dist-info/RECORD,,