hap-cli 0.9.9__tar.gz → 0.9.10__tar.gz

{hap_cli-0.9.9 → hap_cli-0.9.10}/MANIFEST.in

@@ -13,3 +13,9 @@ include hap_cli/README_CN.md
 recursive-include hap_cli/locale *.json
 include hap_cli/guide/index.json
 recursive-include hap_cli/guide *.md
+
+# Development-only trees stay out of the sdist too (see setup.py _PACKAGES).
+prune hap_cli/tests
+prune live_tests
+prune app_live_tests
+global-exclude __pycache__ *.py[cod]

{hap_cli-0.9.9 → hap_cli-0.9.10}/PKG-INFO

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

{hap_cli-0.9.9 → hap_cli-0.9.10}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.9"
+__version__ = "0.9.10"
 
 # The command tree used to live in hap_cli/hap_cli.py. A module named
 # after the package it sits in shadows that package: run python with the

{hap_cli-0.9.9 → hap_cli-0.9.10}/hap_cli/commands/v3_registry.py

@@ -21,6 +21,8 @@ re-implementation on legacy endpoints.
 
 from __future__ import annotations
 
+import logging
+
 import click
 
 from hap_cli.commands.app_cmd import app
@@ -34,8 +36,11 @@ from hap_cli.core.v3.render import render_v3_response
 from hap_cli.core import worksheet as _ws_mod
 from hap_cli.core import workflow as _wf_mod
 from hap_cli.core import record_lookups as _lookups
+from hap_cli.core import record_discussions as _discussions
 from hap_cli.i18n import t
 
