adam-community 1.0.26__py3-none-any.whl → 1.0.28__py3-none-any.whl

adam_community/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.26"
+__version__ = "1.0.28"

adam_community/cli/sif_build.py

@@ -270,7 +270,8 @@ def generateDockerfile(work_dir: Path) -> Path:
     """
     dockerfile_path = work_dir / "Dockerfile"
 
-    dockerfile_content = """FROM alpine
+    # 使用 DaoCloud 镜像加速，解决国内网络访问 Docker Hub 的问题
+    dockerfile_content = """FROM docker.m.daocloud.io/library/alpine
 COPY . /sif
 """
 
@@ -409,18 +410,11 @@ def sif():
 @click.argument('image_url')
 @click.option('--username', help='Docker 仓库用户名')
 @click.option('--password', help='Docker 仓库密码')
-@click.option('--chunk-size', help='覆盖自适应计算的切片大小（如 100M, 500M）')
 @click.option('--keep-temp', is_flag=True, help='保留临时文件')
-def upload(sif_file, image_url, username, password, chunk_size, keep_temp):
-    """将 SIF 文件切片并构建 Docker 镜像推送到仓库
+def upload(sif_file, image_url, username, password, keep_temp):
+    """将 SIF 文件打包为 Docker 镜像并推送到仓库
 
-    切片策略：
-    - 文件 < 500MB：不切片，直接使用原文件
-    - 文件 500MB-2GB：切片大小 100MB
-    - 文件 2GB-10GB：切片大小 500MB
-    - 文件 > 10GB：切片大小 1GB
-
-    可通过 --chunk-size 参数覆盖自适应策略
+    直接使用完整的 SIF 文件，不进行切片，避免合并问题。
 
     示例:
         adam-cli sif upload ./xxx.sif xxx.cn-hangzhou.cr.aliyuncs.com/openscore/openscore-core:1.0.0
@@ -443,7 +437,7 @@ def upload(sif_file, image_url, username, password, chunk_size, keep_temp):
 
     try:
         # ===== 步骤 1: 验证环境 =====
-        console.print("\n[bold blue]📦 步骤 1/5: 验证环境[/bold blue]")
+        console.print("\n[bold blue]📦 步骤 1/4: 验证环境[/bold blue]")
 
         # 验证 SIF 文件
         valid, error_msg = validateSifFile(sif_path)
@@ -474,51 +468,24 @@ def upload(sif_file, image_url, username, password, chunk_size, keep_temp):
                 border_style="red"
             ))
             sys.exit(1)
-        console.print("   ✓ split 命令可用")
         console.print("   ✓ Docker 已安装并运行")
 
         # ===== 步骤 2: 创建工作目录 =====
-        console.print("\n[bold blue]📦 步骤 2/5: 创建工作目录[/bold blue]")
+        console.print("\n[bold blue]📦 步骤 2/4: 创建工作目录[/bold blue]")
         work_dir = createWorkDir(sif_path)
         console.print(f"   ✓ 工作目录: {work_dir}")
 
-        # ===== 步骤 3: 切片 SIF 文件 =====
-        console.print("\n[bold blue]📦 步骤 3/5: 切片 SIF 文件[/bold blue]")
-
-        # 计算切片大小
-        if chunk_size:
-            actual_chunk_size = chunk_size
-            console.print(f"   切片策略: 自定义 ({chunk_size})")
-        else:
-            actual_chunk_size = calculateOptimalChunkSize(file_size)
-            if actual_chunk_size:
-                console.print(f"   切片策略: 自适应 ({actual_chunk_size})")
-            else:
-                console.print(f"   切片策略: 不切片 (文件 < 500MB)")
+        # ===== 步骤 3: 复制 SIF 文件 =====
+        console.print("\n[bold blue]📦 步骤 3/4: 复制 SIF 文件[/bold blue]")
 
+        # 直接复制完整的 SIF 文件，不进行切片
+        dest_file = work_dir / sif_path.name
+        shutil.copy2(sif_path, dest_file)
+        console.print(f"   ✓ SIF 文件已复制: {dest_file.name}")
         console.print(f"   文件大小: {file_size_mb:.2f} MB")
 
-        # 执行切片
-        try:
-            chunks = splitSifFile(sif_path, actual_chunk_size, work_dir)
-            console.print(f"   ✓ 切片完成: {len(chunks)} 个文件")
-
-            # 显示切片详情
-            console.print(f"\n   📄 切片详情:")
-            for chunk in chunks:
-                chunk_size_mb = chunk.stat().st_size / (1024 * 1024)
-                console.print(f"      - {chunk.name} ({chunk_size_mb:.2f} MB)")
-        except subprocess.CalledProcessError as e:
-            console.print(Panel.fit(
-                f"[bold red]❌ SIF 文件切片失败[/bold red]\n"
-                f"错误: {e.stderr}",
-                border_style="red"
-            ))
-            cleanupTempFiles(work_dir, keep_temp, console)
-            sys.exit(1)
-
         # ===== 步骤 4: 生成 Dockerfile =====
