diff --git a/ci/envs/latest.yml b/ci/envs/latest.yml index f2ccb38e..3baea170 100644 --- a/ci/envs/latest.yml +++ b/ci/envs/latest.yml @@ -19,6 +19,7 @@ dependencies: - rasterstats - rioxarray - scikit-learn + - tqdm # Optional - qgis # testing diff --git a/ci/envs/minimal.yml b/ci/envs/minimal.yml index 124b90b7..a5d7baf4 100644 --- a/ci/envs/minimal.yml +++ b/ci/envs/minimal.yml @@ -19,6 +19,7 @@ dependencies: - rasterstats - rioxarray - scikit-learn + - tqdm # Optional # - qgis # testing diff --git a/cropclassification/util/mosaic_util.py b/cropclassification/util/mosaic_util.py index 47b4ed4a..1ec84768 100644 --- a/cropclassification/util/mosaic_util.py +++ b/cropclassification/util/mosaic_util.py @@ -9,6 +9,8 @@ from typing import Any, Optional import pyproj +from tqdm import tqdm +from tqdm.contrib.logging import logging_redirect_tqdm from . import date_util, openeo_util, raster_index_util, raster_util @@ -254,16 +256,17 @@ def calc_periodic_mosaic( ) # Process the mosaic images to be generated locally. - for image_local in images_local: - # Prepare index output file path - raster_index_util.calc_index( - image_local["base_image_path"], - image_local["path"], - index=image_local["index_type"], - pixel_type=image_local["pixel_type"], - process_options=image_local["process_options"], - force=force, - ) + with logging_redirect_tqdm(): + for image_local in tqdm(images_local): + # Prepare index output file path + raster_index_util.calc_index( + image_local["base_image_path"], + image_local["path"], + index=image_local["index_type"], + pixel_type=image_local["pixel_type"], + process_options=image_local["process_options"], + force=force, + ) return periodic_mosaic_params diff --git a/environment-dev.yml b/environment-dev.yml index f0fae39c..c518dbc4 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -19,6 +19,7 @@ dependencies: - rasterstats - rioxarray - scikit-learn + - tqdm # Optional - qgis # testing diff --git a/setup.py b/setup.py index d26cf3ab..bdcd9968 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ "tensorflow", "numpy<2", "exactextract", + "tqdm", ], entry_points=""" [console_scripts]