deepflow-openagent-cli 0.1.6__tar.gz → 0.1.7__tar.gz

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepflow-openagent-cli
-Version: 0.1.6
+Version: 0.1.7
 Summary: Command-line client for OpenAgent OpenAPI (agents, conversations, SSE chat, tools, channels, knowledge bases).
 Author: DeepFlow AI
 Project-URL: Repository, https://github.com/DeepFlowAI/OpenAgent
@@ -158,6 +158,30 @@ selected version does not exist; use `--from base` for a fresh environment.
 Version ID is different from the `x.y.z` version label. First save automatically
 publishes; later saves require a separate `versions publish` command.
 
+Binary uploads (including PDF) use the same sandbox upload writer as the workbench:
+
+```bash
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf
+# After retry exhaustion, reuse BOTH printed IDs and the same local file:
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf \
+  --upload-id UPLOAD_ID --sandbox-id SANDBOX_ID
+```
+
+Uploads accept 1 byte–50 MiB and create `/workspace/files/uploads` automatically.
+The returned path is `/workspace/files/uploads/<upload_id>-<original_filename>`;
+use that path in subsequent OCR or chat commands. The ID prefix prevents duplicate
+files after a lost response. Reusing the same ID/name with different bytes is
+rejected. The sandbox ID pins retries to the original development environment.
+This admin/config API accepts binary content; channel visitor format restrictions
+still apply only to visitor uploads. Uploading does not automatically start OCR.
+
+Uploads and `dev exec` submission/status/stop retry connection failures and HTTP
+408/429/502/503/504 up to four times (1/2/4/8 second delays). Execution retries keep
+the same execution ID and output cursor. Upload retries resend the whole binary
+body; chunk resume is not implemented. Other mutating commands are not retried.
+Requires updated CLI, API server and Cloud PC control plane; no VM image rebuild
+is needed for the upload writer.
+
 Additional operations:
 
 ```bash
@@ -176,8 +200,9 @@ Config update replaces configuration: provide `model_name`, `thinking_enabled`
 and the complete `env_vars` list; omitted thinking/env fields reset to defaults.
 Config queries include environment variable values. File mutation and snapshot
 operations share the per-agent management lock; direct writes by the sandbox's
-Agent or terminal are outside that lock. Cloud PC HTTP requests have a 900-second
-timeout and are not automatically retried. After a timeout, inspect sandbox or
+Agent or terminal are outside that lock. Upload and execution requests have a
+120-second per-attempt timeout and the retries described above. Other Cloud PC
+HTTP requests have a 900-second timeout and are not automatically retried. After a timeout, inspect sandbox or
 version state before retrying a mutation. Conversation logs and chat-control
 routes still require an administrator session.
 

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/README.md

@@ -137,6 +137,30 @@ selected version does not exist; use `--from base` for a fresh environment.
 Version ID is different from the `x.y.z` version label. First save automatically
 publishes; later saves require a separate `versions publish` command.
 
+Binary uploads (including PDF) use the same sandbox upload writer as the workbench:
+
+```bash
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf
+# After retry exhaustion, reuse BOTH printed IDs and the same local file:
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf \
+  --upload-id UPLOAD_ID --sandbox-id SANDBOX_ID
+```
+
+Uploads accept 1 byte–50 MiB and create `/workspace/files/uploads` automatically.
+The returned path is `/workspace/files/uploads/<upload_id>-<original_filename>`;
+use that path in subsequent OCR or chat commands. The ID prefix prevents duplicate
+files after a lost response. Reusing the same ID/name with different bytes is
+rejected. The sandbox ID pins retries to the original development environment.
+This admin/config API accepts binary content; channel visitor format restrictions
+still apply only to visitor uploads. Uploading does not automatically start OCR.
+
+Uploads and `dev exec` submission/status/stop retry connection failures and HTTP
+408/429/502/503/504 up to four times (1/2/4/8 second delays). Execution retries keep
+the same execution ID and output cursor. Upload retries resend the whole binary
+body; chunk resume is not implemented. Other mutating commands are not retried.
+Requires updated CLI, API server and Cloud PC control plane; no VM image rebuild
+is needed for the upload writer.
+
 Additional operations:
 
 ```bash
