hap-cli 0.8.18__tar.gz → 0.8.19__tar.gz

{hap_cli-0.8.18 → hap_cli-0.8.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.18
+Version: 0.8.19
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.8.18 → hap_cli-0.8.19}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for Mingdao HAP (hap-cli)."""
 
-__version__ = "0.8.18"
+__version__ = "0.8.19"

{hap_cli-0.8.18 → hap_cli-0.8.19}/hap_cli/core/record.py

@@ -259,6 +259,67 @@ def _legacy_cell_entry(
     return {"value": _legacy_cell_value(ctrl, value)}
 
 
+def _coerce_entity_ids(
+    value: Any, id_keys: tuple[str, ...], *, field_label: str,
+) -> list[str]:
+    """Flatten a member / department / org-role / relation cell value to a
+    list of id strings, ready to be wrapped as ``[{idKey: id}, ...]``.
+
+    Accepts every realistic input shape so callers never have to pre-shape:
+      * a scalar id, or comma-separated ids (``"a,b"``);
+      * a list/tuple mixing ids and ``{idKey: ...}`` objects;
+      * a single ``{idKey: ...}`` object — the ``get_records`` read-back
+        shape carries display fields (``fullname`` / ``avatar`` / ``name``)
+        too, so only the id is kept;
+      * a JSON-array/object *string* of the above (e.g. a value copied
+        straight out of a record dump).
+
+    ``id_keys`` lists the accepted id field names in priority order, e.g.
+    ``("accountId", "aid")`` for USER_PICKER. An object that carries none of
+    them fails loudly instead of being ``str()``-mangled into a junk id —
+    that silent mangling sent garbage members to the server before.
+    """
+    if value is None or value == "":
+        return []
+    # A JSON-array/object string is parsed structurally rather than
+    # comma-split (a member object's JSON has commas inside it).
+    if isinstance(value, str):
+        s = value.strip()
+        if s[:1] in ("[", "{"):
+            try:
+                value = json.loads(s)
+            except (ValueError, TypeError):
+                pass
+    if isinstance(value, dict):
+        items: list[Any] = [value]
+    elif isinstance(value, (list, tuple)):
+        items = list(value)
+    else:
+        items = [p for p in str(value).split(",") if p.strip() != ""]
+    out: list[str] = []
+    for it in items:
+        if isinstance(it, dict):
+            rid = next(
+                (str(it[k]) for k in id_keys if it.get(k) not in (None, "")),
+                None,
+            )
+            if rid is None:
+                raise ValueError(
+                    f"Field '{field_label}': object value is missing an id "
+                    f"field ({'/'.join(id_keys)}): {it!r}"
+                )
+            out.append(rid)
+        elif isinstance(it, (list, tuple)):
+            raise ValueError(
+                f"Field '{field_label}': nested array is not a valid id: {it!r}"
+            )
+        else:
+            s2 = str(it).strip()
+            if s2:
+                out.append(s2)
+    return out
+
+
 def _legacy_cell_value(ctrl: dict[str, Any], value: Any) -> str:
     """Serialize one cell to the legacy receiveControls `value`
     string, per the shapes proven in
@@ -271,14 +332,15 @@ def _legacy_cell_value(ctrl: dict[str, Any], value: Any) -> str:
     if t == 10:  # MULTI_SELECT
         return json.dumps(_resolve_option_keys(ctrl, value), ensure_ascii=False)
 
+    label = _option_field_label(ctrl)
+
     if t in (29, 35):  # RELATE_SHEET / CASCADING_SELECT -> [{"sid": rowId}, ...]
         # Cascade (35) is a relation to a row in another worksheet, persisted
         # the same way as a plain relate (29): an array of {"sid": rowId}. A
