[log] add log

Author: agentscope-ai-java

dashscope/cli/deployments.py

@@ -85,11 +85,9 @@ def _wait_for_deployment(
     except Exception as exc:
         logger.debug("wait_for_deployment error", exc_info=exc)
         err_console.print(
-            f"[red]Error:[/red] Failed to check deployment status: {exc}. "
             f"You can get deployment status via: "
             f"[cyan]dashscope deployments get {deployed_model}[/cyan]",
         )
-        raise typer.Exit(1)
 
 
 def _print_deployments(output):

dashscope/finetune/deployments.py

@@ -47,12 +47,12 @@ def call(  # pylint: disable=arguments-renamed  # type: ignore[override]
 
         Args:
             model (str): The model name.
-            capacity (int): The model service capacity.
             version (str, optional): The model version, unnecessary
                 for fine-tuned model. Defaults to None.
             suffix (str, optional): The name suffix of the model deployment,
                 If specified, the final model name will be model_suffix.
                 Defaults to None.
+            capacity (int, optional): The model service capacity.
             plan (str, optional): The deployment plan required by the
                 service: "ptu" (PTU reserved), "mu" (model unit) or
                 "Lora" (LoRA deployment). Defaults to None.

dashscope/finetune/reinforcement/common/utils.py

@@ -520,11 +520,20 @@ def _sync_upload_to_oss(signed_url: str, zip_path: str) -> int:
         file_size = os.path.getsize(zip_path)
         size_mb = file_size / (1024 * 1024)
         if file_size > FC_OSS_FILE_SIZE_WARNING:
-            logger.warning(
-                f"Uploading large file: {zip_path} ({size_mb:.2f}MB) to OSS",
+            max_mb = FC_OSS_FILE_SIZE_WARNING / (1024 * 1024)
+            reason = (
+                f"Package too large: {zip_path} ({size_mb:.2f}MB) "
+                f"exceeds the maximum allowed size of {max_mb:.0f}MB "
+                f"for OSS upload. The upload was not attempted. "
+                f"Reduce the package size (e.g. exclude large files via "
+                f"env var FC_ZIP_EXCLUDE_PATTERNS) or raise the limit via "
+                f"env var FC_OSS_FILE_SIZE_WARNING (current: "
+                f"{FC_OSS_FILE_SIZE_WARNING} bytes)."
             )
+            logger.error(reason)
             raise OSSUploadError(
-                f"Uploading large file: {zip_path} ({size_mb:.2f}MB) to OSS",
+                reason,
+                file_size=file_size,
             )
 
         logger.debug(
@@ -541,11 +550,18 @@ def _sync_upload_to_oss(signed_url: str, zip_path: str) -> int:
 
             if response.status_code != 200:
                 error_msg = response.text
+                logger.error(
+                    f"OSS upload failed | File: {zip_path} "
+                    f"({size_mb:.2f}MB), Status: {response.status_code}, "
+                    f"Response: {error_msg}",
+                )
                 raise OSError(
                     f"OSS upload failed ({response.status_code}): {error_msg}",
                 )
 
             return response.status_code
+    except OSSUploadError:
+        raise
     except Exception as e:
         raise RuntimeErrorWithCode(
             "OSS upload error",

dashscope/finetune/reinforcement/component/data/reward_output.py

@@ -55,6 +55,10 @@ class RewardOutput(BaseModel):
         default=None,
         description="Error details if the reward computation failed.",
     )
+    error_code: Optional[str] = Field(
+        default=None,
+        description="Error code if the reward computation failed.",
+    )
 
     class Config:
         extra = "allow"

dashscope/finetune/reinforcement/component/data/rollout_output.py

@@ -40,6 +40,10 @@ class RolloutOutput(BaseModel):
         default=None,
         description="Error details (when failed).",
     )
+    error_code: Optional[str] = Field(
+        default=None,
+        description="Error code (when failed).",
+    )
 
     class Config:
         extra = "allow"

tests/unit/test_cli_main.py

@@ -756,38 +756,6 @@ def mock_call(**kwargs):
         assert "Create deployment failed: deployment failed" in result.output
         assert "Traceback" not in result.output
 
-    def test_deployments_create_exits_nonzero_when_status_poll_fails(
-        self,
-        monkeypatch,
-    ):
-        def mock_call(**_kwargs):
-            return SimpleNamespace(
-                status_code=200,
-                output={"deployed_model": "deploy-1"},
-            )
-
-        def mock_get(*_args, **_kwargs):
-            raise RuntimeError("network down")
-
-        monkeypatch.setattr(
-            "dashscope.cli.deployments.dashscope.Deployments.call",
-            mock_call,
-        )
-        monkeypatch.setattr(
-            "dashscope.cli.deployments.dashscope.Deployments.get",
-            mock_get,
-        )
-
-        result = CliRunner().invoke(
-            cli_app,
-            ["deployments", "create", "--model", "qwen", "--plan", "ptu"],
-        )
-
-        assert result.exit_code == 1
-        assert "Failed to check deployment status" in result.output
-        assert "deployments get deploy-1" in result.output
-        assert "Traceback" not in result.output
-
     def test_application_response_without_usage_is_supported(
         self,
         monkeypatch,