descriptron-vision 2.1.2__tar.gz → 2.2.0__tar.gz

{descriptron_vision-2.1.2 → descriptron_vision-2.2.0}/PKG-INFO

@@ -1,20 +1,19 @@
 Metadata-Version: 2.5
 Name: descriptron-vision
-Version: 2.1.2
+Version: 2.2.0
 Summary: Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer
 Project-URL: Homepage, https://github.com/alexrvandam/Descriptron
 Author: Alex R. Van Dam
 License: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE
-License-File: NOTICE.bak_pre_212_20260929_1100
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Requires-Python: >=3.9
-Requires-Dist: descriptron-core==2.1.2
+Requires-Dist: descriptron-core==2.2.0
 Requires-Dist: einops>=0.7
 Requires-Dist: timm>=0.9
 Requires-Dist: torch>=2.3

{descriptron_vision-2.1.2 → descriptron_vision-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "descriptron-vision"
-version = "2.1.2"
+version = "2.2.0"
 description = "Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -26,7 +26,7 @@ classifiers = [
 # For CUDA, install torch from PyTorch's own index FIRST, then this package:
 #   pip install torch torchvision --index-url https://download.pytorch.org/whl/cu121
 dependencies = [
-  "descriptron-core==2.1.2",
+  "descriptron-core==2.2.0",
   # Capped deliberately. Unbounded, pip installs torch 2.14 with ~3 GB of CUDA 13
   # wheels — not the torch 2.4.0+cu121 this system was validated on, and a version
   # in which the AMP calls below are already deprecated. Raise the cap only after

descriptron_vision-2.1.2/NOTICE.bak_pre_212_20260929_1100

@@ -1,59 +0,0 @@
-Descriptron
-Copyright 2024-2026 Alex R. Van Dam (ORCID 0000-0002-1966-0338)
-
-This product includes software developed by Alex R. Van Dam
-https://github.com/alexrvandam/Descriptron
-
-Licensed under the Apache License, Version 2.0 (see LICENSE). Under Section
-4(d) of that licence, this NOTICE file must be included with any
-redistribution of this software or of any work derived from it.
-
-REQUIRED CITATION
------------------
-Anyone who uses Descriptron, or any software derived from it (including
-descriptron-core, descriptron-vision, descriptron-gui and descriptron-mcp), in
-work that is published, presented or distributed must cite:
-
-  1. The software (Descriptron v2), by the DOI of the version used:
-     Van Dam, A. R. (2026). Descriptron: morphology-driven species descriptions,
-     keys and delimitation for dark taxa (Version 2.0.1). Zenodo.
-     https://doi.org/10.5281/zenodo.22918056
-     (all versions: https://doi.org/10.5281/zenodo.17077224;
-      repository: https://github.com/alexrvandam/Descriptron)
-
-  2. The first Descriptron paper:
-     Van Dam, A. R. & Štarhová Serbina, L. (2026). Descriptron: Artificial
-     intelligence for automating taxonomic species descriptions with a
-     user-friendly software package. Systematic Entomology, 51(1), e70005.
-     https://doi.org/10.1111/syen.70005
-
-  3. Once it is published, the Descriptron v2 paper as well. Its reference
-     will be added here and in CITATION.cff on publication.
-
-BibTeX:
-
-@software{vandam_2026_descriptron_v201,
-  author    = {Van Dam, Alex R.},
-  title     = {Descriptron: morphology-driven species descriptions, keys and
-               delimitation for dark taxa},
-  version   = {v2.0.1},
-  year      = {2026},
-  publisher = {Zenodo},
-  doi       = {10.5281/zenodo.22918056},
-  url       = {https://doi.org/10.5281/zenodo.22918056}
-}
-
-@article{vandam2026descriptron,
-  author  = {Van Dam, Alex R. and Štarhová Serbina, Liliya},
-  title   = {Descriptron: Artificial intelligence for automating taxonomic species
-             descriptions with a user-friendly software package},
-  journal = {Systematic Entomology},
-  volume  = {51},
-  number  = {1},
-  pages   = {e70005},
-  year    = {2026},
-  doi     = {10.1111/syen.70005}
-}
-
-The same information is in CITATION.cff, which GitHub shows as
-"Cite this repository".

descriptron_vision-2.1.2/pyproject.toml.bak_pre_203_20260924_145320

@@ -1,64 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "descriptron-vision"
-version = "2.0.2"
-description = "Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer"
-readme = "README.md"
-requires-python = ">=3.9"
-license = { text = "Apache-2.0" }
-authors = [{ name = "Alex R. Van Dam" }]
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "Topic :: Scientific/Engineering :: Image Recognition",
-  "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: OS Independent",
-]
-
-# torch and torchvision are ordinary wheels on Linux, macOS and Windows, so this
-# installs without a compiler. On a Mac the torchvision detectors can use the
-# Apple GPU through PyTorch's MPS device; Detectron2 cannot, which is why the
-# torchvision backend exists.
-#
-# For CUDA, install torch from PyTorch's own index FIRST, then this package:
-#   pip install torch torchvision --index-url https://download.pytorch.org/whl/cu121
-dependencies = [
-  "descriptron-core==2.0.2",
-  # Capped deliberately. Unbounded, pip installs torch 2.14 with ~3 GB of CUDA 13
-  # wheels — not the torch 2.4.0+cu121 this system was validated on, and a version
-  # in which the AMP calls below are already deprecated. Raise the cap only after
-  # testing, not before.
-  "torch>=2.3",           # torch.amp.GradScaler("cuda") in tv_train_v1 needs 2.3
-  "torchvision>=0.18",
-  "transformers>=4.38",   # Florence-2 scale-bar reading
-  "timm>=0.9",
-  "einops>=0.7",
-  "tqdm>=4.65",
-]
-
-[project.optional-dependencies]
-# SAM2 is not on PyPI and PyPI rejects a git dependency in package metadata, so
-# it cannot be declared here. It is imported lazily and the error message gives
-# the install command:
-#   pip install git+https://github.com/facebookresearch/segment-anything-2
-# Detectron2 is the same story, and additionally needs a compiler; see the
-# Docker image if you would rather not build it.
-ocr = ["easyocr>=1.7"]
-dev = ["pytest>=7", "build>=1", "twine>=5"]
-
-[project.scripts]
-descriptron-train      = "descriptron_vision.cli:train"
-descriptron-predict    = "descriptron_vision.cli:predict"
-descriptron-sweep      = "descriptron_vision.cli:sweep"
-descriptron-sam2pal    = "descriptron_vision.cli:sam2_pal"
-descriptron-dinoland   = "descriptron_vision.cli:dinoland"
-descriptron-measure    = "descriptron_vision.cli:measure"
-
-[project.urls]
-Homepage = "https://github.com/alexrvandam/Descriptron"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/descriptron_vision"]

descriptron_vision-2.1.2/pyproject.toml.bak_pre_204_20260924_165335

@@ -1,64 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "descriptron-vision"
-version = "2.0.3"
-description = "Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer"
-readme = "README.md"
-requires-python = ">=3.9"
-license = { text = "Apache-2.0" }
-authors = [{ name = "Alex R. Van Dam" }]
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "Topic :: Scientific/Engineering :: Image Recognition",
-  "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: OS Independent",
-]
-
-# torch and torchvision are ordinary wheels on Linux, macOS and Windows, so this
-# installs without a compiler. On a Mac the torchvision detectors can use the
-# Apple GPU through PyTorch's MPS device; Detectron2 cannot, which is why the
-# torchvision backend exists.
-#
-# For CUDA, install torch from PyTorch's own index FIRST, then this package:
-#   pip install torch torchvision --index-url https://download.pytorch.org/whl/cu121
-dependencies = [
-  "descriptron-core==2.0.3",
-  # Capped deliberately. Unbounded, pip installs torch 2.14 with ~3 GB of CUDA 13
-  # wheels — not the torch 2.4.0+cu121 this system was validated on, and a version
-  # in which the AMP calls below are already deprecated. Raise the cap only after
-  # testing, not before.
-  "torch>=2.3",           # torch.amp.GradScaler("cuda") in tv_train_v1 needs 2.3
-  "torchvision>=0.18",
-  "transformers>=4.38",   # Florence-2 scale-bar reading
-  "timm>=0.9",
-  "einops>=0.7",
-  "tqdm>=4.65",
-]
-
-[project.optional-dependencies]
-# SAM2 is not on PyPI and PyPI rejects a git dependency in package metadata, so
-# it cannot be declared here. It is imported lazily and the error message gives
-# the install command:
-#   pip install git+https://github.com/facebookresearch/segment-anything-2
-# Detectron2 is the same story, and additionally needs a compiler; see the
-# Docker image if you would rather not build it.
-ocr = ["easyocr>=1.7"]
-dev = ["pytest>=7", "build>=1", "twine>=5"]
-
-[project.scripts]
-descriptron-train      = "descriptron_vision.cli:train"
-descriptron-predict    = "descriptron_vision.cli:predict"
-descriptron-sweep      = "descriptron_vision.cli:sweep"
-descriptron-sam2pal    = "descriptron_vision.cli:sam2_pal"
-descriptron-dinoland   = "descriptron_vision.cli:dinoland"
-descriptron-measure    = "descriptron_vision.cli:measure"
-
-[project.urls]
-Homepage = "https://github.com/alexrvandam/Descriptron"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/descriptron_vision"]

descriptron_vision-2.1.2/pyproject.toml.bak_pre_210_20260925_103754

@@ -1,64 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "descriptron-vision"
-version = "2.0.4"
-description = "Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer"
-readme = "README.md"
-requires-python = ">=3.9"
-license = { text = "Apache-2.0" }
-authors = [{ name = "Alex R. Van Dam" }]
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "Topic :: Scientific/Engineering :: Image Recognition",
-  "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: OS Independent",
-]
-
-# torch and torchvision are ordinary wheels on Linux, macOS and Windows, so this
-# installs without a compiler. On a Mac the torchvision detectors can use the
-# Apple GPU through PyTorch's MPS device; Detectron2 cannot, which is why the
-# torchvision backend exists.
-#
-# For CUDA, install torch from PyTorch's own index FIRST, then this package:
-#   pip install torch torchvision --index-url https://download.pytorch.org/whl/cu121
-dependencies = [
-  "descriptron-core==2.0.4",
-  # Capped deliberately. Unbounded, pip installs torch 2.14 with ~3 GB of CUDA 13
-  # wheels — not the torch 2.4.0+cu121 this system was validated on, and a version
-  # in which the AMP calls below are already deprecated. Raise the cap only after
-  # testing, not before.
-  "torch>=2.3",           # torch.amp.GradScaler("cuda") in tv_train_v1 needs 2.3
-  "torchvision>=0.18",
-  "transformers>=4.38",   # Florence-2 scale-bar reading
-  "timm>=0.9",
-  "einops>=0.7",
-  "tqdm>=4.65",
-]
-
-[project.optional-dependencies]
-# SAM2 is not on PyPI and PyPI rejects a git dependency in package metadata, so
-# it cannot be declared here. It is imported lazily and the error message gives
-# the install command:
-#   pip install git+https://github.com/facebookresearch/segment-anything-2
-# Detectron2 is the same story, and additionally needs a compiler; see the
-# Docker image if you would rather not build it.
-ocr = ["easyocr>=1.7"]
-dev = ["pytest>=7", "build>=1", "twine>=5"]
-
-[project.scripts]
-descriptron-train      = "descriptron_vision.cli:train"
-descriptron-predict    = "descriptron_vision.cli:predict"
-descriptron-sweep      = "descriptron_vision.cli:sweep"
-descriptron-sam2pal    = "descriptron_vision.cli:sam2_pal"
-descriptron-dinoland   = "descriptron_vision.cli:dinoland"
-descriptron-measure    = "descriptron_vision.cli:measure"
-
-[project.urls]
-Homepage = "https://github.com/alexrvandam/Descriptron"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/descriptron_vision"]

descriptron_vision-2.1.2/pyproject.toml.bak_pre_211_20260925_114912

@@ -1,64 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "descriptron-vision"
-version = "2.1.0"
-description = "Mask and landmark prediction for Descriptron: torchvision detectors, SAM2-PAL propagation, DINOv3 landmark transfer"
-readme = "README.md"
-requires-python = ">=3.9"
-license = { text = "Apache-2.0" }
-authors = [{ name = "Alex R. Van Dam" }]
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "Topic :: Scientific/Engineering :: Image Recognition",
-  "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: OS Independent",
-]
-
-# torch and torchvision are ordinary wheels on Linux, macOS and Windows, so this
-# installs without a compiler. On a Mac the torchvision detectors can use the
-# Apple GPU through PyTorch's MPS device; Detectron2 cannot, which is why the
-# torchvision backend exists.
-#
-# For CUDA, install torch from PyTorch's own index FIRST, then this package:
-#   pip install torch torchvision --index-url https://download.pytorch.org/whl/cu121
-dependencies = [
-  "descriptron-core==2.1.0",
-  # Capped deliberately. Unbounded, pip installs torch 2.14 with ~3 GB of CUDA 13
-  # wheels — not the torch 2.4.0+cu121 this system was validated on, and a version
-  # in which the AMP calls below are already deprecated. Raise the cap only after
-  # testing, not before.
-  "torch>=2.3",           # torch.amp.GradScaler("cuda") in tv_train_v1 needs 2.3
-  "torchvision>=0.18",
-  "transformers>=4.38",   # Florence-2 scale-bar reading
-  "timm>=0.9",
-  "einops>=0.7",
-  "tqdm>=4.65",
-]
-
-[project.optional-dependencies]
-# SAM2 is not on PyPI and PyPI rejects a git dependency in package metadata, so
-# it cannot be declared here. It is imported lazily and the error message gives
-# the install command:
-#   pip install git+https://github.com/facebookresearch/segment-anything-2
-# Detectron2 is the same story, and additionally needs a compiler; see the
-# Docker image if you would rather not build it.
-ocr = ["easyocr>=1.7"]
-dev = ["pytest>=7", "build>=1", "twine>=5"]
-
-[project.scripts]
-descriptron-train      = "descriptron_vision.cli:train"
-descriptron-predict    = "descriptron_vision.cli:predict"
-descriptron-sweep      = "descriptron_vision.cli:sweep"
-descriptron-sam2pal    = "descriptron_vision.cli:sam2_pal"
-descriptron-dinoland   = "descriptron_vision.cli:dinoland"
-descriptron-measure    = "descriptron_vision.cli:measure"
-
-[project.urls]
-Homepage = "https://github.com/alexrvandam/Descriptron"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/descriptron_vision"]

