dgenerate-ultralytics-headless 8.3.232__tar.gz → 8.3.234__tar.gz

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.232
+Version: 8.3.234
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -50,7 +50,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: coverage[toml]; extra == "dev"
-Requires-Dist: zensical>=0.0.9; extra == "dev"
+Requires-Dist: zensical>=0.0.9; python_version >= "3.10" and extra == "dev"
 Requires-Dist: mkdocs-ultralytics-plugin>=0.2.3; extra == "dev"
 Requires-Dist: minijinja>=2.0.0; extra == "dev"
 Provides-Extra: export

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.232
+Version: 8.3.234
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -50,7 +50,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: coverage[toml]; extra == "dev"
-Requires-Dist: zensical>=0.0.9; extra == "dev"
+Requires-Dist: zensical>=0.0.9; python_version >= "3.10" and extra == "dev"
 Requires-Dist: mkdocs-ultralytics-plugin>=0.2.3; extra == "dev"
 Requires-Dist: minijinja>=2.0.0; extra == "dev"
 Provides-Extra: export

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/dgenerate_ultralytics_headless.egg-info/requires.txt

@@ -19,10 +19,12 @@ ipython
 pytest
 pytest-cov
 coverage[toml]
-zensical>=0.0.9
 mkdocs-ultralytics-plugin>=0.2.3
 minijinja>=2.0.0
 
+[dev:python_version >= "3.10"]
+zensical>=0.0.9
+
 [export]
 numpy<2.0.0
 openvino>=2024.0.0

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/pyproject.toml

@@ -83,7 +83,7 @@ dev = [
     "pytest",
     "pytest-cov",
     "coverage[toml]",
-    "zensical>=0.0.9",
+    "zensical>=0.0.9; python_version >= '3.10'",
     "mkdocs-ultralytics-plugin>=0.2.3", # for meta descriptions and images, dates and authors
     "minijinja>=2.0.0", # render docs macros without mkdocs-macros-plugin
 ]

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "8.3.232"
+__version__ = "8.3.234"
 
 import importlib
 import os

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/data/augment.py

@@ -1946,7 +1946,7 @@ class Albumentations:
                 new = self.transform(image=im, bboxes=bboxes, class_labels=cls)  # transformed
                 if len(new["class_labels"]) > 0:  # skip update if no bbox in new im
                     labels["img"] = new["image"]
-                    labels["cls"] = np.array(new["class_labels"])
+                    labels["cls"] = np.array(new["class_labels"]).reshape(-1, 1)
                     bboxes = np.array(new["bboxes"], dtype=np.float32)
                 labels["instances"].update(bboxes=bboxes)
         else:

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/engine/exporter.py

