hestia-earth-models 0.54.1__tar.gz → 0.54.3__tar.gz

{hestia-earth-models-0.54.1/hestia_earth_models.egg-info → hestia-earth-models-0.54.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.54.1
+Version: 0.54.3
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3}/hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -1541,7 +1541,7 @@ def _check_consecutive(ints: list[int]) -> bool:
     bool
         Whether or not the list of integers is consecutive.
     """
-    range_list = list(range(min(ints), max(ints)+1))
+    range_list = list(range(min(ints), max(ints)+1)) if ints else []
     return all(a == b for a, b in zip(ints, range_list))
 
 
@@ -1941,38 +1941,37 @@ def _should_run_tier_2(
         grouped_data.items()
     ))
 
-    start_year = list(complete_data.keys())[0]
-    end_year = list(complete_data.keys())[-1]
+    timestamps = list(complete_data)
+    start_year = timestamps[0] if timestamps else 0
+    end_year = timestamps[-1] if timestamps else 0
 
     measurements = site.get('measurements', [])
 
-    sand_content_data = most_relevant_measurement_value_by_depth_and_date(
+    sand_content_value, _ = most_relevant_measurement_value_by_depth_and_date(
         measurements,
         SAND_CONTENT_TERM_ID,
         f"{start_year}-12-31",
         DEPTH_UPPER,
         DEPTH_LOWER,
         depth_strict=False
-    )
-    sand_content = sand_content_data[0]/100 if sand_content_data else None
+    ) if timestamps else (None, None)
+    sand_content = sand_content_value/100 if sand_content_value else None
 
-    initial_soc_stock_data = most_relevant_measurement_value_by_depth_and_date(
+    initial_soc_stock_value, initial_soc_stock_date = most_relevant_measurement_value_by_depth_and_date(
         measurements,
         TERM_ID,
         f"{end_year}-12-31",
         DEPTH_UPPER,
         DEPTH_LOWER,
         depth_strict=True
-    )
+    ) if timestamps else (None, None)
 
-    run_with_initial_soc_stock = bool(initial_soc_stock_data)
+    run_with_initial_soc_stock = bool(initial_soc_stock_value and initial_soc_stock_date)
 
-    initial_soc_stock = initial_soc_stock_data[0] if run_with_initial_soc_stock else None
-    initial_soc_stock_date = initial_soc_stock_data[1] if run_with_initial_soc_stock else None
     run_in_period = (
         int(abs(diff_in_years(f"{start_year}-12-31", initial_soc_stock_date)) + 1)
         if run_with_initial_soc_stock else MIN_RUN_IN_PERIOD
-    )
+    ) if timestamps else 0
 
     timestamps = list(complete_data.keys())
     temperatures = [complete_data[year][_InnerKey.TEMPERATURES] for year in timestamps]
@@ -1988,7 +1987,7 @@ def _should_run_tier_2(
         should_run_t,
         should_run_w,
         should_run_c,
-        0 < sand_content <= 1,
+        sand_content is not None and 0 < sand_content <= 1,
         run_in_period >= MIN_RUN_IN_PERIOD,
         len(timestamps) >= run_in_period,
         check_cycle_site_ids_identical(cycles),
@@ -2017,7 +2016,7 @@ def _should_run_tier_2(
         sand_content,
         is_irrigateds,
         run_in_period,
-        initial_soc_stock
+        initial_soc_stock_value
     )
 
 

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3}/hestia_earth/models/mocking/search-results.json

@@ -821,11 +821,11 @@
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporated"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
@@ -938,15 +938,15 @@
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPoultry"
+        "@id": "digestibleEnergyPigs"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPigs"
+        "@id": "digestibleEnergySalmonids"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergySalmonids"
+        "@id": "digestibleEnergyPoultry"
       },
       {
         "@type": "Term",
@@ -1024,7 +1024,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaDeerKgN"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
@@ -1032,7 +1036,11 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaGoatsKgN"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
@@ -1040,7 +1048,7 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaInsectsKgN"
       },
       {
         "@type": "Term",
@@ -1056,23 +1064,19 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaInsectsKgN"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
         "@id": "excretaBuffaloKgN"
       },
-      {
-        "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
-      },
       {
         "@type": "Term",
         "@id": "excretaTurkeysKgN"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgN"
+        "@id": "excretaMixturesKgN"
       },
       {
         "@type": "Term",
@@ -1080,7 +1084,7 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaMixturesKgN"
+        "@id": "processedExcretaKgN"
       },
       {
         "@type": "Term",
@@ -1088,11 +1092,11 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaSheepKgN"
+        "@id": "excretaHorsesMulesAndAssesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgN"
+        "@id": "excretaPigsKgN"
       },
       {
         "@type": "Term",
@@ -1100,7 +1104,7 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgN"
+        "@id": "excretaSheepKgN"
       }
     ]
   },
@@ -1111,21 +1115,25 @@
       "units.keyword": "kg VS"
     },
     "results": [
+      {
+        "@type": "Term",
+        "@id": "excretaSolidFishCrustaceansKgVs"
+      },
       {
         "@type": "Term",
         "@id": "excretaInsectsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBuffaloKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
@@ -1133,35 +1141,35 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgVs"
+        "@id": "excretaHorsesMulesAndAssesKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaBuffaloKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaTurkeysKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDairyCattleKgVs"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgVs"
+        "@id": "excretaDairyCattleKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgVs"
+        "@id": "excretaGeeseKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
+        "@id": "excretaPoultryKgVs"
       },
       {
         "@type": "Term",
@@ -1169,27 +1177,27 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgVs"
+        "@id": "excretaDeerKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgVs"
+        "@id": "excretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaMixturesKgVs"
+        "@id": "excretaSheepKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaSheepKgVs"
+        "@id": "excretaBeefCattleFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgVs"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
+        "@id": "excretaMixturesKgVs"
       }
     ]
   },
@@ -1204,7 +1212,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 23.378887
+        "_score": 23.058521
       }
     ]
   },
@@ -1297,6 +1305,10 @@
       }
     },
     "results": [
+      {
+        "@type": "Term",
+        "@id": "petrolBurntIn2StrokeEngine"
+      },
       {
         "@type": "Term",
         "@id": "diesel1D"
@@ -1307,23 +1319,23 @@
       },
       {
         "@type": "Term",
-        "@id": "petrol"
+        "@id": "petrolBurntIn4StrokeEngine"
       },
       {
         "@type": "Term",
-        "@id": "gasolineTypeJetFuel"
+        "@id": "petrol"
       },
       {
         "@type": "Term",
-        "@id": "aviationGasoline"
+        "@id": "diesel"
       },
       {
         "@type": "Term",
-        "@id": "diesel"
+        "@id": "aviationGasoline"
       },
       {
         "@type": "Term",
-        "@id": "diesel2D"
+        "@id": "gasolineTypeJetFuel"
       },
       {
         "@type": "Term",
@@ -1332,6 +1344,10 @@
       {
         "@type": "Term",
         "@id": "en590Diesel"
+      },
+      {
+        "@type": "Term",
+        "@id": "diesel2D"
       }
     ]
   },
@@ -1364,11 +1380,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepRaw"
+        "@id": "milkYieldPerGoatRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerGoatRaw"
+        "@id": "milkYieldPerSheepRaw"
       },
       {
         "@type": "Term",
@@ -1388,11 +1404,11 @@
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerCowFpcm"
+        "@id": "milkYieldPerSheepFpcm"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepFpcm"
+        "@id": "milkYieldPerCowFpcm"
       }
     ]
   },
@@ -1425,10 +1441,6 @@
       }
     },
     "results": [
-      {
-        "@type": "Term",
-        "@id": "ricePlantFlooded"
-      },
       {
         "@type": "Term",
         "@id": "riceGrainInHuskFlooded"
@@ -1452,23 +1464,23 @@
       },
       {
         "@type": "Term",
-        "@id": "deepTillage"
+        "@id": "minimumTillage"
       },
       {
         "@type": "Term",
-        "@id": "stripTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "mulchTillage"
+        "@id": "deepTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "stripTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "mulchTillage"
       },
       {
         "@type": "Term",

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3}/hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py

@@ -107,7 +107,7 @@ def _should_run(site: dict, area_size: float = None):
 
     should_run = all([
         not has_cache,
-        contains_coordinates or area_size <= MAX_AREA_SIZE,
+        contains_coordinates or (area_size is not None and area_size <= MAX_AREA_SIZE),
         contains_geospatial_data
     ])
     return should_run, area_size

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3}/hestia_earth/models/utils/measurement.py

@@ -184,7 +184,7 @@ def most_relevant_measurement_value_by_depth_and_date(
     filtered_measurements = [m for m in measurements if m.get('term', {}).get('@id') == term_id]
 
     if len(filtered_measurements) == 0:
-        return default
+        return default, None
 
     grouped_measurements = group_measurements_by_depth(filtered_measurements, False)
 

hestia-earth-models-0.54.3/hestia_earth/models/version.py

@@ -0,0 +1 @@
+VERSION = '0.54.3'

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.54.1
+Version: 0.54.3
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia-earth-models-0.54.1 → hestia-earth-models-0.54.3}/tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -16,7 +16,12 @@ from hestia_earth.models.ipcc2019.organicCarbonPerHa import (
 )
 
 
-SUBFOLDERS = ['Tier2/without-initial-soc', 'Tier2/with-initial-soc', 'Tier2/with-multi-year-cycles']
+SUBFOLDERS = [
+    'Tier2/without-initial-soc',
+    'Tier2/with-initial-soc',
+    'Tier2/with-multi-year-cycles',
+    'Tier2/without-any-measurements'
+]
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
@@ -109,7 +114,6 @@ def test_run_annual_organic_carbon_inputs(*args):
 @patch(f"{class_path}.related_cycles", return_value=_load_cycles(f"{fixtures_folder}/{SUBFOLDERS[0]}/cycles.jsonld"))
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 def test_run_tier_2_without_initial_soc(*args):
-
     with open(f"{fixtures_folder}/{SUBFOLDERS[0]}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
@@ -123,7 +127,6 @@ def test_run_tier_2_without_initial_soc(*args):
 @patch(f"{class_path}.related_cycles", return_value=_load_cycles(f"{fixtures_folder}/{SUBFOLDERS[1]}/cycles.jsonld"))
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 def test_run_tier_2_with_initial_soc(*args):
-
     with open(f"{fixtures_folder}/{SUBFOLDERS[1]}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
@@ -137,7 +140,6 @@ def test_run_tier_2_with_initial_soc(*args):
 @patch(f"{class_path}.related_cycles", return_value=_load_cycles(f"{fixtures_folder}/{SUBFOLDERS[2]}/cycles.jsonld"))
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 def test_run_tier_2_with_multi_year_cycles(*args):
-
     with open(f"{fixtures_folder}/{SUBFOLDERS[2]}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
@@ -146,3 +148,29 @@ def test_run_tier_2_with_multi_year_cycles(*args):
 
     result = run(site)
     assert result == expected
+
+
+@patch(f"{class_path}.related_cycles", return_value=_load_cycles(f"{fixtures_folder}/{SUBFOLDERS[3]}/cycles.jsonld"))
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+def test_run_tier_2_without_any_measurements(*args):
+    """
+    Issue 594: model should not run and, therefore, return an empty list.
+    Should not raise a value error in `_check_consecutive` function.
+    """
+    with open(f"{fixtures_folder}/{SUBFOLDERS[3]}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{fixtures_folder}/{SUBFOLDERS[3]}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(site)
+    assert result == expected
+
+
+@patch(f"{class_path}.related_cycles", return_value=[])
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+def test_run_tier_2_empty_site_and_cycles(*args):
+    SITE = {}
+    EXPECTED = []
+    result = run(SITE)
+    assert result == EXPECTED

hestia-earth-models-0.54.1/hestia_earth/models/version.py

@@ -1 +0,0 @@
-VERSION = '0.54.1'