Merge pull request dashscope#161 from dashscope/dev/sdk-cli-1

fix(cli): Fix CLI compatibility issue with SDK response objects

Author: luk384090-cloud

dashscope/cli/deployments.py

@@ -162,7 +162,11 @@ def create(
     if output is None:
         error("Deployment creation returned empty response")
 
-    deployed_model = output.get("deployed_model")
+    deployed_model = (
+        output.get("deployed_model")
+        if isinstance(output, dict)
+        else getattr(output, "deployed_model", None)
+    )
     if not deployed_model:
         error(
             "Deployment creation succeeded but missing deployed_model "

dashscope/cli/files.py

@@ -74,7 +74,11 @@ def upload(
     output = ensure_ok(rsp)
 
     # Validate uploaded_files exists and is not empty
-    uploaded_files = output.get("uploaded_files", [])
+    uploaded_files = (
+        output.get("uploaded_files", [])
+        if isinstance(output, dict)
+        else getattr(output, "uploaded_files", [])
+    )
     if not uploaded_files:
         error("Upload succeeded but no file_id returned in response")
 

dashscope/cli/fine_tunes.py

@@ -115,7 +115,11 @@ def _stream_events(job_id: str):
         )
         return
 
-    status = rsp.output.get("status")
+    status = (
+        rsp.output.get("status")
+        if isinstance(rsp.output, dict)
+        else getattr(rsp.output, "status", None)
+    )
     if status in (
         TaskStatus.FAILED,
         TaskStatus.CANCELED,
@@ -150,7 +154,11 @@ def _dump_logs(job_id: str):
             line=LOG_PAGE_SIZE,
         )
         output = ensure_ok(rsp)
-        logs = output.get("logs", [])
+        logs = (
+            output.get("logs", [])
+            if isinstance(output, dict)
+            else getattr(output, "logs", [])
+        )
         if not logs:
             break
         for line in logs:
@@ -244,7 +252,7 @@ def create(
     if output is None:
         error("Fine-tune creation returned empty response")
 
-    job_id = output.get("job_id")
+    job_id = getattr(output, "job_id", None)
     if not job_id:
         error(
             "Fine-tune creation succeeded but missing job_id in response. "

tests/integration/test_large_utf8_payload.py

@@ -70,15 +70,15 @@ def _print_result(resp, elapsed):  # pylint: disable=unused-argument
         return False
 
 
-def test_sync(test_messages):
+def test_sync(messages):  # pylint: disable=redefined-outer-name
     print("\n" + "=" * 60)
     print("SYNC TEST")
     print("=" * 60)
     start = time.time()
     try:
         resp = Generation.call(
             model=MODEL,
-            messages=test_messages,
+            messages=messages,
             max_tokens=MAX_OUTPUT_TOKENS,
             result_format="message",
         )
@@ -94,15 +94,15 @@ def test_sync(test_messages):
     return _print_result(resp, elapsed)
 
 
-async def test_async(test_messages):
+async def test_async(messages):  # pylint: disable=redefined-outer-name
     print("\n" + "=" * 60)
     print("ASYNC TEST")
     print("=" * 60)
     start = time.time()
     try:
         resp = await AioGeneration.call(
             model=MODEL,
-            messages=test_messages,
+            messages=messages,
             max_tokens=MAX_OUTPUT_TOKENS,
             result_format="message",
         )
@@ -118,7 +118,7 @@ async def test_async(test_messages):
     return _print_result(resp, elapsed)
 
 
-def test_stream(test_messages):
+def test_stream(messages):  # pylint: disable=redefined-outer-name
     print("\n" + "=" * 60)
     print("STREAM TEST")
     print("=" * 60)
@@ -127,7 +127,7 @@ def test_stream(test_messages):
     try:
         responses = Generation.call(
             model=MODEL,
-            messages=test_messages,
+            messages=messages,
             max_tokens=MAX_OUTPUT_TOKENS,
             result_format="message",
             stream=True,
@@ -160,10 +160,10 @@ def test_stream(test_messages):
     return True
 
 
-def test_websocket(test_messages):
+def test_websocket(messages):  # pylint: disable=redefined-outer-name
     # WebSocket has a smaller message size limit than HTTP;
     # use a subset that still contains non-ASCII content.
-    ws_messages = test_messages[:5]
+    ws_messages = messages[:5]
     print("\n" + "=" * 60)
     print(
         f"WEBSOCKET TEST ({len(ws_messages)}/{len(messages)} messages)",