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

code/cube3d/render/render_bricks_safe.py

@@ -5,10 +5,62 @@ from pathlib import Path
 import sys
 import os
 import platform
+from typing import List
 
 root_dir = Path(__file__).resolve().parents[2]
 sys.path.append(str(root_dir))
 
+def _resolve_import_ldraw_dir(additional_roots: List[Path] | None = None) -> Path | None:
+    """
+    Attempt to locate the bundled ImportLDraw plugin directory.
+    Returns the directory containing ImportLDraw/__init__.py or None if not found.
+    """
+    script_path = Path(__file__).resolve()
+    code_dir = script_path.parents[2]
+    repo_root = code_dir.parent
+
+    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",
+        repo_root / "ImportLDraw",
+        repo_root / "code" / "ImportLDraw",
+        Path.cwd() / "ImportLDraw",
+        Path.cwd() / "code" / "ImportLDraw",
+    ])
+
+    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
+
 # 根据操作系统自动检测Blender路径
 def _get_blender_path():
     """自动检测Blender路径（支持Mac/Linux）"""
@@ -114,6 +166,40 @@ def render_bricks_safe(
     else:
         print(f"  ⚠️ 警告：LDraw 库目录不存在！")
 
+    import_ldraw_dir = _resolve_import_ldraw_dir()
+    if not import_ldraw_dir:
+        raise FileNotFoundError(
+            "未能找到 ImportLDraw 插件目录。请确保 code/ImportLDraw "
+            "已包含在部署包中，或设置环境变量 IMPORT_LDRAW_DIR 指向插件位置。"
+        )
+
+    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)
+
+    print(f"🔌 ImportLDraw目录: {import_ldraw_dir}")
+    print(f"🔍 ImportLDraw可搜索路径: {extra_sys_paths}")
+
+    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_script = '''
 import bpy
@@ -122,12 +208,36 @@ import os
 import sys
 from pathlib import Path
 import traceback
+import importlib.util
 
 print("=== Blender脚本开始执行 ===")
 
-# 添加ImportLDraw路径
-sys.path.append("{import_ldraw_path}")
-print(f"添加的路径: {{sys.path[-1]}}")
+# 添加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
 
 try:
     print("尝试导入ImportLDraw...")
@@ -138,7 +248,15 @@ try:
 except ImportError as import_error:
     print(f"ImportLDraw导入失败: {{import_error}}")
     traceback.print_exc()
-    sys.exit(1)
+    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)
 
 try:
     plugin_path = Path(ImportLDraw.__file__).parent
@@ -258,7 +376,8 @@ except Exception as e:
     # 写入临时脚本 - 修复布尔值格式化
     with tempfile.NamedTemporaryFile(mode='w', suffix='.py', delete=False) as f:
         script_content = blender_script.format(
-            import_ldraw_path=str(root_dir),
+            import_ldraw_search_paths=repr(extra_sys_paths),
+            import_ldraw_module_dir=repr(str(import_ldraw_dir)),
             ldraw_path=ldraw_lib_path,
             instructions_look_bool=str(instructions_look),  # 直接使用Python布尔值
             reposition_camera_bool=str(reposition_camera),   # 直接使用Python布尔值
@@ -300,7 +419,13 @@ except Exception as e:
         test_cmd = [BLENDER_PATH, '--version']
         print(f"测试Blender: {' '.join(test_cmd)}")
         try:
-            test_result = subprocess.run(test_cmd, capture_output=True, text=True, timeout=10)
+            test_result = subprocess.run(
+                test_cmd,
+                capture_output=True,
+                text=True,
+                timeout=10,
+                env=blender_env
+            )
             print(f"Blender测试返回码: {test_result.returncode}")
             if test_result.stdout:
                 print(f"Blender版本信息: {test_result.stdout.strip()}")
@@ -336,7 +461,8 @@ except Exception as e:
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            timeout=300
+            timeout=300,
+            env=blender_env
         )
 
         # 输出Blender日志
@@ -424,4 +550,4 @@ def main():
         print(f'渲染失败: {e}')
 
 if __name__ == '__main__':
-    main()
+    main()