hap-cli 0.8.30__tar.gz → 0.8.31__tar.gz

{hap_cli-0.8.30 → hap_cli-0.8.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.30
+Version: 0.8.31
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -264,6 +264,7 @@ discover every subcommand.
 | `calendar list / get / create / update / delete` | Event lifecycle |
 | `calendar categories` | Built-in categories |
 | `calendar add-member / remove-member` | Membership |
+| `calendar add-discussion` | Comment on an event (attachments supported) |
 
 ### chat — chat & messaging
 

{hap_cli-0.8.30/hap_cli → hap_cli-0.8.31}/README.md

@@ -235,6 +235,7 @@ discover every subcommand.
 | `calendar list / get / create / update / delete` | Event lifecycle |
 | `calendar categories` | Built-in categories |
 | `calendar add-member / remove-member` | Membership |
+| `calendar add-discussion` | Comment on an event (attachments supported) |
 
 ### chat — chat & messaging
 

{hap_cli-0.8.30 → hap_cli-0.8.31/hap_cli}/README.md

@@ -235,6 +235,7 @@ discover every subcommand.
 | `calendar list / get / create / update / delete` | Event lifecycle |
 | `calendar categories` | Built-in categories |
 | `calendar add-member / remove-member` | Membership |
+| `calendar add-discussion` | Comment on an event (attachments supported) |
 
 ### chat — chat & messaging
 

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/README_CN.md

@@ -218,6 +218,7 @@ hap --json worksheet record list WORKSHEET_ID
 | `calendar list / get / create / update / delete` | 日程生命周期 |
 | `calendar categories` | 内置分类 |
 | `calendar add-member / remove-member` | 成员管理 |
+| `calendar add-discussion` | 在日程下发表评论（可带附件） |
 
 ### chat — 聊天与消息
 

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/__init__.py

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

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/commands/calendar_cmd.py

@@ -543,4 +543,39 @@ def calendar_categories(ctx):
         summary = _simplify_categories_result(raw)
         ctx.output(summary, _render_categories)
     except Exception as e:
-        ctx.handle_error(e)
+        ctx.handle_error(e)
+
+@calendar.command("add-discussion")
+@click.argument("calendar_id")
+@click.option("--message", "-m", required=True, help="Comment text")
+@click.option("--reply-id", default="", help="ID of the comment being replied to")
+@click.option("--file", "-f", "files", multiple=True,
+              help="Attach a file to the comment (repeatable). Accepts a local "
+                   "path or an http(s) URL.")
+@pass_context
+def calendar_add_discussion(ctx, calendar_id, message, reply_id, files):
+    """Post a comment on a calendar event.
+
+    Everyone invited to the event can see the comment. Attached files are
+    downloadable by every participant.
+    """
+    try:
+        session = ctx.get_session()
+        attachments = None
+        if files:
+            from hap_cli.core import upload as up_mod
+            attachments = up_mod.upload_files(
+                session, up_mod.source_descriptors(list(files)))
+        raw = cal_mod.add_discussion(
+            session, calendar_id, message,
+            reply_id=reply_id, attachments=attachments,
+        )
+        data = raw.get("data") if isinstance(raw, dict) else None
+        summary = {
+            "success": True,
+            "discussion_id": (data or {}).get("discussionId", ""),
+            "calendar_id": calendar_id,
+        }
+        ctx.output(summary, lambda d: click.echo("Comment posted."))
+    except Exception as e:
+        ctx.handle_error(e)

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/core/calendar_mod.py

@@ -13,9 +13,12 @@ Enum re-exports (`FREQUENCY_*`, `REMIND_TYPE_*`) mirror
 `src/pages/calendar/modules/calendarDetail/constant.js`.
 """
 
+import json
 from typing import Any, Optional
 
-from hap_cli.core.session import Session
+from hap_cli.core import global_meta as gm
+from hap_cli.core import record as rec_mod
+from hap_cli.core.session import Session, SessionError
 
 
 # ── Enums (pd-openweb constants) ─────────────────────────────────────────
@@ -327,3 +330,64 @@ def remove_member(
 def get_categories(session: Session) -> dict[str, Any]:
     """Get all calendar categories (`Calendar.GetUserAllCalCategories`)."""
     return session.api_call("Calendar", "GetUserAllCalCategories", {})
+
+
+# ── Discussions (comments on an event) ────────────────────────────────────
+
+
+def add_discussion(
+    session: Session,
+    calendar_id: str,
+    message: str,
+    reply_id: str = "",
+    attachments: Optional[list[dict[str, Any]]] = None,
+) -> dict[str, Any]:
+    """Post a comment on a calendar event (`Discussion.AddDiscussion`).
+
+    Traced from `src/pages/calendar/modules/calendarDetail/container/
+    CalendarCommenter.jsx`, which configures the shared commenter
+    (`src/components/comment/commenter.jsx`) with:
+
+      - `sourceType` = SOURCE_TYPE.CALENDAR (3, comment/config.js)
+      - `sourceId`   = the bare calendar id (no composite form, unlike the
+        worksheet-row case's ``{worksheetId}|{rowId}``)
+      - `appId`      = md.global.APPInfo.calendarAppID, and *no*
+        `fromAppId` — a calendar event has no owning app
+
+    Two props of CalendarCommenter deliberately do **not** reach this
+    payload. `remark` is only consumed when the comment is additionally
+    shared to a post (`postAjax.addPost`), and `AddDiscussionRequest`
+    (sources/main_api/schemas/…AddDiscussionRequest.json) has no such
+    field. `extendsId` is documented "扩展ID(工作表:appId|viewId)" and the
+    calendar commenter never sets it.
+
+    ``attachments`` carries uploaded-file descriptors from
+    ``hap_cli.core.upload``; the frontend sends them JSON-encoded, and
+    each descriptor's ``allowDown`` is what lets anyone but the uploader
+    download the file (see upload._download_permission).
+    """
+    app_id = gm.calendar_app_id(session.get_global_meta())
+    if not app_id:
+        # Guessing an app id here would produce a discussion the calendar
+        # UI cannot render, which is worse than refusing.
+        raise SessionError(
+            "This server did not publish the calendar application, so the "
+            "comment cannot be posted. Check that you are signed in to the "
+            "right server, then try again."
+        )
+    data: dict[str, Any] = {
+        "sourceId": calendar_id,
+        "sourceType": rec_mod.DISCUSSION_SOURCE_CALENDAR,
+        "message": message,
+        "appId": app_id,
+        # commenter.jsx: `forReacordDiscussion && entityType === 2 ? 2 : 0`
+        # — a calendar comment is always the plain kind.
+        "entityType": 0,
+    }
+    if reply_id:
+        data["replyId"] = reply_id
+    if attachments:
+        data["attachments"] = json.dumps(attachments, ensure_ascii=False)
+    result = session.api_call("Discussion", "AddDiscussion", data)
+    rec_mod.ensure_discussion_ok(result, "add comment")
+    return result

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/core/global_meta.py

@@ -156,6 +156,21 @@ def worksheet_row_app_id(meta: Any) -> str:
     return str(_app_info(meta).get("worksheetRowAppID") or "")
 
 
+def calendar_app_id(meta: Any) -> str:
+    """Return ``md.global.APPInfo.calendarAppID``.
+
+    The internal "application" id HAP uses for **calendar-event**
+    discussions (``sourceType`` 3 / ``Commenter.TYPES.CALENDAR`` in
+    pd-openweb ``src/components/comment/config.js``). ``AddDiscussion``
+    must carry it as ``appId`` — see
+    ``src/pages/calendar/modules/calendarDetail/container/CalendarCommenter.jsx``.
+    Unlike the worksheet-row case there is no separate ``fromAppId``:
+    a calendar event has no owning app. Returns empty string when the
+    deployment does not expose it.
+    """
+    return str(_app_info(meta).get("calendarAppID") or "")
+
+
 def worksheet_app_id(meta: Any) -> str:
     """Return ``md.global.APPInfo.worksheetAppID`` (whole-worksheet
     discussions, ``sourceType`` 7). Empty string when absent."""

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/core/record.py

@@ -12,10 +12,15 @@ from hap_cli.core import global_meta as gm
 logger = logging.getLogger("hap_cli.record")
 
 # Discussion source types — pd-openweb src/components/comment/config.js
+#   CALENDAR     = 3  calendar-event discussion
 #   WORKSHEET    = 7  whole-worksheet discussion
 #   WORKSHEETROW = 8  single record/row discussion
 # Record-scoped discussions (add/get/delete on a row) are always type 8,
 # and their sourceId is "{worksheetId}|{rowId}" — NOT the bare rowId.
+# The whole enum lives here because this module owns the Discussion
+# endpoint primitives; other modules (calendar) import from it rather
+# than redeclaring their own copy.
+DISCUSSION_SOURCE_CALENDAR = 3
 DISCUSSION_SOURCE_WORKSHEET = 7
 DISCUSSION_SOURCE_WORKSHEET_ROW = 8
 
@@ -1050,7 +1055,7 @@ def _discussion_source_id(worksheet_id: str, row_id: str) -> str:
     return f"{worksheet_id}|{row_id}"
 
 
-def _ensure_discussion_ok(result: Any, action: str) -> None:
+def ensure_discussion_ok(result: Any, action: str) -> None:
     """Raise if the Discussion endpoint reported failure.
 
     Discussion endpoints return ``{code: 1, data: ...}`` on success and a
@@ -1138,7 +1143,7 @@ def add_discussion(
     if attachments:
         data["attachments"] = json.dumps(attachments, ensure_ascii=False)
     result = session.api_call("Discussion", "AddDiscussion", data)
-    _ensure_discussion_ok(result, "add discussion")
+    ensure_discussion_ok(result, "add discussion")
     return result
 
 
@@ -1157,7 +1162,7 @@ def remove_discussion(
         "Discussion", "RemoveDiscussion",
         {"discussionId": discussion_id, "sourceType": source_type},
     )
-    _ensure_discussion_ok(result, "delete discussion")
+    ensure_discussion_ok(result, "delete discussion")
     return result
 
 

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/locale/messages.json

@@ -2217,6 +2217,22 @@
       "en": "Calendar and schedule management.",
       "zh-Hans": "日程与日历管理"
     },
+    "calendar add-discussion": {
+      "en": "Post a comment on a calendar event.\n\nEveryone invited to the event can see the comment. Attached files are\ndownloadable by every participant.",
+      "zh-Hans": "在日程下发表评论。\n\n日程的所有参与者都能看到这条评论；随评论上传的附件，参与者均可下载。"
+    },
+    "calendar add-discussion --file": {
+      "en": "Attach a file to the comment (repeatable). Accepts a local path or an http(s) URL.",
+      "zh-Hans": "为评论添加附件（可重复指定）。可传本地路径或 http(s) 链接。"
+    },
+    "calendar add-discussion --message": {
+      "en": "Comment text",
+      "zh-Hans": "评论内容"
+    },
+    "calendar add-discussion --reply-id": {
+      "en": "ID of the comment being replied to",
+      "zh-Hans": "被回复的评论 ID"
+    },
     "calendar add-member": {
       "en": "Add members to a calendar event.",
       "zh-Hans": "向日程事件添加成员"
@@ -4890,4 +4906,4 @@
       "zh-Hans": "应用到现有视图的高层视图 JSON（格式与 'view create --view-spec' 相同）。规格中表达的内容全部更新；其他设置保持不变。字段引用可为名称、别名或 controlId。提供时忽略其他选项"
     }
   }
-}
+}

