Refactor logging for asset thread management, enhance Blender binary path retrieval, and improve target format handling in GLTF generation

Author: Tweekazoid

.vscode/launch.json

@@ -19,7 +19,7 @@
             "args": [
                 "check",
                 "--exclude", "scripts,tests,_debug,_bck,*.tmp,__pycache__,build,.venv,*.pyi,pic_lib.py",
-                ".",
+                "."
             ],
             "console": "integratedTerminal",
             "cwd": "${workspaceFolder}"

blenderkit_server_utils/concurrency.py

@@ -81,12 +81,14 @@ def _thread_target(
                 ) from e
 
         try:
-            logger.debug("Starting thread for asset %s", asset)
             asset_keys_snapshot = (
                 asset.get("id", ""),
                 asset.get("assetType", ""),
                 asset.get("name", "N/A"),
             )
+
+            logger.debug("Starting thread for asset %s", asset_keys_snapshot)
+
             t = threading.Thread(
                 target=_thread_target,
                 args=(tuple(call_args), static_kwargs, asset_keys_snapshot),

blenderkit_server_utils/send_to_bg.py

@@ -206,6 +206,7 @@ def _run_blender(command: list[str], verbosity_level: int) -> int:
     """Run Blender with the given command and stream output per verbosity."""
     stdout_val, stderr_val = subprocess.PIPE, subprocess.PIPE
     logger.info("Running Blender command: %s", command)
+    logger.debug("Raw command: %s", " ".join(command))
     with subprocess.Popen(command, stdout=stdout_val, stderr=stderr_val, creationflags=get_process_flags()) as proc:
         if verbosity_level == VERBOSITY_ALL:
             stdout_thread = threading.Thread(
@@ -333,6 +334,7 @@ def send_to_bg(  # noqa: PLR0913
         Process return code from Blender.
     """
     binary_path = _select_binary_path(binary_path, asset_data, asset_file_path=asset_file_path, binary_type=binary_type)
+
     temp_folder, own_temp_folder = _ensure_temp_folder(temp_folder)
     payload = DataPayload(
         file_path=asset_file_path,

blenderkit_server_utils/utils.py

@@ -486,14 +486,25 @@ def get_all_blender_versions(blenders_path: str | None) -> list[tuple[float, str
             continue
         try:
             version = version_to_float(fn)
+            # add also full executable in in the directory
+            if sys.platform == "win32":
+                exe_path = os.path.join(blenders_path, fn, "blender.exe")
+            elif sys.platform == "darwin":
+                exe_path = os.path.join(blenders_path, fn, "blender.app", "Contents", "MacOS", "blender")
+            else:  # assume linux
+                exe_path = os.path.join(blenders_path, fn, "blender")
+
+            if not os.path.exists(exe_path):
+                continue
+
             blenders.append((version, fn))
         except ValueError:
             continue
     return blenders
 
 
-def get_latest_blender_path(blenders_path: str | None) -> str | None:
-    """Get the path to the latest Blender version in the specified directory.
+def get_latest_blender_binary_path(blenders_path: str | None) -> str | None:
+    """Get the path to the latest Blender binary version in the specified directory.
 
     Args:
         blenders_path: Directory containing Blender installations. If None, uses config.BLENDERS_PATH.
@@ -513,8 +524,22 @@ def get_latest_blender_path(blenders_path: str | None) -> str | None:
         logger.error("No Blender versions found in %s", blenders_path)
         return None
 
+    latest_blender = all_blenders[0][1]
+    # Handle different OS paths
+    if sys.platform == "darwin":  # macOS
+        binary = os.path.join(
+            blenders_path,
+            latest_blender,
+            "Contents",
+            "MacOS",
+            "Blender",
+        )
+    else:  # Windows and Linux
+        ext = ".exe" if sys.platform == "win32" else ""
+        binary = os.path.join(blenders_path, latest_blender, f"blender{ext}")
+
     # Return the path to the latest Blender version
-    out = os.path.join(blenders_path, all_blenders[0][1])
+    out = binary if os.path.exists(binary) else None
     return out
 
 

generate_gltf.py

@@ -31,35 +31,43 @@
 # get latest version from there
 if not config.BLENDER_PATH and config.BLENDERS_PATH:
     logger.error("BLENDER_PATH not set, checking BLENDERS_PATH, result may be tainted.")
-    latest_version = utils.get_latest_blender_path(config.BLENDERS_PATH)
+    latest_version = utils.get_latest_blender_binary_path(config.BLENDERS_PATH)
     if latest_version:
         config.BLENDER_PATH = latest_version
 
 if not config.BLENDER_PATH:
     logger.error("At least one of BLENDER_PATH & BLENDERS_PATH must be set.")
     sys.exit(1)
 
+# Constants
+AVAILABLE_TARGET_FORMATS = ["gltf", "gltf_godot"]
+DEFAULT_TARGET_FORMAT: str = "gltf_godot"
 
+# argparse for target format
 args = argparse.ArgumentParser()
-args.add_argument("--target_format", type=str, default="gltf_godot", help="Target export format")
+args.add_argument(
+    "--target_format",
+    type=str,
+    choices=AVAILABLE_TARGET_FORMATS,
+    default=DEFAULT_TARGET_FORMAT,
+    help="Target export format",
+)
 
 
-# Constants
+# Determine target format from args, env var, or default
 TARGET_FORMAT = args.parse_args().target_format
 if TARGET_FORMAT:
     logger.info("Using target format from args: %s", TARGET_FORMAT)
 if not TARGET_FORMAT:
     # use env var or default
     TARGET_FORMAT = os.getenv("TARGET_FORMAT", None)
-    if not TARGET_FORMAT:
-        logger.info("No target format specified, defaulting to 'gltf_godot'")
 
 if not TARGET_FORMAT:
-    logger.error("No target format specified, defaulting to 'gltf_godot'")
-    TARGET_FORMAT = "gltf_godot"
+    logger.error("No target format specified, defaulting to %s", DEFAULT_TARGET_FORMAT)
+    TARGET_FORMAT = DEFAULT_TARGET_FORMAT
 
 # target mode can be only one of these 2 now
-if TARGET_FORMAT not in ["gltf", "gltf_godot"]:
+if TARGET_FORMAT not in AVAILABLE_TARGET_FORMATS:
     logger.error("Invalid target format specified: %s", TARGET_FORMAT)
     sys.exit(1)
 
@@ -87,7 +95,7 @@ def generate_gltf(asset_data: dict[str, Any], api_key: str, binary_path: str, ta
         asset_data: Asset metadata returned from the search API.
         api_key: API key used for authenticated operations.
         binary_path: Absolute path to the Blender binary used for background operations.
-        target_format: The target export format, e.g., 'gltf_godot'.
+        target_format: The target export format, e.g., '{DEFAULT_TARGET_FORMAT=gltf_godot}'.
 
     Returns:
         True when the GLTF was generated and uploaded successfully; False otherwise.
@@ -144,9 +152,10 @@ def generate_gltf(asset_data: dict[str, Any], api_key: str, binary_path: str, ta
 
         if SKIP_UPDATE:
             logger.info("SKIP_UPDATE is set, not patching the asset.")
-            opened = utils.open_folder(os.path.dirname(files[0]["path"]))
+            logger.debug("Generated files: %s", files)
+            opened = utils.open_folder(os.path.dirname(files[0]["file_path"]))
             if not opened:
-                logger.error("Failed to open folder %s", os.path.dirname(files[0]["path"]))
+                logger.error("Failed to open folder %s", os.path.dirname(files[0]["file_path"]))
                 utils.cleanup_temp(temp_folder)
 
             return False

pyproject.toml

@@ -61,6 +61,7 @@ target-version = "py311"
 line-length = 120
 include = ["pyproject.toml",
     "**/*.py",
+    "*.py"
     ]
 exclude = [
     "_debug/**",