hestia-earth-models 0.62.0__py3-none-any.whl → 0.62.1__py3-none-any.whl

hestia_earth/models/mocking/search-results.json

@@ -131,227 +131,227 @@
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirCropResidueDecomposition"
+        "@id": "n2OToAirNaturalVegetationBurningDirect"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirAboveGroundBiomassStockChangeManagementChange"
+        "@id": "hexaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "h2SToAirInputsProduction"
+        "@id": "1112TetrafluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirOrganicSoilCultivation"
+        "@id": "pToDrainageWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirCropResidueDecomposition"
+        "@id": "nmvocToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirExcretaIndirect"
+        "@id": "pErosionSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirInputsProductionFossil"
+        "@id": "co2ToAirBelowGroundBiomassStockChangeLandUseChange"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirFloodedRice"
+        "@id": "po43ToSurfaceWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterSoilFlux"
+        "@id": "po43ToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirFuelCombustion"
+        "@id": "blackCarbonToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirWasteTreatment"
+        "@id": "pesticideToSoilInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirReservoirs"
+        "@id": "soxToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "blackCarbonToAirIndustrialProcesses"
+        "@id": "noxToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "tspToAirInputsProduction"
+        "@id": "nmvocToAirSilageFeeding"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirExcreta"
+        "@id": "nf3ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirAnimalHousing"
+        "@id": "tspToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterAquacultureSystems"
+        "@id": "noxToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToSurfaceWaterInputsProduction"
+        "@id": "no3ToGroundwaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "no3ToSurfaceWaterInputsProduction"
+        "@id": "pToGroundwaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "po43ToGroundwaterInputsProduction"
+        "@id": "nToSurfaceWaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirNaturalVegetationBurningDirect"
+        "@id": "ch4ToAirInputsProductionNonFossil"
       },
       {
         "@type": "Term",
-        "@id": "hexaneToAirInputsProduction"
+        "@id": "tspToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "1112TetrafluoroethaneToAirIndustrialProcesses"
+        "@id": "n2OToAirOrganicFertiliserDirect"
       },
       {
         "@type": "Term",
-        "@id": "pToDrainageWaterIndustrialProcesses"
+        "@id": "pm25ToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirWasteTreatment"
+        "@id": "ch4ToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "pErosionSoilFlux"
+        "@id": "no3ToGroundwaterOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirBelowGroundBiomassStockChangeLandUseChange"
+        "@id": "n2OToAirNaturalVegetationBurningIndirect"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterIndustrialProcesses"
+        "@id": "pm10ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterAquacultureSystems"
+        "@id": "ch4ToAirEntericFermentation"
       },
       {
         "@type": "Term",
-        "@id": "blackCarbonToAirFuelCombustion"
+        "@id": "nh3ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToSoilInputsProduction"
+        "@id": "n2ToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "soxToAirInputsProduction"
+        "@id": "n2OToAirInorganicFertiliserDirect"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirInputsProduction"
+        "@id": "nh3ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirSilageFeeding"
+        "@id": "pesticideToHarvestedCropPesticideApplication"
       },
       {
         "@type": "Term",
-        "@id": "nf3ToAirInputsProduction"
+        "@id": "112TrichlorotrifluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "tspToAirFuelCombustion"
+        "@id": "nh3ToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicSoilBurning"
+        "@id": "n2ToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterInputsProduction"
+        "@id": "co2ToAirAboveGroundBiomassStockChangeManagementChange"
       },
       {
         "@type": "Term",
-        "@id": "pToGroundwaterInputsProduction"
+        "@id": "h2SToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nToSurfaceWaterExcreta"
+        "@id": "co2ToAirOrganicSoilCultivation"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirInputsProductionNonFossil"
+        "@id": "co2ToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "tspToAirIndustrialProcesses"
+        "@id": "n2OToAirExcretaIndirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicFertiliserDirect"
+        "@id": "ch4ToAirInputsProductionFossil"
       },
       {
         "@type": "Term",
-        "@id": "pm25ToAirCropResidueBurning"
+        "@id": "ch4ToAirFloodedRice"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirCropResidueDecomposition"
+        "@id": "nh4ToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterOrganicFertiliser"
+        "@id": "co2ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirNaturalVegetationBurningIndirect"
+        "@id": "co2ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirInputsProduction"
+        "@id": "ch4ToAirReservoirs"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirEntericFermentation"
+        "@id": "blackCarbonToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirWasteTreatment"
+        "@id": "tspToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirInorganicFertiliser"
+        "@id": "noxToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirInorganicFertiliserDirect"
+        "@id": "pm10ToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirSoilFlux"
+        "@id": "pToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToHarvestedCropPesticideApplication"
+        "@id": "nh4ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "112TrichlorotrifluoroethaneToAirInputsProduction"
+        "@id": "no3ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirOrganicFertiliser"
+        "@id": "po43ToGroundwaterInputsProduction"
       },
       {
         "@type": "Term",
@@ -1223,7 +1223,7 @@
         "termType": "electricity",
         "@id": "electricityGridMarketMix",
         "units": "kWh",
-        "_score": 27.804459
+        "_score": 27.80577
       },
       {
         "@type": "Term",
@@ -1231,7 +1231,7 @@
         "termType": "electricity",
         "@id": "electricityGridRenewableMix",
         "units": "kWh",
-        "_score": 27.804459
+        "_score": 27.80577
       }
     ]
   },
