pyopenrivercam 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

{pyopenrivercam-0.9.0.dist-info → pyopenrivercam-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenrivercam
-Version: 0.9.0
+Version: 0.9.2
 Summary: pyorc: free and open-source image-based surface velocity and discharge.
 Author-email: Hessel Winsemius <winsemius@rainbowsensing.com>
 Requires-Python: >=3.9
@@ -28,9 +28,12 @@ Requires-Dist: geopandas
 Requires-Dist: matplotlib
 Requires-Dist: netCDF4
 Requires-Dist: numba>0.56
-Requires-Dist: numpy>2
+Requires-Dist: numpy==1.26.4; python_version == '3.9'
+Requires-Dist: numpy>=2; python_version >= '3.10'
 Requires-Dist: opencv-python
 Requires-Dist: packaging; platform_machine == 'armv7l'
+Requires-Dist: pillow==9.5.0; python_version == '3.9'
+Requires-Dist: pillow; python_version >= '3.10'
 Requires-Dist: pip
 Requires-Dist: pyproj
 Requires-Dist: pythran; platform_machine == 'armv7l'

{pyopenrivercam-0.9.0.dist-info → pyopenrivercam-0.9.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-pyorc/__init__.py,sha256=yPY8lllCcJb3rKv4-9O6b393ZSX86dAiOSRqAbEBmaQ,523
+pyorc/__init__.py,sha256=UQuU9xy-pxY7XonoYJqzQU1RinDVb6mgc3FAsaWrA0g,523
 pyorc/const.py,sha256=Ia0KRkm-E1lJk4NxQVPDIfN38EBB7BKvxmwIHJrGPUY,2597
 pyorc/cv.py,sha256=t2ZR4eyGbiwlIaGHysOheWdaDQuqpWLKjcTiAUzWAR0,50261
 pyorc/helpers.py,sha256=jed0YyywnpvsZS-8mcA7Lfzn9np1MTlmVLE_PDn2QY0,30454
 pyorc/plot_helpers.py,sha256=gLKslspsF_Z4jib5jkBv2wRjKnHTbuRFgkp_PCmv-uU,1803
 pyorc/project.py,sha256=CGKfICkQEpFRmh_ZeDEfbQ-wefJt7teWJd6B5IPF038,7747
 pyorc/pyorc.sh,sha256=-xOSUNnMAwVbdNkjKNKMZMaBljWsGLhadG-j0DNlJP4,5
-pyorc/sample_data.py,sha256=_yxtjhHc1sjHXZJRWQgBNOOn0Qqs2A5CavyFOQX5p8U,3241
+pyorc/sample_data.py,sha256=AhQgYozpbMcSxtNyi6WfHSKHeSRgDQqFhLO0-VrQKiU,3171
 pyorc/api/__init__.py,sha256=k2OQQH4NrtXTuVm23d0g_SX6H5DhnKC9_kDyzJ4dWdk,428
 pyorc/api/cameraconfig.py,sha256=NP9F7LhPO3aO6FRWkrGl6XpX8O3K59zfTtaYR3Kujqw,65419
 pyorc/api/cross_section.py,sha256=MH0AEw5K1Kc1ClZeQRBUYkShZYVk41fshLn6GzCZAas,65212
@@ -26,8 +26,8 @@ pyorc/service/camera_config.py,sha256=OsRLpe5jd-lu6HT4Vx5wEg554CMS-IKz-q62ir4VbP
 pyorc/service/velocimetry.py,sha256=bPI1OdN_fi0gZES08mb7yqCS_4I-lKSZ2JvWSGTRD1E,34434
 pyorc/velocimetry/__init__.py,sha256=5oShoMocCalcCZuIsBqlZlqQuKJgDDBUvXQIo-uqFPA,88
 pyorc/velocimetry/ffpiv.py,sha256=92XDgzCW4mEZ5ow82zV0APOhfDc1OVftBjKqYdw1zzc,17494
-pyopenrivercam-0.9.0.dist-info/entry_points.txt,sha256=Cv_WI2Y6QLnPiNCXGli0gS4WAOAeMoprha1rAR3vdRE,44
-pyopenrivercam-0.9.0.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-pyopenrivercam-0.9.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-pyopenrivercam-0.9.0.dist-info/METADATA,sha256=d2rvFtUmIHAhMBruxLKJ8qEukxEl3y4fZWzAbeeNZ0w,12383
-pyopenrivercam-0.9.0.dist-info/RECORD,,
+pyopenrivercam-0.9.2.dist-info/entry_points.txt,sha256=Cv_WI2Y6QLnPiNCXGli0gS4WAOAeMoprha1rAR3vdRE,44
+pyopenrivercam-0.9.2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+pyopenrivercam-0.9.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pyopenrivercam-0.9.2.dist-info/METADATA,sha256=LjzGioSQjEn7ku6f8v6N0jti7SiJvMw7Le1HQwboeas,12566
+pyopenrivercam-0.9.2.dist-info/RECORD,,

pyorc/__init__.py

@@ -1,6 +1,6 @@
 """pyorc: free and open-source image-based surface velocity and discharge."""
 
-__version__ = "0.9.0"
+__version__ = "0.9.2"
 
 from .api import CameraConfig, CrossSection, Frames, Transect, Velocimetry, Video, get_camera_config, load_camera_config  # noqa
 from .project import *  # noqa

pyorc/sample_data.py

@@ -4,78 +4,84 @@ import os
 import time
 import zipfile
 
+import platformdirs
+import requests
 
-def get_hommerich_dataset():
-    """Retrieve and cache sample dataset of Sheaf river."""
+cache_dir = platformdirs.user_cache_dir("pyorc")
+
+
+def zenodo_pooch(record_id, cache_name):
+    """Retrieve files from Zenodo record."""
     try:
         import pooch
     except ImportError:
         raise ImportError("This function needs pooch. Install pyorc with pip install pyopenrivercam[extra]")
+    r = requests.get(
+        f"https://zenodo.org/api/records/{record_id}",
+        timeout=30,
+        # headers=headers
+    )
+    if r.status_code != 200:
+        raise RuntimeError(f"Failed to fetch metadata for record {record_id}. {r.status_code} {r.text}")
+    meta = r.json()
+    urls = {f["key"]: f["links"]["self"] for f in meta["files"]}
 
+    return pooch.create(
+        path=pooch.os_cache(cache_name),
+        base_url="",
+        urls=urls,
+        registry={name: None for name in urls},
+    )
+
+
+def get_hommerich_dataset():
+    """Retrieve and cache sample dataset of Sheaf river."""
     # Define the DOI link
     filename = "20241010_081717.mp4"
-    base_url = "https://zenodo.org/records/15002591/files"
-    url = base_url + "/" + filename
-    print(f"Retrieving or providing cached version of dataset from {url}")
-    # Create a Pooch registry to manage downloads
-    registry = pooch.create(
-        # Define the cache directory
-        path=pooch.os_cache("pyorc"),
-        # Define the base URL for fetching data
-        base_url=base_url,
-        # Define the registry with the file we're expecting to download
-        registry={filename: None},
-    )
+    file_path = os.path.join(cache_dir, filename)
     # Fetch the dataset
-    for attempt in range(5):
-        try:
-            file_path = registry.fetch(filename, progressbar=True)
-            break
-        except Exception as e:
-            if attempt == 4:
-                raise f"Download failed with error: {e}."
-            else:
-                print(f"Download failed with error: {e}. Retrying...")
-                time.sleep(1)
-    print(f"Hommerich video is available in {file_path}")
+    if not os.path.exists(file_path):
+        for attempt in range(5):
+            registry = zenodo_pooch(
+                record_id=15002591,
+                cache_name="pyorc",
+            )
+            try:
+                file_path = registry.fetch(filename, progressbar=True)
+                break
+            except Exception as e:
+                if attempt == 4:
+                    raise f"Download failed with error: {e}."
+                else:
+                    print(f"Download failed with error: {e}. Retrying...")
+                    time.sleep(1)
+        print(f"Hommerich video is available in {file_path}")
     return file_path
 
 
 def get_hommerich_pyorc_zip():
     """Retrieve and cache sample dataset of Sheaf river."""
-    try:
-        import pooch
-    except ImportError:
-        raise ImportError("This function needs pooch. Install pyorc with pip install pyopenrivercam[extra]")
-
-    # Define the DOI link
+    #
+    # # Define the DOI link
     filename = "hommerich_20241010_081717_pyorc_data.zip.zip"
-    base_url = "https://zenodo.org/records/15002591/files"
-    url = base_url + "/" + filename
-    print(f"Retrieving or providing cached version of dataset from {url}")
-    # Create a Pooch registry to manage downloads
-    registry = pooch.create(
-        # Define the cache directory
-        path=pooch.os_cache("pyorc"),
-        # Define the base URL for fetching data
-        base_url=base_url,
-        # Define the registry with the file we're expecting to download
-        registry={filename: None},
-    )
-    # Fetch the dataset
-    file_path = registry.fetch(filename, progressbar=True)
+    file_path = os.path.join(cache_dir, filename)
     # Fetch the dataset
-    for attempt in range(5):
-        try:
-            file_path = registry.fetch(filename, progressbar=True)
-            break
-        except Exception as e:
-            if attempt == 4:
-                raise f"Download failed with error: {e}."
-            else:
-                print(f"Download failed with error: {e}. Retrying...")
-                time.sleep(1)
-    print(f"Hommerich video is available in {file_path}")
+    if not os.path.exists(file_path):
+        for attempt in range(5):
+            registry = zenodo_pooch(
+                record_id=15002591,
+                cache_name="pyorc",
+            )
+            try:
+                file_path = registry.fetch(filename, progressbar=True)
+                break
+            except Exception as e:
+                if attempt == 4:
+                    raise f"Download failed with error: {e}."
+                else:
+                    print(f"Download failed with error: {e}. Retrying...")
+                    time.sleep(1)
+        print(f"Hommerich video is available in {file_path}")
     return file_path