+_logger = logging.getLogger("hap_cli.record")
+
 
 def _drop(group, *names):
     """Remove legacy commands from a Click group before re-registering.
@@ -324,7 +329,42 @@ register_v3(record, "get", tool="get_record_details", subtable_guard=True)
 # (record_cmd.py) — not V3.
 register_v3(record, "delete", tool="batch_delete_records",  # multi-id via batch
             confirm="Delete the selected record(s) from worksheet {worksheet_id}?")
-register_v3(record, "discussions", tool="get_record_discussions")
+def _record_discussions_mentions(ctx, response, options):
+    """Show mentions as @name, in both the JSON and the md form.
+
+    How the two forms differ, and why md may cost a second read, is in
+    ``hap_cli.core.record_discussions``."""
+    payload = response.get("data") if isinstance(response, dict) else None
+    if not isinstance(payload, dict):
+        return response
+    discussions = payload.get("discussions")
+    if isinstance(discussions, list):
+        _discussions.render_json(discussions)
+        return response
+    if not isinstance(discussions, str):
+        return response
+    names = _discussions.names_from_md(discussions)
+    if any(i not in names for i in _discussions.mentioned_ids(discussions)):
+        params = click.get_current_context().params
+        query = {
+            "pageIndex": params.get("page_index"),
+            "pageSize": params.get("page_size"),
+            "search": params.get("search"),
+            "onlyWithAttachments": params.get("only_with_attachments"),
+        }
+        try:
+            names.update(_discussions.fetch_names(
+                ctx.get_session(), params.get("worksheet_id") or "",
+                params.get("row_id") or "", app_id=_resolve_list_app_id(ctx),
+                query={k: v for k, v in query.items() if v not in (None, "")}))
+        except Exception as exc:
+            _logger.warning("Could not look up mentioned names: %s", exc)
+    payload["discussions"] = _discussions.render_md(discussions, names)
+    return response
+
+
+register_v3(record, "discussions", tool="get_record_discussions",
+            post_process=_record_discussions_mentions)
 register_v3(record, "logs", tool="get_record_logs")
 register_v3(record, "relations", tool="get_record_relations")
 register_v3(record, "pivot", tool="get_record_pivot_data",

hap_cli-0.9.10/hap_cli/core/record_discussions.py

@@ -0,0 +1,137 @@
+"""Readable record discussions: mention markers rendered as ``@name``.
+
+A discussion stores its mentions inside the text: ``[aid]<accountId>[/aid]``
+per person (external portal users have ids like ``a#6805…``) and
+``[all]atAll[/all]`` for everyone. The web renders them through
+``createLinksForMessage`` (MDPublic src/components/comment/utils/
+createLinksForMessage.js:86-109): a person becomes ``@<name>`` and the
+everyone marker becomes ``@`` + AT_ALL_TEXT[WORKSHEETROW] = "全体参与者"
+(src/components/comment/config.js:22). An id it cannot name stays as-is.
+
+The V3 discussions endpoint answers JSON with a ``mentions`` list that
+names every ``[aid]`` in the message, so the JSON form is rendered from
+the response alone. Its ``md`` form drops that list and writes each author
+as ``{"AccountId":…,"FullNmae":…}`` (sic — a server-side typo), so the md
+form is rendered from a name map the caller supplies.
+"""
+
+from __future__ import annotations
+
+import json
+import re
+from typing import Any, Iterable
+
+AT_ALL_TEXT = "全体参与者"
+
+_AID_RE = re.compile(r"\[aid\]([^\[\]]+?)\[/aid\]")
+_ALL_RE = re.compile(r"\[all\]atAll\[/all\]", re.IGNORECASE)
+# One author as the md form writes it; tolerant of the server ever fixing
+# the misspelt key.
+_MD_AUTHOR_RE = re.compile(
+    r'\{"AccountId":"([^"]*)","(?:FullNmae|FullName)":"((?:[^"\\]|\\.)*)"\}')
+
+
+def render_markers(text: str, names: dict[str, str]) -> str:
+    """Replace mention markers with ``@name``; unknown ids stay visible."""
+    if not text:
+        return text or ""
+
+    def _person(m: re.Match) -> str:
+        name = names.get(m.group(1).strip())
+        return f"@{name}" if name else m.group(0)
+
+    return _AID_RE.sub(_person, _ALL_RE.sub(f"@{AT_ALL_TEXT}", text))
+
+
+def mentioned_ids(text: str) -> list[str]:
+    seen: list[str] = []
+    for aid in _AID_RE.findall(text or ""):
+        aid = aid.strip()
+        if aid not in seen:
+            seen.append(aid)
+    return seen
+
+
+def _people(item: dict) -> Iterable[dict]:
+    for key in ("_createdBy", "replyToAuthor"):
+        if isinstance(item.get(key), dict):
+            yield item[key]
+    for person in item.get("mentions") or []:
+        if isinstance(person, dict):
+            yield person
+
+
+def names_from_json(discussions: Any) -> dict[str, str]:
+    """Account id → name from every author, reply target and mention."""
+    names: dict[str, str] = {}
+    for item in discussions or []:
+        if not isinstance(item, dict):
+            continue
+        for person in _people(item):
+            aid = person.get("accountId")
+            name = person.get("fullname") or person.get("name")
+            if aid and name:
+                names[aid] = name
+    return names
+
+
+def render_json(discussions: Any) -> Any:
+    """Render each discussion's ``message`` in place.
+
+    The stored text moves to ``rawMessage``; ``mentionsEveryone`` is set
+    when the message mentions everyone. The server's ``mentions`` list
+    (id and name of each person mentioned) is left as it is."""
+    if not isinstance(discussions, list):
+        return discussions
+    names = names_from_json(discussions)
+    for item in discussions:
+        if not isinstance(item, dict) or not isinstance(item.get("message"), str):
+            continue
+        raw = item["message"]
+        rendered = render_markers(raw, names)
+        if rendered != raw:
+            item["rawMessage"] = raw
+            item["message"] = rendered
+        if _ALL_RE.search(raw):
+            item["mentionsEveryone"] = True
+    return discussions
+
+
+def names_from_md(text: str) -> dict[str, str]:
+    names: dict[str, str] = {}
+    for aid, name in _MD_AUTHOR_RE.findall(text or ""):
+        if aid and name:
+            names[aid] = _unescape(name)
+    return names
+
+
+def _unescape(value: str) -> str:
+    try:
+        return json.loads(f'"{value}"')
+    except ValueError:
+        return value
+
+
+def render_md(text: str, names: dict[str, str]) -> str:
+    """Write authors as plain names and mentions as ``@name``."""
+    if not isinstance(text, str):
+        return text
+    text = _MD_AUTHOR_RE.sub(lambda m: _unescape(m.group(2)), text)
+    return render_markers(text, names)
+
+
+DISCUSSIONS_PATH = "/v3/app/worksheets/{worksheet_id}/rows/{row_id}/discussions"
+
+
+def fetch_names(
+    session: Any, worksheet_id: str, row_id: str, *, app_id: str,
+    query: dict[str, Any],
+) -> dict[str, str]:
+    """Names for the md form: the same page asked for again as JSON, whose
+    ``mentions`` list names everyone the md text only gives ids for."""
+    params = dict(query, responseFormat="json")
+    response = session.v3_call(
+        "GET", DISCUSSIONS_PATH, app_id=app_id, query=params,
+        path_params={"worksheet_id": worksheet_id, "row_id": row_id})
+    data = response.get("data") if isinstance(response, dict) else None
+    return names_from_json((data or {}).get("discussions"))

{hap_cli-0.9.9 → hap_cli-0.9.10}/hap_cli.egg-info/PKG-INFO

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

hap_cli-0.9.10/hap_cli.egg-info/SOURCES.txt

@@ -0,0 +1,211 @@
+MANIFEST.in
+README.md
+setup.py
+hap_cli/README.md
+hap_cli/README_CN.md
+hap_cli/__init__.py
+hap_cli/__main__.py
+hap_cli/_entry.py
+hap_cli/context.py
+hap_cli/i18n.py
+hap_cli.egg-info/PKG-INFO
+hap_cli.egg-info/SOURCES.txt
+hap_cli.egg-info/dependency_links.txt
+hap_cli.egg-info/entry_points.txt
+hap_cli.egg-info/requires.txt
+hap_cli.egg-info/top_level.txt
+hap_cli/commands/__init__.py
+hap_cli/commands/app_cmd.py
+hap_cli/commands/app_creator_cmd.py
+hap_cli/commands/app_editor_cmd.py
+hap_cli/commands/attachment_cmd.py
+hap_cli/commands/auth_cmd.py
+hap_cli/commands/calendar_cmd.py
+hap_cli/commands/chart_cmd.py
+hap_cli/commands/chat_cmd.py
+hap_cli/commands/chatbot_cmd.py
+hap_cli/commands/config_cmd.py
+hap_cli/commands/contact_cmd.py
+hap_cli/commands/department_cmd.py
+hap_cli/commands/group_cmd.py
+hap_cli/commands/guide_cmd.py
+hap_cli/commands/icon_cmd.py
+hap_cli/commands/instance_cmd.py
+hap_cli/commands/node_cmd.py
+hap_cli/commands/optionset_cmd.py
+hap_cli/commands/page_cmd.py
+hap_cli/commands/post_cmd.py
+hap_cli/commands/record_cmd.py
+hap_cli/commands/region_cmd.py
+hap_cli/commands/role_cmd.py
+hap_cli/commands/update_cmd.py
+hap_cli/commands/upload_cmd.py
+hap_cli/commands/v3_registry.py
+hap_cli/commands/workflow_cmd.py
+hap_cli/commands/worksheet_cmd.py
+hap_cli/core/__init__.py
+hap_cli/core/action_spec_adapter.py
+hap_cli/core/app.py
+hap_cli/core/attachment.py
+hap_cli/core/auth.py
+hap_cli/core/calendar_mod.py
+hap_cli/core/chart.py
+hap_cli/core/chat.py
+hap_cli/core/chatbot.py
+hap_cli/core/cli_access.py
+hap_cli/core/condition_dsl.py
+hap_cli/core/contact.py
+hap_cli/core/control_type_codes.py
+hap_cli/core/department.py
+hap_cli/core/field_normalizer.py
+hap_cli/core/field_spec_adapter.py
+hap_cli/core/filter_translator.py
+hap_cli/core/filter_v3.py
+hap_cli/core/flow_node.py
+hap_cli/core/global_meta.py
+hap_cli/core/group.py
+hap_cli/core/guide.py
+hap_cli/core/icon_index.py
+hap_cli/core/instance.py
+hap_cli/core/layout_check.py
+hap_cli/core/logger.py
+hap_cli/core/optionset.py
+hap_cli/core/page.py
+hap_cli/core/post.py
+hap_cli/core/record.py
+hap_cli/core/record_defaults.py
+hap_cli/core/record_discussions.py
+hap_cli/core/record_form_checks.py
+hap_cli/core/record_lookups.py
+hap_cli/core/record_rules.py
+hap_cli/core/relation_scope.py
+hap_cli/core/relogin.py
+hap_cli/core/response_crypto.py
+hap_cli/core/role.py
+hap_cli/core/role_perm_builder.py
+hap_cli/core/rule_spec_adapter.py
+hap_cli/core/session.py
+hap_cli/core/token_crypto.py
+hap_cli/core/update.py
+hap_cli/core/upload.py
+hap_cli/core/view_spec_adapter.py
+hap_cli/core/workflow.py
+hap_cli/core/workflow_node_dsl.py
+hap_cli/core/worksheet.py
+hap_cli/core/worksheet_form.py
+hap_cli/core/worksheet_reference.py
+hap_cli/core/worksheet_templates.py
+hap_cli/core/app_creator/__init__.py
+hap_cli/core/app_creator/charts.py
+hap_cli/core/app_creator/cleanup.py
+hap_cli/core/app_creator/compiler.py
+hap_cli/core/app_creator/config.py
+hap_cli/core/app_creator/errors.py
+hap_cli/core/app_creator/executor.py
+hap_cli/core/app_creator/fields.py
+hap_cli/core/app_creator/hap.py
+hap_cli/core/app_creator/merge.py
+hap_cli/core/app_creator/schema.py
+hap_cli/core/app_creator/selftest.py
+hap_cli/core/app_creator/smoke.py
+hap_cli/core/app_creator/steps.py
+hap_cli/core/app_creator/store.py
+hap_cli/core/app_creator/validate.py
+hap_cli/core/app_creator/workflow_dsl.py
+hap_cli/core/app_creator/_hapmeta/__init__.py
+hap_cli/core/app_creator/_hapmeta/control_type_codes.py
+hap_cli/core/app_creator/_hapmeta/worksheet_templates.py
+hap_cli/core/app_creator/design/design.schema.json
+hap_cli/core/app_creator/examples/minimal.design.json
+hap_cli/core/app_creator/recording/__init__.py
+hap_cli/core/app_creator/recording/console.py
+hap_cli/core/app_creator/recording/jsonl.py
+hap_cli/core/app_creator/recording/mirror.py
+hap_cli/core/app_creator/recording/report.py
+hap_cli/core/app_creator/seed/INSTRUCTIONS.md
+hap_cli/core/app_creator/seed/__init__.py
+hap_cli/core/app_creator/seed/cli.py
+hap_cli/core/app_creator/seed/executor.py
+hap_cli/core/app_creator/seed/template.py
+hap_cli/core/app_creator/seed/resources/attachments.json
+hap_cli/core/app_creator/seed/resources/sample.docx
+hap_cli/core/app_creator/seed/resources/sample.pdf
+hap_cli/core/app_creator/seed/resources/sample_images.json
+hap_cli/core/editor/__init__.py
+hap_cli/core/editor/apply.py
+hap_cli/core/editor/componentlower.py
+hap_cli/core/editor/editspec.py
+hap_cli/core/editor/errors.py
+hap_cli/core/editor/fieldlower.py
+hap_cli/core/editor/jsonschema_mini.py
+hap_cli/core/editor/models.py
+hap_cli/core/editor/ops.py
+hap_cli/core/editor/planner.py
+hap_cli/core/editor/reader.py
+hap_cli/core/editor/_hapmeta/__init__.py
+hap_cli/core/editor/_hapmeta/control_type_codes.py
+hap_cli/core/editor/editspec/component.schema.json
+hap_cli/core/editor/editspec/custom-action.schema.json
+hap_cli/core/editor/editspec/envelope.schema.json
+hap_cli/core/editor/editspec/field.schema.json
+hap_cli/core/v3/__init__.py
+hap_cli/core/v3/dispatcher.py
+hap_cli/core/v3/render.py
+hap_cli/core/v3/schema.py
+hap_cli/guide/index.json
+hap_cli/guide/en/approval.md
+hap_cli/guide/en/chart.md
+hap_cli/guide/en/messages.md
+hap_cli/guide/en/overview.md
+hap_cli/guide/en/post.md
+hap_cli/guide/en/record.md
+hap_cli/guide/en/setup.md
+hap_cli/guide/en/skills.md
+hap_cli/guide/en/workflow.md
+hap_cli/guide/en/worksheet.md
+hap_cli/guide/zh-Hans/approval.md
+hap_cli/guide/zh-Hans/chart.md
+hap_cli/guide/zh-Hans/messages.md
+hap_cli/guide/zh-Hans/overview.md
+hap_cli/guide/zh-Hans/post.md
+hap_cli/guide/zh-Hans/record.md
+hap_cli/guide/zh-Hans/setup.md
+hap_cli/guide/zh-Hans/skills.md
+hap_cli/guide/zh-Hans/workflow.md
+hap_cli/guide/zh-Hans/worksheet.md
+hap_cli/locale/__init__.py
+hap_cli/locale/messages.json
+hap_cli/locale/messages.schema.json
+hap_cli/utils/__init__.py
+hap_cli/utils/atomic_write.py
+hap_cli/utils/confirm.py
+hap_cli/utils/formatting.py
+hap_cli/utils/options.py
+hap_cli/utils/parameter_mapping.py
+sources/v3-api-schema/INDEX.json
+sources/v3-api-schema/add_member_to_role.yaml
+sources/v3-api-schema/batch_delete_records.yaml
+sources/v3-api-schema/create_optionset.yaml
+sources/v3-api-schema/create_role.yaml
+sources/v3-api-schema/delete_optionset.yaml
+sources/v3-api-schema/delete_record.yaml
+sources/v3-api-schema/delete_role.yaml
+sources/v3-api-schema/delete_worksheet.yaml
+sources/v3-api-schema/get_app_info.yaml
+sources/v3-api-schema/get_app_knowledge_list.yaml
+sources/v3-api-schema/get_app_worksheets_list.yaml
+sources/v3-api-schema/get_optionset_list.yaml
+sources/v3-api-schema/get_record_details.yaml
+sources/v3-api-schema/get_record_discussions.yaml
+sources/v3-api-schema/get_record_list.yaml
+sources/v3-api-schema/get_record_logs.yaml
+sources/v3-api-schema/get_record_pivot_data.yaml
+sources/v3-api-schema/get_record_relations.yaml
+sources/v3-api-schema/get_record_share_link.yaml
+sources/v3-api-schema/get_regions.yaml
+sources/v3-api-schema/get_role_details.yaml
+sources/v3-api-schema/get_role_list.yaml
+sources/v3-api-schema/knowledge_search.yaml
+sources/v3-api-schema/leave_all_roles.yaml
+sources/v3-api-schema/remove_member_from_role.yaml
+sources/v3-api-schema/update_optionset.yaml

hap_cli-0.9.10/hap_cli.egg-info/top_level.txt

@@ -0,0 +1 @@
+hap_cli

{hap_cli-0.9.9 → hap_cli-0.9.10}/setup.py

@@ -21,18 +21,29 @@ def _read_version():
 # V3 schemas live at <repo>/sources/v3-api-schema/*.yaml + INDEX.json
 # (canonical for development). For wheel installs we copy them into
 # <package>/sources/v3-api-schema/ so the runtime loader
-# (hap_cli/core/v3/schema.py) finds them by walking up.
+# (hap_cli/core/v3/schema.py) finds them by walking up. Only inside the
+# package: a copy at the build root installed a top-level ``sources``
+# directory into the user's site-packages.
 class _CopyV3Schemas(build_py):
     def run(self):
         super().run()
         repo_root = Path(__file__).parent.resolve()
         src = repo_root / "sources" / "v3-api-schema"
         if src.is_dir():
-            for build_lib in (Path(self.build_lib), Path(self.build_lib) / "hap_cli"):
-                target = build_lib / "sources" / "v3-api-schema"
-                target.mkdir(parents=True, exist_ok=True)
-                for f in (*src.glob("*.yaml"), *src.glob("INDEX.json")):
-                    shutil.copy2(f, target / f.name)
+            target = Path(self.build_lib) / "hap_cli" / "sources" / "v3-api-schema"
+            target.mkdir(parents=True, exist_ok=True)
+            for f in (*src.glob("*.yaml"), *src.glob("INDEX.json")):
+                shutil.copy2(f, target / f.name)
+
+
+# Ship the CLI only. The test suite (a third of the package) and the
+# repo's live-test harnesses are development tools: installing them put
+# packages named ``live_tests`` / ``app_live_tests`` into site-packages
+# and got a compiled test module quarantined by antivirus software.
+_PACKAGES = find_packages(
+    include=["hap_cli", "hap_cli.*"],
+    exclude=["hap_cli.tests", "hap_cli.tests.*"],
+)
 
 
 setup(
@@ -43,7 +54,7 @@ setup(
     long_description_content_type="text/markdown",
     author="hap-cli",
     license="Apache-2.0",
-    packages=find_packages(),
+    packages=_PACKAGES,
     python_requires=">=3.10",
     install_requires=[
         "click>=8.0",

hap_cli-0.9.9/app_live_tests/__init__.py

@@ -1,11 +0,0 @@
-"""Repeatable live smoke tests for the hap-cli-app-editor skill.
-
-This is a top-level, stdlib-only package (no ``test_*.py`` files, so the
-default pytest run never collects it — mirror of ``live_tests/``). It
-drives the *real* editor entry point (``python3 -m scripts apply`` inside
-the skill) plus the ``hap`` binary for setup/assertions, against a
-persistent test app that it creates on first run and reuses thereafter.
-
-    python3 -m app_live_tests smoke          # run all scenarios
-    python3 -m app_live_tests cleanup        # delete the persistent app
-"""

hap_cli-0.9.9/app_live_tests/__main__.py

@@ -1,32 +0,0 @@
-"""``python -m app_live_tests <smoke|cleanup> ...`` dispatch."""
-from __future__ import annotations
-
-import sys
-
-_USAGE = (
-    "usage: python -m app_live_tests <command>\n"
-    "  smoke [--case worksheet|field|view]   run live scenarios on the persistent app\n"
-    "  cleanup                               delete the persistent test app\n"
-)
-
-
-def main(argv: list[str] | None = None) -> int:
-    argv = list(sys.argv[1:] if argv is None else argv)
-    if not argv or argv[0] in ("-h", "--help"):
-        print(_USAGE)
-        return 0 if argv else 1
-    cmd, rest = argv[0], argv[1:]
-    if cmd == "smoke":
-        from app_live_tests.smoke import main as run
-        return run(rest)
-    if cmd == "cleanup":
-        from app_live_tests import state
-        app_id = state.delete_app()
-        print(f"deleted {app_id}" if app_id else "no persistent app to delete")
-        return 0
-    print(f"unknown command: {cmd}\n{_USAGE}", file=sys.stderr)
-    return 1
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

hap_cli-0.9.9/app_live_tests/config.py

@@ -1,20 +0,0 @@
-"""Paths and binary config for the app_live_tests harness."""
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-# The installed CLI (PATH lookup by default; override with HAP_BIN).
-HAP_BIN = os.environ.get("HAP_BIN", "hap")
-
-# Python used to invoke the editor skill (defaults to the running one).
-PYTHON_BIN = os.environ.get("HAP_EDITOR_PYTHON", "")  # "" -> sys.executable
-
-_PKG_DIR = Path(__file__).resolve().parent
-REPO_ROOT = _PKG_DIR.parent
-SKILL_DIR = REPO_ROOT / "skills" / "hap-cli-app-editor"
-
-STATE_DIR = _PKG_DIR / "state"
-STATE_FILE = STATE_DIR / "current_app.json"
-
-TIMEOUT = int(os.environ.get("HAP_EDITOR_TIMEOUT", "120"))

hap_cli-0.9.9/app_live_tests/fixtures/__init__.py

@@ -1 +0,0 @@
-"""Long-lived live fixtures. Built once, kept, reused by later work."""