lockbot 2.8.0__tar.gz → 2.9.0__tar.gz

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

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

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

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

{lockbot-2.8.0 → lockbot-2.9.0}/python/lockbot/backend/app/bots/router.py

@@ -127,6 +127,33 @@ def _normalize_cluster_configs(cc):
     return cc
 
 
+def _get_node_keys(cc) -> set:
+    """Extract node key set from cluster_configs (any format)."""
+    if _is_device_array_format(cc):
+        return {item["node_key"] for item in cc}
+    if isinstance(cc, dict):
+        return set(cc.keys())
+    if isinstance(cc, list):
+        return set(cc)
+    return set()
+
+
+def _validate_node_aliases(config_overrides, cluster_configs):
+    """Raise HTTPException if NODE_ALIASES contains keys not in cluster_configs."""
+    if not config_overrides:
+        return
+    aliases = config_overrides.get("NODE_ALIASES")
+    if not aliases:
+        return
+    valid_keys = _get_node_keys(cluster_configs)
+    invalid = set(aliases.keys()) - valid_keys
+    if invalid:
+        raise HTTPException(
+            status_code=422,
+            detail=f"NODE_ALIASES contains keys not in cluster_configs: {sorted(invalid)}",
+        )
+
+
 def _device_dict_to_array(d: dict) -> list:
     """Convert DEVICE cluster_configs from dict to ordered array for API response.
 
@@ -214,6 +241,8 @@ 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}")
 
+    _validate_node_aliases(body.config_overrides, body.cluster_configs)
+
     exists = (
         db.query(Bot)
         .filter(
@@ -349,6 +378,11 @@ def update_bot(
     if user.role != "super_admin" and bot.user_id != user.id:
         raise HTTPException(status_code=403, detail="Cannot edit another user's bot")
 
+    # Validate NODE_ALIASES keys against cluster_configs
+    if body.config_overrides and body.config_overrides.get("NODE_ALIASES"):
+        cc = body.cluster_configs if body.cluster_configs is not None else json.loads(bot.cluster_configs)
+        _validate_node_aliases(body.config_overrides, cc)
+
     changes = {}
     if body.name is not None:
         # Check for duplicate name (excluding current bot and deleted bots)

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

@@ -57,6 +57,17 @@ def _validate_config_overrides(v: dict | None) -> dict | None:
     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")
 
+    node_aliases = v.get("NODE_ALIASES")
+    if node_aliases is not None and (
+        not isinstance(node_aliases, dict)
+        or not all(isinstance(k, str) and isinstance(a, str) and len(a) <= 15 for k, a in node_aliases.items())
+    ):
+        errors.append("NODE_ALIASES must be a dict of {string: string} with alias length <= 15")
+
+    show_alias = v.get("SHOW_NODE_ALIAS")
+    if show_alias is not None and not isinstance(show_alias, bool):
+        errors.append("SHOW_NODE_ALIAS must be a boolean")
+
     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.8.0 → lockbot-2.9.0}/python/lockbot/core/base_bot.py

@@ -121,6 +121,18 @@ class BaseLockBot:
         """
         return self.adapter.build_reply("\u274c" + error_msg, [user_id])
 
+    @property
+    def _duration_whitelist(self):
+        return self.config.get_val("DURATION_WHITELIST") or []
+
+    def _display_node(self, node_key):
+        """Return node_key with alias suffix if SHOW_NODE_ALIAS is enabled."""
+        if not self.config.get_val("SHOW_NODE_ALIAS"):
+            return node_key
+        aliases = self.config.get_val("NODE_ALIASES") or {}
+        alias = aliases.get(node_key)
+        return f"{node_key}「{alias}」" if alias else node_key
+
     def _whitelist_hint(self):
         """Return whitelist hint string if BOT_OWNER is configured, else empty string."""
         owner = self.config.get_val("BOT_OWNER")

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

@@ -177,7 +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 []
+        whitelist = self._duration_whitelist
         with self._lock:
             timestamp = int(time.time())
 
@@ -251,7 +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 []
+        whitelist = self._duration_whitelist
         with self._lock:
             timestamp = int(time.time())
             for node_key, dev_ids in zip(node_key_list, dev_ids_list, strict=True):
