Upload code/cube3d/render/render_bricks_safe.py with huggingface_hub

code/cube3d/render/render_bricks_safe.py

@@ -63,61 +63,43 @@ def _download_import_ldraw(target_root: Path) -> Path | None:
 
     return None
 
-def _resolve_import_ldraw_dir(additional_roots: List[Path] | None = None) -> Path | None:
+def _resolve_import_ldraw_dir() -> Path:
     """
-    Attempt to locate the bundled ImportLDraw plugin directory.
-    Returns the directory containing ImportLDraw/__init__.py or None if not found.
+    Locate ImportLDraw plugin directory (simplified for Docker deployment).
+
+    Checks only 3 deterministic locations:
+    1. Environment variable IMPORT_LDRAW_DIR (for local dev override)
+    2. {repo}/code/ImportLDraw (Docker deployment path)
+    3. {repo}/code/ImportLDraw_auto (auto-downloaded fallback)
+
+    Raises FileNotFoundError if not found in any location.
     """
-    script_path = Path(__file__).resolve()
-    code_dir = script_path.parents[2]
-    repo_root = code_dir.parent
+    code_dir = Path(__file__).resolve().parents[2]
 
+    # 1. Environment variable override (local development)
     env_override = os.environ.get("IMPORT_LDRAW_DIR")
-    candidate_dirs: List[Path] = []
-
     if env_override:
-        candidate_dirs.append(Path(env_override).expanduser())
-
-    candidate_dirs.extend([
-        code_dir / "ImportLDraw",
-        code_dir / "ImportLDraw_auto",
-        repo_root / "ImportLDraw",
-        repo_root / "ImportLDraw_auto",
-        repo_root / "code" / "ImportLDraw",
-        repo_root / "code" / "ImportLDraw_auto",
-        Path.cwd() / "ImportLDraw",
-        Path.cwd() / "ImportLDraw_auto",
-        Path.cwd() / "code" / "ImportLDraw",
-        Path.cwd() / "code" / "ImportLDraw_auto",
-    ])
-
-    if additional_roots:
-        for root in additional_roots:
-            candidate_dirs.append(root / "ImportLDraw")
-
-    seen: List[Path] = []
-    for candidate in candidate_dirs:
-        if not candidate:
-            continue
-        try:
-            candidate = candidate.resolve()
-        except FileNotFoundError:
-            candidate = candidate.expanduser()
-        if candidate in seen:
-            continue
-        seen.append(candidate)
-        if (candidate / "__init__.py").exists():
-            return candidate
-
-    search_base = repo_root if repo_root.exists() else code_dir
-    try:
-        for sub in search_base.rglob("ImportLDraw"):
-            if (sub / "__init__.py").exists():
-                return sub
-    except Exception:
-        pass
-
-    return None
+        path = Path(env_override).expanduser()
+        if (path / "__init__.py").exists():
+            print(f"✓ Using IMPORT_LDRAW_DIR: {path}")
+            return path
+        else:
+            print(f"⚠️  IMPORT_LDRAW_DIR set but invalid: {path}")
+
+    # 2. Docker deployment path / Repository bundled path
+    for subdir in ["ImportLDraw", "ImportLDraw_auto"]:
+        path = code_dir / subdir
+        if (path / "__init__.py").exists():
+            print(f"✓ Found ImportLDraw at: {path}")
+            return path
+
+    # Not found - fail fast with clear error
+    raise FileNotFoundError(
+        f"ImportLDraw not found in:\n"
+        f"  - {code_dir / 'ImportLDraw'}\n"
+        f"  - {code_dir / 'ImportLDraw_auto'}\n"
+        f"Set IMPORT_LDRAW_DIR environment variable or ensure Docker build succeeded."
+    )
 
 # 根据操作系统自动检测Blender路径
 def _get_blender_path():