-        console.print("\n[bold blue]📦 步骤 4/5: 生成 Dockerfile[/bold blue]")
+        console.print("\n[bold blue]📦 步骤 4/4: 生成 Dockerfile[/bold blue]")
         dockerfile_path = generateDockerfile(work_dir)
         console.print(f"   ✓ Dockerfile 已生成")
 
@@ -553,8 +520,7 @@ def upload(sif_file, image_url, username, password, chunk_size, keep_temp):
         console.print(Panel.fit(
             f"[bold green]✅ 构建成功！[/bold green]\n"
             f"镜像: {image_url}\n"
-            f"大小: {file_size_mb:.2f} MB\n"
-            f"切片数: {len(chunks)}",
+            f"大小: {file_size_mb:.2f} MB",
             border_style="green"
         ))
 

{adam_community-1.0.26.dist-info → adam_community-1.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adam_community
-Version: 1.0.26
+Version: 1.0.28
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community

{adam_community-1.0.26.dist-info → adam_community-1.0.28.dist-info}/RECORD

@@ -1,5 +1,5 @@
 adam_community/__init__.py,sha256=vAmF9VQR6D4peppH0hnrHDmZK5cFeFPh11GIsTKUXhE,429
-adam_community/__version__.py,sha256=qsWFNiLm8PRshbacOTrlIH_bB-tODfzJKwdZTTLVp20,23
+adam_community/__version__.py,sha256=pC0eKGXF1PH-qw7ZFRVVeFacCzuUE-x6jPc3T4w6jNc,23
 adam_community/tool.py,sha256=F6jxRU3urqTfgjLIZSW-hVWyj0FpNwvY65jOODXI19w,4954
 adam_community/util.py,sha256=SDXnWLHLfJxEJ5WBnwNq_FeHNwXxGK_F36dpI_hVkNc,17766
 adam_community/cli/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -7,7 +7,7 @@ adam_community/cli/build.py,sha256=fCteEXjtU2ZsXXUWa-j61gh_JVU-6xSAH_LpOP5swFc,1
 adam_community/cli/cli.py,sha256=UMJo6olpWF4D99_xYZ6n8ztdcVUFf8n48Lroy568G8g,2883
 adam_community/cli/init.py,sha256=JiRjUkYVnha6Oz-eQ9BgB0nEN6y-tkrNXfy3s342_74,9717
 adam_community/cli/parser.py,sha256=LWYVW69z4ICFXgvD5Vtcy1P-rEUxV_Rs4X96n34i3gE,17732
-adam_community/cli/sif_build.py,sha256=_UbXhkwTAZZqVgiThGvXnN3YzzhOGGr6BCPvrSF4RLY,17713
+adam_community/cli/sif_build.py,sha256=dGhVwdxAWHQZveItNRpcdHTw-w1kg2rgBYgVH4ipVQ8,16413
 adam_community/cli/updater.py,sha256=zN521c-G20MKz63wm7h16quBxiEZp4vQ6AbyV-IqtXk,6304
 adam_community/cli/templates/Makefile.j2,sha256=arpo9AzOZTmjxIYiya9S_G_ldHYVVvf4cVOxNooQeGs,113
 adam_community/cli/templates/README_agent.md.j2,sha256=lbhaEPZrgbCfUG-T7GItkgfIV9h1rqxyfRQuGhcdOqU,8901
@@ -26,8 +26,8 @@ adam_community/cli/templates/long_description.md.j2,sha256=Rj6hcuNzEL0Sp17GQVCRJ
 adam_community/cli/templates/long_description_en.md.j2,sha256=xSbahwGarXlWopZqHw7lrcv1dQuvwj2ChhZv5pJmUy4,1725
 adam_community/cli/templates/rag_python.py.j2,sha256=YJL7-WIx-Dumt7lHuUGxl3Rbaw0kpkh8hpcCJ5lz9lA,2494
 adam_community/cli/templates/toolbox_python.py.j2,sha256=EOnmsJUvQRrcO7K7c88kI42gMmcM0Z4ab46qwOJXbH8,4192
-adam_community-1.0.26.dist-info/METADATA,sha256=QNfIfmrN4SG3vRdg5RbDzJUIE0H7HUfWFNvNhn_aPsM,3628
-adam_community-1.0.26.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-adam_community-1.0.26.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
-adam_community-1.0.26.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
-adam_community-1.0.26.dist-info/RECORD,,
+adam_community-1.0.28.dist-info/METADATA,sha256=pCes8Oix7qsB1Y_aBOWD9855DjLGW7GlDHgbClDVZF4,3628
+adam_community-1.0.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+adam_community-1.0.28.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
+adam_community-1.0.28.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
+adam_community-1.0.28.dist-info/RECORD,,