hestia-earth-models 0.65.4__py3-none-any.whl → 0.65.5__py3-none-any.whl

tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py

@@ -41,7 +41,9 @@ RUN_SCENARIOS = [
     ("non-soil-based-gohac-system", 3),           # Closes issue #848
     ("soil-based-gohac-system", 3),               # Closes issue #848
     ("with-gapfilled-start-date-end-date", 1),    # Closes issue #972
-    ("forest-to-orchard-with-ground-cover", 3)    # Closes issue #989
+    ("forest-to-orchard-with-ground-cover", 3),   # Closes issue #989
+    ("orchard-data-complete", 3),                 # Closes issue #1011
+    ("orchard-data-partially-complete", 3)        # Closes issue #1011
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py

@@ -40,7 +40,9 @@ RUN_SCENARIOS = [
     ("multiple-method-classifications", 5),       # Closes issue #764
     ("non-soil-based-gohac-system", 3),           # Closes issue #848
     ("with-gapfilled-start-date-end-date", 1),    # Closes issue #972
-    ("forest-to-orchard-with-ground-cover", 3)    # Closes issue #989
+    ("forest-to-orchard-with-ground-cover", 3),   # Closes issue #989
+    ("orchard-data-complete", 3),                 # Closes issue #1011
+    ("orchard-data-partially-complete", 3)        # Closes issue #1011
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -64,7 +64,9 @@ RUN_SCENARIOS = [
     ("multiple-method-classifications", 5),              # Closes issue #764
     ("non-soil-based-gohac-system", 3),                  # Closes issue #848
     ("with-gapfilled-start-date-end-date", 1),           # Closes issue #972
-    ("forest-to-orchard-with-ground-cover", 3)           # Closes issue #989
+    ("forest-to-orchard-with-ground-cover", 3),          # Closes issue #989
+    ("orchard-data-complete", 3),                 # Closes issue #1011
+    ("orchard-data-partially-complete", 3)        # Closes issue #1011
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -105,7 +105,7 @@ PARAMS_SHOULD_RUN = [
     ("tier-1/should-not-run", False),
     ("tier-1/without-management-with-measured-soc", False),
     ("tier-1/land-use-change", True),                                # Closes issue 755
-    ("tier-1/run-with-site-type", True),                             # Closes issue 755
+    ("tier-1/run-with-site-type", False),                            # Closes issue 755
     ("tier-1/cropland-polar", False),                                # Closes issue 794
     ("tier-1/cropland-with-system-increasing-c-input", True),        # Closes issue 851
     ("tier-1/with-gapfilled-start-date-end-date", False),            # Closes issue 972
@@ -122,7 +122,8 @@ PARAMS_SHOULD_RUN = [
     ("tier-2/with-irrigation-dates", True),                          # Closes issue 716
     ("tier-2/with-paddy-rice", False),                               # Closes issue 718
     ("tier-2/with-sand-without-date", True),                         # Closes issue 739
-    ("tier-2/with-irrigated-upland-rice", False)                     # Closes issue 718
+    ("tier-2/with-irrigated-upland-rice", False),                    # Closes issue 718
+    ("tier-1/land-use-change-with-unknown-management", True)         # Closes issue 1007
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

tests/models/ipcc2019/test_organicCarbonPerHa_tier_1_utils.py

@@ -154,6 +154,7 @@ LAND_USE_CATEGORY_PARAMS = [
     ("set-aside", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.SET_ASIDE),
     ("set-aside-override", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.SET_ASIDE),
     ("upland-rice", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.ANNUAL_CROPS),
+    ("unknown", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.UNKNOWN)
 ]
 
 
@@ -194,14 +195,14 @@ MANAGEMENT_CATEGORY_PARAMS = [
     ("full-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.FULL_TILLAGE),
     ("high-intensity-grazing", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.HIGH_INTENSITY_GRAZING),
     ("improved-grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.IMPROVED_GRASSLAND),
-    ("no-management/annual-crops", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.FULL_TILLAGE),
-    ("no-management/annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.FULL_TILLAGE),
-    ("no-management/grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
     ("no-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.NO_TILLAGE),
     ("nominally-managed", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
-    ("other", IpccLandUseCategory.OTHER, IpccManagementCategory.OTHER),
+    ("not-relevant", IpccLandUseCategory.OTHER, IpccManagementCategory.NOT_RELEVANT),
     ("reduced-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.REDUCED_TILLAGE),
     ("severely-degraded", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.SEVERELY_DEGRADED),
+    ("unknown/annual-crops", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.UNKNOWN),
+    ("unknown/annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.UNKNOWN),
+    ("unknown/grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.UNKNOWN)
 ]
 
 
@@ -310,7 +311,10 @@ CARBON_INPUT_CATEGORY_PARAMS = [
         "grassland-medium/1-improvements",
         IpccManagementCategory.IMPROVED_GRASSLAND,
         IpccCarbonInputCategory.GRASSLAND_MEDIUM
-    )
+    ),
+    ("not-relevant", IpccManagementCategory.NOT_RELEVANT, IpccCarbonInputCategory.NOT_RELEVANT),
+    ("unknown/cropland", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.UNKNOWN),
+    ("unknown/grassland", IpccManagementCategory.IMPROVED_GRASSLAND, IpccCarbonInputCategory.UNKNOWN)
 ]
 
 
@@ -395,18 +399,18 @@ def test_calc_soc_stocks(regime_start_years, soc_equilibriums, expected):
 TEST_INVENTORY = {
         1960: {
             _InventoryKey.LU_CATEGORY: IpccLandUseCategory.FOREST,
-            _InventoryKey.MG_CATEGORY: IpccManagementCategory.OTHER,
-            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.OTHER
+            _InventoryKey.MG_CATEGORY: IpccManagementCategory.NOT_RELEVANT,
+            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.NOT_RELEVANT
         },
         1965: {
             _InventoryKey.LU_CATEGORY: IpccLandUseCategory.FOREST,
-            _InventoryKey.MG_CATEGORY: IpccManagementCategory.OTHER,
-            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.OTHER
+            _InventoryKey.MG_CATEGORY: IpccManagementCategory.NOT_RELEVANT,
+            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.NOT_RELEVANT
         },
         1970: {
             _InventoryKey.LU_CATEGORY: IpccLandUseCategory.GRASSLAND,
             _InventoryKey.MG_CATEGORY: IpccManagementCategory.NOMINALLY_MANAGED,
-            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.OTHER
+            _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.NOT_RELEVANT
         },
         1995: {
             _InventoryKey.LU_CATEGORY: IpccLandUseCategory.ANNUAL_CROPS,
@@ -434,7 +438,7 @@ EXPECTED_MISSING_YEARS = {
     1990: {
         _InventoryKey.LU_CATEGORY: IpccLandUseCategory.GRASSLAND,
         _InventoryKey.MG_CATEGORY: IpccManagementCategory.NOMINALLY_MANAGED,
-        _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.OTHER
+        _InventoryKey.CI_CATEGORY: IpccCarbonInputCategory.NOT_RELEVANT
     },
     2023: {
         _InventoryKey.LU_CATEGORY: IpccLandUseCategory.ANNUAL_CROPS,

tests/models/utils/test_blank_node.py

@@ -25,7 +25,7 @@ from hestia_earth.models.utils.blank_node import (
     split_node_by_dates,
     _most_recent_nodes,
     _shallowest_node,
-    validate_start_date_end_date
+    validate_start_date_end_date, _str_dates_match
 )
 
 
@@ -338,7 +338,7 @@ def test_get_date_month():
 
     Should only be found in blank node `dates` field. (Format not permitted in `startDate` or `endDate` fields.)
     """
-    assert _get_datestr_format(DATESTR_MONTH), DatestrFormat.MONTH
+    assert _get_datestr_format(DATESTR_MONTH) == DatestrFormat.MONTH
 
 
 def test_get_date_month_day():
@@ -347,7 +347,7 @@ def test_get_date_month_day():
 
     Should only be found in blank node `dates` field. (Format not permitted in `startDate` or `endDate` fields.)
     """
-    assert _get_datestr_format(DATESTR_MONTH_DAY), DatestrFormat.MONTH_DAY
+    assert _get_datestr_format(DATESTR_MONTH_DAY) == DatestrFormat.MONTH_DAY
 
 
 def test_get_datestr_format_no_zero_padding():
@@ -355,21 +355,34 @@ def test_get_datestr_format_no_zero_padding():
     assert _get_datestr_format(DATE_STR) is None
 
 
+def test_str_dates_match():
+    assert _str_dates_match("2010", "2010-12-31") is True
+    assert _str_dates_match("2010", "2010-01-01") is False
+    assert _str_dates_match("2010", "2010-12-31") is True
+    assert _str_dates_match("2010", "2010-01") is False
+
+    assert _str_dates_match("2010", "2010-12-31", mode=DatestrGapfillMode.START) is False
+    assert _str_dates_match("2010", "2010-01-01", mode=DatestrGapfillMode.START) is True
+
+
 # --- test _gapfill_datestr ---
 
 
 def test_complete_datestr_year():
-    assert _gapfill_datestr(DATESTR_YEAR), "2000-01-01T00:00:00"
-    assert _gapfill_datestr(DATESTR_YEAR, DatestrGapfillMode.END), "2000-12-31T23:59:59"
+    assert _gapfill_datestr(DATESTR_YEAR) == "2000-01-01T00:00:00"
+    assert _gapfill_datestr(DATESTR_YEAR, DatestrGapfillMode.MIDDLE) == "2000-07-01T23:59:59"
+    assert _gapfill_datestr(DATESTR_YEAR, DatestrGapfillMode.END) == "2000-12-31T23:59:59"
 
 
 def test_complete_datestr_year_month():
-    assert _gapfill_datestr(DATESTR_YEAR_MONTH), "2000-01-01T00:00:00"
+    assert _gapfill_datestr(DATESTR_YEAR_MONTH) == "2000-01-01T00:00:00"
+    assert _gapfill_datestr(DATESTR_YEAR_MONTH, DatestrGapfillMode.MIDDLE) == "2000-01-16T11:59:59"
     assert _gapfill_datestr(DATESTR_YEAR_MONTH, DatestrGapfillMode.END) == "2000-01-31T23:59:59"
 
 
 def test_complete_datestr_year_month_day():
-    assert _gapfill_datestr(DATESTR_YEAR_MONTH_DAY), "2000-01-01T00:00:00"
+    assert _gapfill_datestr(DATESTR_YEAR_MONTH_DAY) == "2000-01-01T00:00:00"
+    assert _gapfill_datestr(DATESTR_YEAR_MONTH_DAY, DatestrGapfillMode.MIDDLE) == "2000-01-01T11:59:59"
     assert _gapfill_datestr(DATESTR_YEAR_MONTH_DAY, DatestrGapfillMode.END) == "2000-01-01T23:59:59"
 
 
@@ -379,9 +392,11 @@ def test_gapfill_datestr_feburary():
     """
     # Non-leap year
     assert _gapfill_datestr("1981-02") == "1981-02-01T00:00:00"
+    assert _gapfill_datestr("1981-02", DatestrGapfillMode.MIDDLE) == "1981-02-14T23:59:59"
     assert _gapfill_datestr("1981-02", DatestrGapfillMode.END) == "1981-02-28T23:59:59"
 
     # Leap year
+    assert _gapfill_datestr("2024-02", DatestrGapfillMode.MIDDLE) == "2024-02-15T11:59:59"
     assert _gapfill_datestr("2024-02", DatestrGapfillMode.END) == "2024-02-29T23:59:59"