From 6f334fde731bd5660ef5830b532082905cf02bc1 Mon Sep 17 00:00:00 2001
From: gooker_young <gooker_young@qq.com>
Date: Sat, 27 Jun 2026 00:39:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor(cli/hfdownload):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=B7=A5=E5=85=B7=EF=BC=8C=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?SETENV=E5=92=8Cmodelscope=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  移除本地setenvs函数，改用封装好的SETENV任务
2.  替换hf下载命令为modelscope下载命令
3.  优化参数命名和默认下载目录逻辑
4.  简化任务编排代码
---
 src/pyflowx/cli/hfdownload.py | 88 +++++++++++------------------------
 src/pyflowx/tasks/system.py   |  2 +-
 2 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/src/pyflowx/cli/hfdownload.py b/src/pyflowx/cli/hfdownload.py
index c5ecc70..389c30a 100644
--- a/src/pyflowx/cli/hfdownload.py
+++ b/src/pyflowx/cli/hfdownload.py
@@ -1,82 +1,50 @@
 import argparse
-import os
 from pathlib import Path
 from typing import Literal, get_args
 
 import pyflowx as px
+from pyflowx.tasks.system import SETENV
 
 HFDownloadType = Literal["model", "dataset", "space"]
 
 
-def setenvs():
-    """设置 HuggingFace mirror 环境变量."""
-    os.environ["HF_ENDPOINT"] = "https://hf-mirror.com"
-
-
 def main():
     parser = argparse.ArgumentParser(description="Download a model from HuggingFace.")
-    parser.add_argument("dataset_name", type=str, help="HuggingFace dataset name.")
+    parser.add_argument("name", help="Target name.")
     parser.add_argument(
-        "--type",
-        type=str,
-        nargs="?",
-        default="dataset",
-        choices=get_args(HFDownloadType),
-        help="HuggingFace dataset type.",
+        "--type", "-t", nargs="?", default="model", choices=get_args(HFDownloadType), help="Target type."
     )
-    parser.add_argument("--use-hfd", action="store_true", help="Use HFD tool to download dataset.")
+    parser.add_argument("--dir", default=None, help="Download directory.")
     args = parser.parse_args()
 
-    if not args.dataset_name:
-        parser.error("dataset_name is required")
+    if not args.name:
+        parser.error("name is required")
 
-    dataset_name = args.dataset_name
+    target_name = args.name
 
     # 创建下载目录
-    download_dir = Path.cwd() / dataset_name
+    if args.dir:
+        download_dir = Path(args.dir)
+    else:
+        download_dir = Path.home() / ".models" / target_name.split("/")[-1]
     download_dir.mkdir(parents=True, exist_ok=True)
 
-    if args.use_hfd:
-        graph = px.Graph.from_specs([
-            px.TaskSpec(name="setenvs", fn=setenvs, verbose=True),
-            px.TaskSpec(
-                name="download_hfd",
-                cmd=["wget", "https://hf-mirror.com/hfd/hfd.sh"],
-                depends_on=("setenvs",),
-                verbose=True,
-            ),
-            px.TaskSpec(
-                name="chmod_hfd",
-                cmd=["chmod", "a+x", "hfd.sh"],
-                depends_on=("download_hfd",),
-                verbose=True,
-            ),
-            px.TaskSpec(
-                name="run_hfd",
-                cmd=["./hfd.sh", dataset_name, args.type],
-                depends_on=("chmod_hfd",),
-                verbose=True,
-            ),
-        ])
-    else:
-        graph = px.Graph.from_specs([
-            px.TaskSpec(name="setenvs", fn=setenvs, verbose=True),
-            px.TaskSpec(
-                name="download",
-                cmd=[
-                    "uvx",
-                    "hf",
-                    "download",
-                    "--repo-type",
-                    args.type,
-                    "--force-download",
-                    dataset_name,
-                    "--local-dir",
-                    str(Path.cwd() / dataset_name),
-                ],
-                depends_on=("setenvs",),
-                verbose=True,
-            ),
-        ])
+    graph = px.Graph.from_specs([
+        SETENV("HF_ENDPOINT", "https://hf-mirror.com"),
+        px.TaskSpec(
+            name="download",
+            cmd=[
+                "uvx",
+                "modelscope",
+                "download",
+                f"--{args.type}",
+                target_name,
+                "--local_dir",
+                str(download_dir),
+            ],
+            depends_on=("setenv_hf_endpoint",),
+            verbose=True,
+        ),
+    ])
 
     px.run(graph, strategy="thread", verbose=True)
diff --git a/src/pyflowx/tasks/system.py b/src/pyflowx/tasks/system.py
index f4237ee..11a6a84 100644
--- a/src/pyflowx/tasks/system.py
+++ b/src/pyflowx/tasks/system.py
@@ -28,7 +28,7 @@ def SETENV(name: str, value: str, default: bool = False):
         else:
             os.environ[name] = value
 
-    return px.TaskSpec(f"set_env_{name}", fn=set_env)
+    return px.TaskSpec(f"setenv_{name.lower()}", fn=set_env, verbose=True)
 
 
 def WHICH(cmd: str):