tinet-agent-cli 0.1.0.dev37__py3-none-any.whl → 0.1.0.dev39__py3-none-any.whl

taco/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.0.dev37"
+__version__ = "0.1.0.dev39"

taco/agent_openapi/service.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from typing import Any
 
 import httpx
@@ -67,6 +68,11 @@ def validate_response(operation: AgentOperation, payload: Any) -> dict[str, Any]
             exit_code=4,
             request_id=request_id,
             path=operation.http["path"],
+            raw_response=json.dumps(
+                payload,
+                ensure_ascii=False,
+                separators=(",", ":"),
+            ),
         )
     business = dict(payload)
     business.pop("requestId", None)

taco/aikb/executors.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import json
 import math
 import os
+import re
 from typing import Any
 from urllib.parse import urlsplit
 
@@ -17,6 +19,13 @@ from taco.core.http_headers import with_cli_user_agent
 
 
 DEFAULT_UPLOAD_TIMEOUT_SECONDS = 600.0
+RAW_HTML_CONTENT_IGNORED_MESSAGE = (
+    "服务端 rawHtmlContent 为非标准 JSON 内容，CLI 已忽略该属性。"
+)
+_RAW_HTML_CONTENT_PATTERN = re.compile(
+    r'"rawHtmlContent"\s*:\s*.*?(?=,\s*"escapedHtmlContent"\s*:)',
+    re.DOTALL,
+)
 
 
 def execute_http(
@@ -26,13 +35,53 @@ def execute_http(
     query: dict[str, Any],
     body: dict[str, Any],
 ) -> dict[str, Any]:
+    raw_html_content_ignored = False
+
+    def repair_signature_response(raw: str) -> Any:
+        nonlocal raw_html_content_ignored
+        payload = _parse_signature_response_without_raw_html(raw)
+        raw_html_content_ignored = True
+        return payload
+
     payload = client.request_json(
         operation.http["method"],
         operation.http["path"],
         query=query or None,
         json_body=body or None,
+        preserve_invalid_response=operation.id == "signature-for-upload",
+        invalid_json_parser=(
+            repair_signature_response
+            if operation.id == "signature-for-upload"
+            else None
+        ),
+    )
+    result = validate_response(operation, payload)
+    if raw_html_content_ignored:
+        result["message"] = RAW_HTML_CONTENT_IGNORED_MESSAGE
+    return result
+
+
+def _parse_signature_response_without_raw_html(raw: str) -> dict[str, Any]:
+    matches = tuple(_RAW_HTML_CONTENT_PATTERN.finditer(raw))
+    if len(matches) != 1:
+        raise ValueError("响应中不存在唯一的非标准 rawHtmlContent 属性")
+    repaired = _RAW_HTML_CONTENT_PATTERN.sub(
+        '"rawHtmlContent":null',
+        raw,
+        count=1,
     )
-    return validate_response(operation, payload)
+    payload = json.loads(repaired)
+    if not isinstance(payload, dict):
+        raise ValueError("响应不是 JSON 对象")
+    result = payload.get("result")
+    if (
+        not isinstance(result, dict)
+        or "rawHtmlContent" not in result
+        or result["rawHtmlContent"] is not None
+    ):
+        raise ValueError("非标准 rawHtmlContent 不在 result 中")
+    result.pop("rawHtmlContent")
+    return payload
 
 
 def execute_presigned_put(

taco/assets/__init__.py

@@ -1 +1 @@
-"""Packaged schemas, scenarios, examples, and Agent skills."""
+"""Packaged schemas, scenarios, examples, and API catalogs."""

taco/assets/agent_openapi/operations/trace/list-message-traces.json

@@ -47,12 +47,12 @@
               "inputs": {"description": "节点输入；JSON 内容返回对象，否则可能返回原始值。"},
               "process_data": {"description": "节点处理过程数据。"},
               "outputs": {"description": "节点输出；JSON 内容返回对象，否则可能返回原始值。"},
-              "status": {"type": "string", "description": "节点执行状态。"},
+              "status": {"type": ["string", "null"], "description": "节点执行状态。"},
               "error": {"type": ["string", "null"], "description": "节点执行错误信息。"},
               "elapsed_time": {"type": ["number", "null"], "description": "节点执行耗时，单位秒。"},
               "execution_metadata": {"type": ["object", "null"], "description": "节点执行元数据。", "additionalProperties": true},
               "extras": {"type": ["object", "null"], "description": "节点额外信息。", "additionalProperties": true},
-              "created_at": {"type": "integer", "description": "节点开始执行的 Unix 秒级时间戳。"},
+              "created_at": {"type": ["integer", "null"], "description": "节点开始执行的 Unix 秒级时间戳。"},
               "finished_at": {"type": ["integer", "null"], "description": "节点完成执行的 Unix 秒级时间戳。"}
             },
             "additionalProperties": true

taco/assets/manifest.json

@@ -1,8 +1,7 @@
 {
   "format_version": 1,
-  "cli_version": "0.1.0.dev37",
+  "cli_version": "0.1.0.dev39",
   "resource_groups": [
-    "skills",
     "schemas",
     "scenarios",
     "examples",

taco/cli.py

@@ -13,7 +13,10 @@ from taco.core.errors import TacoError
 from taco.core.output import failure, to_json_line
 
 
-app = typer.Typer(help="Tinet Agent CLI Orchestrator")
+app = typer.Typer(
+    help="Tinet Agent CLI Orchestrator",
+    add_completion=False,
+)
 app.add_typer(agent_app, name="agent")
 app.add_typer(aikb_app, name="aikb")
 app.add_typer(profile_app, name="profile")
@@ -63,7 +66,7 @@ def root(
 def main() -> None:
     try:
         result = app(
-            args=_without_ignored_compat_args(sys.argv[1:]),
+            args=_normalize_cli_args(sys.argv[1:]),
             standalone_mode=False,
             prog_name="taco",
         )
@@ -101,11 +104,15 @@ def main() -> None:
         )
 
 
-def _without_ignored_compat_args(args: list[str]) -> list[str]:
-    filtered: list[str] = []
+def _normalize_cli_args(args: list[str]) -> list[str]:
+    global_args: list[str] = []
+    command_args: list[str] = []
     index = 0
     while index < len(args):
         argument = args[index]
+        if argument == "--":
+            command_args.extend(args[index:])
+            break
         if argument == "--from-zenava":
             index += 1
             if index < len(args) and args[index].lower() in {"true", "false"}:
@@ -114,9 +121,25 @@ def _without_ignored_compat_args(args: list[str]) -> list[str]:
         if argument.startswith("--from-zenava="):
             index += 1
             continue
-        filtered.append(argument)
+        if argument in {"--json", "--no-input"}:
+            global_args.append(argument)
+            index += 1
+            continue
+        if argument == "--profile":
+            index += 1
+            if index < len(args) and not args[index].startswith("-"):
+                global_args.extend((argument, args[index]))
+                index += 1
+            else:
+                command_args.append(argument)
+            continue
+        if argument.startswith("--profile="):
+            global_args.append(argument)
+            index += 1
+            continue
+        command_args.append(argument)
         index += 1
-    return filtered
+    return [*global_args, *command_args]
 
 
 def _exit_main_with_error(error: TacoError) -> None:

taco/commands/agent.py

@@ -5,7 +5,7 @@ import os
 import tempfile
 from json import JSONDecodeError
 from pathlib import Path
-from typing import Any
+from typing import Any, Literal
 from uuid import UUID, uuid4
 
 import typer
@@ -14,12 +14,11 @@ from taco.commands.app import app_app
 from taco.commands.category import category_app
 from taco.commands.chatflow import chatflow_app
 from taco.commands.credential import credential_app
-from taco.commands.discovery import example_app, scenario_app, schema_app, skills_app
+from taco.commands.discovery import example_app, scenario_app, schema_app
 from taco.commands.model import model_app
 from taco.commands.tool import tool_app
 from taco.commands.workflow import workflow_app
-from taco.agent_openapi.catalog import load_catalog, operation_not_found
-from taco.agent_openapi.models import thaw
+from taco.agent_openapi.catalog import load_catalog
 from taco.agent_openapi.parameters import parse_parameters
 from taco.agent_openapi.service import AgentOpenApiService
 from taco.core.context import get_cli_context
@@ -35,11 +34,15 @@ from taco.services.tool_service import ToolService
 from taco.services.workflow_tool_service import WorkflowToolService
 
 
-agent_app = typer.Typer(help="Agent 智能体管理")
+agent_app = typer.Typer(help="智能体管理")
 agent_tool_app = typer.Typer(help="本地 Agent DSL 工具挂载")
-agent_operation_app = typer.Typer(help="发现 Agent 数据 OpenAPI operation")
+conversation_app = typer.Typer(help="智能体会话记录管理")
+conversation_message_app = typer.Typer(help="会话消息管理")
+conversation_trace_app = typer.Typer(help="消息追踪管理")
 agent_app.add_typer(agent_tool_app, name="tool")
-agent_app.add_typer(agent_operation_app, name="operation")
+agent_app.add_typer(conversation_app, name="conversation")
+conversation_app.add_typer(conversation_message_app, name="message")
+conversation_app.add_typer(conversation_trace_app, name="trace")
 agent_app.add_typer(app_app, name="app")
 agent_app.add_typer(category_app, name="category")
 agent_app.add_typer(model_app, name="model")
@@ -47,112 +50,121 @@ agent_app.add_typer(workflow_app, name="workflow")
 agent_app.add_typer(chatflow_app, name="chatflow")
 agent_app.add_typer(example_app, name="example")
 agent_app.add_typer(scenario_app, name="scenario")
-agent_app.add_typer(skills_app, name="skills")
 agent_app.add_typer(schema_app, name="schema")
 agent_tool_app.add_typer(tool_app, name="catalog")
 agent_tool_app.add_typer(credential_app, name="credential")
 
 
-@agent_operation_app.command("list", help="列出 Agent 数据 OpenAPI operation。")
-def list_agent_operations(
+@conversation_app.command("list", help="查询智能体会话记录。")
+def list_conversations(
     ctx: typer.Context,
-    group: str | None = typer.Option(None, "--group", help="按分组筛选。"),
+    app_id: str = typer.Option(..., "--app-id", help="智能体应用 ID。"),
+    created_at_start: int = typer.Option(
+        ...,
+        "--created-at-start",
+        min=1,
+        help="创建开始时间，Unix 秒级时间戳。",
+    ),
+    created_at_end: int = typer.Option(
+        ...,
+        "--created-at-end",
+        min=1,
+        help="创建结束时间，Unix 秒级时间戳，跨度不超过 90 天。",
+    ),
+    conversation_id: str | None = typer.Option(
+        None,
+        "--conversation-id",
+        help="按指定会话 ID 查询。",
+    ),
+    invoke_from: Literal["PROD", "DEBUG"] | None = typer.Option(
+        None,
+        "--invoke-from",
+        help="会话来源：PROD 或 DEBUG。",
+    ),
+    is_transfer_human: bool | None = typer.Option(
+        None,
+        "--is-transfer-human/--no-transfer-human",
+        help="筛选是否发生过转人工。",
+    ),
+    limit: int = typer.Option(10, "--limit", min=1, max=100, help="查询数量。"),
+    cursor: str | None = typer.Option(None, "--cursor", help="下一页游标。"),
 ) -> None:
-    operations = [
-        _agent_operation_summary(item)
-        for item in load_catalog().operations
-        if group is None or item.group == group
-    ]
-    emit_success(ctx, operations, json_default=True)
-
-
-@agent_operation_app.command("search", help="按关键词搜索 Agent 数据 OpenAPI operation。")
-def search_agent_operations(ctx: typer.Context, query: str = typer.Argument(...)) -> None:
-    needle = query.casefold()
-    matches = []
-    for operation in load_catalog().operations:
-        haystack = " ".join(
-            [operation.id, operation.title, operation.description, *operation.keywords]
-        ).casefold()
-        if needle in haystack:
-            matches.append(_agent_operation_summary(operation))
-    emit_success(ctx, matches[:10], json_default=True)
+    _call_named_agent_operation(
+        ctx,
+        "list-conversations",
+        body=_without_none(
+            {
+                "app_id": app_id,
+                "created_at_start": created_at_start,
+                "created_at_end": created_at_end,
+                "conversation_id": conversation_id,
+                "invoke_from": invoke_from,
+                "is_transfer_human": is_transfer_human,
+                "limit": limit,
+                "cursor": cursor,
+            }
+        ),
+    )
 
 
-@agent_operation_app.command("describe", help="查看 Agent 数据 OpenAPI operation 完整契约。")
-def describe_agent_operation(
+@conversation_message_app.command("list", help="查询指定会话的消息记录。")
+def list_conversation_messages(
     ctx: typer.Context,
-    operation_id: str = typer.Argument(...),
+    app_id: str = typer.Option(..., "--app-id", help="智能体应用 ID。"),
+    conversation_id: str = typer.Option(..., "--conversation-id", help="会话 ID。"),
+    conversation_created_at: int = typer.Option(
+        ...,
+        "--conversation-created-at",
+        min=1,
+        help="会话创建时间，Unix 秒级时间戳。",
+    ),
+    limit: int = typer.Option(10, "--limit", min=1, max=100, help="查询数量。"),
+    cursor: str | None = typer.Option(None, "--cursor", help="下一页游标。"),
 ) -> None:
-    operation = load_catalog().by_id.get(operation_id)
-    if operation is None:
-        exit_with_error(ctx, operation_not_found(operation_id), json_default=True)
-    emit_success(
+    _call_named_agent_operation(
         ctx,
-        {
-            **_agent_operation_summary(operation),
-            "description": operation.description,
-            "keywords": list(operation.keywords),
-            "http": thaw(operation.http),
-            "response": thaw(operation.response),
-            "risk": thaw(operation.risk),
-            "execution": thaw(operation.execution),
-            "examples": thaw(operation.examples),
-        },
-        json_default=True,
+        "list-conversation-messages",
+        body=_without_none(
+            {
+                "app_id": app_id,
+                "conversation_id": conversation_id,
+                "conversation_created_at": conversation_created_at,
+                "limit": limit,
+                "cursor": cursor,
+            }
+        ),
     )
 
 
-@agent_app.command("call", help="校验参数并执行 Agent 数据 OpenAPI operation。")
-def call_agent_operation(
+@conversation_trace_app.command("list", help="查询指定消息的详细日志追踪。")
+def list_message_traces(
     ctx: typer.Context,
-    operation_id: str = typer.Argument(...),
-    param: list[str] | None = typer.Option(
-        None,
-        "--param",
-        help="语义参数 key=value，可重复。",
-    ),
-    params_file: Path | None = typer.Option(
-        None,
-        "--params-file",
-        help="语义参数 JSON 文件。",
-    ),
-    body_file: Path | None = typer.Option(
-        None,
-        "--body-file",
-        help="JSON body 文件。",
+    app_id: str = typer.Option(..., "--app-id", help="智能体应用 ID。"),
+    conversation_id: str = typer.Option(..., "--conversation-id", help="会话 ID。"),
+    conversation_created_at: int = typer.Option(
+        ...,
+        "--conversation-created-at",
+        min=1,
+        help="会话创建时间，Unix 秒级时间戳。",
     ),
+    message_id: str = typer.Option(..., "--message-id", help="消息 ID。"),
+    limit: int = typer.Option(10, "--limit", min=1, max=100, help="查询数量。"),
+    cursor: str | None = typer.Option(None, "--cursor", help="下一页游标。"),
 ) -> None:
-    operation = load_catalog().by_id.get(operation_id)
-    if operation is None:
-        exit_with_error(ctx, operation_not_found(operation_id), json_default=True)
-    try:
-        query, body = parse_parameters(
-            operation,
-            params=param,
-            params_file=params_file,
-            body_file=body_file,
-        )
-        result = AgentOpenApiService().call(
-            operation_id,
-            query=query,
-            body=body,
-            profile=get_cli_context(ctx).profile,
-        )
-    except TacoError as error:
-        exit_with_error(ctx, error, json_default=True)
-    emit_success(ctx, result, json_default=True)
-
-
-def _agent_operation_summary(operation) -> dict[str, Any]:
-    return {
-        "id": operation.id,
-        "title": operation.title,
-        "group": operation.group,
-        "method": operation.http["method"],
-        "path": operation.http["path"],
-        "risk": operation.risk["level"],
-    }
+    _call_named_agent_operation(
+        ctx,
+        "list-message-traces",
+        body=_without_none(
+            {
+                "app_id": app_id,
+                "conversation_id": conversation_id,
+                "conversation_created_at": conversation_created_at,
+                "message_id": message_id,
+                "limit": limit,
+                "cursor": cursor,
+            }
+        ),
+    )
 
 
 @agent_app.command("create", help="创建 Agent 并把服务端默认配置写入本地 DSL。")
@@ -574,6 +586,48 @@ def publish_agent(
     emit_success(ctx, data, json_default=True)
 
 
+def _call_named_agent_operation(
+    ctx: typer.Context,
+    operation_id: str,
+    *,
+    query: dict[str, Any] | None = None,
+    body: dict[str, Any] | None = None,
+) -> None:
+    operation = load_catalog().by_id[operation_id]
+    try:
+        validated_query, validated_body = _validated_agent_parameters(
+            operation,
+            query=query or {},
+            body=body or {},
+        )
+        result = AgentOpenApiService().call(
+            operation_id,
+            query=validated_query,
+            body=validated_body,
+            profile=get_cli_context(ctx).profile,
+        )
+    except TacoError as error:
+        exit_with_error(ctx, error, json_default=True)
+    emit_success(ctx, result, json_default=True)
+
+
+def _validated_agent_parameters(
+    operation,
+    *,
+    query: dict[str, Any],
+    body: dict[str, Any],
+) -> tuple[dict[str, Any], dict[str, Any]]:
+    expressions = [
+        f"{key}={value if isinstance(value, str) else json.dumps(value)}"
+        for key, value in [*query.items(), *body.items()]
+    ]
+    return parse_parameters(operation, params=expressions)
+
+
+def _without_none(values: dict[str, Any]) -> dict[str, Any]:
+    return {key: value for key, value in values.items() if value is not None}
+
+
 def _read_json_object(path: Path | None) -> dict[str, Any]:
     if path is None:
         return {}