lockbot 2.1.2__tar.gz → 2.2.0__tar.gz

{lockbot-2.1.2/python/lockbot.egg-info → lockbot-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockbot
-Version: 2.1.2
+Version: 2.2.0
 Summary: Cluster resource management bot for IM platforms
 Author-email: Jianbang Yang <yangjianbang112@gmail.com>
 License: MIT
@@ -47,6 +47,9 @@ Supports both standalone Flask deployment and a full platform mode with FastAPI
 
 [中文文档](README_CN.md) | [Live Demo](https://dynamicheart.github.io/lockbot/)
 
+[![PyPI version](https://img.shields.io/pypi/v/lockbot?color=blue)](https://pypi.org/project/lockbot/)
+[![Docker Image](https://img.shields.io/badge/ghcr.io-dynamicheart%2Flockbot-blue?logo=docker)](https://github.com/DynamicHeart/lockbot/pkgs/container/lockbot)
+
 ## Features
 
 - **Device Lock Bot** — Lock/unlock individual GPUs or devices on a cluster
@@ -100,14 +103,14 @@ docker pull ghcr.io/dynamicheart/lockbot:latest
 docker run -d --name lockbot -p 8000:8000 \
   -e JWT_SECRET=your-secret \
   -e ENCRYPTION_KEY=your-fernet-key \
-  -v lockbot-data:/app/python/lockbot/data \
+  -v lockbot-data:/data \
   ghcr.io/dynamicheart/lockbot:latest
 
 # 4. Create super_admin (password auto-generated and printed)
 docker exec -it lockbot python tools/create_super_admin.py --username admin --email admin@example.com
 ```
 
-> **Database**: SQLite file auto-created at `DATA_DIR/lockbot.db` (default: `python/lockbot/data/lockbot.db`). Override with `DATA_DIR` env var.
+> **Data persistence**: All data (SQLite DB, bot state files) stored under `/data`. Override with `DATA_DIR` env var.
 
 ## Bot Configuration
 

{lockbot-2.1.2 → lockbot-2.2.0}/README.md

@@ -7,6 +7,9 @@ Supports both standalone Flask deployment and a full platform mode with FastAPI
 
 [中文文档](README_CN.md) | [Live Demo](https://dynamicheart.github.io/lockbot/)
 
+[![PyPI version](https://img.shields.io/pypi/v/lockbot?color=blue)](https://pypi.org/project/lockbot/)
+[![Docker Image](https://img.shields.io/badge/ghcr.io-dynamicheart%2Flockbot-blue?logo=docker)](https://github.com/DynamicHeart/lockbot/pkgs/container/lockbot)
+
 ## Features
 
 - **Device Lock Bot** — Lock/unlock individual GPUs or devices on a cluster
@@ -60,14 +63,14 @@ docker pull ghcr.io/dynamicheart/lockbot:latest
 docker run -d --name lockbot -p 8000:8000 \
   -e JWT_SECRET=your-secret \
   -e ENCRYPTION_KEY=your-fernet-key \
-  -v lockbot-data:/app/python/lockbot/data \
+  -v lockbot-data:/data \
   ghcr.io/dynamicheart/lockbot:latest
 
 # 4. Create super_admin (password auto-generated and printed)
 docker exec -it lockbot python tools/create_super_admin.py --username admin --email admin@example.com
 ```
 
-> **Database**: SQLite file auto-created at `DATA_DIR/lockbot.db` (default: `python/lockbot/data/lockbot.db`). Override with `DATA_DIR` env var.
+> **Data persistence**: All data (SQLite DB, bot state files) stored under `/data`. Override with `DATA_DIR` env var.
 
 ## Bot Configuration
 

{lockbot-2.1.2 → lockbot-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lockbot"
-version = "2.1.2"
+version = "2.2.0"
 description = "Cluster resource management bot for IM platforms"
 readme = "README.md"
 license = {text = "MIT"}

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/admin/router.py

@@ -3,13 +3,16 @@ Admin API routes.
 """
 
 import contextlib
+import io
+import json
 import os
 import shutil
 import tempfile
+import zipfile
 from datetime import datetime
 
 from fastapi import APIRouter, Depends, HTTPException
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse, Response
 from sqlalchemy.orm import Session
 from starlette.background import BackgroundTask
 
@@ -21,6 +24,7 @@ from lockbot.backend.app.auth.schemas import (
     AdminEditUser,
     PasswordResetOut,
     UserOut,
+    UserOutWithStats,
 )
 from lockbot.backend.app.bots.models import Bot
 from lockbot.backend.app.database import get_db
@@ -68,18 +72,36 @@ def admin_create_user(
     return PasswordResetOut(id=user.id, username=user.username, new_password=raw_password)
 
 
-@router.get("/users", response_model=list[UserOut])
+@router.get("/users", response_model=list[UserOutWithStats])
 def list_users(
     operator: User = Depends(require_admin),
     db: Session = Depends(get_db),
 ):
     """List users visible to the operator.
-    Super_admin sees all; admin sees only users (not admins/super_admins)."""
+    Super_admin sees all; admin sees only users (not admins/super_admins).
+    Includes bot_count and running_count for each user."""
     if operator.role == "super_admin":
-        return db.query(User).all()
-
-    # admin: see regular users + self
-    return db.query(User).filter((User.role == "user") | (User.id == operator.id)).all()
+        users = db.query(User).all()
+    else:
+        # admin: see regular users + self
+        users = db.query(User).filter((User.role == "user") | (User.id == operator.id)).all()
+
+    # Attach bot stats for each user
+    result = []
+    for u in users:
+        data = UserOut.model_validate(u)
+        bot_count = db.query(Bot).filter(Bot.user_id == u.id, Bot.is_deleted.is_(False)).count()
+        running_count = (
+            db.query(Bot)
+            .filter(
+                Bot.user_id == u.id,
+                Bot.status == "running",
+                Bot.is_deleted.is_(False),
+            )
+            .count()
+        )
+        result.append({**data.model_dump(), "bot_count": bot_count, "running_count": running_count})
+    return result
 
 
 @router.put("/users/{user_id}", response_model=UserOut)
@@ -169,7 +191,7 @@ def list_all_bots(
     _admin: User = Depends(require_admin),
     db: Session = Depends(get_db),
 ):
-    rows = db.query(Bot, User.username).join(User, Bot.user_id == User.id).all()
+    rows = db.query(Bot, User.username).join(User, Bot.user_id == User.id).filter(Bot.is_deleted.is_(False)).all()
     return [
         {c.name: getattr(bot, c.name) for c in bot.__table__.columns} | {"owner": username} for bot, username in rows
     ]
@@ -181,7 +203,7 @@ def platform_stats(
     db: Session = Depends(get_db),
 ):
     total_users = db.query(User).count()
-    bots = db.query(Bot).all()
+    bots = db.query(Bot).filter(Bot.is_deleted.is_(False)).all()
     return {
         "totalUsers": total_users,
         "totalBots": len(bots),
@@ -222,3 +244,43 @@ def download_backup(
         media_type="application/x-sqlite3",
         background=BackgroundTask(os.unlink, tmp_path),
     )
+
+
+_DEFAULT_DATA_DIR = os.environ.get("DATA_DIR", "/data")
+
+
+@router.get("/bot-states")
+def download_all_bot_states(
+    _admin: User = Depends(require_super_admin),
+    db: Session = Depends(get_db),
+):
+    """Download all bot state files as a zip archive (super_admin only)."""
+    bots = db.query(Bot).filter(Bot.is_deleted.is_(False)).all()
+
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
+        for bot in bots:
+            # Determine data dir from config_overrides or default
+            data_dir = _DEFAULT_DATA_DIR
+            try:
+                overrides = json.loads(bot.config_overrides or "{}")
+                data_dir = overrides.get("DATA_DIR") or _DEFAULT_DATA_DIR
+            except (json.JSONDecodeError, AttributeError):
+                pass
+            state_file = os.path.join(data_dir, "bots", str(bot.id), "bot_state.json")
+            folder_name = f"bot_{bot.id}_{bot.name}"
+            if os.path.exists(state_file):
+                zf.write(state_file, f"{folder_name}/bot_state.json")
+            else:
+                # Create an empty placeholder so the admin knows the bot has no state
+                zf.writestr(f"{folder_name}/bot_state.json", "{}")
+
+    buf.seek(0)
+    content = buf.read()
+
+    filename = f"lockbot_states_{datetime.now().strftime('%Y%m%d_%H%M%S')}.zip"
+    return Response(
+        content=content,
+        media_type="application/zip",
+        headers={"Content-Disposition": f'attachment; filename="{filename}"'},
+    )

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/auth/schemas.py

@@ -30,6 +30,13 @@ class UserOut(BaseModel):
     model_config = {"from_attributes": True}
 
 
+class UserOutWithStats(UserOut):
+    """User info with bot statistics."""
+
+    bot_count: int = 0
+    running_count: int = 0
+
+
 class TokenOut(BaseModel):
     access_token: str
     token_type: str = "bearer"

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/bots/models.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, func
+from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, Text, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from lockbot.backend.app.database import Base
@@ -35,6 +35,10 @@ class Bot(Base):
     last_request_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
     config_overrides: Mapped[str] = mapped_column(Text, default="{}")  # JSON
 
+    # Soft delete
+    is_deleted: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
+    deleted_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
+
     created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
     updated_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now(), onupdate=func.now())
 

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/bots/router.py

@@ -15,7 +15,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi.responses import PlainTextResponse
 from sqlalchemy.orm import Session
 
-from lockbot.backend.app.auth.dependencies import get_current_user, require_admin
+from lockbot.backend.app.auth.dependencies import get_current_user, require_admin, require_super_admin
 from lockbot.backend.app.auth.models import User
 from lockbot.backend.app.bots import encryption
 from lockbot.backend.app.bots.manager import bot_manager
@@ -57,7 +57,7 @@ def _write_log(bot_id: int, message: str, level: str = "INFO", category: str = "
         "category": category,
         "level": level,
         "message": message,
-        "created_at": datetime.utcnow().isoformat(),
+        "created_at": datetime.utcnow().isoformat() + "Z",
     }
     try:
         with open(log_path, "a", encoding="utf-8") as f:
@@ -101,7 +101,7 @@ def _mask_bot(bot: Bot, db: Session | None = None) -> dict:
 def _get_user_bot(bot_id: int, user: User, db: Session) -> Bot:
     """Fetch a bot owned by the user (or any bot if admin), or raise 404."""
     bot = db.get(Bot, bot_id)
-    if not bot or (bot.user_id != user.id and user.role not in ("admin", "super_admin")):
+    if not bot or bot.is_deleted or (bot.user_id != user.id and user.role not in ("admin", "super_admin")):
         raise HTTPException(status_code=404, detail="Bot not found")
     return bot
 
@@ -167,7 +167,7 @@ def list_bots(
     user: User = Depends(get_current_user),
     db: Session = Depends(get_db),
 ):
-    return db.query(Bot).filter(Bot.user_id == user.id).all()
+    return db.query(Bot).filter(Bot.user_id == user.id, Bot.is_deleted.is_(False)).all()
 
 
 @router.post("", response_model=BotOut, status_code=status.HTTP_201_CREATED)
@@ -179,7 +179,15 @@ def create_bot(
     if body.bot_type.upper() not in VALID_BOT_TYPES:
         raise HTTPException(status_code=422, detail=f"Invalid bot_type, must be one of {VALID_BOT_TYPES}")
 
-    exists = db.query(Bot).filter(Bot.user_id == user.id, Bot.name == body.name).first()
+    exists = (
+        db.query(Bot)
+        .filter(
+            Bot.user_id == user.id,
+            Bot.name == body.name,
+            Bot.is_deleted.is_(False),
+        )
+        .first()
+    )
     if exists:
         raise HTTPException(status_code=409, detail="Bot name already exists")
 
@@ -202,7 +210,15 @@ def create_bot(
     # Auto-start the bot if within quota
     auto_started = False
     if user.role not in ("admin", "super_admin"):
-        running_count = db.query(Bot).filter(Bot.user_id == user.id, Bot.status == "running").count()
+        running_count = (
+            db.query(Bot)
+            .filter(
+                Bot.user_id == user.id,
+                Bot.status == "running",
+                Bot.is_deleted.is_(False),
+            )
+            .count()
+        )
         if running_count >= user.max_running_bots:
             pass  # Quota reached — bot created but not started
         else:
@@ -237,7 +253,7 @@ def get_running_states(
     db: Session = Depends(get_db),
 ):
     """Return state for all bots owned by the user (running from memory, stopped from file)."""
-    user_bots = db.query(Bot).filter(Bot.user_id == user.id).all()
+    user_bots = db.query(Bot).filter(Bot.user_id == user.id, Bot.is_deleted.is_(False)).all()
     result = {}
     for bot in user_bots:
         instance = bot_manager.get_instance(bot.id)
@@ -277,16 +293,27 @@ def update_bot(
 ):
     bot = _get_user_bot(bot_id, user, db)
 
-    # Admin cannot edit other admins' bots
-    if user.role == "admin" and bot.user_id != user.id:
-        owner = db.get(User, bot.user_id)
-        if owner and owner.role in ("admin", "super_admin"):
-            raise HTTPException(status_code=403, detail="Cannot edit another admin's bot")
+    # Only owner or super_admin can edit
+    if user.role != "super_admin" and bot.user_id != user.id:
+        raise HTTPException(status_code=403, detail="Cannot edit another user's bot")
 
     if bot.status == "running":
         raise HTTPException(status_code=409, detail="Cannot update a running bot. Stop it first.")
 
     if body.name is not None:
+        # Check for duplicate name (excluding current bot and deleted bots)
+        dup = (
+            db.query(Bot)
+            .filter(
+                Bot.user_id == bot.user_id,
+                Bot.name == body.name,
+                Bot.id != bot_id,
+                Bot.is_deleted.is_(False),
+            )
+            .first()
+        )
+        if dup:
+            raise HTTPException(status_code=409, detail="Bot name already exists")
         bot.name = body.name
     if body.group_id is not None:
         bot.group_id = body.group_id
@@ -314,16 +341,19 @@ def delete_bot(
 ):
     bot = _get_user_bot(bot_id, user, db)
 
-    # Admin cannot delete other admins' bots
-    if user.role == "admin" and bot.user_id != user.id:
-        owner = db.get(User, bot.user_id)
-        if owner and owner.role in ("admin", "super_admin"):
-            raise HTTPException(status_code=403, detail="Cannot delete another admin's bot")
+    # Only owner or super_admin can delete
+    if user.role != "super_admin" and bot.user_id != user.id:
+        raise HTTPException(status_code=403, detail="Cannot delete another user's bot")
 
-    if bot.status == "running":
-        raise HTTPException(status_code=409, detail="Cannot delete a running bot. Stop it first.")
+    # Stop the bot first if running
+    if bot.status in ("running", "error"):
+        with contextlib.suppress(RuntimeError):
+            bot_manager.stop_bot(bot_id)
+        bot.status = "stopped"
+        bot.pid = None
 
-    db.delete(bot)
+    bot.is_deleted = True
+    bot.deleted_at = datetime.utcnow()
     db.commit()
 
 
@@ -331,20 +361,14 @@ def delete_bot(
 def transfer_bot_owner(
     bot_id: int,
     body: dict,
-    user: User = Depends(require_admin),
+    user: User = Depends(require_super_admin),
     db: Session = Depends(get_db),
 ):
-    """Transfer bot ownership. Admin can transfer regular users' bots, super_admin can transfer all."""
+    """Transfer bot ownership. Super_admin can transfer all bots."""
     bot = db.get(Bot, bot_id)
-    if not bot:
+    if not bot or bot.is_deleted:
         raise HTTPException(status_code=404, detail="Bot not found")
 
-    # Permission: admin cannot transfer other admins' bots
-    if user.role == "admin" and bot.user_id != user.id:
-        owner = db.get(User, bot.user_id)
-        if owner and owner.role in ("admin", "super_admin"):
-            raise HTTPException(status_code=403, detail="Cannot transfer another admin's bot")
-
     target_username = (body.get("username") or "").strip()
     if not target_username:
         raise HTTPException(status_code=400, detail="username is required")
@@ -353,10 +377,6 @@ def transfer_bot_owner(
     if not target_user:
         raise HTTPException(status_code=404, detail="Target user not found")
 
-    # Admin cannot transfer bot to another admin
-    if user.role == "admin" and target_user.role in ("admin", "super_admin"):
-        raise HTTPException(status_code=403, detail="Cannot transfer bot to an admin")
-
     old_owner = db.get(User, bot.user_id)
     old_name = old_owner.username if old_owner else "unknown"
     bot.user_id = target_user.id
@@ -391,7 +411,15 @@ def start_bot(
 
     # Enforce max_running_bots quota (admins are exempt)
     if user.role not in ("admin", "super_admin"):
-        running_count = db.query(Bot).filter(Bot.user_id == user.id, Bot.status == "running").count()
+        running_count = (
+            db.query(Bot)
+            .filter(
+                Bot.user_id == user.id,
+                Bot.status == "running",
+                Bot.is_deleted.is_(False),
+            )
+            .count()
+        )
         if running_count >= user.max_running_bots:
             raise HTTPException(
                 status_code=403,
@@ -889,7 +917,7 @@ async def webhook(bot_id: int, request: Request, db: Session = Depends(get_db)):
 
     # Update last_request_at
     bot = db.get(Bot, bot_id)
-    if bot:
+    if bot and not bot.is_deleted:
         bot.last_request_at = datetime.utcnow()
         db.commit()
 
@@ -921,7 +949,7 @@ async def _reply_bot_not_running(
 ) -> PlainTextResponse:
     """When a bot is not running, POST a 'not started' message back to the IM platform."""
     bot = db.get(Bot, bot_id)
-    if not bot:
+    if not bot or bot.is_deleted:
         raise HTTPException(status_code=404, detail="Bot not found")
 
     # URL verification must still work even when the bot is stopped

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/config.py

@@ -8,10 +8,12 @@ from pathlib import Path
 # Project root directory (lockbot/)
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
+DATA_DIR = os.environ.get("DATA_DIR", "/data")
+
 # Database
 DATABASE_URL = os.environ.get(
     "DATABASE_URL",
-    f"sqlite:///{BASE_DIR / 'data' / 'lockbot.db'}",
+    f"sqlite:///{os.path.join(DATA_DIR, 'lockbot.db')}",
 )
 
 # JWT

{lockbot-2.1.2 → lockbot-2.2.0}/python/lockbot/backend/app/main.py

@@ -72,6 +72,25 @@ def _migrate_users_must_change_password():
         logger.info("Migrated users: added 'must_change_password' column")
 
 
+def _migrate_bot_soft_delete():
+    """Add 'is_deleted' and 'deleted_at' columns to bots if they don't exist (SQLite migration)."""
+    from sqlalchemy import inspect as sa_inspect
+    from sqlalchemy import text
+
+    insp = sa_inspect(engine)
+    if "bots" not in insp.get_table_names():
+        return
+    columns = [c["name"] for c in insp.get_columns("bots")]
+    if "is_deleted" not in columns:
+        with engine.begin() as conn:
+            conn.execute(text("ALTER TABLE bots ADD COLUMN is_deleted BOOLEAN NOT NULL DEFAULT 0"))
+        logger.info("Migrated bots: added 'is_deleted' column")
+    if "deleted_at" not in columns:
+        with engine.begin() as conn:
+            conn.execute(text("ALTER TABLE bots ADD COLUMN deleted_at DATETIME"))
+        logger.info("Migrated bots: added 'deleted_at' column")
+
+
 def _seed_dev_admin():
     """Create admin user in dev mode if it doesn't exist."""
     from lockbot.backend.app.config import (
@@ -153,6 +172,7 @@ async def lifespan(app: FastAPI):
     _migrate_bot_logs_category()
     _migrate_bot_consecutive_failures()
     _migrate_users_must_change_password()
+    _migrate_bot_soft_delete()
     _seed_dev_admin()
     _seed_dev_users()
     _reset_running_bots()
@@ -196,7 +216,14 @@ def _reset_running_bots():
     db = SessionLocal()
     try:
         # Collect all bots that need recovery (running + error)
-        recover_bots = db.query(Bot).filter(Bot.status.in_(["running", "error"])).all()
+        recover_bots = (
+            db.query(Bot)
+            .filter(
+                Bot.status.in_(["running", "error"]),
+                Bot.is_deleted.is_(False),
+            )
+            .all()
+        )
         if not recover_bots:
             return
 

{lockbot-2.1.2 → lockbot-2.2.0/python/lockbot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockbot
-Version: 2.1.2
+Version: 2.2.0
 Summary: Cluster resource management bot for IM platforms
 Author-email: Jianbang Yang <yangjianbang112@gmail.com>
 License: MIT
@@ -47,6 +47,9 @@ Supports both standalone Flask deployment and a full platform mode with FastAPI
 
 [中文文档](README_CN.md) | [Live Demo](https://dynamicheart.github.io/lockbot/)
 
+[![PyPI version](https://img.shields.io/pypi/v/lockbot?color=blue)](https://pypi.org/project/lockbot/)
+[![Docker Image](https://img.shields.io/badge/ghcr.io-dynamicheart%2Flockbot-blue?logo=docker)](https://github.com/DynamicHeart/lockbot/pkgs/container/lockbot)
+
 ## Features
 
 - **Device Lock Bot** — Lock/unlock individual GPUs or devices on a cluster
@@ -100,14 +103,14 @@ docker pull ghcr.io/dynamicheart/lockbot:latest
 docker run -d --name lockbot -p 8000:8000 \
   -e JWT_SECRET=your-secret \
   -e ENCRYPTION_KEY=your-fernet-key \
-  -v lockbot-data:/app/python/lockbot/data \
+  -v lockbot-data:/data \
   ghcr.io/dynamicheart/lockbot:latest
 
 # 4. Create super_admin (password auto-generated and printed)
 docker exec -it lockbot python tools/create_super_admin.py --username admin --email admin@example.com
 ```
 
-> **Database**: SQLite file auto-created at `DATA_DIR/lockbot.db` (default: `python/lockbot/data/lockbot.db`). Override with `DATA_DIR` env var.
+> **Data persistence**: All data (SQLite DB, bot state files) stored under `/data`. Override with `DATA_DIR` env var.
 
 ## Bot Configuration