lockbot 2.7.0__tar.gz → 2.8.0__tar.gz

{lockbot-2.7.0/python/lockbot.egg-info → lockbot-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockbot
-Version: 2.7.0
+Version: 2.8.0
 Summary: Cluster resource management bot for IM platforms
 Author-email: Jianbang Yang <yangjianbang112@gmail.com>
 License: MIT

{lockbot-2.7.0 → lockbot-2.8.0}/pyproject.toml

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

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/backend/app/backup/scheduler.py

@@ -4,7 +4,7 @@ Backup scheduler — daemon thread for periodic BOS backups.
 
 import logging
 import threading
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 
 logger = logging.getLogger(__name__)
 
@@ -25,7 +25,7 @@ class BackupScheduler:
         if self._thread and self._thread.is_alive():
             return
         self._stop_event.clear()
-        self._started_at = datetime.now(timezone.utc)
+        self._started_at = datetime.now()
         self._last_error = ""
         self._thread = threading.Thread(target=self._run, daemon=True, name="backup-scheduler")
         self._thread.start()
@@ -56,11 +56,11 @@ class BackupScheduler:
 
     def _run(self):
         while not self._stop_event.is_set():
-            self._last_heartbeat = datetime.now(timezone.utc)
+            self._last_heartbeat = datetime.now()
             try:
                 seconds = self._seconds_until_next()
                 if seconds is not None:
-                    self._next_run_at = datetime.now(timezone.utc) + timedelta(seconds=seconds)
+                    self._next_run_at = datetime.now() + timedelta(seconds=seconds)
                 else:
                     self._next_run_at = None
                 if seconds is None:
@@ -76,7 +76,9 @@ class BackupScheduler:
                 if triggered or self._stop_event.is_set():
                     continue  # Config changed or shutting down, recalculate
 
-                # Time to backup
+                # Time to backup — skip if last successful backup was recent
+                if self._should_skip():
+                    continue
                 self._do_backup()
             except Exception as exc:
                 self._last_error = str(exc)
@@ -84,6 +86,30 @@ class BackupScheduler:
                 # Sleep a bit before retry
                 self._stop_event.wait(timeout=60)
 
+    def _should_skip(self) -> bool:
+        """Skip if last successful backup was less than 20 hours ago (prevents duplicates on restart)."""
+        from lockbot.backend.app.backup.service import get_backup_config
+        from lockbot.backend.app.database import SessionLocal
+
+        db = SessionLocal()
+        try:
+            config = get_backup_config(db)
+        finally:
+            db.close()
+
+        last_time = config.get("backup_last_time", "")
+        last_status = config.get("backup_last_status", "")
+        if not last_time or last_status != "success":
+            return False
+        try:
+            last_dt = datetime.strptime(last_time, "%Y-%m-%d %H:%M:%S")
+            if (datetime.now() - last_dt).total_seconds() < 20 * 3600:
+                logger.info("Skipping backup — last success was %s (< 20h ago)", last_time)
+                return True
+        except ValueError:
+            pass
+        return False
+
     def _seconds_until_next(self) -> int | None:
         """Calculate seconds until next backup. Returns None if disabled."""
         from lockbot.backend.app.backup.service import get_backup_config
@@ -110,12 +136,10 @@ class BackupScheduler:
         except (ValueError, IndexError):
             return None
 
-        now = datetime.now(timezone.utc)
+        # Use local time (server timezone) for scheduling
+        now = datetime.now()
         target = now.replace(hour=hour, minute=minute, second=0, microsecond=0)
         if target <= now:
-            # Next day
-            from datetime import timedelta
-
             target += timedelta(days=1)
 
         return int((target - now).total_seconds())

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/backend/app/bots/schemas.py

@@ -53,6 +53,10 @@ def _validate_config_overrides(v: dict | None) -> dict | None:
             if not (lo <= val <= hi):
                 errors.append(f"{key} must be between {lo} and {hi}")
 
+    whitelist = v.get("DURATION_WHITELIST")
+    if whitelist is not None and (not isinstance(whitelist, list) or not all(isinstance(u, str) for u in whitelist)):
+        errors.append("DURATION_WHITELIST must be a list of strings")
+
     max_dur = v.get("MAX_LOCK_DURATION")
     default_dur = v.get("DEFAULT_DURATION")
     if isinstance(max_dur, int) and isinstance(default_dur, int) and max_dur != -1 and default_dur > max_dur:

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/base_bot.py

@@ -121,6 +121,13 @@ class BaseLockBot:
         """
         return self.adapter.build_reply("\u274c" + error_msg, [user_id])
 
+    def _whitelist_hint(self):
+        """Return whitelist hint string if BOT_OWNER is configured, else empty string."""
+        owner = self.config.get_val("BOT_OWNER")
+        if not owner:
+            return ""
+        return t("error.whitelist_hint", config=self.config, owner=owner)
+
     # ------------------------------------------------------ _msg_with_usage
     def _msg_with_usage(self, msg_key, *, node_key=None, sep="", **kwargs):
         """Return ``t(msg_key, ...) + sep + self._current_usage(node_key)``."""

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/device_bot.py

@@ -177,6 +177,7 @@ class DeviceBot(BaseLockBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             timestamp = int(time.time())
 
@@ -193,7 +194,7 @@ class DeviceBot(BaseLockBot):
                         user_id, self._msg_with_usage("error.device_in_use_or_shared", node_key=node_key)
                     )
 
-                if max_dur > 0:
+                if max_dur > 0 and user_id not in whitelist:
                     for device in devices:
                         total_duration = duration
                         user_info = find_user_info(device["current_users"], user_id)
@@ -209,6 +210,7 @@ class DeviceBot(BaseLockBot):
                                     "error.lock_max_duration_exceeded",
                                     config=self.config,
                                     max_duration=format_duration(max_dur, config=self.config),
+                                    whitelist_hint=self._whitelist_hint(),
                                 ),
                             )
 
@@ -249,6 +251,7 @@ class DeviceBot(BaseLockBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             timestamp = int(time.time())
             for node_key, dev_ids in zip(node_key_list, dev_ids_list, strict=True):
@@ -260,7 +263,7 @@ class DeviceBot(BaseLockBot):
                         user_id, self._msg_with_usage("error.device_exclusive_mode", node_key=node_key)
                     )
 
-                if max_dur > 0:
+                if max_dur > 0 and user_id not in whitelist:
                     for device in devices:
                         user_info = find_user_info(device["current_users"], user_id)
                         if user_info:
@@ -276,6 +279,7 @@ class DeviceBot(BaseLockBot):
                                     "error.slock_max_duration_exceeded",
                                     config=self.config,
                                     max_duration=format_duration(max_dur, config=self.config),
+                                    whitelist_hint=self._whitelist_hint(),
                                 ),
                             )
 

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/i18n/en.py

@@ -27,8 +27,9 @@ MESSAGES = {
     "error.duration_must_be_positive": "Duration must be greater than 0\n",
     "error.node_in_use_or_shared": "Node is in use by others or in shared mode\n\n",
     "error.node_exclusive_mode": "Node is in exclusive mode\n\n",
-    "error.lock_max_duration_exceeded": "Note: consecutive lock cannot exceed {max_duration}\n\n",
-    "error.slock_max_duration_exceeded": "Note: consecutive slock cannot exceed {max_duration}\n\n",
+    "error.lock_max_duration_exceeded": "Note: consecutive lock cannot exceed {max_duration}\n\n{whitelist_hint}",
+    "error.slock_max_duration_exceeded": "Note: consecutive slock cannot exceed {max_duration}\n\n{whitelist_hint}",
+    "error.whitelist_hint": "To lock longer, contact @{owner} to be added to the whitelist\n\n",
     "error.node_not_requested": "You have not requested this node\n",
     "error.unrecognized_command": "❌ Unrecognized command: {command}",
     "error.unknown_error": "❌ Unknown error: {command}",
@@ -139,9 +140,9 @@ MESSAGES = {
     "notify.booking_expired_header": "⚠️ The following bookings have expired:\n",
     "notify.pending_bookings_header": "🗓️ Pending bookings:\n",
     "notify.duration_clamped": (
-        "⚠️ [Lock Duration Adjusted]\n"
+        "⚠️ [Lock Duration Adjusted]\n\n"
         "The admin has set max lock duration to {max_duration}. "
-        "Your remaining lock time has been automatically shortened.\n"
+        "Your remaining lock time has been automatically shortened.\n\n"
     ),
     # ── Help: news (inline) ──
     "help.news_header": "📢 Announcement:\n",

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/i18n/zh.py

@@ -27,8 +27,9 @@ MESSAGES = {
     "error.duration_must_be_positive": "【申请资源时间应大于0】\n",
     "error.node_in_use_or_shared": "【节点正在被他人使用或处于共享状态】\n\n",
     "error.node_exclusive_mode": "【节点正处于独占状态】\n\n",
-    "error.lock_max_duration_exceeded": "【注意: 目前禁止连续lock超过{max_duration}】\n\n",
-    "error.slock_max_duration_exceeded": "【注意: 目前禁止连续slock超过{max_duration}】\n\n",
+    "error.lock_max_duration_exceeded": "【注意: 目前禁止连续lock超过{max_duration}】\n\n{whitelist_hint}",
+    "error.slock_max_duration_exceeded": "【注意: 目前禁止连续slock超过{max_duration}】\n\n{whitelist_hint}",
+    "error.whitelist_hint": "如需长期lock，请联系管理员 @{owner} 申请加入白名单\n\n",
     "error.node_not_requested": "【你并未申请过该节点资源】\n",
     "error.unrecognized_command": "❌【未识别的命令】{command}",
     "error.unknown_error": "❌【未知错误】{command}",
@@ -133,7 +134,8 @@ MESSAGES = {
     "notify.booking_expired_header": "⚠️ 以下预约已失效，请重新预约：\n",
     "notify.pending_bookings_header": "🗓️ 目前待抢锁的预约：\n",
     "notify.duration_clamped": (
-        "⚠️【锁定时长调整通知】\n管理员已将最大锁定时长调整为 {max_duration}，您的锁定剩余时长已被自动缩短，请知悉。\n"
+        "⚠️【锁定时长调整通知】\n\n"
+        "管理员已将最大锁定时长调整为 {max_duration}，您的锁定剩余时长已被自动缩短，请知悉。\n\n"
     ),
     # ── Help: news (inline) ──
     "help.news_header": "📢 公告:\n",

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/io.py

@@ -114,6 +114,7 @@ def create_or_load_device_state(config=None):
     state_filename = os.path.join(_bot_dir(config), "bot_state.json")
     cluster_configs = _cfg_get(config, "CLUSTER_CONFIGS")
     max_duration = _cfg_get(config, "MAX_LOCK_DURATION", -1)
+    duration_whitelist = _cfg_get(config, "DURATION_WHITELIST", [])
 
     default_state = {
         node_key: [
@@ -150,7 +151,7 @@ def create_or_load_device_state(config=None):
                     device_status = old_by_id[dev_id]
                     _migrate_status_fields(device_status)
                     _migrate_user_info_fields(device_status["current_users"])
-                    clamped = apply_max_duration_limit(device_status["current_users"], max_duration)
+                    clamped = apply_max_duration_limit(device_status["current_users"], max_duration, duration_whitelist)
                     clamped_user_ids.update(clamped)
                     default_device.update(**device_status)
 
@@ -175,6 +176,7 @@ def create_or_load_node_state(config=None):
     state_filename = os.path.join(_bot_dir(config), "bot_state.json")
     cluster_configs = _cfg_get(config, "CLUSTER_CONFIGS")
     max_duration = _cfg_get(config, "MAX_LOCK_DURATION", -1)
+    duration_whitelist = _cfg_get(config, "DURATION_WHITELIST", [])
 
     default_state = {
         shortname: {
@@ -202,7 +204,7 @@ def create_or_load_node_state(config=None):
             node_status.pop("fullname", None)
             _migrate_user_info_fields(node_status.get("current_users", []))
             _migrate_user_info_fields(node_status.get("booking_list", []))
-            clamped = apply_max_duration_limit(node_status.get("current_users", []), max_duration)
+            clamped = apply_max_duration_limit(node_status.get("current_users", []), max_duration, duration_whitelist)
             clamped_user_ids.update(clamped)
             default_state[node_key].update(**node_status)
 

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/node_bot.py

@@ -111,6 +111,7 @@ class NodeBot(BaseLockBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if not all(
@@ -122,7 +123,7 @@ class NodeBot(BaseLockBot):
 
             timestamp = int(time.time())
 
-            if max_dur > 0:
+            if max_dur > 0 and user_id not in whitelist:
                 for node in nodes:
                     total_duration = duration
                     user_info = find_user_info(node["current_users"], user_id)
@@ -138,6 +139,7 @@ class NodeBot(BaseLockBot):
                                 "error.lock_max_duration_exceeded",
                                 config=self.config,
                                 max_duration=format_duration(max_dur, config=self.config),
+                                whitelist_hint=self._whitelist_hint(),
                             ),
                         )
 
@@ -169,6 +171,7 @@ class NodeBot(BaseLockBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if not all(node["status"] != "exclusive" for node in nodes):
@@ -176,7 +179,7 @@ class NodeBot(BaseLockBot):
 
             timestamp = int(time.time())
 
-            if max_dur > 0:
+            if max_dur > 0 and user_id not in whitelist:
                 for node in nodes:
                     user_info = find_user_info(node["current_users"], user_id)
                     if user_info:
@@ -190,6 +193,7 @@ class NodeBot(BaseLockBot):
                             "error.slock_max_duration_exceeded",
                             config=self.config,
                             max_duration=format_duration(max_dur, config=self.config),
+                            whitelist_hint=self._whitelist_hint(),
                         )
                         return self.show_error(user_id, msg)
 

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/queue_bot.py

@@ -38,6 +38,7 @@ class QueueBot(NodeBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if not all(
@@ -61,7 +62,7 @@ class QueueBot(NodeBot):
             users_to_notify = set()
             users_to_notify.add(user_id)
 
-            if max_dur > 0:
+            if max_dur > 0 and user_id not in whitelist:
                 for node in nodes:
                     booking_info = find_user_info(node["booking_list"], user_id)
                     if not command_has_duration and booking_info:
@@ -81,6 +82,7 @@ class QueueBot(NodeBot):
                                 "error.lock_max_duration_exceeded",
                                 config=self.config,
                                 max_duration=format_duration(max_dur, config=self.config),
+                                whitelist_hint=self._whitelist_hint(),
                             ),
                         )
 
@@ -130,6 +132,7 @@ class QueueBot(NodeBot):
             return error_reply
 
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if any(
@@ -140,13 +143,14 @@ class QueueBot(NodeBot):
 
             timestamp = int(time.time())
 
-            if max_dur > 0 and duration > max_dur:
+            if max_dur > 0 and user_id not in whitelist and duration > max_dur:
                 return self.show_error(
                     user_id,
                     t(
                         "error.lock_max_duration_exceeded",
                         config=self.config,
                         max_duration=format_duration(max_dur, config=self.config),
+                        whitelist_hint=self._whitelist_hint(),
                     ),
                 )
 
@@ -170,6 +174,7 @@ class QueueBot(NodeBot):
         content = t("success.take_success_by", config=self.config, user_id=user_id)
         content += self._msg_with_usage("label.before_take")
         max_dur = self.config.get_val("MAX_LOCK_DURATION")
+        whitelist = self.config.get_val("DURATION_WHITELIST") or []
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if any(find_user_info(node["current_users"], user_id) for node in nodes):
@@ -180,13 +185,14 @@ class QueueBot(NodeBot):
             users_to_notify.add(user_id)
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
 
-            if max_dur > 0 and remaining_duration(timestamp, duration) > max_dur:
+            if max_dur > 0 and user_id not in whitelist and remaining_duration(timestamp, duration) > max_dur:
                 return self.show_error(
                     user_id,
                     t(
                         "error.lock_max_duration_exceeded",
                         config=self.config,
                         max_duration=format_duration(max_dur, config=self.config),
+                        whitelist_hint=self._whitelist_hint(),
                     ),
                 )
 

{lockbot-2.7.0 → lockbot-2.8.0}/python/lockbot/core/utils.py

@@ -71,13 +71,17 @@ def remaining_duration(start_time, duration):
     return max(duration - elapsed_duration, 0)
 
 
-def apply_max_duration_limit(user_list, max_duration):
+def apply_max_duration_limit(user_list, max_duration, whitelist=None):
     """Clamp each user's remaining duration to max_duration in place.
 
     Returns a list of user_ids whose durations were clamped.
+    Whitelist users are skipped.
     """
+    whitelist = whitelist or []
     clamped_users = []
     for user_info in user_list:
+        if user_info["user_id"] in whitelist:
+            continue
         final_duration = remaining_duration(user_info["start_time"], user_info["duration"])
         if max_duration > 0 and final_duration > max_duration:
             user_info["duration"] = user_info["duration"] - final_duration + max_duration

{lockbot-2.7.0 → lockbot-2.8.0/python/lockbot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockbot
-Version: 2.7.0
+Version: 2.8.0
 Summary: Cluster resource management bot for IM platforms
 Author-email: Jianbang Yang <yangjianbang112@gmail.com>
 License: MIT