@@ -1306,83 +1306,83 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaRabbitsKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaMixturesKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaRabbitsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaTurkeysKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "processedExcretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaMixturesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaInsectsKgN"
+        "@id": "excretaDairyCattleKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
+        "@id": "excretaPigsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgN"
+        "@id": "excretaSheepKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgN"
+        "@id": "excretaHorsesMulesAndAssesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDairyCattleKgN"
+        "@id": "excretaCamelsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgN"
+        "@id": "excretaInsectsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSheepKgN"
+        "@id": "excretaBeefCattleFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgN"
+        "@id": "excretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgN"
+        "@id": "excretaGeeseKgN"
       }
     ]
   },
@@ -1494,7 +1494,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.790089
+        "_score": 24.974434
       }
     ]
   },
@@ -1683,15 +1683,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "petrolBurntIn2StrokeEngine"
+        "@id": "diesel1D"
       },
       {
         "@type": "Term",
-        "@id": "marineDieselOil"
+        "@id": "petrolBurntIn2StrokeEngine"
       },
       {
         "@type": "Term",
-        "@id": "diesel1D"
+        "@id": "marineDieselOil"
       },
       {
         "@type": "Term",
@@ -1715,15 +1715,15 @@
       },
       {
         "@type": "Term",
-        "@id": "diesel2D"
+        "@id": "diesel4D"
       },
       {
         "@type": "Term",
-        "@id": "diesel4D"
+        "@id": "en590Diesel"
       },
       {
         "@type": "Term",
-        "@id": "en590Diesel"
+        "@id": "diesel2D"
       }
     ]
   },
