fix(cli): improve error handling and fix assistant update bug

Author: kevin

dashscope/cli/assistants.py

@@ -271,7 +271,7 @@ def update_assistant(
         description=description,
         instructions=instructions,
         tools=_parse_json_array(tools, "tools"),
-        file_ids=file_ids or [],
+        file_ids=file_ids,
         metadata=_parse_json_object(metadata, "metadata"),
         workspace=workspace,
         top_p=top_p,

dashscope/cli/files.py

@@ -64,15 +64,12 @@ def upload(
     if not os.path.exists(file_path):
         error(f"File {file_path} does not exist")
 
-    try:
-        rsp = dashscope.Files.upload(
-            file_path=file_path,
-            purpose=purpose,
-            description=description,  # type: ignore[arg-type]
-            base_address=base_url,
-        )
-    except Exception as exception:
-        error(str(exception))
+    rsp = dashscope.Files.upload(
+        file_path=file_path,
+        purpose=purpose,
+        description=description,  # type: ignore[arg-type]
+        base_address=base_url,
+    )
     output = ensure_ok(rsp)
     file_id = output["uploaded_files"][0]["file_id"]
     success(f"Upload success, file id: {file_id}")

dashscope/cli/generation.py

@@ -7,6 +7,7 @@
 
 from dashscope.aigc import Generation
 from dashscope.cli.common import (
+    error,
     handle_sdk_error,
     print_failed_message,
 )
@@ -42,10 +43,7 @@ def _build_generation_kwargs(
         try:
             kwargs["messages"] = json.loads(messages)
         except json.JSONDecodeError as exc:
-            typer.echo(
-                "Error: --messages must be a valid JSON string",
-                err=True,
-            )
+            error("--messages must be a valid JSON string")
             raise typer.Exit(1) from exc
 
     # Group simple parameters to reduce branches

tests/unit/test_cli_main.py

@@ -2,6 +2,7 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 
 import os
+import re
 import subprocess
 import sys
 from types import SimpleNamespace
@@ -16,6 +17,12 @@
 from dashscope.common.error import AuthenticationError
 
 
+def strip_ansi_codes(text):
+    """Remove ANSI escape codes from text."""
+    ansi_escape = re.compile(r"\x1b\[[0-9;]*m")
+    return ansi_escape.sub("", text)
+
+
 # pylint: disable=too-many-public-methods
 class TestCliMain:
     def test_main_prints_authentication_error_without_traceback(
@@ -46,7 +53,8 @@ def test_top_level_help_shows_global_api_key(self):
         result = CliRunner().invoke(cli_app, ["--help"])
 
         assert result.exit_code == 0
-        assert "--api-key" in result.output
+        clean_output = strip_ansi_codes(result.output)
+        assert "--api-key" in clean_output
 
     def test_python_module_help_suppresses_urllib3_warning(self):
         result = subprocess.run(
@@ -84,7 +92,8 @@ def test_rl_register_functions_hyphen_alias_help(self):
         )
 
         assert result.exit_code == 0
-        assert "rollout-classpaths" in result.output
+        clean_output = strip_ansi_codes(result.output)
+        assert "rollout-classpaths" in clean_output
 
     def test_rl_test_functions_hyphen_alias_help(self):
         result = CliRunner().invoke(
@@ -93,7 +102,8 @@ def test_rl_test_functions_hyphen_alias_help(self):
         )
 
         assert result.exit_code == 0
-        assert "--input" in result.output
+        clean_output = strip_ansi_codes(result.output)
+        assert "--input" in clean_output
 
     def test_rl_upload_data_hyphen_alias_help(self):
         result = CliRunner().invoke(
@@ -102,7 +112,8 @@ def test_rl_upload_data_hyphen_alias_help(self):
         )
 
         assert result.exit_code == 0
-        assert "training-files" in result.output
+        clean_output = strip_ansi_codes(result.output)
+        assert "training-files" in clean_output
 
     def test_missing_global_api_key_value_does_not_consume_command(
         self,

tests/unit/test_cli_runs.py

@@ -1,13 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) Alibaba, Inc. and its affiliates.
 
+import re
 from types import SimpleNamespace
 
 from typer.testing import CliRunner
 
 from dashscope.cli import runs
 
 
+def strip_ansi_codes(text):
+    """Remove ANSI escape codes from text."""
+    ansi_escape = re.compile(r"\x1b\[[0-9;]*m")
+    return ansi_escape.sub("", text)
+
+
 class TestCliRuns:
     def test_create(self, monkeypatch):
         captured_thread_id = None
@@ -120,8 +127,9 @@ def test_get_requires_thread_id(self):
         result = CliRunner().invoke(runs.app, ["get", "run-1234"])
 
         assert result.exit_code != 0
-        assert "Missing option" in result.output
-        assert "--thread-id" in result.output
+        clean_output = strip_ansi_codes(result.output)
+        assert "Missing option" in clean_output
+        assert "--thread-id" in clean_output
 
     def test_get(self, monkeypatch):
         captured_run_id = None