lockbot 2.5.4__tar.gz → 2.5.5__tar.gz

{lockbot-2.5.4/python/lockbot.egg-info → lockbot-2.5.5}/PKG-INFO

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

{lockbot-2.5.4 → lockbot-2.5.5}/pyproject.toml

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

{lockbot-2.5.4 → lockbot-2.5.5}/python/lockbot/backend/app/bots/router.py

@@ -327,26 +327,38 @@ def update_bot(
         )
         if dup:
             raise HTTPException(status_code=409, detail="Bot name already exists")
-        changes["name"] = {"from": bot.name, "to": body.name}
+        if body.name != bot.name:
+            changes["name"] = {"from": bot.name, "to": body.name}
         bot.name = body.name
     if body.group_id is not None:
         bot.group_id = body.group_id
     if body.webhook_url is not None:
-        changes["webhook_url"] = "updated"
+        old_val = encryption.decrypt(bot.webhook_url) if bot.webhook_url else ""
+        if body.webhook_url != old_val:
+            changes["webhook_url"] = "updated"
         bot.webhook_url = encryption.encrypt(body.webhook_url)
     if body.aes_key is not None:
-        changes["aes_key"] = "updated"
+        old_val = encryption.decrypt(bot.aes_key) if bot.aes_key else ""
+        if body.aes_key != old_val:
+            changes["aes_key"] = "updated"
         bot.aes_key = encryption.encrypt(body.aes_key)
     if body.token is not None:
-        changes["token"] = "updated"
+        old_val = encryption.decrypt(bot.token) if bot.token else ""
+        if body.token != old_val:
+            changes["token"] = "updated"
         bot.token = encryption.encrypt(body.token)
     if body.cluster_configs is not None:
-        if isinstance(body.cluster_configs, dict):
-            node_summary = {k: len(v) if isinstance(v, list) else v for k, v in body.cluster_configs.items()}
-            changes["cluster_configs"] = node_summary
-        else:
-            changes["cluster_configs"] = f"{len(body.cluster_configs)} nodes"
-        bot.cluster_configs = json.dumps(body.cluster_configs, ensure_ascii=False)
+        new_json = json.dumps(body.cluster_configs, ensure_ascii=False)
+        if new_json != (bot.cluster_configs or ""):
+            old_configs = json.loads(bot.cluster_configs) if bot.cluster_configs else None
+            if isinstance(body.cluster_configs, dict):
+                # DEVICE bot: {node: [devices...]} → summary with device counts
+                node_summary = {k: len(v) if isinstance(v, list) else v for k, v in body.cluster_configs.items()}
+                changes["cluster_configs"] = node_summary
+            else:
+                # NODE bot: list of node names → show from/to
+                changes["cluster_configs"] = {"from": old_configs, "to": body.cluster_configs}
+        bot.cluster_configs = new_json
     if body.config_overrides is not None:
         old_overrides = json.loads(bot.config_overrides) if bot.config_overrides else {}
         diff = {}
@@ -354,19 +366,32 @@ def update_bot(
             old_v = old_overrides.get(k)
             if old_v != v:
                 diff[k] = {"from": old_v, "to": v}
-        changes["config_overrides"] = diff if diff else "no change"
+        if diff:
+            changes["config_overrides"] = diff
         bot.config_overrides = json.dumps(body.config_overrides, ensure_ascii=False)
 
-    write_audit_log(
-        db,
-        user,
-        "bot.update",
-        target_type="bot",
-        target_id=bot_id,
-        target_name=bot.name,
-        detail={"changed": list(changes.keys())},
-        ip=request.client.host if request.client else None,
-    )
+    if changes:
+        write_audit_log(
+            db,
+            user,
+            "bot.update",
+            target_type="bot",
+            target_id=bot_id,
+            target_name=bot.name,
+            detail=changes,
+            ip=request.client.host if request.client else None,
+        )
+    else:
+        write_audit_log(
+            db,
+            user,
+            "bot.update",
+            target_type="bot",
+            target_id=bot_id,
+            target_name=bot.name,
+            detail={"no_change": True},
+            ip=request.client.host if request.client else None,
+        )
     db.commit()
     db.refresh(bot)
     return bot

{lockbot-2.5.4 → lockbot-2.5.5/python/lockbot.egg-info}/PKG-INFO

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