@@ -1765,19 +1765,19 @@
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerBuffaloRaw"
+        "@id": "milkYieldPerSheepFpcm"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerCamelRaw"
+        "@id": "milkYieldPerCowFpcm"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepFpcm"
+        "@id": "milkYieldPerBuffaloRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerCowFpcm"
+        "@id": "milkYieldPerCamelRaw"
       },
       {
         "@type": "Term",

hestia_earth/models/schererPfister2015/utils.py

@@ -68,8 +68,8 @@ def get_water(cycle: dict, precipitation: float):
     return list_sum([irrigation/10, precipitation or 0])
 
 
-def calculate_R(heavy_winter_precipitation: float, water: float):
-    winter_precipitation = 1 if heavy_winter_precipitation > 0 else 0.1
+def calculate_R(heavy_winter_precipitation: bool, water: float):
+    winter_precipitation = 1 if heavy_winter_precipitation else 0.1
     water_coeff = (587.8 - 1.219 * water) + (0.004105 * water ** 2) if water > 850 else (0.0483 * water ** 1.61)
     return water_coeff * winter_precipitation
 

hestia_earth/models/site/brackishWater.py

@@ -23,7 +23,7 @@ TERM_ID = 'brackishWater'
 
 def _measurement():
     data = _new_measurement(TERM_ID)
-    data['value'] = [100]
+    data['value'] = [True]
     data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 

hestia_earth/models/site/flowingWater.py

@@ -31,7 +31,7 @@ SITE_TYPE_TO_TERM_ID = {
 
 def _measurement(site: dict, term_id: str):
     data = _new_measurement(term_id)
-    data['value'] = [1]
+    data['value'] = [True]
     data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/site/freshWater.py

@@ -23,7 +23,7 @@ TERM_ID = 'freshWater'
 
 def _measurement():
     data = _new_measurement(TERM_ID)
-    data['value'] = [100]
+    data['value'] = [True]
     data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 

hestia_earth/models/site/management.py

@@ -1,16 +1,29 @@
 """
-Management node with data gap-filled data from cycles.
+Management node
+
+This model provides data gap-filled data from cycles in the form of a list of management nodes
+(https://www.hestia.earth/schema/Management).
+
+It includes products of type crop, forage, landCover (gap-filled with a value of 100) and practices of type waterRegime,
+tillage, cropResidueManagement and landUseManagement.
+
+All values are copied from the source node, except for crop and forage terms in which case the dates are copied from the
+cycle.
+
+When nodes are chronologically consecutive with "% area" or "boolean" units and the same term and value, they are
+condensed into a single node to aid readability.
 """
-from typing import List, Any, Callable
 from functools import reduce
+
 from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import filter_list_term_type, linked_node
 from hestia_earth.utils.tools import flatten, safe_parse_float
+from hestia_earth.utils.blank_node import get_node_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_blank_nodes_id
 from hestia_earth.models.utils.term import get_lookup_value
-from hestia_earth.models.utils.blank_node import get_node_value
+from hestia_earth.models.utils.blank_node import condense_nodes
 from hestia_earth.models.utils.site import related_cycles
 from . import MODEL
 
@@ -24,7 +37,8 @@ REQUIREMENTS = {
                 "products": [
                     {
                         "@type": "Product",
-                        "term.termType": ["crop", "forage", "landCover"]
+                        "term.termType": ["crop", "forage", "landCover"],
+                        "units": ["% area", "boolean"]
                     }
                 ],
                 "practices": [
@@ -35,6 +49,7 @@ REQUIREMENTS = {
                             "cropResidueManagement",
                             "landUseManagement"
                         ],
+                        "units": ["% area", "boolean"],
                         "value": ""
                     }
                 ],
@@ -126,7 +141,7 @@ def _overwrite_dates(cycle: dict, values: list) -> list:
     return [v | _include(cycle, ["startDate", "endDate"]) for v in values]
 
 
-def _copy_item_if_exists(source: dict, keys: List[str] = None, dest: dict = None) -> dict:
+def _copy_item_if_exists(source: dict, keys: list[str] = None, dest: dict = None) -> dict:
     keys = keys or []
     dest = dest or {}
     return reduce(lambda p, c: p | ({c: source[c]} if c in source else {}), keys, dest)
@@ -139,7 +154,7 @@ def _get_landCover_term_id(product: dict) -> str:
 
 
 def _get_items_with_relevant_term_type(
-        cycles: List[dict], item_name: str, relevant_values: list, date_fill: Callable = _default_dates
+        cycles: list[dict], item_name: str, relevant_values: list, date_fill: callable = _default_dates
 ):
     """Get items from the list of cycles with any of the relevant values. Also adds dates if missing."""
     return flatten(
@@ -152,7 +167,7 @@ def _get_items_with_relevant_term_type(
     )
 
 
-def _get_lookup_with_debug(term: dict, column: str) -> Any:
+def _get_lookup_with_debug(term: dict, column: str) -> any:
     get_lookup_value(term, column, model_key=MODEL_KEY, land_cover_key=LAND_COVER_KEY)
 
 
@@ -169,7 +184,7 @@ def _data_from_input(cycle: dict, term_id: str) -> dict:
     }
 
 
-def _process_rule(cycle, term, term_type) -> List:
+def _process_rule(cycle, term, term_type) -> list:
     relevant_terms = []
     for column, condition, new_term in INPUT_RULES[term_type]:
         lookup_result = _get_lookup_with_debug(term, LOOKUPS[column])
@@ -180,7 +195,7 @@ def _process_rule(cycle, term, term_type) -> List:
     return relevant_terms
 
 
-def _get_relevant_inputs(cycles: List[dict]) -> List:
+def _get_relevant_inputs(cycles: list[dict]) -> list:
     relevant_inputs = []
     for cycle in [c for c in cycles if "inputs" in c]:
         for i in cycle["inputs"]:
@@ -230,6 +245,8 @@ def _should_run(site: dict):
         )
         for product in list(filter(_get_landCover_term_id, products_crop_forage))
     ]
+    all_products = products_land_cover + products_crop_forage
+    all_products = condense_nodes(all_products)
 
     practices = [
         _extract_node_value(
@@ -248,6 +265,7 @@ def _should_run(site: dict):
             ]
         )
     ]
+    practices = condense_nodes(practices)
 
     relevant_inputs = _get_relevant_inputs(cycles)
     logRequirements(
@@ -260,9 +278,9 @@ def _should_run(site: dict):
         practice_ids=log_blank_nodes_id(practices),
         inputs=log_blank_nodes_id(relevant_inputs)
     )
-    should_run = any(products_crop_forage + products_land_cover + practices + relevant_inputs)
+    should_run = any(all_products + practices + relevant_inputs)
     logShouldRun(site, MODEL, None, should_run=should_run, model_key=MODEL_KEY)
-    return should_run, products_crop_forage + products_land_cover, practices, relevant_inputs
+    return should_run, all_products, practices, relevant_inputs
 
 
 def run(site: dict):