lockbot 2.6.2__tar.gz → 2.7.0__tar.gz

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

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

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

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

{lockbot-2.6.2 → lockbot-2.7.0}/python/lockbot/backend/app/bots/router.py

@@ -127,6 +127,28 @@ def _normalize_cluster_configs(cc):
     return cc
 
 
+def _device_dict_to_array(d: dict) -> list:
+    """Convert DEVICE cluster_configs from dict to ordered array for API response.
+
+    Why: JS JSON.parse auto-sorts pure-numeric keys ("0","1","2"), losing user-defined
+    node ordering. Array format preserves insertion order in all environments.
+    """
+    return [{"node_key": k, "devices": v} for k, v in d.items()]
+
+
+def _device_array_to_dict(arr: list) -> dict:
+    """Convert DEVICE cluster_configs from ordered array to dict for DB storage.
+
+    DB continues to store dict format; conversion happens at API boundary only.
+    """
+    return {item["node_key"]: item["devices"] for item in arr}
+
+
+def _is_device_array_format(cc) -> bool:
+    """Check if cluster_configs is in the new array-of-dicts DEVICE format."""
+    return isinstance(cc, list) and bool(cc) and isinstance(cc[0], dict) and "node_key" in cc[0]
+
+
 def _build_config_dict(bot: Bot, db: Session | None = None) -> dict:
     """
     Build the full config dict from a DB Bot record.
@@ -213,7 +235,12 @@ def create_bot(
         webhook_url=encryption.encrypt(body.webhook_url),
         aes_key=encryption.encrypt(body.aes_key),
         token=encryption.encrypt(body.token),
-        cluster_configs=json.dumps(body.cluster_configs, ensure_ascii=False),
+        cluster_configs=json.dumps(
+            _device_array_to_dict(body.cluster_configs)
+            if _is_device_array_format(body.cluster_configs)
+            else body.cluster_configs,
+            ensure_ascii=False,
+        ),
         config_overrides=json.dumps(body.config_overrides or {}, ensure_ascii=False),
     )
     db.add(bot)
@@ -358,16 +385,20 @@ def update_bot(
             changes["token"] = "updated"
         bot.token = encryption.encrypt(body.token)
     if body.cluster_configs is not None:
-        new_json = json.dumps(body.cluster_configs, ensure_ascii=False)
+        # Convert array format to dict for storage
+        cc_for_storage = body.cluster_configs
+        if _is_device_array_format(cc_for_storage):
+            cc_for_storage = _device_array_to_dict(cc_for_storage)
+        new_json = json.dumps(cc_for_storage, 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):
+            if isinstance(cc_for_storage, 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()}
+                node_summary = {k: len(v) if isinstance(v, list) else v for k, v in cc_for_storage.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}
+                changes["cluster_configs"] = {"from": old_configs, "to": cc_for_storage}
         bot.cluster_configs = new_json
     if body.config_overrides is not None:
         old_overrides = json.loads(bot.config_overrides) if bot.config_overrides else {}

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

@@ -2,9 +2,10 @@
 Bot Pydantic schemas
 """
 
+import json
 from datetime import datetime
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, field_validator, model_validator
 
 # ── config_overrides value bounds ─────────────────────────────────────────────
 _CFG_RULES: dict[str, tuple[int, int] | None] = {
@@ -15,6 +16,24 @@ _CFG_RULES: dict[str, tuple[int, int] | None] = {
 }
 
 
+def _serialize_device_configs(cluster_configs_json: str) -> str:
+    """Convert DEVICE cluster_configs from stored dict JSON to ordered array JSON.
+
+    DB stores: '{"2": ["a800"], "0": ["h20"]}'
+    API returns: '[{"node_key": "2", "devices": ["a800"]}, {"node_key": "0", "devices": ["h20"]}]'
+
+    This ensures JS frontend receives an array that preserves insertion order,
+    avoiding the JS engine's automatic sorting of numeric object keys.
+    """
+    try:
+        cc = json.loads(cluster_configs_json)
+        if isinstance(cc, dict):
+            return json.dumps([{"node_key": k, "devices": v} for k, v in cc.items()], ensure_ascii=False)
+    except (json.JSONDecodeError, TypeError):
+        pass
+    return cluster_configs_json
+
+
 def _validate_config_overrides(v: dict | None) -> dict | None:
     if not v:
         return v
@@ -93,6 +112,13 @@ class BotOut(BaseModel):
 
     model_config = {"from_attributes": True}
 
+    @model_validator(mode="after")
+    def convert_device_cluster_configs(self):
+        """For DEVICE bots, convert stored dict JSON to array JSON for frontend."""
+        if self.bot_type == "DEVICE" and self.cluster_configs:
+            self.cluster_configs = _serialize_device_configs(self.cluster_configs)
+        return self
+
 
 class BotDetail(BotOut):
     """Detail view with sensitive fields (both masked and raw for show/copy)."""

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

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