rathflow-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{rathflow_cli-0.1.2/rathflow_cli.egg-info → rathflow_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rathflow-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: RathFlow command line client: sessions, memory, sandboxes, assets and billing over the RathFlow REST API.
 Author: Rath Team
 License-Expression: MIT
@@ -75,17 +75,17 @@ The default gateway is `https://rathflow.lynwe.com`. Point it elsewhere with
 
 | Group | What it covers |
 | --- | --- |
-| `auth` | log in / out, register, API keys (`keys`, `key-create`, `key-revoke`) |
+| `auth` | log in / out, register, profile (`profile`, `profile-update`, `change-password`, `set-email`, `set-avatar`), API keys |
 | `config` | local profiles (`list`, `show`, `set`, `use`) |
-| `org` | organizations, invitations |
+| `org` | organizations (`list`, `create`, `invite`, `accept`) |
 | `project` | projects, scope switching, project config, share links |
 | `session` | sessions, blocks, events |
 | `memory` | memory entries, search, commit tasks |
 | `sandbox` | sandboxes, exec, code, files, logs |
-| `agent` | agent definitions, versions, prompts, runs |
+| `agent` | agent definitions, versions, prompts, runs, attachments |
 | `asset` | assets, versions, credentials, publish |
 | `billing` | subscription, usage, invoices |
-| `workflow` | workflows |
+| `workflow` | workflows (`list`, `get`, `create`, `delete`, `counts`) |
 | `admin` | platform administration (platform admins only) |
 
 Two more entry points sit at the root:

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/README.md

@@ -44,17 +44,17 @@ The default gateway is `https://rathflow.lynwe.com`. Point it elsewhere with
 
 | Group | What it covers |
 | --- | --- |
-| `auth` | log in / out, register, API keys (`keys`, `key-create`, `key-revoke`) |
+| `auth` | log in / out, register, profile (`profile`, `profile-update`, `change-password`, `set-email`, `set-avatar`), API keys |
 | `config` | local profiles (`list`, `show`, `set`, `use`) |
-| `org` | organizations, invitations |
+| `org` | organizations (`list`, `create`, `invite`, `accept`) |
 | `project` | projects, scope switching, project config, share links |
 | `session` | sessions, blocks, events |
 | `memory` | memory entries, search, commit tasks |
 | `sandbox` | sandboxes, exec, code, files, logs |
-| `agent` | agent definitions, versions, prompts, runs |
+| `agent` | agent definitions, versions, prompts, runs, attachments |
 | `asset` | assets, versions, credentials, publish |
 | `billing` | subscription, usage, invoices |
-| `workflow` | workflows |
+| `workflow` | workflows (`list`, `get`, `create`, `delete`, `counts`) |
 | `admin` | platform administration (platform admins only) |
 
 Two more entry points sit at the root:

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rathflow-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = "RathFlow command line client: sessions, memory, sandboxes, assets and billing over the RathFlow REST API."
 readme = "README.md"
 requires-python = ">=3.10"

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/__init__.py

@@ -3,4 +3,4 @@
 安装：``uv tool install rathflow-cli``（或 ``pip install rathflow-cli``）。
 """
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/cli.py

@@ -101,7 +101,10 @@ def _value_opts() -> set[str]:
         for param in getattr(cmd, "params", []):
             if getattr(param, "is_flag", False) or getattr(param, "count", False):
                 continue
-            found.update(getattr(param, "opts", []))
+            # 只认真正的选项（以 "-" 开头）。位置参数的 opts 是它自己的名字
+            # （例如 `auth profile` 的 `profile`），把它当吃值的选项会让
+            # `rathflow auth profile --json` 里的 --json 不被前移而报错。
+            found.update(o for o in getattr(param, "opts", []) if o.startswith("-"))
         for sub in getattr(cmd, "commands", {}).values():
             found |= walk(sub)
         return found

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/commands/agent.py

@@ -1,7 +1,9 @@
-"""agent：Agent 定义、版本、运行与 Agent 目录。"""
+"""agent：Agent 定义、版本、运行、Agent 目录与附件。"""
 
 from __future__ import annotations
 
+import base64
+
 import typer
 
 from .. import output
@@ -271,6 +273,47 @@ def messages(
     )
 
 
+@app.command("attachment")
+def attachment(
+    attachment_id: str = typer.Argument(..., help="sha256:<hex>，取自事件里的 attachmentRef"),
+    out: str = typer.Option(None, "--out", "-o", help="写文件；缺省写 stdout"),
+) -> None:
+    """读附件字节（流式，分片直写，不整包缓冲）。"""
+    st = current()
+    fh = None
+    try:
+        if out:
+            fh = open(out, "wb")
+        for chunk in st.client().stream(
+            "agent.ReadAttachment", path_params={"attachment_id": attachment_id}
+        ):
+            if st.json_out:
+                output.emit_json(chunk)
+                continue
+            data = _bytes(chunk.get("data"))
+            if not data:
+                continue
+            if fh:
+                fh.write(data)
+            else:
+                output.write_bytes(data)
+    finally:
+        if fh:
+            fh.close()
+
+
+def _bytes(value) -> bytes:
+    """protojson 把 bytes 编成 base64；解失败就当纯文本用。"""
+    if not value:
+        return b""
+    if isinstance(value, bytes):
+        return value
+    try:
+        return base64.b64decode(value, validate=True)
+    except Exception:
+        return str(value).encode()
+
+
 def _text_of(text: str | None, file: str | None) -> str | None:
     """config_json 是自由 JSON 文本：字面量或文件（- 读 stdin）。"""
     if text and file:

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/commands/auth_cmd.py

@@ -2,9 +2,14 @@
 
 from __future__ import annotations
 
+import base64
+import mimetypes
+import sys
+
 import typer
 
 from .. import config, output
+from ..errors import UsageError
 from ..state import current
 
 app = typer.Typer(no_args_is_help=True, help="登录 / 登出 / 注册 / 身份")
@@ -123,6 +128,102 @@ def key_revoke(
     typer.echo(f"已吊销 {key_id}")
 
 
+# ------------------------------------------------------------------ 个人资料
+
+_AVATAR_MEDIA_TYPES = {"image/png", "image/jpeg", "image/webp", "image/gif"}
+
+
+@app.command("profile")
+def profile() -> None:
+    """看当前账号资料（头像以 base64 内联，这里只显示「有/类型」，字节走 --json）。"""
+    st = current()
+    payload = st.client().call("auth.GetProfile")
+    if st.json_out:
+        output.emit_json(payload)
+        return
+    view = {k: v for k, v in payload.items() if k != "avatarBytes"}
+    if payload.get("avatarBytes"):
+        view["avatar"] = payload.get("avatarMediaType") or "有（--json 取字节）"
+    output.emit_object(view, json_out=False)
+
+
+@app.command("profile-update")
+def profile_update(
+    display_name: str = typer.Option(None, "--display-name", help="显示名"),
+    username: str = typer.Option(None, "--username"),
+    phone: str = typer.Option(None, "--phone"),
+) -> None:
+    """改资料；只发显式给出的字段（都不给 = 用法错，避免空 PATCH）。"""
+    st = current()
+    body: dict = {}
+    if display_name is not None:
+        body["displayName"] = display_name
+    if username is not None:
+        body["username"] = username
+    if phone is not None:
+        body["phone"] = phone
+    if not body:
+        raise UsageError("至少给一个：--display-name / --username / --phone")
+    output.emit_object(st.client().call("auth.UpdateProfile", body=body), json_out=st.json_out)
+
+
+@app.command("change-password")
+def change_password(
+    current_password: str = typer.Option(None, "--current-password", help="缺省交互输入，不进 shell 历史"),
+    new_password: str = typer.Option(None, "--new-password", help="缺省交互输入；>=8 位且含大小写"),
+) -> None:
+    """改密码（旧密码证明是本人）。"""
+    st = current()
+    current_password = current_password or typer.prompt("当前密码", hide_input=True)
+    new_password = new_password or typer.prompt("新密码", hide_input=True, confirmation_prompt=True)
+    st.client().call(
+        "auth.ChangePassword",
+        body={"currentPassword": current_password, "newPassword": new_password},
+    )
+    typer.echo("密码已更新")
+
+
+@app.command("set-email")
+def set_email(
+    new_email: str = typer.Option(..., "--email", "-e", help="新登录邮箱"),
+    current_password: str = typer.Option(None, "--current-password", help="缺省交互输入"),
+) -> None:
+    """换登录邮箱（要当前密码，防止被盗会话直接改）。"""
+    st = current()
+    current_password = current_password or typer.prompt("当前密码", hide_input=True)
+    payload = st.client().call(
+        "auth.UpdateEmail",
+        body={"newEmail": new_email, "currentPassword": current_password},
+    )
+    output.emit_object(payload, json_out=st.json_out)
+
+
+@app.command("set-avatar")
+def set_avatar(
+    file: str = typer.Option(None, "--file", "-f", help="图片文件；传 - 读 stdin"),
+    media_type: str = typer.Option(None, "--media-type", help="缺省按扩展名猜"),
+    clear: bool = typer.Option(False, "--clear", help="清除头像"),
+) -> None:
+    """换/清头像（base64 内联，服务端限 64KB 方图）。"""
+    st = current()
+    if clear and file:
+        raise UsageError("--clear 与 --file 互斥")
+    if not clear and not file:
+        raise UsageError("给 --file <图片>，或用 --clear 清除头像")
+    body: dict = {}
+    if clear:
+        body = {"data": "", "mediaType": ""}
+    else:
+        raw = sys.stdin.buffer.read() if file == "-" else open(file, "rb").read()
+        mt = media_type or (mimetypes.guess_type(file)[0] if file != "-" else None)
+        if mt not in _AVATAR_MEDIA_TYPES:
+            raise UsageError(
+                f"媒体类型 {mt or '(未知)'} 不在白名单：{', '.join(sorted(_AVATAR_MEDIA_TYPES))}（用 --media-type 指定）"
+            )
+        body = {"data": base64.b64encode(raw).decode(), "mediaType": mt}
+    output.emit_object(st.client().call("auth.UpdateAvatar", body=body), json_out=st.json_out)
+
+
 def whoami() -> None:
     """显示登录身份 + 作用域 + 可访问项目（后者顺带证明令牌有效）。"""
     st = current()

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/commands/org.py

@@ -30,6 +30,22 @@ def list_() -> None:
     output.emit_items(payload, items_key="orgs", columns=_COLUMNS, json_out=st.json_out)
 
 
+@app.command("create")
+def create(
+    name: str = typer.Option(..., "--name", "-n", help="展示名（1..60 字符；slug 服务端派生）"),
+) -> None:
+    """新建组织（自己是 OWNER，且会附带一个默认 project）。"""
+    st = current()
+    payload = st.client().call("tenant.CreateOrg", body={"name": name})
+    if st.json_out:
+        output.emit_json(payload)
+        return
+    org = payload.get("org") or {}
+    typer.echo(f"已创建 {org.get('orgId') or '?'}  {org.get('name') or name}")
+    if payload.get("defaultProjectId"):
+        typer.echo(f"切过去：rathflow project use {payload['defaultProjectId']}")
+
+
 @app.command("invite")
 def invite(
     org_id: str = typer.Argument(...),

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/commands/workflow.py

@@ -44,6 +44,19 @@ def get(workflow_id: str = typer.Argument(...)) -> None:
     output.emit_object(payload, json_out=st.json_out)
 
 
+@app.command("counts")
+def counts() -> None:
+    """每个 project 的存活工作流数（服务端不返回 0 的行 = 没有）。"""
+    st = current()
+    payload = st.client().call("workflow.CountWorkflowsByProject")
+    output.emit_items(
+        payload,
+        items_key="counts",
+        columns=[("PROJECT ID", "projectId"), ("数量", "count")],
+        json_out=st.json_out,
+    )
+
+
 @app.command("create")
 def create(
     title: str = typer.Option(None, "--title", "-t"),

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/endpoints.py

@@ -21,6 +21,11 @@ ENDPOINTS: dict[str, tuple[str, str]] = {
     "auth.Login": ("POST", "/api/v1/auth/login"),
     "auth.Logout": ("POST", "/api/v1/auth/logout"),
     "auth.Refresh": ("POST", "/api/v1/auth/refresh"),
+    "auth.ChangePassword": ("POST", "/api/v1/profile/password"),
+    "auth.GetProfile": ("GET", "/api/v1/profile"),
+    "auth.UpdateAvatar": ("PUT", "/api/v1/profile/avatar"),
+    "auth.UpdateEmail": ("POST", "/api/v1/profile/email"),
+    "auth.UpdateProfile": ("PATCH", "/api/v1/profile"),
     "auth.Register": ("POST", "/api/v1/auth/register"),
     "auth.RevokeAPIKey": ("DELETE", "/api/v1/api-keys/{key_id}"),
     # ---- tenant：分享链接（能力凭证，明文只在创建/轮换时出现一次）----
@@ -30,6 +35,7 @@ ENDPOINTS: dict[str, tuple[str, str]] = {
     "tenant.UpdateProjectShare": ("PATCH", "/api/v1/projects/{project_id}/share"),
     # ---- tenant：org 成员身份 ----
     "tenant.AcceptOrgInvitation": ("POST", "/api/v1/orgs/join"),
+    "tenant.CreateOrg": ("POST", "/api/v1/orgs"),
     "tenant.CreateOrgInvitation": ("POST", "/api/v1/orgs/{org_id}/invitations"),
     "tenant.ListMyOrgs": ("GET", "/api/v1/orgs"),
     # ---- tenant：project ----
@@ -56,6 +62,7 @@ ENDPOINTS: dict[str, tuple[str, str]] = {
     "session.ShareBlock": ("POST", "/api/v1/blocks/{block_id}/shares"),
     "session.StreamSessionEvents": ("GET", "/api/v1/sessions/{session_id}/events:stream"),
     # ---- workflow ----
+    "workflow.CountWorkflowsByProject": ("GET", "/api/v1/workflows:counts"),
     "workflow.CreateWorkflow": ("POST", "/api/v1/workflows"),
     "workflow.DeleteWorkflow": ("DELETE", "/api/v1/workflows/{workflow_id}"),
     "workflow.GetWorkflow": ("GET", "/api/v1/workflows/{workflow_id}"),
@@ -63,6 +70,7 @@ ENDPOINTS: dict[str, tuple[str, str]] = {
     "workflow.UpdateWorkflow": ("PATCH", "/api/v1/workflows/{workflow_id}"),
     # ---- agent ----
     "agent.CreateAgentDef": ("POST", "/api/v1/agents"),
+    "agent.ReadAttachment": ("GET", "/api/v1/attachments/{attachment_id}"),
     "agent.DeleteAgentDef": ("DELETE", "/api/v1/agents/{agent_def_id}"),
     "agent.GetAgentDef": ("GET", "/api/v1/agents/{agent_def_id}"),
     "agent.GetAgentDefVersion": ("GET", "/api/v1/agents/{agent_def_id}/versions/{version}"),
@@ -155,6 +163,7 @@ MULTI_PARAMS: dict[str, frozenset[str]] = {
 # 走 call() 会拿到逐行 JSON 的未解析正文。
 STREAMING: frozenset[str] = frozenset(
     {
+        "agent.ReadAttachment",
         "sandbox.RunCommand",
         "sandbox.RunCode",
         "sandbox.ReadFile",
@@ -197,7 +206,17 @@ def render_path(key: str, params: dict) -> str:
             raise UsageError(f"{key} 需要路径参数 --path {name}=<值>")
         text = str(value)
         if name in multi:
-            return "/".join(quote(seg, safe="") for seg in text.split("/"))
+            segments = text.split("/")
+            # `.` / `..` / 空段会被 HTTP 客户端按 URL 语义归一化（`a/b/../c` → `a/c`，
+            # `//x` → `/x`），于是实际请求会跑到别的端点上，还顺手绕过上面那层
+            # 「首段在域内」的检查。逐段 encode 拦不住它们（`.` 是 unreserved，
+            # quote 不会动），所以在这里直接拒掉，要求相对、干净的路径。
+            for seg in segments:
+                if seg in ("", ".", ".."):
+                    raise UsageError(
+                        f"{name} 不能含空段或 '.'/'..'：{text!r}（要相对路径，如 memories/notes/a.md）"
+                    )
+            return "/".join(quote(seg, safe="") for seg in segments)
         return quote(text, safe="")
 
     return _TEMPLATE_RE.sub(repl, template)

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3}/rathflow_cli/selftest.py

@@ -1,12 +1,14 @@
 """轻量自检（不联服务端）：``python -m rathflow_cli.selftest``
 
-查两件事，都是「装得上但会打错 URL」的那类毛病：
+查三件事，都是「装得上但会打错 URL」的那类毛病：
 
 1. **命令实现里不写 URL 字面量** —— 所有请求必须走 ``endpoints.py`` 的端点 key；
 2. **端点表与生成物一致** —— 生成物 ``endpoints.ts`` 由上游 proto 生成，本包的
    ``endpoints.py`` 手工同步；两者漂移就会打错 URL。生成物在本仓库中不存在
    （它是上游 monorepo 的产物），此时这一项跳过，可用环境变量
    ``RATHFLOW_ENDPOINTS_TS`` 指向它来启用比对。
+3. **多段路径参数拦住点段** —— ``..`` 会被 HTTP 客户端按 URL 语义归一化，
+   把请求打到别的端点上（还会绕过命令自己的域检查）。
 """
 
 from __future__ import annotations
@@ -16,6 +18,8 @@ import os
 import sys
 from pathlib import Path
 
+from .errors import UsageError
+
 from . import endpoints
 
 _COMMANDS = Path(__file__).resolve().parent / "commands"
@@ -46,7 +50,12 @@ _URL_LITERAL = re.compile(r'"(?:/api/|/admin/api/)')
 
 def main() -> int:
     generated_problems, compared = _check_generated()
-    problems = generated_problems + _check_no_url_literals()
+    problems = (
+        generated_problems
+        + _check_no_url_literals()
+        + _check_path_guard()
+        + _check_hoist_flags()
+    )
     if problems:
         print(f"自检未通过（{len(problems)} 项）：", file=sys.stderr)
         for line in problems:
@@ -112,6 +121,49 @@ def _check_no_url_literals() -> list[str]:
     return problems
 
 
+def _check_hoist_flags() -> list[str]:
+    """全局旗标写在子命令后面也必须能用（脚本里最常见的写法）。"""
+    from . import cli
+
+    problems = []
+    for argv in (
+        ["rathflow", "auth", "profile", "--json"],
+        ["rathflow", "project", "list", "--json"],
+        ["rathflow", "config", "use", "default", "--json"],
+        ["rathflow", "session", "get", "S1", "--json"],
+    ):
+        hoisted = cli._hoist_globals(list(argv))
+        if hoisted[1:2] != ["--json"]:
+            problems.append(f"{' '.join(argv)}: 末尾 --json 未被前移（会报 no such option）")
+    return problems
+
+
+def _check_path_guard() -> list[str]:
+    """多段路径里的 ``.``/``..``/空段必须被拒，正常路径仍要能渲染。"""
+    cases = {"memory.Read": "memory_path", "sandbox.ReadFile": "path"}
+    bad_inputs = ("a/../b", "../x", "/abs", "a//b", "a/./b")
+    problems = []
+    for key, name in cases.items():
+        others = {p: "X1" for p in endpoints.path_params(key) if p != name}
+        for bad in bad_inputs:
+            try:
+                rendered = endpoints.render_path(key, {name: bad, **others})
+            except UsageError:
+                continue
+            except Exception as exc:  # noqa: BLE001 - 自检要报「类型不对」
+                problems.append(f"{key}: {name}={bad!r} 抛了 {type(exc).__name__}，应抛 UsageError")
+            else:
+                problems.append(
+                    f"{key}: {name}={bad!r} 未被拒绝，会渲染成 {rendered}（URL 归一化后打到别的端点）"
+                )
+        good = endpoints.render_path(key, {name: "a/b c.md", **others})
+        if not good.endswith("a/b%20c.md"):
+            problems.append(f"{key}: 正常路径渲染异常 {good}")
+    return problems
+
+
+
+
 def _names(raw: str) -> set[str]:
     return set(re.findall(r'"([^"]+)"', raw))
 

{rathflow_cli-0.1.2 → rathflow_cli-0.1.3/rathflow_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rathflow-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: RathFlow command line client: sessions, memory, sandboxes, assets and billing over the RathFlow REST API.
 Author: Rath Team
 License-Expression: MIT
@@ -75,17 +75,17 @@ The default gateway is `https://rathflow.lynwe.com`. Point it elsewhere with
 
 | Group | What it covers |
 | --- | --- |
-| `auth` | log in / out, register, API keys (`keys`, `key-create`, `key-revoke`) |
+| `auth` | log in / out, register, profile (`profile`, `profile-update`, `change-password`, `set-email`, `set-avatar`), API keys |
 | `config` | local profiles (`list`, `show`, `set`, `use`) |
-| `org` | organizations, invitations |
+| `org` | organizations (`list`, `create`, `invite`, `accept`) |
 | `project` | projects, scope switching, project config, share links |
 | `session` | sessions, blocks, events |
 | `memory` | memory entries, search, commit tasks |
 | `sandbox` | sandboxes, exec, code, files, logs |
-| `agent` | agent definitions, versions, prompts, runs |
+| `agent` | agent definitions, versions, prompts, runs, attachments |
 | `asset` | assets, versions, credentials, publish |
 | `billing` | subscription, usage, invoices |
-| `workflow` | workflows |
+| `workflow` | workflows (`list`, `get`, `create`, `delete`, `counts`) |
 | `admin` | platform administration (platform admins only) |
 
 Two more entry points sit at the root: