Rename bot/config.py to bot/client.py

bot/client.py

@@ -0,0 +1,32 @@
+# PATH: bot/client.py
+from logging import getLogger
+from hydrogram import Client
+from bot.config import Telegram
+
+logger = getLogger("bot")
+
+def create_client() -> Client:
+    """
+    Creates Hydrogram client in a safe way:
+    - If SESSION_STRING is present -> user/bot session (no bot token needed)
+    - Else BOT_TOKEN must be present
+    """
+    kwargs = dict(
+        name="app",
+        api_id=Telegram.API_ID,
+        api_hash=Telegram.API_HASH,
+        in_memory=True,
+        sleep_threshold=-1,
+        max_concurrent_transmissions=10,
+    )
+
+    if Telegram.SESSION_STRING.strip():
+        kwargs["session_string"] = Telegram.SESSION_STRING.strip()
+        logger.info("Using SESSION_STRING auth")
+    else:
+        if not Telegram.BOT_TOKEN.strip():
+            raise RuntimeError("Missing BOT_TOKEN (and SESSION_STRING is empty).")
+        kwargs["bot_token"] = Telegram.BOT_TOKEN.strip()
+        logger.info("Using BOT_TOKEN auth")
+
+    return Client(**kwargs)

bot/config.py

@@ -1,48 +0,0 @@
-# PATH: bot/config.py
-import os
-
-def _get_int(name: str, default: int) -> int:
-    try:
-        return int(os.environ.get(name, str(default)))
-    except Exception:
-        return default
-
-def _get_str(name: str, default: str = "") -> str:
-    return str(os.environ.get(name, default))
-
-class Telegram:
-    # REQUIRED
-    API_ID: int = _get_int("TELEGRAM_API_ID", 12345)
-    API_HASH: str = _get_str("TELEGRAM_API_HASH", "YOUR_API_HASH")
-
-    # Use either SESSION_STRING (preferred on HF if bot token blocked) OR BOT_TOKEN
-    SESSION_STRING: str = _get_str("SESSION_STRING", "")
-    BOT_TOKEN: str = _get_str("BOT_TOKEN", "")
-
-    OWNER_ID: int = _get_int("OWNER_ID", 0)  # put your tg id
-    BOT_USERNAME: str = _get_str("TELEGRAM_BOT_USERNAME", "BotFather")
-
-class Server:
-    BIND_ADDRESS: str = _get_str("BIND_ADDRESS", "0.0.0.0")
-    PORT: int = _get_int("PORT", 7860)
-    BASE_URL: str = _get_str("BASE_URL", "http://127.0.0.1:7860")
-
-LOGGER_CONFIG_JSON = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "formatters": {
-        "default": {
-            "format": "[%(asctime)s][%(name)s][%(levelname)s] -> %(message)s",
-            "datefmt": "%d/%m/%Y %H:%M:%S",
-        }
-    },
-    "handlers": {
-        "stream": {"class": "logging.StreamHandler", "formatter": "default"}
-    },
-    "loggers": {
-        "uvicorn": {"level": "INFO", "handlers": ["stream"]},
-        "uvicorn.error": {"level": "INFO", "handlers": ["stream"]},
-        "bot": {"level": "INFO", "handlers": ["stream"]},
-        "hydrogram": {"level": "INFO", "handlers": ["stream"]},
-    },
-}