@@ -84,7 +84,11 @@ from ultralytics.utils import (
     ARM64,
     DEFAULT_CFG,
     IS_COLAB,
+    IS_DEBIAN_BOOKWORM,
+    IS_DEBIAN_TRIXIE,
     IS_JETSON,
+    IS_RASPBERRYPI,
+    IS_UBUNTU,
     LINUX,
     LOGGER,
     MACOS,
@@ -1193,8 +1197,16 @@ class Exporter:
             java_version = int(version_match.group(1)) if version_match else 0
             assert java_version >= 17, "Java version too old"
         except (FileNotFoundError, subprocess.CalledProcessError, AssertionError):
-            cmd = (["sudo"] if is_sudo_available() else []) + ["apt", "install", "-y", "openjdk-21-jre"]
-            subprocess.run(cmd, check=True)
+            cmd = None
+            if IS_UBUNTU or IS_DEBIAN_TRIXIE:
+                LOGGER.info(f"\n{prefix} installing Java 21 for Ubuntu...")
+                cmd = (["sudo"] if is_sudo_available() else []) + ["apt", "install", "-y", "openjdk-21-jre"]
+            elif IS_RASPBERRYPI or IS_DEBIAN_BOOKWORM:
+                LOGGER.info(f"\n{prefix} installing Java 17 for Raspberry Pi or Debian ...")
+                cmd = (["sudo"] if is_sudo_available() else []) + ["apt", "install", "-y", "openjdk-17-jre"]
+
+            if cmd:
+                subprocess.run(cmd, check=True)
 
         return torch2imx(
             self.model,

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/nn/autobackend.py

@@ -606,7 +606,7 @@ class AutoBackend(nn.Module):
                 if k in {"stride", "batch", "channels"}:
                     metadata[k] = int(v)
                 elif k in {"imgsz", "names", "kpt_shape", "kpt_names", "args"} and isinstance(v, str):
-                    metadata[k] = eval(v)
+                    metadata[k] = ast.literal_eval(v)
             stride = metadata["stride"]
             task = metadata["task"]
             batch = metadata["batch"]

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/nn/tasks.py

@@ -1730,10 +1730,10 @@ def guess_model_task(model):
     if isinstance(model, torch.nn.Module):  # PyTorch model
         for x in "model.args", "model.model.args", "model.model.model.args":
             with contextlib.suppress(Exception):
-                return eval(x)["task"]
+                return eval(x)["task"]  # nosec B307: safe eval of known attribute paths
         for x in "model.yaml", "model.model.yaml", "model.model.model.yaml":
             with contextlib.suppress(Exception):
-                return cfg2task(eval(x))
+                return cfg2task(eval(x))  # nosec B307: safe eval of known attribute paths
         for m in model.modules():
             if isinstance(m, (Segment, YOLOESegment)):
                 return "segment"

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/solutions/templates/similarity-search.html

@@ -106,7 +106,9 @@
         card.style.display = idx < k ? "block" : "none";
       });
       const buttons = document.querySelectorAll(".topk-btn");
-      buttons.forEach((btn) => btn.classList.remove("active"));
+      buttons.forEach((btn) => {
+        btn.classList.remove("active");
+      });
       event.target.classList.add("active");
     }
     document.addEventListener("DOMContentLoaded", () => {

{dgenerate_ultralytics_headless-8.3.232 → dgenerate_ultralytics_headless-8.3.234}/ultralytics/utils/__init__.py

@@ -651,6 +651,32 @@ def is_ubuntu() -> bool:
         return False
 
 
+def is_debian(codenames: list[str] | None | str = None) -> list[bool] | bool:
+    """Check if the OS is Debian.
+
+    Args:
+        codenames (list[str] | None | str): Specific Debian codename to check for (e.g., 'buster', 'bullseye'). If None,
+            only checks for Debian.
+
+    Returns:
+        (list[bool] | bool): List of booleans indicating if OS matches each Debian codename, or a single boolean if no
+            codenames provided.
+    """
+    try:
+        with open("/etc/os-release") as f:
+            content = f.read()
+            if codenames is None:
+                return "ID=debian" in content
+            if isinstance(codenames, str):
+                codenames = [codenames]
+            return [
+                f"VERSION_CODENAME={codename}" in content if codename else "ID=debian" in content
+                for codename in codenames
+            ]
+    except FileNotFoundError:
+        return [False] * len(codenames) if codenames else False
+
+
 def is_colab():
     """Check if the current script is running inside a Google Colab notebook.
 
@@ -879,6 +905,8 @@ IS_JETSON = is_jetson()
 IS_JUPYTER = is_jupyter()
 IS_PIP_PACKAGE = is_pip_package()
 IS_RASPBERRYPI = is_raspberrypi()
+IS_DEBIAN, IS_DEBIAN_BOOKWORM, IS_DEBIAN_TRIXIE = is_debian([None, "bookworm", "trixie"])
+IS_UBUNTU = is_ubuntu()
 GIT = GitRepo()
 USER_CONFIG_DIR = get_user_config_dir()  # Ultralytics settings dir
 SETTINGS_FILE = USER_CONFIG_DIR / "settings.json"