descriptron 2.3.0__tar.gz → 2.5.2__tar.gz

{descriptron-2.3.0 → descriptron-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: descriptron
-Version: 2.3.0
+Version: 2.5.2
 Summary: Descriptron: image annotation, phenomics and evidence-tiered species descriptions
 Project-URL: Homepage, https://github.com/alexrvandam/Descriptron
 Author: Alex R. Van Dam
@@ -13,13 +13,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Bio-Informatics
 Requires-Python: >=3.9
-Requires-Dist: descriptron-core==2.3.0
-Requires-Dist: descriptron-gui==2.3.0
-Requires-Dist: descriptron-vision==2.3.0
+Requires-Dist: descriptron-core==2.5.2
+Requires-Dist: descriptron-gui==2.5.2
+Requires-Dist: descriptron-vision==2.5.2
 Provides-Extra: llm
-Requires-Dist: descriptron-core[llm]==2.3.0; extra == 'llm'
+Requires-Dist: descriptron-core[llm]==2.5.2; extra == 'llm'
 Provides-Extra: rag
-Requires-Dist: descriptron-core[rag]==2.3.0; extra == 'rag'
+Requires-Dist: descriptron-core[rag]==2.5.2; extra == 'rag'
 Description-Content-Type: text/markdown
 
 # descriptron
@@ -27,11 +27,19 @@ Description-Content-Type: text/markdown
 Image annotation, phenomics and evidence-tiered species descriptions.
 
 ```bash
-pip install descriptron          # everything
-descriptron-gui                  # the annotation GUI
+pip install torch==2.10.0 torchvision==0.25.0 --index-url https://download.pytorch.org/whl/cu128   # NVIDIA; Mac/CPU: drop --index-url
+SAM2_BUILD_CUDA=0 pip install git+https://github.com/facebookresearch/sam2.git   # SAM2 library (Windows: set SAM2_BUILD_CUDA=0 first)
+pip install descriptron          # analysis programs, detectors and the GUI
+descriptron-gui                  # first start downloads the SAM2 model file (898 MB) once
 descriptron --list               # the 62 analysis programs
 ```
 
+**SAM2 is not on PyPI**, so it cannot be installed with this package: install it from Meta's GitHub as above, into
+the same Python (3.10 or newer; 3.12 recommended). The GUI downloads the SAM2 model file `sam2_hiera_large.pt` once
+into `~/.cache/descriptron/sam2/`; if you already have it, copy it there or set `DESCRIPTRON_SAM2_CHECKPOINT`.
+Step by step for Windows, macOS and Linux:
+https://github.com/alexrvandam/Descriptron/blob/main/docs/INSTALL_PIP.md
+
 This is a convenience package with no code of its own. It installs:
 
 | | |

{descriptron-2.3.0 → descriptron-2.5.2}/README.md

@@ -3,11 +3,19 @@
 Image annotation, phenomics and evidence-tiered species descriptions.
 
 ```bash
-pip install descriptron          # everything
-descriptron-gui                  # the annotation GUI
+pip install torch==2.10.0 torchvision==0.25.0 --index-url https://download.pytorch.org/whl/cu128   # NVIDIA; Mac/CPU: drop --index-url
+SAM2_BUILD_CUDA=0 pip install git+https://github.com/facebookresearch/sam2.git   # SAM2 library (Windows: set SAM2_BUILD_CUDA=0 first)
+pip install descriptron          # analysis programs, detectors and the GUI
+descriptron-gui                  # first start downloads the SAM2 model file (898 MB) once
 descriptron --list               # the 62 analysis programs
 ```
 
+**SAM2 is not on PyPI**, so it cannot be installed with this package: install it from Meta's GitHub as above, into
+the same Python (3.10 or newer; 3.12 recommended). The GUI downloads the SAM2 model file `sam2_hiera_large.pt` once
+into `~/.cache/descriptron/sam2/`; if you already have it, copy it there or set `DESCRIPTRON_SAM2_CHECKPOINT`.
+Step by step for Windows, macOS and Linux:
+https://github.com/alexrvandam/Descriptron/blob/main/docs/INSTALL_PIP.md
+
 This is a convenience package with no code of its own. It installs:
 
 | | |

{descriptron-2.3.0 → descriptron-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "descriptron"
-version = "2.3.0"
+version = "2.5.2"
 description = "Descriptron: image annotation, phenomics and evidence-tiered species descriptions"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -22,14 +22,14 @@ classifiers = [
 # what people will type, and it should give them the whole system rather than a
 # "no matching distribution" error.
 dependencies = [
-  "descriptron-core==2.3.0",
-  "descriptron-vision==2.3.0",
-  "descriptron-gui==2.3.0",
+  "descriptron-core==2.5.2",
+  "descriptron-vision==2.5.2",
+  "descriptron-gui==2.5.2",
 ]
 
 [project.optional-dependencies]
-llm = ["descriptron-core[llm]==2.3.0"]
-rag = ["descriptron-core[rag]==2.3.0"]
+llm = ["descriptron-core[llm]==2.5.2"]
+rag = ["descriptron-core[rag]==2.5.2"]
 
 [project.urls]
 Homepage = "https://github.com/alexrvandam/Descriptron"

{descriptron-2.3.0 → descriptron-2.5.2}/src/descriptron/__init__.py

@@ -5,4 +5,4 @@ There is no code here on purpose. Import from the distributions themselves:
     from descriptron_core.cli import data_path, available
     from descriptron_vision.cli import require
 """
-__version__ = "2.3.0"
+__version__ = "2.5.2"