openforis-whisp 2.0.0a5__tar.gz → 2.0.0b1__tar.gz

{openforis_whisp-2.0.0a5 → openforis_whisp-2.0.0b1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: openforis-whisp
-Version: 2.0.0a5
+Version: 2.0.0b1
 Summary: Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations.
 License: MIT
 Keywords: whisp,geospatial,data-processing
 Author: Andy Arnell
-Author-email: and.arnell@fao.org
+Author-email: andrew.arnell@fao.org
 Requires-Python: >=3.10
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{openforis_whisp-2.0.0a5 → openforis_whisp-2.0.0b1}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "openforis-whisp"
-version = "2.0.0a5"
+version = "2.0.0b1"
 description = "Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations."
 repository = "https://github.com/forestdatapartnership/whisp"
-authors = ["Andy Arnell <and.arnell@fao.org>"]
+authors = ["Andy Arnell <andrew.arnell@fao.org>"]
 readme = "README.md"
 license = "MIT"
 keywords = ["whisp", "geospatial", "data-processing"]

{openforis_whisp-2.0.0a5 → openforis_whisp-2.0.0b1}/src/openforis_whisp/__init__.py

@@ -29,9 +29,7 @@ try:
 except Exception as e:
     print("Error in default EE initialization:", e)
 
-from openforis_whisp.datasets import (
-    combine_datasets,
-)
+from openforis_whisp.datasets import combine_datasets, combine_custom_bands
 
 from openforis_whisp.stats import (
     whisp_stats_ee_to_ee,
@@ -56,6 +54,7 @@ from openforis_whisp.parameters.config_runtime import (
 
 from openforis_whisp.reformat import (
     validate_dataframe_using_lookups,
+    validate_dataframe_using_lookups_flexible,
     validate_dataframe,
     create_schema_from_dataframe,
     load_schema_if_any_file_changed,

{openforis_whisp-2.0.0a5 → openforis_whisp-2.0.0b1}/src/openforis_whisp/datasets.py

@@ -1215,40 +1215,6 @@ def nci_ocs2020_prep():
 
 ###Combining datasets
 
-###Combining datasets
-
-# def combine_datasets():
-#     """Combines datasets into a single multiband image, with fallback if assets are missing."""
-#     img_combined = ee.Image(1).rename(geometry_area_column)
-
-#     # Combine images directly
-#     for img in [func() for func in list_functions()]:
-#         try:
-#             img_combined = img_combined.addBands(img)
-#         except ee.EEException as e:
-#             # logger.error(f"Error adding image: {e}")
-#             print(f"Error adding image: {e}")
-
-#     try:
-#         # Attempt to print band names to check for errors
-#         print(img_combined.bandNames().getInfo())
-#     except ee.EEException as e:
-#         # logger.error(f"Error printing band names: {e}")
-#         # logger.info("Running code for filtering to only valid datasets due to error in input")
-#         print("using valid datasets filter due to error in input")
-#         # Validate images
-#         images_to_test = [func() for func in list_functions()]
-#         valid_imgs = keep_valid_images(images_to_test)  # Validate images
-
-#         # Retry combining images after validation
-#         img_combined = ee.Image(1).rename(geometry_area_column)
-#         for img in valid_imgs:
-#             img_combined = img_combined.addBands(img)
-
-#     img_combined = img_combined.multiply(ee.Image.pixelArea())
-
-#     return img_combined
-
 
 def combine_datasets(national_codes=None):
     """Combines datasets into a single multiband image, with fallback if assets are missing."""
@@ -1380,5 +1346,32 @@ def ee_image_checker(image):
     return False
 
 
-# print(combine_valid_datasets().bandNames().getInfo())
-# print(combine_datasets().bandNames().getInfo())
+# preparation steps for multiband image with area per pixel values
+# function for notebook environment
+# user provides custom_images dict and custom_bands_info dict
+def combine_custom_bands(custom_images, custom_bands_info):
+    """
+    Combine custom Earth Engine images into a single multiband image with area conversion.
+
+    Returns
+    -------
+    ee.Image
+        Combined bands converted to area values
+    """
+    # ... existing validation code ...
+
+    # Step 3: Rename and combine images
+    band_names = list(custom_bands_info.keys())
+
+    # Start with first image
+    custom_ee_image = custom_images[band_names[0]].rename(band_names[0])
+
+    # Add remaining images if any
+    for name in band_names[1:]:
+        next_image = custom_images[name].rename(name)
+        custom_ee_image = custom_ee_image.addBands(next_image)
+
+    # Convert to area values
+    custom_ee_image = custom_ee_image.multiply(ee.Image.pixelArea())
+
+    return custom_ee_image  # Only return the image

{openforis_whisp-2.0.0a5 → openforis_whisp-2.0.0b1}/src/openforis_whisp/parameters/lookup_gee_datasets.csv

@@ -2,7 +2,7 @@ name,order,ISO2_code,theme,theme_timber,use_for_risk,use_for_risk_timber,exclude
 EUFO_2020,10,,treecover,naturally_reg_2020,1,1,0,float32,1,0,g_jrc_gfc_2020_prep
 GLAD_Primary,20,,treecover,primary,1,1,0,float32,1,0,g_glad_pht_prep
 TMF_undist,30,,treecover,primary,1,1,0,float32,1,0,g_jrc_tmf_undisturbed_prep
-GFC_TC_2020,50,,treecover,naturally_reg_2020,1,1,0,float32,1,0,g_glad_gfc_10pc_prep
+GFC_TC_2020,50,,treecover,naturally_reg_2020,1,1,0,float32,1,0,g_gfc_tc_2020_prep
 Forest_FDaP,60,,treecover,naturally_reg_2020,1,1,0,float32,1,0,g_glad_gfc_10pc_prep
 ESA_TC_2020,70,,treecover,naturally_reg_2020,1,1,0,float32,1,0,g_esa_worldcover_trees_prep
 TMF_plant,80,,commodities,NA,1,1,0,float32,1,0,g_jrc_tmf_plantation_prep
@@ -199,3 +199,4 @@ nBR_INPE_TCamz_pasture_2020,2422,BR,commodities,NA,1,1,0,float32,1,0,nbr_terracl
 nBR_INPE_TCcer_pasture_2020,2423,BR,commodities,NA,1,1,0,float32,1,0,nbr_terraclass_cer20_ac_prep
 nBR_MapBiomas_col9_pasture_2020,2424,BR,commodities,NA,1,1,0,float32,1,0,nbr_mapbiomasc9_pasture_prep
 nCI_Cocoa_bnetd,3000,CI,commodities,NA,1,1,0,float32,1,0,nci_ocs2020_prep
+