hap-cli 0.6.6__tar.gz → 0.6.7__tar.gz

{hap_cli-0.6.6 → hap_cli-0.6.7}/PKG-INFO

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

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for MingDAO HAP (hap-cli)."""
 
-__version__ = "0.6.6"
+__version__ = "0.6.7"

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/commands/contact_cmd.py

@@ -51,14 +51,33 @@ def _simplify_user(u: dict[str, Any] | None) -> dict[str, Any] | None:
         v = u.get(src)
         if v:
             out[dst] = v
+    # Newer endpoints (User.GetContactUserList,
+    # User.GetProjectResignedUserList) nest the department under
+    # `departmentInfo`. Flatten it here so the rendered shape stays flat.
+    dept = u.get("departmentInfo") or {}
+    if isinstance(dept, dict):
+        if dept.get("departmentName") and not out.get("department"):
+            out["department"] = dept["departmentName"]
+        if dept.get("departmentId"):
+            out["department_id"] = dept["departmentId"]
     if u.get("accountStatus") and u["accountStatus"] != 0:
         out["status"] = u["accountStatus"]
     return out
 
 
 def _simplify_search_result(raw: dict[str, Any]) -> dict[str, Any]:
-    users = [_simplify_user(u) for u in (raw.get("userResult") or [])]
-    return {"users": [u for u in users if u]}
+    """Unified envelope for the two contact-search endpoints.
+
+    Both `User.GetContactUserList` (after extracting the `users`
+    sub-dict in the core layer) and `User.GetProjectResignedUserList`
+    hand us a ``{"list": [...], "allCount": N}`` shape — project it to
+    ``{"total": N, "users": [...]}`` so a single renderer handles both.
+    """
+    users = [_simplify_user(u) for u in (raw.get("list") or [])]
+    return {
+        "total": raw.get("allCount", 0),
+        "users": [u for u in users if u],
+    }
 
 
 def _simplify_friends_result(raw: dict[str, Any]) -> dict[str, Any]:
@@ -151,40 +170,35 @@ def _render_friend_requests(summary: dict[str, Any]) -> None:
 @contact.command("search")
 @click.argument("keywords")
 @org_id_option()
-@click.option(
-    "--range", "range_", type=int, default=None,
-    help="Server-defined range bucket (numeric)",
-)
 @click.option("--page-size", "-n", default=20, help="Items per page")
 @click.option("--page", "-p", default=1, help="Page number")
 @click.option(
-    "--filter-other/--no-filter-other", "is_filter_other", default=None,
-    help="Filter out third-party collaborators (friends + colleagues only)",
-)
-@click.option(
-    "--take-count/--no-take-count", "take_total_count", default=None,
-    help="Include total count in response",
+    "--resigned/--no-resigned",
+    "resigned",
+    default=False,
+    help="Search resigned members instead of active ones",
 )
 @pass_context
-def contact_search(
-    ctx, keywords, org_id, range_, page_size, page, is_filter_other, take_total_count,
-):
-    """Search contacts by keyword within an organization."""
+def contact_search(ctx, keywords, org_id, page_size, page, resigned):
+    """Search members of an organization by keyword.
+
+    Defaults to active members. Pass --resigned to search former
+    members. Uses the current organization when --org-id is omitted.
+    """
     try:
         session = ctx.get_session()
         pid = require_api_project_id(session, org_id)
-        raw = contact_mod.search_contacts(
+        fn = contact_mod.search_resigned_users if resigned else contact_mod.search_contacts
+        raw = fn(
             session,
             keywords,
             project_id=pid,
-            range_=range_,
             page_index=page,
             page_size=page_size,
-            is_filter_other=is_filter_other,
-            take_total_count=take_total_count,
         )
         summary = _simplify_search_result(raw)
-        ctx.output(summary, lambda d: _render_users(d, "Matches"))
+        header = "Resigned matches" if resigned else "Matches"
+        ctx.output(summary, lambda d: _render_users(d, header))
     except Exception as e:
         ctx.handle_error(e)
 

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/commands/department_cmd.py

@@ -34,8 +34,8 @@ def _simplify_department(d: dict[str, Any] | None) -> dict[str, Any] | None:
         "id": d.get("departmentId") or d.get("id"),
         "name": d.get("departmentName") or d.get("name"),
     }
-    if d.get("userCount") is not None:
-        out["user_count"] = d.get("userCount")
+    # userCount from these list/tree endpoints is unreliable (always 0) —
+    # use `department members` for a real count. Intentionally omitted.
     if d.get("haveSubDepartment") is not None:
         out["has_children"] = bool(d.get("haveSubDepartment"))
     if d.get("disabled"):
@@ -75,13 +75,23 @@ def _simplify_department_members(raw: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def _simplify_dept_search_node(node: dict[str, Any] | None) -> dict[str, Any] | None:
+    # SearchDeptAndUsers returns departments as a recursive tree under
+    # the `subs` field (distinct from GetProjectSubDepartmentTree which
+    # uses `subDepartments`).
+    base = _simplify_department(node)
+    if base is None or not isinstance(node, dict):
+        return base
+    subs = node.get("subs") or []
+    children = [c for c in (_simplify_dept_search_node(s) for s in subs) if c]
+    if children:
+        base["children"] = children
+    return base
+
+
 def _simplify_dept_search(raw: dict[str, Any]) -> dict[str, Any]:
-    users = [_simplify_user(u) for u in (raw.get("users") or [])]
-    depts = [_simplify_department(d) for d in (raw.get("departments") or [])]
-    return {
-        "users": [u for u in users if u],
-        "departments": [d for d in depts if d],
-    }
+    depts = [_simplify_dept_search_node(d) for d in (raw.get("departments") or [])]
+    return {"departments": [d for d in depts if d]}
 
 
 # ── Human-readable renderers ───────────────────────────────────────────────
@@ -94,8 +104,6 @@ def _render_departments(depts: list[dict[str, Any]], header: str = "Departments"
     click.echo(f"{header} ({len(depts)}):")
     for d in depts:
         extras = []
-        if d.get("user_count") is not None:
-            extras.append(f"{d['user_count']} members")
         if d.get("has_children"):
             extras.append("has sub-departments")
         if d.get("disabled"):
@@ -111,8 +119,7 @@ def _render_tree(nodes: list[dict[str, Any]], depth: int = 0) -> None:
         return
     for n in nodes:
         indent = "  " * depth
-        count = f"  ({n['user_count']} members)" if n.get("user_count") is not None else ""
-        click.echo(f"{indent}• {n.get('name') or '?'}{count}")
+        click.echo(f"{indent}• {n.get('name') or '?'}")
         click.echo(f"{indent}  id: {n.get('id')}")
         if n.get("children"):
             _render_tree(n["children"], depth + 1)
@@ -123,8 +130,6 @@ def _render_department_info(info: dict[str, Any]) -> None:
     click.echo(f"ID: {info.get('id')}")
     if info.get("parent_name") or info.get("parent_id"):
         click.echo(f"Parent: {info.get('parent_name') or ''} ({info.get('parent_id') or ''})")
-    if info.get("user_count") is not None:
-        click.echo(f"Members: {info['user_count']}")
     if info.get("disabled"):
         click.echo("Status: disabled")
     chargers = info.get("charge_users") or []
@@ -136,14 +141,11 @@ def _render_department_info(info: dict[str, Any]) -> None:
 
 def _render_dept_search(summary: dict[str, Any]) -> None:
     depts = summary.get("departments") or []
-    users = summary.get("users") or []
-    if not depts and not users:
-        click.echo("No matches.")
+    if not depts:
+        click.echo("No matching departments.")
         return
-    if depts:
-        _render_departments(depts, "Matching departments")
-    if users:
-        _render_users({"users": users}, "Matching users")
+    click.echo(f"Matching departments ({len(depts)}):")
+    _render_tree(depts)
 
 
 # ── Commands ───────────────────────────────────────────────────────────────
@@ -249,11 +251,12 @@ def department_members(
     "--include-disabled/--no-include-disabled",
     "include_disabled",
     default=None,
-    help="Include disabled departments/users",
+    help="Include disabled departments",
 )
 @pass_context
 def department_search(ctx, keywords, org_id, include_disabled):
-    """Search departments and users within the organization."""
+    """Search departments by keyword. Results render as a tree showing
+    each match with its sub-departments."""
     try:
         session = ctx.get_session()
         pid = require_api_project_id(session, org_id)

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/core/contact.py

@@ -26,37 +26,55 @@ from hap_cli.core.session import Session
 def search_contacts(
     session: Session,
     keywords: str,
-    project_id: str = "",
-    range_: Optional[int] = None,
+    project_id: str,
     page_index: int = 1,
     page_size: int = 20,
-    is_filter_other: Optional[bool] = None,
-    take_total_count: Optional[bool] = None,
 ) -> dict[str, Any]:
-    """Search address book contacts by keyword.
-
-    Wraps `AddressBook.SearchAddressbookAndDepartment`
-    (src/api/addressBook.js L73). Despite the endpoint name, the
-    ``departmentResult`` field is always empty on current SaaS builds —
-    only ``userResult`` actually populates. Use
-    :func:`hap_cli.core.department.search_dept_and_users` when you need
-    department matches. `range_` is a numeric bucket; the CLI passes
-    it through untouched because the server controls the enum.
+    """Search active members of an organization by keyword.
+
+    Wraps `User.GetContactUserList`. The server response carries both
+    ``oftenUsers`` (frequently-contacted shortcut) and ``users`` (full
+    matches); only the latter is useful for a general search, so this
+    function returns ``raw["users"]`` with shape
+    ``{"list": [...], "allCount": N}`` — the same envelope produced by
+    :func:`search_resigned_users` so both can share simplifiers.
+
+    ``dataRange`` is fixed at 2 (whole organization) because the
+    alternate buckets are not exposed via the CLI.
     """
     data: dict[str, Any] = {
         "keywords": keywords,
+        "projectId": project_id,
+        "dataRange": 2,
         "pageIndex": page_index,
         "pageSize": page_size,
     }