@@ -238,30 +220,17 @@ def render_bricks_safe(
 
     import_ldraw_dir = import_ldraw_dir.resolve()
     import_ldraw_parent = import_ldraw_dir.parent
-    extra_sys_paths: List[str] = []
-    for candidate in [
-        import_ldraw_parent,
-        root_dir,
-        root_dir.parent,
-        Path.cwd(),
-        Path.cwd() / "code"
-    ]:
-        if not candidate:
-            continue
-        candidate_str = str(candidate.resolve())
-        if os.path.exists(candidate_str) and candidate_str not in extra_sys_paths:
-            extra_sys_paths.append(candidate_str)
+
+    # Simplified: Single deterministic path for sys.path
+    import_ldraw_path = str(import_ldraw_parent)
 
     print(f"🔌 ImportLDraw目录: {import_ldraw_dir}")
-    print(f"🔍 ImportLDraw可搜索路径: {extra_sys_paths}")
+    print(f"📍 ImportLDraw父目录: {import_ldraw_path}")
 
+    # Set PYTHONPATH for Blender (will work with --python-use-system-env flag)
     blender_env = os.environ.copy()
-    pythonpath_entries = extra_sys_paths.copy()
-    existing_pythonpath = blender_env.get("PYTHONPATH")
-    if existing_pythonpath:
-        pythonpath_entries.append(existing_pythonpath)
-    blender_env["PYTHONPATH"] = os.pathsep.join(pythonpath_entries)
-    print(f"PYTHONPATH 将被设置为: {blender_env['PYTHONPATH']}")
+    blender_env["PYTHONPATH"] = import_ldraw_path
+    print(f"✓ PYTHONPATH 设置为: {import_ldraw_path}")
 
     # 修复布尔值格式化问题
     blender_script = '''
@@ -271,55 +240,24 @@ import os
 import sys
 from pathlib import Path
 import traceback
-import importlib.util
 
 print("=== Blender脚本开始执行 ===")
 
-# 添加ImportLDraw候选路径
-IMPORT_LDRAW_SEARCH_PATHS = {import_ldraw_search_paths}
-IMPORT_LDRAW_MODULE_DIR = Path({import_ldraw_module_dir})
-
-print(f"预设ImportLDraw搜索路径: {{IMPORT_LDRAW_SEARCH_PATHS}}")
-print(f"ImportLDraw模块目录: {{IMPORT_LDRAW_MODULE_DIR}}")
-
-for candidate in IMPORT_LDRAW_SEARCH_PATHS:
-    abs_candidate = os.path.abspath(candidate)
-    if os.path.exists(abs_candidate) and abs_candidate not in sys.path:
-        sys.path.insert(0, abs_candidate)
-        print(f"已注入sys.path: {{abs_candidate}}")
-
-def _manual_import_importldraw(module_dir: Path):
-    init_file = module_dir / "__init__.py"
-    if not init_file.exists():
-        raise FileNotFoundError(f"ImportLDraw __init__.py 不存在: {{init_file}}")
-    spec = importlib.util.spec_from_file_location(
-        "ImportLDraw",
-        str(init_file),
-        submodule_search_locations=[str(module_dir)]
-    )
-    module = importlib.util.module_from_spec(spec)
-    sys.modules["ImportLDraw"] = module
-    spec.loader.exec_module(module)
-    return module
+# Simplified: Single deterministic sys.path (demo.zip style)
+sys.path.append("{import_ldraw_path}")
+print(f"✓ Added to sys.path: {{sys.path[-1]}}")
 
+# Import ImportLDraw (fail fast if not found)
 try:
-    print("尝试导入ImportLDraw...")
+    print("Importing ImportLDraw...")
     import ImportLDraw
     from ImportLDraw.loadldraw.loadldraw import Options, Configure, loadFromFile, FileSystem
-    print("ImportLDraw导入成功")
-    print(f"ImportLDraw文件位置: {{ImportLDraw.__file__}}")
+    print(f"✓ ImportLDraw loaded from: {{ImportLDraw.__file__}}")
 except ImportError as import_error:
-    print(f"ImportLDraw导入失败: {{import_error}}")
+    print(f"❌ ImportLDraw import failed: {{import_error}}")
+    print(f"   sys.path: {{sys.path}}")
     traceback.print_exc()
-    try:
-        print("尝试手动加载 ImportLDraw...")
-        ImportLDraw = _manual_import_importldraw(IMPORT_LDRAW_MODULE_DIR)
-        from ImportLDraw.loadldraw.loadldraw import Options, Configure, loadFromFile, FileSystem
-        print("✅ 手动加载 ImportLDraw 成功")
-    except Exception as manual_error:
-        print(f"❌ 手动加载 ImportLDraw 失败: {{manual_error}}")
-        traceback.print_exc()
-        sys.exit(1)
+    sys.exit(1)
 
 try:
     plugin_path = Path(ImportLDraw.__file__).parent
@@ -441,12 +379,11 @@ except Exception as e:
     # 写入临时脚本 - 修复布尔值格式化
     with tempfile.NamedTemporaryFile(mode='w', suffix='.py', delete=False) as f:
         script_content = blender_script.format(
-            import_ldraw_search_paths=repr(extra_sys_paths),
-            import_ldraw_module_dir=repr(str(import_ldraw_dir)),
+            import_ldraw_path=import_ldraw_path,  # Simplified: single path
             ldraw_path=ldraw_lib_path,
-            instructions_look_bool=str(instructions_look),  # 直接使用Python布尔值
-            reposition_camera_bool=str(reposition_camera),   # 直接使用Python布尔值
-            square_image_bool=str(square_image),             # 直接使用Python布尔值
+            instructions_look_bool=str(instructions_look),
+            reposition_camera_bool=str(reposition_camera),
+            square_image_bool=str(square_image),
             fov=fov,
             img_resolution=img_resolution,
             input_file=in_file,
@@ -507,12 +444,15 @@ except Exception as e:
                 '--server-args', '-screen 0 1024x768x24 -ac +extension GLX +extension RENDER +render -noreset',
                 BLENDER_PATH,
                 '--background',
+                '--python-use-system-env',  # CRITICAL: Enable PYTHONPATH support
                 '--python', script_path
             ]
             print("✅ 使用 xvfb-run 进行无头渲染（GLX 扩展已启用）")
         else:
             cmd = [
-                BLENDER_PATH, '--background',
+                BLENDER_PATH,
+                '--background',
+                '--python-use-system-env',  # CRITICAL: Enable PYTHONPATH support
                 '--python', script_path
             ]
             print("⚠️  直接运行 Blender（无 xvfb）")