Merge pull request #129 from luk384090-cloud/main

Dev/CLI Refactor

Author: luk384090-cloud

dashscope/cli/fine_tunes.py

@@ -121,7 +121,7 @@ def _dump_logs(job_id: str):
         output = ensure_ok(rsp)
         for line in output["logs"]:
             console.print(line, highlight=False)
-        if output["total"] < LOG_PAGE_SIZE:
+        if len(output["total"]) < LOG_PAGE_SIZE:
             break
         offset += LOG_PAGE_SIZE
 

dashscope/cli/oss.py

@@ -5,6 +5,7 @@
 
 import typer
 
+import dashscope
 from dashscope.utils.oss_utils import OssUtils
 from dashscope.cli.common import console, error, success
 
@@ -56,7 +57,9 @@ def upload(
     if not os.path.exists(file_path):
         error(f"File {file_path} does not exist")
 
-    resolved_key = api_key or os.environ.get("DASHSCOPE_API_KEY")
+    resolved_key = (
+        api_key or dashscope.api_key or os.environ.get("DASHSCOPE_API_KEY")
+    )
     if not resolved_key:
         error(
             "Please set your DashScope API key as environment variable "