-    if project_id:
-        data["projectId"] = project_id
-    if range_ is not None:
-        data["range"] = range_
-    if is_filter_other is not None:
-        data["isFilterOther"] = is_filter_other
-    if take_total_count is not None:
-        data["takeTotalCount"] = take_total_count
-    return session.api_call("AddressBook", "SearchAddressbookAndDepartment", data)
+    raw = session.api_call("User", "GetContactUserList", data) or {}
+    return raw.get("users") or {"list": [], "allCount": 0}
+
+
+def search_resigned_users(
+    session: Session,
+    keywords: str,
+    project_id: str,
+    page_index: int = 1,
+    page_size: int = 20,
+) -> dict[str, Any]:
+    """Search resigned members of an organization by keyword.
+
+    Wraps `User.GetProjectResignedUserList`. Returns the raw
+    ``{"list": [...], "allCount": N}`` envelope — matches the shape
+    produced by :func:`search_contacts` on purpose so callers can feed
+    both through one simplifier.
+    """
+    data: dict[str, Any] = {
+        "projectId": project_id,
+        "pageIndex": page_index,
+        "pageSize": page_size,
+    }
+    if keywords:
+        data["keywords"] = keywords
+    return session.api_call("User", "GetProjectResignedUserList", data)
 
 
 def get_friends(

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/tests/test_core.py

@@ -1621,44 +1621,56 @@ class TestPage:
 class TestContact:
     @patch("hap_cli.core.session.requests.post")
     def test_search_contacts_defaults(self, mock_post, mock_session):
-        """`AddressBook.SearchAddressbookAndDepartment` minimal call.
-
-        Real fields per src/api/addressBook.js L73: keywords, projectId,
-        range, pageIndex, pageSize, isFilterOther, takeTotalCount.
-        """
-        mock_post.return_value = _mock_response([{"accountId": "u1", "fullname": "Alice"}])
+        """`User.GetContactUserList` — defaults + `users` sub-field extraction."""
+        mock_post.return_value = _mock_response({
+            "oftenUsers": {"list": [{"accountId": "skip"}]},
+            "users": {"list": [{"accountId": "u1", "fullname": "Alice"}], "allCount": 1},
+        })
         from hap_cli.core import contact as contact_mod
         result = contact_mod.search_contacts(mock_session, "Alice", project_id="proj1")
-        assert result == [{"accountId": "u1", "fullname": "Alice"}]
+        # Only the `users` envelope is returned; `oftenUsers` is dropped.
+        assert result == {"list": [{"accountId": "u1", "fullname": "Alice"}], "allCount": 1}
         args = mock_post.call_args
-        assert "AddressBook/SearchAddressbookAndDepartment" in args[0][0]
+        assert "User/GetContactUserList" in args[0][0]
         body = args[1]["json"]
         assert body["keywords"] == "Alice"
         assert body["projectId"] == "proj1"
-        # Defaults
+        assert body["dataRange"] == 2
         assert body["pageIndex"] == 1
         assert body["pageSize"] == 20
 
     @patch("hap_cli.core.session.requests.post")
-    def test_search_contacts_full_fields(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"list": [], "allCount": 0})
+    def test_search_contacts_empty_envelope(self, mock_post, mock_session):
+        """Missing `users` sub-field degrades gracefully to an empty envelope."""
+        mock_post.return_value = _mock_response({})
         from hap_cli.core import contact as contact_mod
