update

app.py

@@ -1,94 +1,5 @@
-# from flask import Flask, request, jsonify
-# from telegram import Bot
-# from telegram.error import TelegramError
-# from dotenv import load_dotenv
-
-# # Change this import
-# from datetime import datetime, timezone  # instead of just datetime
-# import os
-# import asyncio
-
-# app = Flask(__name__)
-# load_dotenv()
-
-# TELEGRAM_BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN")
-# TELEGRAM_CHAT_ID = os.getenv("TELEGRAM_CHAT_ID")
-
-# bot = Bot(token=TELEGRAM_BOT_TOKEN)
-
-# async def send_telegram_message_async(message):
-#     try:
-#         await bot.send_message(
-#             chat_id=TELEGRAM_CHAT_ID,
-#             text=message,
-#             parse_mode="Markdown",
-#             disable_notification=True
-#         )
-#         return {"ok": True}
-#     except TelegramError as e:
-#         return {"ok": False, "error": str(e)}
-
-# def send_telegram_message(message):
-#     # Run async function in Flask's synchronous context
-#     loop = asyncio.new_event_loop()
-#     asyncio.set_event_loop(loop)
-#     result = loop.run_until_complete(send_telegram_message_async(message))
-#     loop.close()
-#     return result
-
-# @app.route('/', methods=['GET'])
-# def health_check():
-#     return jsonify(
-#         {
-#             "status": "healthy", 
-#             "message": "Telegram backend is running", 
-#             "timestamp": datetime.now(timezone.utc).isoformat() + " UTC"
-#             }
-#     )
-
-# @app.route('/send-message', methods=['POST'])
-# def send_message():
-#     try:
-#         data = request.get_json()
-#         required_fields = ['name', 'email', 'message']
-#         if not all(field in data for field in required_fields):
-#             return jsonify({"error": "Missing required fields: name, email, message"}), 400
-
-#         name = data['name'].strip()
-#         email = data['email'].strip()
-#         message = data['message'].strip()
-
-#         if not all([name, email, message]):
-#             return jsonify({"error": "All fields must not be empty"}), 400
-#         if len(message) > 4096:
-#             return jsonify({"error": "Message exceeds 4096 character limit"}), 400
-#         if '@' not in email or '.' not in email.split('@')[1]:
-#             return jsonify({"error": "Invalid email format"}), 400
-
-#         timestamp = datetime.now(timezone.utc).isoformat().split('.')[0] + " UTC"
-#         telegram_message = (
-#             f"*New Message*\n"
-#             f"_Received on: {timestamp}_\n"
-#             f"---\n"
-#             f"*Sender Details:*\n"
-#             f"- *Name:* {name}\n"
-#             f"- *Email:* {email}\n"
-#             f"---\n"
-#             f"*Message:*\n"
-#             f"{message}"
-#         )
-
-#         result = send_telegram_message(telegram_message)
-#         if result.get("ok"):
-#             return jsonify({"success": True, "message": "Message sent to Telegram"}), 200
-#         else:
-#             return jsonify({"error": "Failed to send message", "details": result.get("error", "Unknown error")}), 500
-#     except Exception as e:
-#         return jsonify({"error": f"Server error: {str(e)}"}), 500
-
-# if __name__ == "__main__":
-#     app.run(host="0.0.0.0", port=7860)
-
+import socket
+import httpx
 from fastapi import FastAPI, HTTPException
 from telegram import Bot
 from telegram.error import TelegramError
@@ -96,6 +7,7 @@ from pydantic import BaseModel
 from datetime import datetime, timezone
 import os
 from dotenv import load_dotenv
+import logging
 
 app = FastAPI()
 load_dotenv()
@@ -105,6 +17,10 @@ TELEGRAM_CHAT_ID = os.getenv("TELEGRAM_CHAT_ID")
 
 bot = Bot(token=TELEGRAM_BOT_TOKEN)
 
+# Set up logging
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
 class MessageData(BaseModel):
     name: str
     email: str
@@ -118,6 +34,27 @@ async def health_check():
         "timestamp": datetime.now(timezone.utc).isoformat() + " UTC"
     }
 
+@app.get("/test-dns")
+async def test_dns():
+    try:
+        ip = socket.gethostbyname("api.telegram.org")
+        logger.info(f"DNS resolved: api.telegram.org -> {ip}")
+        return {"status": "success", "ip": ip}
+    except socket.gaierror as e:
+        logger.error(f"DNS resolution failed: {str(e)}")
+        return {"status": "error", "details": str(e)}
+
+@app.get("/test-network")
+async def test_network():
+    try:
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            response = await client.get("https://api.ipify.org?format=json")
+            logger.info(f"Network test successful: {response.json()}")
+            return {"status": "success", "data": response.json()}
+    except httpx.HTTPError as e:
+        logger.error(f"Network test failed: {str(e)}")
+        return {"status": "error", "details": str(e)}
+
 @app.post("/send-message")
 async def send_message(data: MessageData):
     try:
@@ -145,17 +82,23 @@ async def send_message(data: MessageData):
             f"{message}"
         )
 
-        try:
-            await bot.send_message(
-                chat_id=TELEGRAM_CHAT_ID,
-                text=telegram_message,
-                parse_mode="Markdown",
-                disable_notification=True
-            )
-            return {"success": True, "message": "Message sent to Telegram"}
-        except TelegramError as e:
-            raise HTTPException(status_code=500, detail=f"Failed to send message: {str(e)}")
+        logger.debug(f"Sending message to chat_id: {TELEGRAM_CHAT_ID}")
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            bot = Bot(token=TELEGRAM_BOT_TOKEN, client=client)
+            try:
+                await bot.send_message(
+                    chat_id=TELEGRAM_CHAT_ID,
+                    text=telegram_message,
+                    parse_mode="Markdown",
+                    disable_notification=True
+                )
+                logger.info("Message sent successfully")
+                return {"success": True, "message": "Message sent to Telegram"}
+            except TelegramError as e:
+                logger.error(f"TelegramError: {str(e)}")
+                raise HTTPException(status_code=500, detail=f"Failed to send message: {str(e)}")
     except Exception as e:
+        logger.error(f"Unexpected error: {str(e)}")
         raise HTTPException(status_code=500, detail=f"Server error: {str(e)}")
 
 if __name__ == "__main__":

requirements.txt

@@ -2,4 +2,5 @@ fastapi==0.115.2
 uvicorn==0.32.0
 python-telegram-bot==21.5
 pydantic==2.9.2
-python-dotenv==1.0.1
+python-dotenv==1.0.1
+httpx==0.27.2