lockbot 2.9.4__tar.gz → 2.9.5__tar.gz

{lockbot-2.9.4/python/lockbot.egg-info → lockbot-2.9.5}/PKG-INFO

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

{lockbot-2.9.4 → lockbot-2.9.5}/pyproject.toml

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

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/backend/app/bots/schemas.py

@@ -72,6 +72,10 @@ def _validate_config_overrides(v: dict | None) -> dict | None:
     if allow_alias is not None and not isinstance(allow_alias, bool):
         errors.append("ALLOW_USER_ALIAS must be a boolean")
 
+    display_model = v.get("DISPLAY_DEVICE_MODEL")
+    if display_model is not None and not isinstance(display_model, bool):
+        errors.append("DISPLAY_DEVICE_MODEL 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.9.4 → lockbot-2.9.5}/python/lockbot/backend/app/config.py

@@ -8,7 +8,8 @@ from pathlib import Path
 # Project root directory (lockbot/)
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
-DATA_DIR = os.environ.get("DATA_DIR", "/data")
+DATA_DIR = os.environ.get("DATA_DIR", str(BASE_DIR.parent / "data"))
+os.makedirs(DATA_DIR, exist_ok=True)
 
 # Database
 DATABASE_URL = os.environ.get(

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/device_bot.py

@@ -474,19 +474,14 @@ class DeviceBot(BaseLockBot):
         text = t("help.rule3_lock_modes", config=self.config)
         text += t("help.lock_all_devices_example", config=self.config, node=example_node)
         text += t("help.lock_device_example", config=self.config, node=example_node)
-        text += t("help.lock_device_duration_example", config=self.config, node=example_node)
-        text += t("help.lock_device_range_example", config=self.config, node=example_node)
         text += t("help.slock_device_range_example", config=self.config, node=example_node)
         text += t("help.section2_title", config=self.config)
         text += t("help.unlock_device_example", config=self.config, node=example_node)
-        text += t("help.unlock_device_range_example", config=self.config, node=example_node)
         text += t("help.free_device_range_example", config=self.config, node=example_node)
-        text += t("help.free_node_all_example", config=self.config, node=example_node)
         text += t("help.free_all", config=self.config)
         text += t("help.section3_title", config=self.config)
         text += t("help.kickout_device_example", config=self.config, node=example_node)
         text += t("help.kickout_device_range_example", config=self.config, node=example_node)
-        text += t("help.kickout_device_range2_example", config=self.config, node=example_node)
         text += t("help.section4_title", config=self.config)
         text += t("help.section5_title", config=self.config)
         text += t("help.query_at_bot", config=self.config)
@@ -494,7 +489,7 @@ class DeviceBot(BaseLockBot):
         text += "\n"
 
         if self.config.get_val("ALLOW_USER_ALIAS"):
-            text += f"6. 备注: alias {example_node} <备注>\n\n"
+            text += t("alias.help_section", config=self.config, node=example_node, num=6)
 
         return text
 

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/device_usage_utils.py

@@ -115,7 +115,8 @@ def render_device_lines(node_status, grouped_usage, idle_groups, config=None):
     Generate display lines from locked and idle device groups.
     """
     lines = []
-    show_model = _is_heterogeneous(node_status)
+    force_show = config.get_val("DISPLAY_DEVICE_MODEL") if config else False
+    show_model = force_show or _is_heterogeneous(node_status)
     all_segments = []
 
     has_merged = any(len(dev_ids) > 1 for (_, dev_ids) in grouped_usage) or any(

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/i18n/en.py

@@ -102,18 +102,18 @@ MESSAGES = {
     "help.kickout_example": "    kickout {node} (force-release node {node})\n",
     "help.query_node_example": "    query {node} (query node {node})\n",
     # ── Help text (DEVICE) command examples ──
-    "help.lock_all_devices_example": "    lock {node} (lock all devices on node)\n",
-    "help.lock_device_example": "    lock {node} dev0 (lock device 0 on {node})\n",
-    "help.lock_device_duration_example": "    lock {node} dev0 2h (lock device 0 on {node} for 2h)\n",
-    "help.lock_device_range_example": "    lock {node} dev0-3 (lock devices 0-3 on {node})\n",
-    "help.slock_device_range_example": "    slock {node} dev0-3 (shared-lock devices 0-3 on {node})\n",
-    "help.unlock_device_example": "    unlock {node} (release all your devices on node)\n",
-    "help.unlock_device_range_example": "    unlock {node} dev0-3 (release devices 0-3 on {node})\n",
-    "help.free_device_range_example": "    free {node} dev0-3 (release devices 0-3 on {node})\n",
-    "help.free_node_all_example": "    free {node} (release all your devices on {node})\n",
-    "help.kickout_device_example": "    kickout {node} (force-release all devices on node)\n",
-    "help.kickout_device_range_example": "    kickout {node} dev0-3 (force-release devices 0-3 on {node})\n",
-    "help.kickout_device_range2_example": "    kickout {node} dev0 (force-release device 0 on {node})\n",
+    "help.lock_all_devices_example": "    lock {node}\n",
+    "help.lock_device_example": "    lock {node} dev0\n",
+    "help.lock_device_duration_example": "    lock {node} dev0 2h\n",
+    "help.lock_device_range_example": "    lock {node} dev0-3\n",
+    "help.slock_device_range_example": "    slock {node} dev0-3 2h\n",
+    "help.unlock_device_example": "    unlock {node}\n",
+    "help.unlock_device_range_example": "    unlock {node} dev0-3\n",
+    "help.free_device_range_example": "    free {node} dev0-3\n",
+    "help.free_node_all_example": "    free {node}\n",
+    "help.kickout_device_example": "    kickout {node}\n",
+    "help.kickout_device_range_example": "    kickout {node} dev0-3\n",
+    "help.kickout_device_range2_example": "    kickout {node} dev0\n",
     "help.resource_list_title": "Resource list:\n",
     "help.resource_list_item": "    {node_key}: dev_id 0~{max_dev}\n",
     # ── Help text (QUEUE) extras ──
@@ -174,6 +174,7 @@ MESSAGES = {
     "opkick.notify_kicked": "⚠️ [Operator Release]\n\nNode: {node_key}\n",
     "opkick.notify_kicked_reason": "Reason: {reason}\n\n",
     # ── Alias command ──
+    "alias.help_section": "{num}. Alias: alias {node} <label>\n   Clear: alias {node}\n",
     "alias.usage": "Usage: alias <node_key> [label]\nExample: alias node0 10.10.10.56\nClear: alias node0",
     "alias.invalid_node": "Node {node_key} does not exist. Available: {valid_keys}\n",
     "alias.invalid_alias": "Alias cannot contain line breaks; please enter a single-line label",

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/i18n/zh.py

@@ -96,18 +96,18 @@ MESSAGES = {
     "help.kickout_example": "    kickout {node} (强制释放{node}节点)\n",
     "help.query_node_example": "    query {node} (查询{node}节点)\n",
     # ── Help text (DEVICE) command examples ──
-    "help.lock_all_devices_example": "    lock {node} (锁定当前节点的所有设备)\n",
-    "help.lock_device_example": "    lock {node} dev0 (锁定{node}节点的0号设备)\n",
-    "help.lock_device_duration_example": "    lock {node} dev0 2h (锁定{node}节点的0号设备2小时)\n",
-    "help.lock_device_range_example": "    lock {node} dev0-3 (锁定{node}节点的0-3号设备)\n",
-    "help.slock_device_range_example": "    slock {node} dev0-3 (共享锁定{node}节点的0-3号设备)\n",
-    "help.unlock_device_example": "    unlock {node} (释放当前节点所有申请过的设备)\n",
-    "help.unlock_device_range_example": "    unlock {node} dev0-3 (释放{node}节点的0-3号设备)\n",
-    "help.free_device_range_example": "    free {node} dev0-3 (释放{node}节点的0-3号设备)\n",
-    "help.free_node_all_example": "    free {node} (释放{node}节点所有申请过的设备)\n",
-    "help.kickout_device_example": "    kickout {node} (强制释放当前节点的所有设备)\n",
-    "help.kickout_device_range_example": "    kickout {node} dev0-3 (强制释放{node}节点的0-3号设备)\n",
-    "help.kickout_device_range2_example": "    kickout {node} dev0 (强制释放{node}节点的0号设备)\n",
+    "help.lock_all_devices_example": "    lock {node}\n",
+    "help.lock_device_example": "    lock {node} dev0\n",
+    "help.lock_device_duration_example": "    lock {node} dev0 2h\n",
+    "help.lock_device_range_example": "    lock {node} dev0-3\n",
+    "help.slock_device_range_example": "    slock {node} dev0-3 2h\n",
+    "help.unlock_device_example": "    unlock {node}\n",
+    "help.unlock_device_range_example": "    unlock {node} dev0-3\n",
+    "help.free_device_range_example": "    free {node} dev0-3\n",
+    "help.free_node_all_example": "    free {node}\n",
+    "help.kickout_device_example": "    kickout {node}\n",
+    "help.kickout_device_range_example": "    kickout {node} dev0-3\n",
+    "help.kickout_device_range2_example": "    kickout {node} dev0\n",
     "help.resource_list_title": "资源列表:\n",
     "help.resource_list_item": "    {node_key}: dev_id 0~{max_dev}\n",
     # ── Help text (QUEUE) extras ──
@@ -167,6 +167,7 @@ MESSAGES = {
     "opkick.notify_kicked": "⚠️【运维释放】\n\n节点: {node_key}\n",
     "opkick.notify_kicked_reason": "原因: {reason}\n\n",
     # ── Alias command ──
+    "alias.help_section": "{num}. 备注: alias {node} <备注>\n   清除: alias {node}\n",
     "alias.usage": "用法: alias <节点名> [备注]\n示例: alias node0 10.10.10.56\n清除: alias node0",
     "alias.invalid_node": "节点 {node_key} 不存在，可用节点: {valid_keys}\n",
     "alias.invalid_alias": "备注不能包含换行，请输入单行备注",

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/node_bot.py

@@ -361,7 +361,7 @@ class NodeBot(BaseLockBot):
         reply_info += f"    {example_node0}\n"
 
         if self.config.get_val("ALLOW_USER_ALIAS"):
-            reply_info += f"6. 备注: alias {example_node0} <备注>\n"
+            reply_info += t("alias.help_section", config=self.config, node=example_node0, num=6)
 
         reply_info += "\n"
         return reply_info

{lockbot-2.9.4 → lockbot-2.9.5}/python/lockbot/core/queue_bot.py

@@ -348,7 +348,7 @@ class QueueBot(NodeBot):
         parts.append(f"    {example_node0}\n")
 
         if self.config.get_val("ALLOW_USER_ALIAS"):
-            parts.append(f"8. 备注: alias {example_node0} <备注>\n")
+            parts.append(t("alias.help_section", config=self.config, node=example_node0, num=8))
 
         parts.append("\n")
         return "".join(parts)

{lockbot-2.9.4 → lockbot-2.9.5/python/lockbot.egg-info}/PKG-INFO

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