-        contact_mod.search_contacts(
-            mock_session,
-            keywords="Zhang",
-            project_id="proj1",
-            range_=10,
-            page_index=2,
-            page_size=50,
-            is_filter_other=True,
-            take_total_count=True,
+        result = contact_mod.search_contacts(
+            mock_session, keywords="Zhang", project_id="proj1", page_index=2, page_size=50,
         )
+        assert result == {"list": [], "allCount": 0}
         body = mock_post.call_args[1]["json"]
-        assert body["range"] == 10
         assert body["pageIndex"] == 2
         assert body["pageSize"] == 50
-        assert body["isFilterOther"] is True
-        assert body["takeTotalCount"] is True
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_search_resigned_users(self, mock_post, mock_session):
+        """`User.GetProjectResignedUserList` — shape matches active search."""
+        mock_post.return_value = _mock_response({
+            "list": [{"accountId": "r1", "fullname": "Gone"}],
+            "allCount": 1,
+        })
+        from hap_cli.core import contact as contact_mod
+        result = contact_mod.search_resigned_users(
+            mock_session, keywords="Gone", project_id="proj1", page_index=2, page_size=50,
+        )
+        assert result == {"list": [{"accountId": "r1", "fullname": "Gone"}], "allCount": 1}
+        args = mock_post.call_args
+        assert "User/GetProjectResignedUserList" in args[0][0]
+        body = args[1]["json"]
+        assert body["keywords"] == "Gone"
+        assert body["projectId"] == "proj1"
+        assert body["pageIndex"] == 2
+        assert body["pageSize"] == 50
 
     @patch("hap_cli.core.session.requests.post")
     def test_get_friends_full_fields(self, mock_post, mock_session):

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/tests/test_integration_approval.py

@@ -60,7 +60,7 @@ def _dummy_account_id(integration_session, project_id):
     res = contact.search_contacts(
         integration_session, project_id=project_id, keywords="a", page_size=1
     )
-    users = (res or {}).get("userResult") or []
+    users = (res or {}).get("list") or []
     if not users:
         pytest.skip("project has no users matching 'a' — cannot run delegation tests")
     return users[0].get("accountId")

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli/tests/test_integration_social.py

@@ -39,19 +39,26 @@ class TestChat:
 class TestContact:
 
     def test_01_search(self, integration_session, project_id):
-        """Contact search returns ``{userResult}``. The endpoint is
-        named ``SearchAddressbookAndDepartment`` and also emits an
-        always-empty ``departmentResult`` alongside it — the CLI only
-        surfaces the user matches, but both fields remain in the raw
-        envelope, so we assert on ``userResult`` only."""
+        """`User.GetContactUserList` → unified ``{list, allCount}`` envelope."""
         result = contact.search_contacts(
             integration_session,
             project_id=project_id,
             keywords="a",
             page_size=5,
         )
-        assert_dict_like(result, ["userResult"])
-        assert isinstance(result["userResult"], list)
+        assert_dict_like(result, ["list"])
+        assert isinstance(result["list"], list)
+
+    def test_01b_search_resigned(self, integration_session, project_id):
+        """`User.GetProjectResignedUserList` — same envelope as active search."""
+        result = contact.search_resigned_users(
+            integration_session,
+            project_id=project_id,
+            keywords="",
+            page_size=5,
+        )
+        assert_dict_like(result, ["list"])
+        assert isinstance(result["list"], list)
 
     def test_02_resolve(self, integration_session):
         """AddressBook.GetUserAddressbookByKeywords returns a paged dict."""

{hap_cli-0.6.6 → hap_cli-0.6.7}/hap_cli.egg-info/PKG-INFO

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

{hap_cli-0.6.6 → hap_cli-0.6.7}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="hap-cli",
-    version="0.6.6",
+    version="0.6.7",
     description="CLI harness for MingDAO HAP - Enterprise no-code platform",
     long_description=open("hap_cli/README.md").read(),
     long_description_content_type="text/markdown",