adam-community 1.0.26__tar.gz → 1.0.28__tar.gz

{adam_community-1.0.26 → adam_community-1.0.28}/PKG-INFO

@@ -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.28/adam_community/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.0.28"

{adam_community-1.0.26 → adam_community-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 → adam_community-1.0.28}/adam_community.egg-info/PKG-INFO

@@ -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 → adam_community-1.0.28}/test/test_sif_upload.py

@@ -330,7 +330,7 @@ class TestGenerateDockerfile(unittest.TestCase):
         with open(dockerfile_path, 'r') as f:
             content = f.read()
 
-        self.assertIn("FROM alpine", content)
+        self.assertIn("FROM docker.m.daocloud.io/library/alpine", content)
         self.assertIn("COPY . /sif", content)
 
 
@@ -422,7 +422,7 @@ class TestIntegration(unittest.TestCase):
         # 7. 验证 Dockerfile 内容
         with open(dockerfile_path, 'r') as f:
             content = f.read()
-        self.assertIn("FROM alpine", content)
+        self.assertIn("FROM docker.m.daocloud.io/library/alpine", content)
         self.assertIn("COPY . /sif", content)
 
     def test_chunk_size_boundaries(self):

adam_community-1.0.26/adam_community/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.26"