From 38fd3652f7e70633a0421482c6a0a412896fe58a Mon Sep 17 00:00:00 2001 From: Ekaropolus Date: Tue, 20 May 2025 02:41:46 -0600 Subject: [PATCH] Webhook should not have a upddate before instancing the bot --- pxy_bots/views.py | 114 +++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/pxy_bots/views.py b/pxy_bots/views.py index b19760d..0677a51 100644 --- a/pxy_bots/views.py +++ b/pxy_bots/views.py @@ -16,73 +16,83 @@ logger = logging.getLogger(__name__) @csrf_exempt async def telegram_webhook(request, bot_name): """ - Webhook view that handles Telegram updates asynchronously and only uses LangChain. + Webhook view that handles Telegram updates asynchronously and logs messages. """ try: logger.info(f"Webhook called for bot: {bot_name}") - # Step 1: Fetch the bot instance asynchronously + # 1) Fetch the bot instance try: - bot_instance = await sync_to_async(TelegramBot.objects.get)(name=bot_name, is_active=True) - # Step 1.5: get_or_create de la conversación - user_id = str(update.effective_user.id) - conv, _ = await sync_to_async(TelegramConversation.objects.get_or_create)( - bot=bot_instance, - user_id=user_id, - defaults={'started_at': timezone.now()} + bot_instance = await sync_to_async(TelegramBot.objects.get)( + name=bot_name, is_active=True ) - - # Step 1.6: guardar mensaje entrante - incoming_text = update.message.text or "" - await sync_to_async(TelegramMessage.objects.create)( - conversation=conv, - direction=TelegramMessage.IN, - content=incoming_text - ) - logger.info(f"Loaded bot configuration: {bot_instance}") except TelegramBot.DoesNotExist: logger.error(f"Bot '{bot_name}' not found or inactive.") return JsonResponse({"error": f"Bot '{bot_name}' not found."}, status=400) - # Step 2: Ensure the bot has a LangChain assistant - if not bot_instance.assistant: - logger.error(f"No assistant configured for bot '{bot_name}'.") - return JsonResponse({"error": "Assistant not configured."}, status=400) + if request.method != "POST": + logger.warning("Received non-POST request") + return JsonResponse({"error": "Invalid request method"}, status=405) - # Step 3: Process POST request from Telegram - if request.method == "POST": - try: - request_body = json.loads(request.body.decode("utf-8")) - update = Update.de_json(request_body, Bot(token=bot_instance.token)) - logger.info(f"Update received: {update}") - except json.JSONDecodeError as e: - logger.error(f"Failed to decode JSON: {e}") - return JsonResponse({"error": "Invalid JSON payload"}, status=400) + # 2) Parse the incoming update + try: + payload = json.loads(request.body.decode("utf-8")) + update = Update.de_json(payload, Bot(token=bot_instance.token)) + logger.info(f"Update received: {update}") + except Exception as e: + logger.error(f"Failed to parse update: {e}") + return JsonResponse({"error": "Invalid JSON payload"}, status=400) - # Step 4: Route commands to the appropriate handlers - if update.message: - if update.message.text == "/start": - await start(update) - elif update.message.text == "/help": - await help_command(update) - elif update.message.text == "/dream_city": - await dream_city_command(update) - elif update.message.location: - await handle_location(update) - else: - # Step 5: Process AI-generated response using LangChain - assistant_instance = await sync_to_async(LangchainAIService)(bot_instance.assistant) - bot_response = await sync_to_async(assistant_instance.generate_response)(update.message.text) + # 3) Log conversation & inbound message + user_id = str(update.effective_user.id) + conv, _ = await sync_to_async(TelegramConversation.objects.get_or_create)( + bot=bot_instance, + user_id=user_id, + defaults={'started_at': timezone.now()} + ) + incoming_text = update.message.text or "" + await sync_to_async(TelegramMessage.objects.create)( + conversation=conv, + direction=TelegramMessage.IN, + content=incoming_text + ) - # Step 6: Send the response back to Telegram - await update.message.reply_text(bot_response) + # 4) Route commands or AI + if update.message: + # built-in commands + if update.message.text == "/start": + await start(update) + elif update.message.text == "/help": + await help_command(update) + elif update.message.text == "/dream_city": + await dream_city_command(update) + elif update.message.location: + await handle_location(update) + else: + # AI fallback + assistant_instance = await sync_to_async(LangchainAIService)( + bot_instance.assistant + ) + start_time = timezone.now() + bot_response = await sync_to_async( + assistant_instance.generate_response + )(update.message.text) + response_time = int((timezone.now() - start_time).total_seconds() * 1000) - return JsonResponse({"status": "ok"}) + # Send reply + await update.message.reply_text(bot_response) - logger.warning("Received non-POST request") - return JsonResponse({"error": "Invalid request method"}, status=400) + # 5) Log outbound message + await sync_to_async(TelegramMessage.objects.create)( + conversation=conv, + direction=TelegramMessage.OUT, + content=bot_response, + response_time_ms=response_time + ) + + return JsonResponse({"status": "ok"}) except Exception as e: - logger.error(f"Error in webhook: {e}") - return JsonResponse({"error": f"Unexpected error: {str(e)}"}, status=500) + logger.error(f"Error in telegram_webhook: {e}") + return JsonResponse({"error": f"Unexpected error: {e}"}, status=500)