@@ -597,4 +597,6 @@ class DeviceBot(BaseLockBot):
         """
         Get a text description of the current cluster device usage (supports merged display and heterogeneous hints).
         """
-        return get_current_usage(node_filter, self.state.bot_state, {}, config=self.config)
+        return get_current_usage(
+            node_filter, self.state.bot_state, {}, config=self.config, display_node=self._display_node
+        )

{lockbot-2.8.0 → lockbot-2.9.0}/python/lockbot/core/device_usage_utils.py

@@ -157,7 +157,7 @@ def render_device_lines(node_status, grouped_usage, idle_groups, config=None):
     return lines
 
 
-def get_current_usage(node_filter, bot_state, monitor_status, config=None):
+def get_current_usage(node_filter, bot_state, monitor_status, config=None, display_node=None):
     """
     Get current device usage info including idle, locked, and in-use devices.
     """
@@ -169,7 +169,8 @@ def get_current_usage(node_filter, bot_state, monitor_status, config=None):
             or node_key == node_filter
             or (isinstance(node_filter, list) and node_key in node_filter)
         ):
-            usage_info += t("device_usage.node_header", config=config, node_key=node_key)
+            shown_name = display_node(node_key) if display_node else node_key
+            usage_info += t("device_usage.node_header", config=config, node_key=shown_name)
 
             grouped_usage = group_locked_devices(node_status)
             shown_indices = set()

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

@@ -111,7 +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 []
+        whitelist = self._duration_whitelist
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if not all(
@@ -171,7 +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 []
+        whitelist = self._duration_whitelist
         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):
@@ -397,7 +397,7 @@ class NodeBot(BaseLockBot):
 
                                 uid = user_info["user_id"] + format_access_mode(node["status"], config=self.config)
                                 duration = format_duration(remaining_time, config=self.config)
-                                alert_info += f"{node_key} {uid}  {duration}\n"
+                                alert_info += f"{self._display_node(node_key)} {uid}  {duration}\n"
 
                         if EARLY_NOTIFY and not user_info["is_notified"] and 0 < remaining_time <= TIME_ALERT:
                             trigger_time_alert = True
@@ -407,7 +407,7 @@ class NodeBot(BaseLockBot):
 
                             uid = user_info["user_id"] + format_access_mode(node["status"], config=self.config)
                             duration = format_duration(remaining_time, config=self.config)
-                            alert_info += f"{node_key} {uid}  {duration}\n"
+                            alert_info += f"{self._display_node(node_key)} {uid}  {duration}\n"
 
                     for user_id in removed_users_id:
                         remove_user_info(node["current_users"], user_id)
@@ -453,11 +453,12 @@ class NodeBot(BaseLockBot):
             usage_info = ""
             for node_key, node_status in nodes.items():
                 if node_filter is None or node_key == node_filter:
+                    display_name = self._display_node(node_key)
                     if node_status["status"] == "idle":
-                        usage_info += "{:} {}\n".format(node_key, t("status.idle", config=self.config))
+                        usage_info += "{:} {}\n".format(display_name, t("status.idle", config=self.config))
                     else:
                         for user_idx, user_info in enumerate(node_status["current_users"]):
-                            node_name = f"{node_key}" if user_idx == 0 else ""
+                            node_name = f"{display_name}" if user_idx == 0 else ""
                             uid = user_info["user_id"] + format_access_mode(node_status["status"], config=self.config)
                             duration = format_duration(
                                 remaining_duration(user_info["start_time"], user_info["duration"]), config=self.config

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

@@ -38,7 +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 []
+        whitelist = self._duration_whitelist
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if not all(
@@ -132,7 +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 []
+        whitelist = self._duration_whitelist
         with self._lock:
             nodes = [self.state.bot_state[node_key] for node_key in node_keys]
             if any(
@@ -174,7 +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 []
+        whitelist = self._duration_whitelist
         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):

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

@@ -77,7 +77,8 @@ def apply_max_duration_limit(user_list, max_duration, whitelist=None):
     Returns a list of user_ids whose durations were clamped.
     Whitelist users are skipped.
     """
-    whitelist = whitelist or []
+    if whitelist is None:
+        whitelist = []
     clamped_users = []
     for user_info in user_list:
         if user_info["user_id"] in whitelist:

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

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