hap_cli-0.8.31/hap_cli/tests/test_calendar_discussion_cli.py

@@ -0,0 +1,89 @@
+"""`hap calendar add-discussion` — commenting on a calendar event.
+
+Until this command existed, attaching a file to a calendar event's
+comment thread had no CLI path at all: the only `Discussion/AddDiscussion`
+caller in the codebase was the worksheet-record one, pinned to
+`sourceType` 8. Anyone who needed it had to assemble the request by hand
+against the raw session — which is how a calendar comment attachment
+first shipped without its download permission (see
+test_upload_allow_down.py).
+
+Payload traced from pd-openweb
+`src/pages/calendar/modules/calendarDetail/container/CalendarCommenter.jsx`
+→ `src/components/comment/commenter.jsx`, cross-checked against
+`sources/main_api/schemas/MD.Web.Ajax.Request.Discussion.AddDiscussionRequest.json`.
+"""
+
+from unittest.mock import patch
+
+from click.testing import CliRunner
+
+from hap_cli.hap_cli import cli
+
+
+class TestAddDiscussionCli:
+
+    def test_message_reaches_the_core_call(self):
+        runner = CliRunner()
+        with patch("hap_cli.context.Context.get_session"), \
+             patch("hap_cli.core.calendar_mod.add_discussion",
+                   return_value={"code": 1, "data": {"discussionId": "d1"}}) as m:
+            res = runner.invoke(cli, ["calendar", "add-discussion", "cal1",
+                                      "-m", "会前看下资料"])
+        assert res.exit_code == 0, res.output
+        assert m.call_args[0][1:] == ("cal1", "会前看下资料")
+        assert m.call_args[1]["reply_id"] == ""
+        assert m.call_args[1]["attachments"] is None
+
+    def test_reply_id_is_forwarded(self):
+        runner = CliRunner()
+        with patch("hap_cli.context.Context.get_session"), \
+             patch("hap_cli.core.calendar_mod.add_discussion",
+                   return_value={"code": 1, "data": {}}) as m:
+            res = runner.invoke(cli, ["calendar", "add-discussion", "cal1",
+                                      "-m", "收到", "--reply-id", "d0"])
+        assert res.exit_code == 0, res.output
+        assert m.call_args[1]["reply_id"] == "d0"
+
+    def test_files_are_uploaded_and_attached(self, tmp_path):
+        runner = CliRunner()
+        f = tmp_path / "proto.zip"
+        f.write_bytes(b"zip")
+        descriptor = {"fileID": "o_1", "fileExt": ".zip", "allowDown": True}
+        with patch("hap_cli.context.Context.get_session"), \
+             patch("hap_cli.core.upload.upload_files",
+                   return_value=[descriptor]) as up, \
+             patch("hap_cli.core.calendar_mod.add_discussion",
+                   return_value={"code": 1, "data": {}}) as m:
+            res = runner.invoke(cli, ["calendar", "add-discussion", "cal1",
+                                      "-m", "原型包", "-f", str(f)])
+        assert res.exit_code == 0, res.output
+        assert up.call_args[0][1] == [{"path": str(f)}]
+        assert m.call_args[1]["attachments"] == [descriptor]
+
+    def test_an_http_source_is_fetched_rather_than_opened_as_a_path(self):
+        runner = CliRunner()
+        with patch("hap_cli.context.Context.get_session"), \
+             patch("hap_cli.core.upload.upload_files",
+                   return_value=[{"fileID": "o_2"}]) as up, \
+             patch("hap_cli.core.calendar_mod.add_discussion",
+                   return_value={"code": 1, "data": {}}):
+            res = runner.invoke(cli, ["calendar", "add-discussion", "cal1",
+                                      "-m", "链接", "-f",
+                                      "https://example.com/a.pdf"])
+        assert res.exit_code == 0, res.output
+        assert up.call_args[0][1] == [{"url": "https://example.com/a.pdf"}]
+
+    def test_message_is_required(self):
+        runner = CliRunner()
+        with patch("hap_cli.context.Context.get_session"):
+            res = runner.invoke(cli, ["calendar", "add-discussion", "cal1"])
+        assert res.exit_code != 0
+
+    def test_help_is_end_user_copy(self):
+        runner = CliRunner()
+        res = runner.invoke(cli, ["calendar", "add-discussion", "--help"])
+        assert res.exit_code == 0
+        for leak in ("AddDiscussion", "Discussion/", "sourceType", "pd-openweb",
+                     "calendarAppID", "commenter", "endpoint"):
+            assert leak not in res.output

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli/tests/test_core.py