-        # bare rowId makes the server answer "服务异常" (bug #642cc8).
-        if isinstance(value, (list, tuple)):
-            ids = [str(v) for v in value]
-        else:
-            ids = [s for s in str(value).split(",") if s != ""]
+        # bare rowId makes the server answer "服务异常" (bug #642cc8). Object
+        # inputs ({"sid": rowId, ...} read-back shape) keep only the sid.
+        ids = _coerce_entity_ids(value, ("sid", "rowid", "rowId"),
+                                 field_label=label)
         return json.dumps([{"sid": rid} for rid in ids], ensure_ascii=False)
 
     if t == 48:  # ORG_ROLE -> [{"organizeId": id}, ...]
@@ -286,20 +348,21 @@ def _legacy_cell_value(ctrl: dict[str, Any], value: Any) -> str:
         # of {"organizeId": id} objects; organizeName is display-only and the
         # server resolves it from the id. A bare organizeId is rejected with
         # "服务异常" (bug #642cc8). See pd-openweb CellControls/OrgRole.jsx.
-        ids = value if isinstance(value, (list, tuple)) else \
-            [s for s in str(value).split(",") if s != ""]
-        return json.dumps([{"organizeId": str(i)} for i in ids],
-                          ensure_ascii=False)
-
-    if t == 26:  # USER_PICKER
-        ids = value if isinstance(value, (list, tuple)) else \
-            [s for s in str(value).split(",") if s != ""]
-        return json.dumps([{"accountId": str(i)} for i in ids],
-                          ensure_ascii=False)
-    if t == 27:  # DEPARTMENT
-        ids = value if isinstance(value, (list, tuple)) else \
-            [s for s in str(value).split(",") if s != ""]
-        return json.dumps([{"departmentId": str(i)} for i in ids],
+        ids = _coerce_entity_ids(value, ("organizeId", "id"),
+                                 field_label=label)
+        return json.dumps([{"organizeId": i} for i in ids], ensure_ascii=False)
+
+    if t == 26:  # USER_PICKER -> always an array of {"accountId": id}, even
+        # for a single member. Object inputs (the full member object the UI
+        # holds / get_records returns: {accountId, fullname, avatar, ...})
+        # are reduced to their accountId — a bare object would fail the save.
+        ids = _coerce_entity_ids(value, ("accountId", "aid"),
+                                 field_label=label)
+        return json.dumps([{"accountId": i} for i in ids], ensure_ascii=False)
+    if t == 27:  # DEPARTMENT -> [{"departmentId": id}, ...]
+        ids = _coerce_entity_ids(value, ("departmentId", "id"),
+                                 field_label=label)
+        return json.dumps([{"departmentId": i} for i in ids],
                           ensure_ascii=False)
 
     if t == 36:  # SWITCH / checkbox

hap_cli-0.8.19/hap_cli/tests/test_member_relation_array_wrap.py

@@ -0,0 +1,103 @@
+"""Member / department / org-role / relation cells must always serialize
+to a JSON *array* of id objects, and must accept object-shaped inputs.
+
+A USER_PICKER (26) cell is always an array, even for a single member
+(evidence: a bare ``{"accountId":...}`` object on AddWorksheetRow fails
+server-side). hap-cli's encoder already wraps scalars in an array, but it
+mangled object-shaped inputs: ``[{"accountId": str(i)} for i in value]``
+ran ``str()`` over a whole member dict when the value was a member object
+or — the natural ``get_records`` read-back shape — a list of member
+objects ``[{"accountId","fullname","avatar",...}]``. The id is now
+extracted from such objects and the cell is always emitted as an array.
+
+The same fix covers DEPARTMENT (27, ``departmentId``), ORG_ROLE
+(48, ``organizeId``) and RELATE_SHEET/CASCADING (29/35, ``sid``).
+"""
+
+import json
+
+import pytest
+
+from hap_cli.core import record as rec_mod
+
+
+def _val(type_code, value):
+    return rec_mod._legacy_cell_value({"type": type_code, "controlName": "f"}, value)
+
+
+class TestUserPickerAlwaysArray:
+    def test_single_account_id_string(self):
+        assert _val(26, "a1") == '[{"accountId": "a1"}]'
+
+    def test_comma_separated_ids(self):
+        assert _val(26, "a1,a2") == '[{"accountId": "a1"}, {"accountId": "a2"}]'
+
+    def test_list_of_ids(self):
+        assert _val(26, ["a1", "a2"]) == \
+            '[{"accountId": "a1"}, {"accountId": "a2"}]'
+
+    def test_single_member_object_keeps_only_account_id(self):
+        v = {"accountId": "a1", "fullname": "林梦阳", "name": "林梦阳",
+             "avatar": "https://x", "avatarMiddle": "https://y"}
+        assert _val(26, v) == '[{"accountId": "a1"}]'
+
+    def test_list_of_member_objects_readback_shape(self):
+        v = [{"accountId": "a1", "fullname": "甲", "avatar": "u1"},
+             {"accountId": "a2", "fullname": "乙", "avatar": "u2"}]
+        assert _val(26, v) == \
+            '[{"accountId": "a1"}, {"accountId": "a2"}]'
+
+    def test_json_array_of_objects_string(self):
+        v = json.dumps([{"accountId": "a1", "fullname": "甲"}])
+        assert _val(26, v) == '[{"accountId": "a1"}]'
+
+    def test_json_object_string(self):
+        v = json.dumps({"accountId": "a1", "fullname": "甲"})
+        assert _val(26, v) == '[{"accountId": "a1"}]'
+
+    def test_member_object_without_account_id_rejected(self):
+        with pytest.raises(ValueError):
+            _val(26, {"fullname": "甲", "avatar": "u"})
+
+    def test_empty_is_empty_array(self):
+        assert _val(26, "") == "[]"
+        assert _val(26, None) == "[]"
+
+
+class TestDepartmentObjectShape:
+    def test_object_keeps_department_id(self):
+        v = {"departmentId": "d1", "departmentName": "研发"}
+        assert _val(27, v) == '[{"departmentId": "d1"}]'
+
+    def test_list_of_objects(self):
+        v = [{"departmentId": "d1"}, {"departmentId": "d2"}]
+        assert _val(27, v) == \
+            '[{"departmentId": "d1"}, {"departmentId": "d2"}]'
+
+    def test_plain_id_still_works(self):
+        assert _val(27, "d1") == '[{"departmentId": "d1"}]'
+
+
+class TestOrgRoleObjectShape:
+    def test_object_keeps_organize_id(self):
+        v = {"organizeId": "o1", "organizeName": "主管"}
+        assert _val(48, v) == '[{"organizeId": "o1"}]'
+
+    def test_plain_id_still_works(self):
+        assert _val(48, "o1") == '[{"organizeId": "o1"}]'
+
+
+class TestRelateObjectShape:
+    def test_relate_object_keeps_sid(self):
+        v = {"sid": "row1", "name": "记录甲"}
+        assert _val(29, v) == '[{"sid": "row1"}]'
+
+    def test_relate_list_of_objects_readback(self):
+        v = [{"sid": "row1", "name": "甲"}, {"sid": "row2", "name": "乙"}]
+        assert _val(29, v) == '[{"sid": "row1"}, {"sid": "row2"}]'
+
+    def test_relate_plain_rowid_still_works(self):
+        assert _val(29, "row1") == '[{"sid": "row1"}]'
+
+    def test_cascading_object_keeps_sid(self):
+        assert _val(35, {"sid": "row1"}) == '[{"sid": "row1"}]'

{hap_cli-0.8.18 → hap_cli-0.8.19}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.18
+Version: 0.8.19
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.8.18 → hap_cli-0.8.19}/hap_cli.egg-info/SOURCES.txt

@@ -168,6 +168,7 @@ hap_cli/tests/test_integration_social.py
 hap_cli/tests/test_integration_v3.py
 hap_cli/tests/test_integration_workflow.py
 hap_cli/tests/test_integration_worksheet_extra.py
+hap_cli/tests/test_member_relation_array_wrap.py
 hap_cli/tests/test_multi_profile.py
 hap_cli/tests/test_org_approval_v3_semantic_cli.py
 hap_cli/tests/test_org_id_cli.py