@@ -155,8 +179,9 @@ Config update replaces configuration: provide `model_name`, `thinking_enabled`
 and the complete `env_vars` list; omitted thinking/env fields reset to defaults.
 Config queries include environment variable values. File mutation and snapshot
 operations share the per-agent management lock; direct writes by the sandbox's
-Agent or terminal are outside that lock. Cloud PC HTTP requests have a 900-second
-timeout and are not automatically retried. After a timeout, inspect sandbox or
+Agent or terminal are outside that lock. Upload and execution requests have a
+120-second per-attempt timeout and the retries described above. Other Cloud PC
+HTTP requests have a 900-second timeout and are not automatically retried. After a timeout, inspect sandbox or
 version state before retrying a mutation. Conversation logs and chat-control
 routes still require an administrator session.
 

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepflow-openagent-cli"
-version = "0.1.6"
+version = "0.1.7"
 description = "Command-line client for OpenAgent OpenAPI (agents, conversations, SSE chat, tools, channels, knowledge bases)."
 readme = "README.md"
 requires-python = ">=3.11"

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/src/deepflow_openagent_cli/__init__.py

@@ -1,3 +1,3 @@
 """DeepFlow OpenAgent CLI — published PyPI package."""
 
-__version__ = "0.1.6"
+__version__ = "0.1.7"

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/src/deepflow_openagent_cli/cli.py

@@ -8,6 +8,7 @@ Run with:
 from __future__ import annotations
 
 import argparse
+from http.client import HTTPException
 import json
 import mimetypes
 import os
