hap-cli 0.9.4__tar.gz → 0.9.6__tar.gz

{hap_cli-0.9.4 → hap_cli-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.4
+Version: 0.9.6
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -339,6 +339,7 @@ discover every subcommand.
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
 | `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
+| `config auto-login [on\|off]` | Renew an expired login in the browser (one click on Authorize) and carry on; `off` stops with "not logged in" |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |
 | `config log view [--lines N] [--no-follow]` | Tail the log file |

{hap_cli-0.9.4/hap_cli → hap_cli-0.9.6}/README.md

@@ -310,6 +310,7 @@ discover every subcommand.
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
 | `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
+| `config auto-login [on\|off]` | Renew an expired login in the browser (one click on Authorize) and carry on; `off` stops with "not logged in" |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |
 | `config log view [--lines N] [--no-follow]` | Tail the log file |

{hap_cli-0.9.4 → hap_cli-0.9.6/hap_cli}/README.md

@@ -310,6 +310,7 @@ discover every subcommand.
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
 | `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
+| `config auto-login [on\|off]` | Renew an expired login in the browser (one click on Authorize) and carry on; `off` stops with "not logged in" |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |
 | `config log view [--lines N] [--no-follow]` | Tail the log file |

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/README_CN.md

@@ -289,6 +289,7 @@ hap --json worksheet record list WORKSHEET_ID
 | `config completion [bash\|zsh\|fish] [--install]` | 启用 `<Tab>` 补全 |
 | `config language [LANG]` | 切换显示语言（`en` / `zh-Hans`；`auto` 跟随登录账号的语言） |
 | `config update [auto\|notify\|off]` | 自动升级开关；`notify` 只提示不安装，`off` 不检查 |
+| `config auto-login [on\|off]` | 登录过期时自动打开浏览器授权页，点一下「授权」命令继续执行；`off` 则直接报未登录 |
 | `config log on / off / status` | 日志开关与状态 |
 | `config log level LEVEL` | 设置日志级别（`DEBUG/INFO/WARNING/ERROR/CRITICAL`） |
 | `config log view [--lines N] [--no-follow]` | 跟踪日志文件 |

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.4"
+__version__ = "0.9.6"
 
 # 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.4 → hap_cli-0.9.6}/hap_cli/commands/config_cmd.py

@@ -126,6 +126,7 @@ def config_completion(shell, install):
 @pass_context
 def config_show(ctx):
     """Display current harness configuration."""
+    from hap_cli.core.relogin import get_mode as get_auto_login_mode
     from hap_cli.core.update import get_update_mode
 
     log_cfg = load_logging_config()
@@ -136,6 +137,7 @@ def config_show(ctx):
             "file": str(resolve_log_path(log_cfg)),
         },
         "update": get_update_mode(),
+        "auto_login": get_auto_login_mode(),
     }
 
     def _human(d):
@@ -144,6 +146,7 @@ def config_show(ctx):
         click.echo(f"  level   : {d['logging']['level']}")
         click.echo(f"  file    : {d['logging']['file']}")
         click.echo(f"update    : {d['update']}")
+        click.echo(f"auto-login: {d['auto_login']}")
 
     ctx.output(data, _human)
 
@@ -253,6 +256,45 @@ def config_update(ctx, mode):
         click.echo(f"Self-update set to: {mode}")
 
 
+# ── `hap config auto-login` ───────────────────────────────────────────────
+
+
+@config.command("auto-login")
+@click.argument("mode", required=False, type=click.Choice(["on", "off"]))
+@pass_context
+def config_auto_login(ctx, mode):
+    """Control whether an expired login is renewed in the browser.
+
+    \b
+      on   when a command finds your login expired, open the browser
+           authorization page, wait for you to click Authorize, then
+           carry on (default)
+      off  stop with a "not logged in" error instead
+
+    Without an argument, shows the current setting. It never applies over
+    SSH, in CI, or where no browser can be shown. Setting the environment
+    variable HAP_AUTO_LOGIN=0 turns it off for one shell.
+    """
+    from hap_cli.core.relogin import CONFIG_KEY, get_mode
+    from hap_cli.core.session import save_config
+
+    if mode is None:
+        current = get_mode()
+        if ctx.json_mode:
+            from hap_cli.utils.formatting import output_json
+            output_json({"auto_login": current})
+        else:
+            click.echo(f"Auto-login: {current}")
+        return
+
+    save_config({CONFIG_KEY: mode})
+    if ctx.json_mode:
+        from hap_cli.utils.formatting import output_json
+        output_json({"status": "ok", "auto_login": mode})
+    else:
+        click.echo(f"Auto-login set to: {mode}")
+
+
 # ── `hap config language` ─────────────────────────────────────────────────
 
 

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/commands/post_cmd.py

@@ -131,6 +131,19 @@ def _resolve_markers(
     return out
 
 
+def _simplify_attachments(items: Any) -> list[dict[str, Any]]:
+    out = []
+    for a in items or []:
+        if not isinstance(a, dict):
+            continue
+        out.append({
+            "id": a.get("fileID"),
+            "name": f"{a.get('originalFilename') or ''}{a.get('ext') or ''}",
+            "size": a.get("filesize"),
+        })
+    return out
+
+
 def _simplify_comment(c: dict[str, Any]) -> dict[str, Any]:
     text = _resolve_markers(
         c.get("message") or "",
@@ -152,6 +165,9 @@ def _simplify_comment(c: dict[str, Any]) -> dict[str, Any]:
         }
     if c.get("withAttachment") and str(c["withAttachment"]) != "0":
         out["has_attachment"] = True
+    files = _simplify_attachments(c.get("attachments"))
+    if files:
+        out["attachments"] = files
     return out
 
 
@@ -203,6 +219,9 @@ def _simplify_post(p: dict[str, Any]) -> dict[str, Any]:
     m_groups = [_simplify_group_ref(g) for g in (p.get("rGroupList") or [])]
     if m_groups:
         out["mentioned_groups"] = m_groups
+    files = _simplify_attachments(p.get("attachments"))
+    if files:
+        out["attachments"] = files
     return out
 
 
@@ -377,6 +396,8 @@ def _render_post_detail(detail: dict[str, Any]) -> None:
     click.echo("")
     for line in (detail.get("text") or "").splitlines() or [""]:
         click.echo(f"  {line}")
+    for f in detail.get("attachments") or []:
+        click.echo(f"  📎 {f.get('name')}")
     click.echo("")
 
     stats = (
@@ -414,6 +435,8 @@ def _render_post_detail(detail: dict[str, Any]) -> None:
             click.echo(header)
             for line in (c.get("text") or "").splitlines() or [""]:
                 click.echo(f"    {line}")
+            for f in c.get("attachments") or []:
+                click.echo(f"    📎 {f.get('name')}")
             click.echo("")
 
 
@@ -669,7 +692,13 @@ def post_get(ctx, post_id):
     default=0,
     type=int,
     show_default=True,
-    help="Post type: 0=text, 3=link, 5=vote, 7=file",
+    help="Post type. Leave at 0 (text); adding --file makes it an "
+         "attachment post on its own.",
+)
+@click.option(
+    "--file", "-f", "files", multiple=True,
+    help="Attach a file: a local path or an http(s) address. Repeat for "
+         "several. Videos, pictures and documents all work.",
 )
 @click.option(
     "--to-group",
@@ -694,15 +723,20 @@ def post_get(ctx, post_id):
 @click.option("--dry-run", is_flag=True,
               help="Show the audience and what would be sent, without publishing.")
 @pass_context
-def post_create(ctx, org_id, message, post_type, share_group_ids, share_org_ids,
-                legacy_group_ids, legacy_org_ids, card_group_ids, dry_run):
+def post_create(ctx, org_id, message, post_type, files, share_group_ids,
+                share_org_ids, legacy_group_ids, legacy_org_ids,
+                card_group_ids, dry_run):
     """Create a new post in the given organization.
 
     Audience is set with --to-group / --to-org and defaults to everyone in
     --org-id when neither is given. Who can see a post is covered in
     `hap guide post audience`; the group-chat card is `hap guide post card`.
+    Files given with --file are uploaded and attached to the post.
     """
     try:
+        if post_type == post_mod.POST_TYPE_ATTACHMENT and not files:
+            raise click.UsageError(
+                "An attachment post needs at least one --file.")
         share_group_ids = tuple(share_group_ids) + tuple(legacy_group_ids)
         share_org_ids = tuple(share_org_ids) + tuple(legacy_org_ids)
         if dry_run:
@@ -712,11 +746,14 @@ def post_create(ctx, org_id, message, post_type, share_group_ids, share_org_ids,
             ) or [f"org:{org_id or '<current>'} (everyone, default)"]
             ctx.output(
                 {"audience": audience, "cardToGroups": list(card_group_ids),
-                 "message": message, "published": False},
+                 "message": message, "files": list(files),
+                 "published": False},
                 lambda d: click.echo(
                     "Would publish to: " + ", ".join(d["audience"])
                     + (f"; card to groups: {', '.join(d['cardToGroups'])}"
-                       if d["cardToGroups"] else "")),
+                       if d["cardToGroups"] else "")
+                    + (f"; files: {', '.join(d['files'])}"
+                       if d["files"] else "")),
             )
             return
         session = ctx.get_session()
@@ -741,6 +778,8 @@ def post_create(ctx, org_id, message, post_type, share_group_ids, share_org_ids,
                     + ". Pick a group whose feed is on, or send a card to the "
                       "chat instead with --card-to-group.")
         pid = require_api_project_id(session, org_id)
+        attachments = (post_mod.upload_post_files(session, list(files))
+                       if files else None)
         raw = post_mod.add_post(
             session,
             project_id=pid,
@@ -748,6 +787,7 @@ def post_create(ctx, org_id, message, post_type, share_group_ids, share_org_ids,
             post_type=post_type,
             share_group_ids=list(share_group_ids) or None,
             share_project_ids=list(share_org_ids) or None,
+            attachments=attachments,
         )
         post_obj = raw.get("post") if isinstance(raw, dict) else None
         summary = _simplify_post(post_obj) if post_obj else {"raw": raw}
@@ -821,14 +861,22 @@ def post_delete(ctx, post_id, yes):
     default="",
     help="Member id being replied to (optional; pairs with --reply-id)",
 )
+@click.option(
+    "--file", "-f", "files", multiple=True,
+    help="Attach a file: a local path or an http(s) address. Repeat for "
+         "several. Videos, pictures and documents all work.",
+)
 @pass_context
-def post_comment(ctx, post_id, message, reply_id, reply_account_id):
-    """Add a comment to a post."""
+def post_comment(ctx, post_id, message, reply_id, reply_account_id, files):
+    """Add a comment to a post, optionally with files attached."""
     try:
         session = ctx.get_session()
+        attachments = (post_mod.upload_post_files(session, list(files))
+                       if files else None)
         raw = post_mod.add_comment(
             session, post_id, message,
             reply_id=reply_id, reply_account_id=reply_account_id,
+            attachments=attachments,
         )
         comment_obj = raw.get("comment") if isinstance(raw, dict) else None
         summary = _simplify_comment(comment_obj) if comment_obj else {"raw": raw}
@@ -864,6 +912,8 @@ def post_comments(ctx, post_id):
                 click.echo(header)
                 for line in (c.get("text") or "").splitlines() or [""]:
                     click.echo(f"  {line}")
+                for f in c.get("attachments") or []:
+                    click.echo(f"  📎 {f.get('name')}")
                 click.echo(f"  id: {c.get('id')}")
                 click.echo("")
         ctx.output(comments, _render)

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/context.py

@@ -20,6 +20,27 @@ NOT_LOGGED_IN_HINT = (
 )
 
 
+def _relogin_notice(login_url: str, timeout: int) -> None:
+    """Tell the user an authorization page is waiting for one click.
+
+    Written to stderr so ``--json`` output on stdout stays parseable; the
+    desktop notification is for callers (AI agents) whose terminal output
+    the user only sees after the command ends.
+    """
+    from hap_cli.core.relogin import desktop_notify
+    from hap_cli.i18n import t
+
+    click.echo(
+        t("Your HAP login has expired. A browser page is open — click "
+          "Authorize (授权) to continue (waiting up to {seconds}s).").format(
+            seconds=timeout),
+        err=True,
+    )
+    click.echo(f"  {login_url}", err=True)
+    desktop_notify(t("Login expired — click Authorize (授权) in the browser "
+                     "to let the command continue."))
+
+
 class Context:
     """Shared CLI context."""
 
@@ -43,6 +64,7 @@ class Context:
         """
         if self.session is None:
             self.session = Session.load(self.profile)
+            self.session.relogin_notice = _relogin_notice
             # One-time migration for sessions logged in before account_id
             # was persisted. Some HAP controllers (notably
             # Invitation/InviteUser) silently degrade when the AccountId
@@ -55,7 +77,10 @@ class Context:
             ):
                 self.session._lazy_resolve_account_id()
         if require_auth and not self.session.auth_token:
-            raise SessionError("Not logged in. Run 'hap auth login' first.")
+            # A saved environment without a token: authorize it again in
+            # the browser rather than stopping the command.
+            if not (self.session.login_url and self.session.recover_auth()):
+                raise SessionError("Not logged in. Run 'hap auth login' first.")
         return self.session
 
     def output(self, data, table_fn=None):

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/core/chat.py

@@ -48,26 +48,43 @@ def _chatmq_get(
     # mirror the other transport hooks.
     from hap_cli.core import cli_access
 
+    from hap_cli.core.session import AuthenticationError
+
     cli_access.ensure_before_request(session, url)
-    headers = {
-        "Authorization": f"md_pss_id {session.auth_token}",
-        "X-Requested-With": "XMLHttpRequest",
-        "User-Agent": hap_user_agent(),
-    }
-    auth_for_log = redact_authorization(headers["Authorization"])
-    logger.info(
-        "HAP GET %s params=%s Authorization=%s",
-        url,
-        format_body_for_log(params) or "{}",
-        auth_for_log,
-    )
-    response = requests.get(url, params=params, headers=headers, timeout=timeout)
-    logger.info(
-        "HAP GET %s -> %d %s",
-        url,
-        response.status_code,
-        format_response_for_log(getattr(response, "text", "") or ""),
-    )
+
+    def _send():
+        headers = {
+            "Authorization": f"md_pss_id {session.auth_token}",
+            "X-Requested-With": "XMLHttpRequest",
+            "User-Agent": hap_user_agent(),
+        }
+        auth_for_log = redact_authorization(headers["Authorization"])
+        logger.info(
+            "HAP GET %s params=%s Authorization=%s",
+            url,
+            format_body_for_log(params) or "{}",
+            auth_for_log,
+        )
+        response = requests.get(url, params=params, headers=headers, timeout=timeout)
+        logger.info(
+            "HAP GET %s -> %d %s",
+            url,
+            response.status_code,
+            format_response_for_log(getattr(response, "text", "") or ""),
+        )
+        return response
+
+    response = _send()
+    # An expired login gets the same one-shot browser re-authorization as
+    # the main transport (Session._post); the read is then resent once.
+    if response.status_code == 401:
+        if not session.recover_auth():
+            raise AuthenticationError(
+                "Authentication failed (HTTP 401). "
+                "Your session token is missing, invalid, or expired.",
+                status_code=401,
+            )
+        response = _send()
     response.raise_for_status()
     return response.json()
 

{hap_cli-0.9.4 → hap_cli-0.9.6}/hap_cli/core/post.py

@@ -24,6 +24,7 @@ Response envelopes (from a live probe on SaaS):
   * ``GetPostDetail`` → bare post object (with ``success: "1"``)
 """
 
+import json
 import logging
 from typing import Any, Optional
 
@@ -219,6 +220,40 @@ def get_post_detail(session: Session, post_id: str) -> dict[str, Any]:
     return session.api_call("Post", "GetPostDetail", {"postId": post_id})
 
 
+# postType of a post carrying uploaded files ("pic and doc"). The feed's
+# own types: 0 text, 1 link, 2 picture, 3 document, 7 vote, 9 attachments
+# (MDPublic src/pages/feed/components/post/postComponent/factory.jsx:18-41,
+# createFeed/index.js:18-22).
+POST_TYPE_ATTACHMENT = 9
+
+
+def _attachment_fields(attachments: list[dict[str, Any]]) -> dict[str, str]:
+    """The two attachment keys, as JSON strings — the server takes strings
+    here, not arrays. Knowledge-center references are not supported, so
+    that list is always empty, as the composer sends it when none are
+    picked."""
+    return {
+        "attachments": json.dumps(attachments, ensure_ascii=False),
+        "knowledgeAttach": "[]",
+    }
+
+
+def upload_post_files(session: Session, sources: list[str]) -> list[dict[str, Any]]:
+    """Upload local paths / http(s) addresses and return attachment items
+    for :func:`add_post` / :func:`add_comment`.
+
+    No organization is named for the upload credential: the feed mounts
+    its uploader without a projectId (MDPublic createFeed/
+    CreateFeedContent.jsx:124-136), same as chat does here.
+    """
+    from hap_cli.core import upload as upload_mod
+
+    descriptors = upload_mod.upload_files(
+        session, upload_mod.source_descriptors(list(sources)))
+    logger.info("post: uploaded %d attachment(s)", len(descriptors))
+    return upload_mod.attachment_items(descriptors)
+
+
 def add_post(
     session: Session,
     project_id: str,
@@ -228,9 +263,16 @@ def add_post(
     share_group_ids: Optional[list[str]] = None,
     share_project_ids: Optional[list[str]] = None,
     radio_project_ids: str = "",
+    attachments: Optional[list[dict[str, Any]]] = None,
 ) -> dict[str, Any]:
     """Create a post via ``Post.AddPost``.
 
+    ``attachments`` are uploaded-file items (see :func:`upload_post_files`).
+    Files make it an attachment post — ``postType`` 9 — and travel as JSON
+    strings next to an empty knowledge-center list, exactly as the feed's
+    composer sends them (MDPublic src/pages/feed/components/createFeed/
+    index.js:18-22 and :163-180; pd-openweb identical).
+
     ``scope`` is a ``PostShareScopeReq`` object — not an int — and it is
     what decides **who can see the post**. The frontend
     (``pd-openweb/src/pages/feed/components/createFeed/index.js``) posts
@@ -261,15 +303,16 @@ def add_post(
             "shareGroupIds": groups,
             "shareProjectIds": orgs,
         }
-    return session.api_call(
-        "Post", "AddPost",
-        {
-            "projectId": project_id,
-            "postType": post_type,
-            "postMsg": message,
-            "scope": scope,
-        },
-    )
+    data: dict[str, Any] = {
+        "projectId": project_id,
+        "postType": post_type,
+        "postMsg": message,
+        "scope": scope,
+    }
+    if attachments:
+        data["postType"] = POST_TYPE_ATTACHMENT
+        data.update(_attachment_fields(attachments))
+    return session.api_call("Post", "AddPost", data)
 
 
 def edit_post(
@@ -304,17 +347,22 @@ def add_comment(
     message: str,
     reply_id: str = "",
     reply_account_id: str = "",
+    attachments: Optional[list[dict[str, Any]]] = None,
 ) -> dict[str, Any]:
     """Add a comment via ``Post.AddPostComment``.
 
     Uses ``postID`` / ``replyID`` (capital ID) to match the documented
-    spelling in ``src/api/post.js``.
+    spelling in ``src/api/post.js``. ``attachments`` go in the same JSON
+    string form as on a post (MDPublic src/pages/feed/components/post/
+    comment/postCommentInput.jsx:181-192; pd-openweb identical).
     """
     data: dict[str, Any] = {"postID": post_id, "message": message}
     if reply_id:
         data["replyID"] = reply_id
     if reply_account_id:
         data["replyAccountId"] = reply_account_id
+    if attachments:
+        data.update(_attachment_fields(attachments))
     return _require_post_success(
         session.api_call("Post", "AddPostComment", data), action="comment")