descriptron_vision-2.1.2/src/descriptron_vision/cli.py.bak_pre_v52_20260924_142454

@@ -1,66 +0,0 @@
-"""
-descriptron_vision.cli — detectors, propagation and landmark transfer
-=====================================================================
-
-Same dispatch as `descriptron_core.cli`. The two dependencies that are not on
-PyPI — SAM2 and Detectron2 — are not declared anywhere: PyPI rejects a git
-dependency in package metadata. They are imported lazily by the programs that
-need them, and `require()` below turns the resulting ImportError into the exact
-command to run.
-"""
-from __future__ import annotations
-
-import sys
-
-from descriptron_core.cli import run as _run_core   # noqa: F401  (shared behaviour)
-from descriptron_core.cli import data_path          # noqa: F401
-
-import os
-import runpy
-from importlib.resources import files
-from pathlib import Path
-
-INSTALL_HINTS = {
-    "sam2": ("SAM2 is not on PyPI, so it cannot be a declared dependency.\n"
-             "  pip install git+https://github.com/facebookresearch/segment-anything-2"),
-    "detectron2": ("Detectron2 is not on PyPI and must be compiled:\n"
-                   "  pip install git+https://github.com/facebookresearch/detectron2\n"
-                   "It needs a C++/CUDA toolchain and has no macOS wheels. If you would\n"
-                   "rather not build it, the Docker image carries it ready to run, and the\n"
-                   "torchvision backend needs none of this."),
-}
-
-
-def require(module: str):
-    """Import an optional heavyweight dependency, or explain how to get it."""
-    try:
-        return __import__(module)
-    except ImportError as exc:
-        hint = INSTALL_HINTS.get(module, f"  pip install {module}")
-        raise SystemExit(f"{module} is required for this step but is not installed.\n"
-                         f"{hint}\n\n(original error: {exc})") from exc
-
-
-def tools_dir() -> Path:
-    return Path(str(files("descriptron_vision") / "tools"))
-
-
-def _run(script: str, argv: list[str], subdir: str | None = None) -> None:
-    base = tools_dir() / subdir if subdir else tools_dir()
-    path = base / script
-    if not path.exists():
-        raise SystemExit(f"{path} is missing — was sync_sources.py run before building?")
-    sys.path.insert(0, str(path.parent))
-    sys.path.insert(0, str(tools_dir()))
-    os.environ.setdefault("DESCRIPTRON_DATA", str(data_path()))
-    sys.argv = [str(path), *argv]
-    runpy.run_path(str(path), run_name="__main__")
-
-
-def train():      _run("tv_train_v1.py", sys.argv[1:], "torchvision_det")
-def predict():    _run("tv_predict_v1.py", sys.argv[1:], "torchvision_det")
-def sweep():      _run("tv_sweep_v1.py", sys.argv[1:], "torchvision_det")
-def sam2_pal():   _run("sam2_pal_batch_v21.py", sys.argv[1:])
-def dinoland():   _run("dinov3_landmark_transfer_v51.py", sys.argv[1:])
-def measure():
-    _run("measurement_script_to_try_after_kpts_prediction_measure_kpts_V35.py", sys.argv[1:])