@@ -129,6 +130,18 @@ def _param(name: str, type_: str, required: bool, description: str) -> ParamDoc:
 
 
 ENDPOINTS: tuple[EndpointDoc, ...] = (
+    EndpointDoc(
+        key="cloudpc.files.upload", method="POST",
+        path="/api/v1/cloudpc/agents/{agent_id}/dev-sandbox/files/upload", scope="config",
+        summary="Upload binary content (1 byte–50 MiB) into /workspace/files/uploads; safe to retry with the same upload ID and sandbox ID.",
+        path_params=[_param("agent_id", "integer", True, "Cloud PC Agent ID.")],
+        query_params=[_param("filename", "string", True, "Original basename."),
+                      _param("upload_id", "string", True, "32 lowercase hex characters; prefixes the saved filename."),
+                      _param("sandbox_id", "integer", True, "Pinned development sandbox ID from dev get.")],
+        response="Saved filename, absolute path and size.",
+        example="deepflow_openagent_cli cloudpc files upload 1 --file ./report.pdf",
+    ),
+
     EndpointDoc(
         key="cloudpc.dev.exec", method="POST", path="/api/v1/cloudpc/agents/{agent_id}/dev-sandbox/executions", scope="config",
         summary='Start an idempotent shell execution. Output remains in the sandbox runtime until restart or eviction (32 retained).',
@@ -1254,6 +1267,38 @@ class OpenApiClient:
         except (URLError, OSError, UnicodeError, ValueError) as exc:
             raise CliError(f"Chat stream interrupted: {exc}") from exc
 
+    def _read_retryable(self, request: Request) -> bytes:
+        """Only for operations whose server contract makes replay safe."""
+        for attempt in range(5):
+            try:
+                with urlopen(request, timeout=120) as response:
+                    return response.read()
+            except HTTPError as exc:
+                if exc.code not in {408, 429, 502, 503, 504} or attempt == 4:
+                    raise CliError(f"HTTP {exc.code}: {exc.read().decode('utf-8', errors='replace')}") from exc
+            except (URLError, OSError, HTTPException) as exc:
+                if attempt == 4:
+                    raise CliError(f"Connection failed after 5 attempts: {exc}") from exc
+            print(f"Connection interrupted; retry {attempt + 1}/4…", file=sys.stderr)
+            time.sleep(2 ** attempt)
+
+    def upload(self, agent_id: int, file: Path, upload_id: str, sandbox_id: int) -> bytes:
+        if not self.api_key:
+            raise CliError(f"Missing API key. Set {ENV_API_KEY} or pass --api-key.")
+        try:
+            with file.open("rb") as source:
+                content = source.read(50 * 1024 * 1024 + 1)
+        except OSError as exc:
+            raise CliError(f"Cannot read upload: {exc}") from exc
+        if not 0 < len(content) <= 50 * 1024 * 1024:
+            raise CliError("Upload must be between 1 byte and 50 MiB.")
+        url = self._build_url(get_endpoint("cloudpc.files.upload"), {"agent_id": agent_id},
+                              {"filename": file.name, "upload_id": upload_id, "sandbox_id": sandbox_id})
+        request = Request(url, data=content, method="POST", headers={
+            "Authorization": f"Bearer {self.api_key}", "Content-Type": "application/octet-stream",
+        })
+        return self._read_retryable(request)
+
     def request(
         self,
         endpoint_key: str,
@@ -1262,6 +1307,7 @@ class OpenApiClient:
         body: dict[str, Any] | None = None,
         *,
         stream: bool = False,
+        retry: bool = False,
     ) -> bytes | None:
         endpoint = get_endpoint(endpoint_key)
         if endpoint.scope and not self.api_key:
@@ -1277,6 +1323,8 @@ class OpenApiClient:
             headers["Content-Type"] = "application/json"
 
         request = Request(url, data=data, headers=headers, method=endpoint.method)
+        if not stream and (retry or endpoint_key in {"cloudpc.dev.exec", "cloudpc.dev.exec_status", "cloudpc.dev.exec_cancel"}):
+            return self._read_retryable(request)
         try:
             options = {"timeout": 900} if endpoint_key.startswith("cloudpc.") else {}
             with urlopen(request, **options) as response:  # noqa: S310 - CLI calls user-provided API host.
@@ -1919,6 +1967,21 @@ def handle_cloudpc(args: argparse.Namespace) -> int:
                 raise CliError("Version ID must be positive.")
         body = {"from_version_id": version_id}
     elif group == "files":
+        if action == "upload":
+            if bool(args.upload_id) != (args.sandbox_id is not None):
+                raise CliError("Use --upload-id and --sandbox-id together when resuming an upload.")
+            client = client_from_args(args)
+            upload_id = args.upload_id or uuid4().hex
+            sandbox_id = args.sandbox_id
+            if sandbox_id is None:
+                dev = json.loads(client.request("cloudpc.dev.get", path_params, retry=True))
+                sandbox_id = dev.get("sandbox_id")
+                if sandbox_id is None:
+                    raise CliError("No upload-capable development sandbox; create/resume it and update the server.")
+            print(f"upload_id={upload_id} sandbox_id={sandbox_id}; reuse both IDs to retry this upload.", file=sys.stderr)
+            data = client.upload(args.agent_id, Path(args.file).expanduser(), upload_id, sandbox_id)
+            print_output(data, pretty=args.pretty, raw=args.raw)
+            return 0
         if action in {"read", "delete"}:
             query = {"path": args.path}
         elif action == "write":
@@ -2129,6 +2192,11 @@ def build_parser() -> argparse.ArgumentParser:
         elif action == "rename":
             command.add_argument("--src", required=True)
             command.add_argument("--dst", required=True)
+    upload = cloudpc_files.add_parser("upload", help="Upload binary files to /workspace/files/uploads (max 50 MiB).")
+    upload.add_argument("agent_id", type=int)
+    upload.add_argument("--file", required=True)
+    upload.add_argument("--upload-id", help="Reuse the printed ID when retrying an interrupted upload.")
+    upload.add_argument("--sandbox-id", type=int, help="Reuse the printed sandbox ID on manual retry.")
     cloudpc_versions = cloudpc_sub.add_parser("versions").add_subparsers(dest="cloudpc_action", required=True)
     for action in ("list", "save", "publish"):
         command = cloudpc_versions.add_parser(action)

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/src/deepflow_openagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepflow-openagent-cli
-Version: 0.1.6
+Version: 0.1.7
 Summary: Command-line client for OpenAgent OpenAPI (agents, conversations, SSE chat, tools, channels, knowledge bases).
 Author: DeepFlow AI
 Project-URL: Repository, https://github.com/DeepFlowAI/OpenAgent
@@ -158,6 +158,30 @@ selected version does not exist; use `--from base` for a fresh environment.
 Version ID is different from the `x.y.z` version label. First save automatically
 publishes; later saves require a separate `versions publish` command.
 
+Binary uploads (including PDF) use the same sandbox upload writer as the workbench:
+
+```bash
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf
+# After retry exhaustion, reuse BOTH printed IDs and the same local file:
+deepflow_openagent_cli cloudpc files upload 123 --file ./report.pdf \
+  --upload-id UPLOAD_ID --sandbox-id SANDBOX_ID
+```
+
+Uploads accept 1 byte–50 MiB and create `/workspace/files/uploads` automatically.
+The returned path is `/workspace/files/uploads/<upload_id>-<original_filename>`;
+use that path in subsequent OCR or chat commands. The ID prefix prevents duplicate
+files after a lost response. Reusing the same ID/name with different bytes is
+rejected. The sandbox ID pins retries to the original development environment.
+This admin/config API accepts binary content; channel visitor format restrictions
+still apply only to visitor uploads. Uploading does not automatically start OCR.
+
+Uploads and `dev exec` submission/status/stop retry connection failures and HTTP
+408/429/502/503/504 up to four times (1/2/4/8 second delays). Execution retries keep
+the same execution ID and output cursor. Upload retries resend the whole binary
+body; chunk resume is not implemented. Other mutating commands are not retried.
+Requires updated CLI, API server and Cloud PC control plane; no VM image rebuild
+is needed for the upload writer.
+
 Additional operations:
 
 ```bash
@@ -176,8 +200,9 @@ Config update replaces configuration: provide `model_name`, `thinking_enabled`
 and the complete `env_vars` list; omitted thinking/env fields reset to defaults.
 Config queries include environment variable values. File mutation and snapshot
 operations share the per-agent management lock; direct writes by the sandbox's
-Agent or terminal are outside that lock. Cloud PC HTTP requests have a 900-second
-timeout and are not automatically retried. After a timeout, inspect sandbox or
+Agent or terminal are outside that lock. Upload and execution requests have a
+120-second per-attempt timeout and the retries described above. Other Cloud PC
+HTTP requests have a 900-second timeout and are not automatically retried. After a timeout, inspect sandbox or
 version state before retrying a mutation. Conversation logs and chat-control
 routes still require an administrator session.
 

{deepflow_openagent_cli-0.1.6 → deepflow_openagent_cli-0.1.7}/tests/test_cloudpc_cli.py

@@ -254,3 +254,83 @@ def test_dev_chat_requires_message_or_existing_round(cli, transport):
     assert run(cli, 'cloudpc', 'dev', 'chat', '7') == 1
     assert run(cli, 'cloudpc', 'dev', 'chat', '7', '--attach') == 1
     assert transport[0] == []
+
+
+def test_binary_upload_replays_exact_body_after_ssl_eof(cli, monkeypatch, tmp_path, capsys):
+    import ssl
+    source = tmp_path / '报告.pdf'
+    content = b'%PDF-1.7\n\x00\xff' + b'x' * (2 * 1024 * 1024)
+    source.write_bytes(content)
+    calls = []
+    def send(request, **kwargs):
+        calls.append(request)
+        if request.method == 'GET':
+            return io.BytesIO(b'{"sandbox_id":42,"exists":true}')
+        if len(calls) == 2:
+            raise ssl.SSLEOFError('UNEXPECTED_EOF_WHILE_READING')
+        return io.BytesIO(b'{"path":"/workspace/files/uploads/saved.pdf"}')
+    monkeypatch.setattr(cli, 'urlopen', send)
+    monkeypatch.setattr(cli.time, 'sleep', lambda _: None)
+    assert run(cli, 'cloudpc', 'files', 'upload', '7', '--file', str(source)) == 0
+    assert calls[1].data == calls[2].data == content
+    assert calls[1].full_url == calls[2].full_url
+    assert 'sandbox_id=42' in calls[1].full_url
+    assert 'upload_id=' in capsys.readouterr().err
+
+
+def test_exec_retries_same_submission_and_cursor(cli, monkeypatch, capsys):
+    from http.client import IncompleteRead
+    calls = []
+    def send(request, **kwargs):
+        calls.append(request)
+        if len(calls) in {1, 3}:
+            raise IncompleteRead(b'partial')
+        if request.method == 'POST':
+            return io.BytesIO(b'{}')
+        return io.BytesIO(b'{"events":[{"event":{"type":"stdout","text":"once"}}],"cursor":1,"state":"exited","exit_code":0}')
+    monkeypatch.setattr(cli, 'urlopen', send)
+    monkeypatch.setattr(cli.time, 'sleep', lambda _: None)
+    assert run(cli, 'cloudpc', 'dev', 'exec', '7', '--command', 'echo once', '--execution-id', 'job') == 0
+    assert calls[0].data == calls[1].data
+    assert calls[2].full_url == calls[3].full_url
+    assert capsys.readouterr().out == 'once'
+
+
+@pytest.mark.parametrize('code', [400, 401, 403, 409, 413])
+def test_upload_permanent_errors_not_retried(cli, monkeypatch, tmp_path, code):
+    file = tmp_path / 'x.pdf'
+    file.write_bytes(b'\xff\x00')
+    calls = []
+    def send(request, **kwargs):
+        calls.append(request)
+        raise HTTPError(request.full_url, code, 'rejected', {}, io.BytesIO(b'rejected'))
+    monkeypatch.setattr(cli, 'urlopen', send)
+    assert run(cli, 'cloudpc', 'files', 'upload', '7', '--file', str(file), '--sandbox-id', '42', '--upload-id', 'a' * 32) == 1
+    assert len(calls) == 1
+
+
+def test_exec_retry_exhaustion_preserves_attach_hint(cli, monkeypatch, capsys):
+    calls = []
+    def send(request, **kwargs):
+        calls.append(request)
+        raise ConnectionResetError('reset')
+    monkeypatch.setattr(cli, 'urlopen', send)
+    monkeypatch.setattr(cli.time, 'sleep', lambda _: None)
+    assert run(cli, 'cloudpc', 'dev', 'exec-attach', '7', 'job', '--after', '8') == 1
+    assert len(calls) == 5
+    assert all('after=8' in request.full_url for request in calls)
+    assert 'exec-attach 7 job --after 8' in capsys.readouterr().err
+
+
+@pytest.mark.parametrize('size', [0, 50 * 1024 * 1024 + 1])
+def test_upload_size_rejected_before_send(cli, transport, tmp_path, size):
+    source = tmp_path / 'x.pdf'
+    with source.open('wb') as file:
+        file.truncate(size)
+    assert run(cli, 'cloudpc', 'files', 'upload', '7', '--file', str(source), '--upload-id', 'a' * 32, '--sandbox-id', '42') == 1
+    assert transport[0] == []
+
+
+def test_upload_manual_retry_requires_both_ids(cli, transport):
+    assert run(cli, 'cloudpc', 'files', 'upload', '7', '--file', 'x.pdf', '--upload-id', 'a' * 32) == 1
+    assert transport[0] == []