fix: links to files

Author: An0nX

scripts/manage_account.py

@@ -5,7 +5,7 @@
 import argparse
 import logging
 import os
-from typing import Dict, Optional, Coroutine, Any, Callable
+from typing import Dict, Optional, Coroutine, Any, Callable, List
 
 # Add project root to sys.path
 project_root = Path(__file__).resolve().parent.parent
@@ -17,17 +17,17 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from userbot import TelegramClient, _generate_random_device
-from userbot.src.db.session import get_db, initialize_database
-import userbot.src.db_manager as db_manager
-from userbot.src.encrypt import encryption_manager
-from userbot.src.db.models import Account
+from userbot.db.session import get_db, initialize_database
+from userbot.db import db_manager
+from userbot.utils.encrypt import encryption_manager
+from userbot.db.models import Account
 
 logging.basicConfig(level=logging.WARNING, format='%(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger('manage_account_cli')
 logger.setLevel(logging.INFO)
 
 async def add_account_logic(args: argparse.Namespace) -> None:
-    # ... (Implementation from previous correct response remains unchanged)
+    """Handles the logic for adding a new account with a full interactive session."""
     logger.info(f"--- Adding new account: {args.name} ---")
 
     session_file_path: str = f"temp_cli_{args.name}.session"
@@ -81,7 +81,7 @@ async def add_account_logic(args: argparse.Namespace) -> None:
                 app_version: str = input("Enter app version: ").strip()
             else:
                 device_details: Dict[str, str] = _generate_random_device()
-                device_model, system_version, app_version = device_details.values()
+                device_model, system_version, app_version = device_details['device_model'], device_details['system_version'], device_details['app_version']
                 logger.info("Generated random device details.")
 
             proxy_type: Optional[str] = None
@@ -214,22 +214,18 @@ async def main() -> None:
     parser = argparse.ArgumentParser(description="DeBot Account Management CLI")
     subparsers = parser.add_subparsers(dest="command", required=True, help="Available commands")
 
-    # Add command
     parser_add = subparsers.add_parser("add", help="Add a new account via interactive login")
     parser_add.add_argument("name", help="Unique name for the new account")
     parser_add.set_defaults(func=add_account_logic)
 
-    # Delete command
     parser_delete = subparsers.add_parser("delete", help="Permanently delete an account")
     parser_delete.add_argument("name", help="Name of the account to delete")
     parser_delete.set_defaults(func=delete_account_logic)
 
-    # Toggle command
     parser_toggle = subparsers.add_parser("toggle", help="Enable or disable an account")
     parser_toggle.add_argument("name", help="Name of the account to toggle")
     parser_toggle.set_defaults(func=toggle_account_logic)
 
-    # Edit command
     parser_edit = subparsers.add_parser("edit", help="Edit properties of an existing account")
     parser_edit.add_argument("name", help="Name of the account to edit")
     parser_edit.add_argument("--lang", help="Set a new language code (e.g., en)")

scripts/setup.py

@@ -78,9 +78,6 @@ def main():
         'LOG_RETENTION_DAYS=30',
         'GC_INTERVAL_SECONDS=3600',
         '',
-        '# --- Auto Update (only for "image" deployment) ---',
-        'AUTO_UPDATE_ENABLED=False',
-        'AUTO_UPDATE_INTERVAL_MINUTES=1440',
     ]
 
     env_file_path = project_root / ".env"

userbot/core/config.py

@@ -1,6 +1,5 @@
 import os
 from dotenv import load_dotenv
-from typing import Dict
 
 # Load environment variables from .env file
 load_dotenv()
@@ -20,7 +19,6 @@
 DB_CONN_RETRY_DELAY: int = int(os.getenv("DB_CONN_RETRY_DELAY", 5))
 
 # --- Application Settings ---
-MODULE_FOLDER: str = "userbot.modules"
 LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO").upper()
 TIMEZONE: str = os.getenv("TIMEZONE", "Etc/GMT-3")
 
@@ -32,7 +30,4 @@
 
 # --- Scheduler Settings ---
 GC_INTERVAL_SECONDS: int = int(os.getenv("GC_INTERVAL_SECONDS", 3600))
-MODULE_UPDATE_INTERVAL_MINUTES: int = int(os.getenv("MODULE_UPDATE_INTERVAL_MINUTES", 1440))
-AUTO_UPDATE_ENABLED: bool = os.getenv("AUTO_UPDATE_ENABLED", "False").lower() in ('true', '1', 't')
-AUTO_UPDATE_INTERVAL_MINUTES: int = int(os.getenv("AUTO_UPDATE_INTERVAL_MINUTES", 1440))
 DEPLOY_TYPE: str = os.getenv("DEPLOY_TYPE", "source")

userbot/db/db_manager.py

@@ -1,16 +1,17 @@
 import json
 import logging
 from datetime import datetime, timezone, timedelta
+from pathlib import Path
 from typing import Optional, Any, List, Dict
 
 from sqlalchemy import select, update, delete, asc, desc
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import selectinload, joinedload
 
-from userbot.src.encrypt import encryption_manager
-from userbot.src.db.models import Account, Session, Log, Module, AccountModule
-from userbot.src.db.session import get_db
+from userbot.utils.encrypt import encryption_manager
+from userbot.db.models import Account, Session, Log, Module, AccountModule
+from userbot.db.session import get_db
 
 logger: logging.Logger = logging.getLogger(__name__)
 

userbot/db/session.py

@@ -11,7 +11,7 @@
     DB_TYPE, DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME,
     DB_CONN_RETRIES, DB_CONN_RETRY_DELAY
 )
-from userbot.src.db.models import Base
+from userbot.db.models import Base
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -45,7 +45,7 @@ async def initialize_database() -> None:
                 await conn.run_sync(Base.metadata.create_all)
             logger.info("Database schema initialization check complete.")
             return  # Success, exit the function
-        except (ConnectionRefusedError, OSError) as e:
+        except (ConnectionRefusedError, OSError, asyncio.TimeoutError) as e:
             if attempt < DB_CONN_RETRIES - 1:
                 logger.warning(
                     f"Database connection failed (attempt {attempt + 1}/{DB_CONN_RETRIES}): {e}. "