@@ -4022,6 +4022,81 @@ class TestCalendar:
         assert body["isAllCalendar"] is True
 
 
+class TestCalendarDiscussions:
+    """Comments on a calendar event.
+
+    Traced from pd-openweb
+    `src/pages/calendar/modules/calendarDetail/container/CalendarCommenter.jsx`,
+    which feeds the shared `src/components/comment/commenter.jsx`:
+    `sourceType` = SOURCE_TYPE.CALENDAR (3, config.js) and `appId` =
+    `md.global.APPInfo.calendarAppID`. The commenter's `remark` prop is
+    *not* part of the AddDiscussion payload — it is only used when the
+    comment is additionally shared to a post (`postAjax.addPost`), and
+    `AddDiscussionRequest` has no such field. `extendsId` is documented
+    "扩展ID(工作表:appId|viewId)" and the calendar commenter never sets it.
+    """
+
+    _META = {"md.global": {"APPInfo": {"calendarAppID": "cal-app-id"}}}
+
+    def _session(self):
+        session = MagicMock()
+        session.get_global_meta.return_value = self._META
+        session.api_call.return_value = {"code": 1, "data": {"discussionId": "d1"}}
+        return session
+
+    def test_payload_shape(self):
+        from hap_cli.core import calendar_mod
+        session = self._session()
+        calendar_mod.add_discussion(session, "cal1", "看下这个附件")
+        controller, action, payload = session.api_call.call_args[0][:3]
+        assert (controller, action) == ("Discussion", "AddDiscussion")
+        assert payload["sourceId"] == "cal1"        # the bare calendar id
+        assert payload["sourceType"] == 3           # SOURCE_TYPE.CALENDAR
+        assert payload["appId"] == "cal-app-id"     # APPInfo.calendarAppID
+        assert payload["message"] == "看下这个附件"
+        assert payload["entityType"] == 0
+        # Worksheet-only / post-only fields must not leak in.
+        assert "extendsId" not in payload
+        assert "remark" not in payload
+        assert "fromAppId" not in payload
+
+    def test_reply_id_is_sent_only_when_given(self):
+        from hap_cli.core import calendar_mod
+        session = self._session()
+        calendar_mod.add_discussion(session, "cal1", "收到")
+        assert "replyId" not in session.api_call.call_args[0][2]
+        calendar_mod.add_discussion(session, "cal1", "收到", reply_id="d0")
+        assert session.api_call.call_args[0][2]["replyId"] == "d0"
+
+    def test_attachments_are_json_encoded(self):
+        from hap_cli.core import calendar_mod
+        session = self._session()
+        calendar_mod.add_discussion(
+            session, "cal1", "原型包",
+            attachments=[{"fileID": "o_1", "fileExt": ".zip", "allowDown": True}],
+        )
+        payload = session.api_call.call_args[0][2]
+        sent = json.loads(payload["attachments"])
+        assert sent[0]["fileID"] == "o_1"
+        # The download permission must survive the hop — see
+        # test_upload_allow_down.py for why it exists at all.
+        assert sent[0]["allowDown"] is True
+
+    def test_failure_code_raises_instead_of_reporting_success(self):
+        from hap_cli.core import calendar_mod
+        session = self._session()
+        session.api_call.return_value = {"code": 7}   # 没有权限操作
+        with pytest.raises(APIError):
+            calendar_mod.add_discussion(session, "cal1", "hi")
+
+    def test_missing_calendar_app_id_is_an_error_not_a_guess(self):
+        from hap_cli.core import calendar_mod
+        session = self._session()
+        session.get_global_meta.return_value = {"md.global": {"APPInfo": {}}}
+        with pytest.raises(SessionError):
+            calendar_mod.add_discussion(session, "cal1", "hi")
+
+
 # ── Chat Tests ────────────────────────────────────────────────────────────
 
 

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.30
+Version: 0.8.31
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -264,6 +264,7 @@ discover every subcommand.
 | `calendar list / get / create / update / delete` | Event lifecycle |
 | `calendar categories` | Built-in categories |
 | `calendar add-member / remove-member` | Membership |
+| `calendar add-discussion` | Comment on an event (attachments supported) |
 
 ### chat — chat & messaging
 

{hap_cli-0.8.30 → hap_cli-0.8.31}/hap_cli.egg-info/SOURCES.txt

@@ -175,6 +175,7 @@ hap_cli/tests/test_attachment_share.py
 hap_cli/tests/test_auth_prerelease.py
 hap_cli/tests/test_bug_036430.py
 hap_cli/tests/test_bug_036750.py
+hap_cli/tests/test_calendar_discussion_cli.py
 hap_cli/tests/test_chart.py
 hap_cli/tests/test_chat_attachment_send.py
 hap_cli/tests/test_chat_recall_cli.py