hestia-earth-models 0.43.0__py3-none-any.whl → 0.44.1__py3-none-any.whl

hestia_earth/models/cycle/completeness/__init__.py

@@ -20,7 +20,8 @@ MODELS = list(map(lambda m: {'key': m, 'run': getattr(import_module(f".{m}", pac
 def _should_run_model(model, cycle: dict):
     is_complete = cycle.get('completeness', {}).get(model.get('key'))
     should_run = is_complete is False
-    logShouldRun(cycle, MODEL, None, should_run, key=model.get('key'))
+    if should_run:
+        logShouldRun(cycle, MODEL, None, should_run, key=model.get('key'))
     return should_run
 
 

hestia_earth/models/cycle/completeness/animalFeed.py

@@ -1,12 +1,12 @@
 """
-Animal feed
+Completeness Animal feed
 
-This model checks if the site is a cropland and updates the
+This model checks if we have the requirements below and updates the
 [Data Completeness](https://hestia.earth/schema/Completeness#animalFeed) value.
 """
 from hestia_earth.schema import SiteSiteType
 
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from . import MODEL
 
 REQUIREMENTS = {
@@ -33,6 +33,8 @@ ALLOWED_SITE_TYPES = [
 def run(cycle: dict):
     site_type = cycle.get('site', {}).get('siteType')
     site_type_allowed = site_type in ALLOWED_SITE_TYPES
-    is_complete = all([site_type_allowed])
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    site_type_allowed=site_type_allowed)
+
+    return all([site_type_allowed])

hestia_earth/models/cycle/completeness/cropResidue.py

@@ -1,12 +1,12 @@
 """
-Crop Residue
+Completeness Crop Residue
 
-This model checks if we have all the [crop residue terms](https://hestia.earth/glossary?termType=cropResidue)
-and updates the [Data Completeness](https://hestia.earth/schema/Completeness#cropResidue) value.
+This model checks if we have the requirements below and updates the
+[Data Completeness](https://hestia.earth/schema/Completeness#cropResidue) value.
 """
 from hestia_earth.utils.model import find_term_match
 
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils.term import get_crop_residue_terms
 from . import MODEL
 
@@ -44,11 +44,26 @@ def _optional_term_ids():
     return [term for term in terms if term not in REQUIRED_TERM_IDS]
 
 
+def _has_product(products):
+    def has_product(term_id: str):
+        return (term_id, find_term_match(products, term_id, None) is not None)
+    return has_product
+
+
 def run(cycle: dict):
     products = cycle.get('products', [])
     # all required terms + at least one of the optional terms must be present
-    required_valid = all([find_term_match(products, term_id, False) for term_id in REQUIRED_TERM_IDS])
-    optional_valid = any([find_term_match(products, term_id, False) for term_id in _optional_term_ids()])
-    is_complete = required_valid and optional_valid
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+    required_products_map = list(map(_has_product(products), REQUIRED_TERM_IDS))
+    optional_products_map = list(map(_has_product(products), _optional_term_ids()))
+
+    has_required_products = all([has_product for _term_id, has_product in required_products_map])
+    has_optional_product = any([has_product for _term_id, has_product in optional_products_map])
+
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    **({
+                        f'has_required_{term_id}': has_product for term_id, has_product in required_products_map
+                    } | {
+                        f'has_optional_{term_id}': has_product for term_id, has_product in optional_products_map
+                    }))
+
+    return all([has_required_products, has_optional_product])

hestia_earth/models/cycle/completeness/excreta.py

@@ -1,12 +1,12 @@
 """
-Excreta
+Completeness Excreta
 
-This model checks if the site is a cropland and updates the
+This model checks if we have the requirements below and updates the
 [Data Completeness](https://hestia.earth/schema/Completeness#excreta) value.
 """
 from hestia_earth.schema import SiteSiteType
 
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from . import MODEL
 
 REQUIREMENTS = {
@@ -33,6 +33,8 @@ ALLOWED_SITE_TYPES = [
 def run(cycle: dict):
     site_type = cycle.get('site', {}).get('siteType')
     site_type_allowed = site_type in ALLOWED_SITE_TYPES
-    is_complete = all([site_type_allowed])
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    site_type_allowed=site_type_allowed)
+
+    return all([site_type_allowed])

hestia_earth/models/cycle/completeness/material.py

@@ -1,13 +1,13 @@
 """
-Material
+Completeness Material
 
-This model checks if the `machinery` Input has been added and updates the
+This model checks if we have the requirements below and updates the
 [Data Completeness](https://hestia.earth/schema/Completeness#material) value.
 """
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_term_match
 
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from . import MODEL
 
 REQUIREMENTS = {
@@ -34,7 +34,12 @@ ALLOWED_SITE_TYPES = [
 def run(cycle: dict):
     site_type = cycle.get('site', {}).get('siteType')
     site_type_allowed = site_type in ALLOWED_SITE_TYPES
-    input = find_term_match(cycle.get('inputs', []), 'machineryInfrastructureDepreciatedAmountPerCycle', None)
-    is_complete = all([site_type_allowed, input])
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+    has_machinery_input = find_term_match(
+        cycle.get('inputs', []), 'machineryInfrastructureDepreciatedAmountPerCycle', None
+    ) is not None
+
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    site_type_allowed=site_type_allowed,
+                    has_machinery_input=has_machinery_input)
+
+    return all([site_type_allowed, has_machinery_input])

hestia_earth/models/cycle/completeness/other.py

@@ -1,13 +1,13 @@
 """
-Other
+Completeness Other
 
-This model checks if the `seed` or `saplings` Input has been added and updates the
+This model checks if we have the requirements below and updates the
 [Data Completeness](https://hestia.earth/schema/Completeness#other) value.
 """
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_term_match, find_primary_product
 
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils.crop import is_orchard
 from . import MODEL
 
@@ -48,6 +48,9 @@ def run(cycle: dict):
     term_id = product.get('term', {}).get('@id')
     has_saplings = find_term_match(cycle.get('inputs', []), 'saplings', None) and is_orchard(MODEL, term_id)
 
-    is_complete = all([site_type_allowed, has_seed or has_saplings])
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    site_type_allowed=site_type_allowed,
+                    has_seed=has_seed,
+                    has_saplings=has_saplings)
+
+    return all([site_type_allowed, has_seed or has_saplings])

hestia_earth/models/cycle/completeness/soilAmendments.py

@@ -1,10 +1,10 @@
 """
-Soil Amendments
+Completeness Soil Amendments
 
-This model checks if the `soilPh` from geospatial dataset is greater than `6.5` and updates the
+This model checks if we have the requirements below and updates the
 [Data Completeness](https://hestia.earth/schema/Completeness#soilAmendments) value.
 """
-from hestia_earth.models.log import logger
+from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils import is_from_model
 from hestia_earth.models.utils.measurement import most_relevant_measurement, measurement_value
 from . import MODEL
@@ -32,6 +32,12 @@ def run(cycle: dict):
     measurements = cycle.get('site', {}).get('measurements', [])
     soilPh_measurement = most_relevant_measurement(measurements, 'soilPh', end_date)
     soilPh = measurement_value(soilPh_measurement)
-    is_complete = is_from_model(soilPh_measurement) and soilPh > 6.5
-    logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, is_complete)
-    return is_complete
+
+    soilPh_added = is_from_model(soilPh_measurement)
+    soilPh_above_6_5 = soilPh > 6.5
+
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    soilPh_added=soilPh_added,
+                    soilPh_above_6_5=soilPh_above_6_5)
+
+    return all([soilPh_added, soilPh_above_6_5])

hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioCarbon.py

@@ -5,7 +5,7 @@ REQUIREMENTS = {
             "term.units": "kg",
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "properties": [{"@type": "Property", "value": "", "term.@id": "energyContentHigherHeatingValue"}]
         }],
         "products": [{

hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioDryMatter.py

@@ -11,7 +11,7 @@ REQUIREMENTS = {
             "term.units": "kg",
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "properties": [
                 {"@type": "Property", "value": "", "term.@id": "energyContentHigherHeatingValue"},
                 {"@type": "Property", "value": "", "term.@id": "dryMatter"}

hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py

@@ -5,7 +5,7 @@ REQUIREMENTS = {
             "term.units": "kg",
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "properties": [{"@type": "Property", "value": "", "term.@id": "energyContentHigherHeatingValue"}]
         }],
         "products": [{

hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py

@@ -11,7 +11,7 @@ REQUIREMENTS = {
             "term.units": "kg",
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "properties": [{"@type": "Property", "value": "", "term.@id": "energyContentHigherHeatingValue"}]
         }],
         "products": [{

hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py

@@ -11,7 +11,7 @@ REQUIREMENTS = {
             "term.units": "kg",
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "properties": [
                 {"@type": "Property", "value": "", "term.@id": "energyContentHigherHeatingValue"},
                 {"@type": "Property", "value": "", "term.@id": "crudeProteinContent"}

hestia_earth/models/cycle/input/hestiaAggregatedData.py

@@ -50,7 +50,8 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Input": [{
-        "impactAssessment": "added from Hestia"
+        "impactAssessment": "added from Hestia",
+        "impactAssessmentIsProxy": "True"
     }]
 }
 MODEL_ID = 'hestiaAggregatedData'
@@ -117,7 +118,7 @@ def _run_seed(cycle: dict, primary_product: dict, seed_input: dict, end_date: st
     impact = _find_closest_impact(cycle, date, primary_product, region, country, [
         {'match': {'endDate': date - 10}}
     ]) or _find_closest_impact(cycle, date, {'term': get_generic_crop()}, region, country)
-    return [{**seed_input, MODEL_KEY: linked_node(impact)}] if impact else []
+    return [{**seed_input, MODEL_KEY: linked_node(impact), 'impactAssessmentIsProxy': True}] if impact else []
 
 
 def _should_run_seed(cycle: dict):
@@ -150,7 +151,7 @@ def _run_input(cycle: dict, date: int):
         logShouldRun(cycle, MODEL_ID, term_id, should_run)
         logShouldRun(cycle, MODEL_ID, term_id, should_run, key=MODEL_KEY)  # show specifically under Input
 
-        return {**input, MODEL_KEY: linked_node(impact)} if impact else None
+        return {**input, MODEL_KEY: linked_node(impact), 'impactAssessmentIsProxy': True} if impact else None
     return run
 
 

hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -17,7 +17,7 @@ REQUIREMENTS = {
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive", "forage", "liveAquaticSpecies"],
             "term.units": "kg",
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "optional": {
                 "properties": [{
                     "@type": "Property",

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -5,7 +5,7 @@ This model estimates the energetic requirements of ruminants and can be used to
 Source:
 [IPCC 2019, Vol.4, Chapter 10](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch10_Livestock.pdf).
 """
-from hestia_earth.schema import InputStatsDefinition, TermTermType, AnimalReferencePeriod, InputFate
+from hestia_earth.schema import InputStatsDefinition, TermTermType, AnimalReferencePeriod
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_float
@@ -35,7 +35,7 @@ REQUIREMENTS = {
         }],
         "animals": [{
             "@type": "Animal",
-            "value": "",
+            "value": "> 0",
             "term.termType": "liveAnimal",
             "referencePeriod": "average",
             "properties": [{
@@ -389,24 +389,23 @@ def _pastureGrass_key_property_value(practice: dict, column: dict):
 
 def _calculate_meanDE(cycle: dict, practices: list):
     values = list(map(lambda p: _pastureGrass_key_property_value(p, 'energyDigestibilityRuminants'), practices))
-    weighted_value = sum([
+    total_weight = sum([weight/100 for _value, weight in values])
+    meanDE = sum([
         value * weight/100 for value, weight in values
-    ]) / sum([
-        weight/100 for _value, weight in values
-    ])
+    ]) / total_weight if total_weight > 0 else 0
 
     debugValues(cycle, model=MODEL_LOG, term=MODEL_KEY,
-                meanDE=weighted_value)
+                meanDE=meanDE)
 
-    return weighted_value
+    return meanDE
 
 
 def _calculate_REM(meanDE: float):
-    return 1.123 - (4.092/1000 * meanDE) + (1.126/100000 * pow(meanDE, 2)) - (25.4/meanDE)
+    return 1.123 - (4.092/1000 * meanDE) + (1.126/100000 * pow(meanDE, 2)) - (25.4/meanDE) if meanDE > 0 else 0
 
 
 def _calculate_REG(meanDE: float):
-    return 1.164 - (5.16/1000 * meanDE) + (1.308/100000 * pow(meanDE, 2)) - (37.4/meanDE)
+    return 1.164 - (5.16/1000 * meanDE) + (1.308/100000 * pow(meanDE, 2)) - (37.4/meanDE) if meanDE > 0 else 0
 
 
 def _calculate_feed_meanDE(cycle: dict, input: dict):
@@ -453,7 +452,7 @@ def _calculate_NEfeed_g(cycle: dict, input: dict, meanDE: float):
 def _calculate_NEfeed(cycle: dict):
     inputs = [i for i in cycle.get('inputs', []) if all([
         len(i.get('value')) > 0,
-        i.get('fate') == InputFate.FED_TO_ANIMALS.value
+        i.get('isAnimalFeed', False) is True
     ])]
     # calculate meanDE for each input first
     inputs = [(input, _calculate_feed_meanDE(cycle, input)) for input in inputs]
@@ -468,7 +467,11 @@ def _calculate_NEfeed(cycle: dict):
 
 
 def _calculate_GE(cycle: dict, meanDE: float, system: dict):
-    animals = [a for a in cycle.get('animals', []) if a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value]
+    animals = [
+        a for a in cycle.get('animals', []) if all([
+            a.get('value') and a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
+        ])
+    ]
 
     # calculate NEm first and re-use in other places
     animals = [(animal, _calculate_NEm(cycle, animal)) for animal in animals]
@@ -557,6 +560,7 @@ def _should_run_practice(cycle: dict):
 def _should_run(cycle: dict, practices: dict):
     systems = filter_list_term_type(cycle.get('practices', []), TermTermType.SYSTEM)
     animalFeed_incomplete = _is_term_type_incomplete(cycle, {'termType': 'animalFeed'})
+    all_animals_have_value = all([a.get('value', 0) > 0 for a in cycle.get('animals', [])])
 
     meanDE = _calculate_meanDE(cycle, practices)
     meanECHHV = _calculate_meanECHHV(cycle, practices)
@@ -564,11 +568,14 @@ def _should_run(cycle: dict, practices: dict):
 
     logRequirements(cycle, model=MODEL_LOG, term_id=MODEL_KEY,
                     animalFeed_incomplete=animalFeed_incomplete,
+                    all_animals_have_value=all_animals_have_value,
                     meanDE=meanDE,
                     meanECHHV=meanECHHV,
                     GE=GE)
 
-    should_run = all([animalFeed_incomplete, len(systems) > 0, len(practices) > 0, GE > 0, meanECHHV > 0])
+    should_run = all([
+        animalFeed_incomplete, all_animals_have_value, len(systems) > 0, len(practices) > 0, GE > 0, meanECHHV > 0
+    ])
     logShouldRun(cycle, MODEL_LOG, MODEL_KEY, should_run)
     return should_run, GE, meanECHHV
 

hestia_earth/models/koble2014/cropResidueManagement.py

@@ -21,7 +21,7 @@ REQUIREMENTS = {
             "@type": "Practice",
             "term.@id": ["residueBurnt", "residueLeftOnField", "residueRemoved"],
             "added": ["value"],
-            "methodModel.@id": "koble2014"
+            "model.@id": "koble2014"
         }]
     }
 }
@@ -36,7 +36,7 @@ MODEL_LOG = '/'.join([MODEL, MODEL_KEY])
 
 
 def _is_recalculated(practice: dict):
-    return practice.get('methodModel', {}).get('@id') == MODEL and is_from_model(practice)
+    return practice.get('model', {}).get('@id') == MODEL and is_from_model(practice)
 
 
 def _run_practice(cycle: dict, ratio: float, practice: dict):

hestia_earth/models/mocking/search-results.json

@@ -22,164 +22,164 @@
       "codToWaterIndustrialProcesses",
       "nToSurfaceWaterSoilFlux",
       "dichlorodifluoromethaneToAirInputsProduction",
-      "bromochlorodifluoromethaneToAirInputsProduction",
-      "co2ToAirUreaHydrolysis",
-      "noToAirExcreta",
       "nh3ToAirCropResidueDecomposition",
       "po43ToSurfaceWaterInorganicFertiliser",
       "bod5ToWaterInputsProduction",
-      "no3ToGroundwaterInorganicFertiliser",
-      "noToAirInorganicFertiliser",
-      "nh4ToGroundwaterExcreta",
       "n2OToAirWasteTreatmentIndirect",
       "n2ToAirWasteTreatment",
+      "noToAirInorganicFertiliser",
+      "nh4ToGroundwaterExcreta",
+      "bromochlorodifluoromethaneToAirInputsProduction",
       "n2OToAirCropResidueDecompositionIndirect",
       "nh3ToAirOrganicSoilCultivation",
       "po43ToGroundwaterInorganicFertiliser",
+      "noToAirExcreta",
+      "no3ToGroundwaterInorganicFertiliser",
+      "co2ToAirUreaHydrolysis",
+      "n2OToAirInputsProduction",
       "nmvocToAirSilageStorage",
       "n2OToAirCropResidueBurningIndirect",
-      "noxToAirOrganicSoilCultivation",
-      "nToSurfaceWaterAquacultureSystems",
-      "n2ToAirExcreta",
+      "nh4ToGroundwaterInorganicFertiliser",
+      "ch4ToAirFuelCombustion",
       "nmvocToAirAnimalHousing",
-      "noxToAirInorganicFertiliser",
-      "n2OToAirExcretaDirect",
-      "ch4ToAirWasteTreatment",
-      "noToAirWasteTreatment",
-      "n2OToAirFuelCombustionDirect",
+      "nh3ToAirFuelCombustion",
+      "po43ToSurfaceWaterInputsProduction",
+      "noxToAirCropResidueDecomposition",
       "pToSurfaceWaterSoilFlux",
+      "noToAirSoilFlux",
       "nh3ToAirInputsProduction",
-      "n2ToAirOrganicFertiliser",
       "pm25ToAirAnimalHousing",
-      "pToGroundwaterSoilFlux",
-      "n2OToAirCropResidueDecompositionDirect",
       "po43ToSurfaceWaterSoilFlux",
       "noToAirAquacultureSystems",
       "ch4ToAirOrganicSoilCultivation",
       "co2ToAirSoilFlux",
-      "n2OToAirInputsProduction",
       "nh4ToGroundwaterOrganicFertiliser",
       "co2ToAirAboveGroundBiomassStockChange",
-      "nh4ToGroundwaterInorganicFertiliser",
+      "noxToAirOrganicSoilCultivation",
+      "nToSurfaceWaterAquacultureSystems",
       "noxToAirFuelCombustion",
-      "ch4ToAirFuelCombustion",
+      "n2ToAirExcreta",
       "nmvocToAirExcreta",
-      "nh3ToAirFuelCombustion",
-      "po43ToSurfaceWaterInputsProduction",
-      "noxToAirCropResidueDecomposition",
-      "noToAirSoilFlux",
+      "noxToAirInorganicFertiliser",
+      "n2OToAirExcretaDirect",
+      "ch4ToAirWasteTreatment",
+      "noToAirWasteTreatment",
+      "n2OToAirFuelCombustionDirect",
+      "n2ToAirOrganicFertiliser",
+      "pToGroundwaterSoilFlux",
+      "n2OToAirCropResidueDecompositionDirect",
       "co2ToAirNaturalVegetationBurning",
       "noToAirCropResidueBurning",
-      "hexaneToAirIndustrialProcesses",
-      "so2ToAirInputsProduction",
-      "h2SToAirIndustrialProcesses",
-      "pm25ToAirFuelCombustion",
-      "pm25ToAirInputsProduction",
-      "11DichlorotetrafluoroethaneToAirInputsProduction",
+      "bod5ToWaterIndustrialProcesses",
+      "n2OToAirCropResidueBurningDirect",
+      "co2ToAirInputsProduction",
       "pToDrainageWaterInputsProduction",
-      "no3ToSurfaceWaterAquacultureSystems",
-      "noToAirInputsProduction",
-      "n2OToAirInorganicFertiliserIndirect",
-      "ch4ToAirAquacultureSystems",
-      "noxToAirSoilFlux",
+      "n2OToAirOrganicSoilBurningDirect",
+      "noxToAirWasteTreatment",
       "ch4ToAirOrganicSoilBurning",
       "po43ToGroundwaterOrganicFertiliser",
       "n2OToAirWasteTreatmentDirect",
       "pErosionInputsProduction",
-      "ch4ToAirCropResidueBurning",
-      "ch4ToAirNaturalVegetationBurning",
+      "nh4ToGroundwaterInputsProduction",
+      "nh4ToGroundwaterCropResidueDecomposition",
+      "nh3ToAirExcreta",
       "nErosionInputsProduction",
       "nh3ToAirInorganicFertiliser",
+      "pToSurfaceWaterInputsProduction",
+      "co2ToAirBelowGroundBiomassStockChange",
+      "nh3ToAirAquacultureSystems",
+      "n2OToAirFuelCombustionIndirect",
+      "nmvocToAirInputsProduction",
       "nh3ToAirCropResidueBurning",
       "co2ToAirOrganicSoilBurning",
-      "co2ToAirBelowGroundBiomassStockChange",
+      "codToWaterInputsProduction",
       "po43ToGroundwaterSoilFlux",
-      "nh3ToAirAquacultureSystems",
+      "noToAirCropResidueDecomposition",
       "co2ToAirLimeHydrolysis",
-      "bod5ToWaterIndustrialProcesses",
+      "hexaneToAirIndustrialProcesses",
+      "so2ToAirInputsProduction",
+      "h2SToAirIndustrialProcesses",
+      "pm25ToAirFuelCombustion",
+      "pm25ToAirInputsProduction",
+      "11DichlorotetrafluoroethaneToAirInputsProduction",
       "n2OToAirAquacultureSystemsIndirect",
-      "n2OToAirCropResidueBurningDirect",
-      "co2ToAirInputsProduction",
       "po43ToSurfaceWaterOrganicFertiliser",
       "n2OToAirOrganicFertiliserIndirect",
-      "n2OToAirOrganicSoilBurningDirect",
-      "noxToAirWasteTreatment",
-      "nh4ToGroundwaterInputsProduction",
-      "n2OToAirFuelCombustionIndirect",
-      "nmvocToAirInputsProduction",
-      "nh4ToGroundwaterCropResidueDecomposition",
-      "nh3ToAirExcreta",
-      "codToWaterInputsProduction",
-      "pToSurfaceWaterInputsProduction",
-      "noToAirCropResidueDecomposition",
+      "no3ToSurfaceWaterAquacultureSystems",
+      "noToAirInputsProduction",
+      "n2OToAirInorganicFertiliserIndirect",
+      "ch4ToAirAquacultureSystems",
+      "noxToAirSoilFlux",
+      "ch4ToAirCropResidueBurning",
+      "ch4ToAirNaturalVegetationBurning",
+      "ch4ToAirSoilFlux",
+      "nh3ToAirNaturalVegetationBurning",
+      "n2OToAirOrganicSoilCultivationDirect",
+      "1112TetrafluoroethaneToAirInputsProduction",
+      "no3ToGroundwaterExcreta",
+      "n2OToAirOrganicSoilBurningIndirect",
+      "nmvocToAirFuelCombustion",
+      "pm10ToAirFuelCombustion",
+      "noxToAirCropResidueBurning",
+      "nh3ToAirOrganicSoilBurning",
+      "noToAirOrganicFertiliser",
+      "no3ToSurfaceWaterIndustrialProcesses",
+      "chlorodifluoromethaneToAirInputsProduction",
+      "n2OToAirSoilFlux",
+      "n2OToAirAquacultureSystemsDirect",
+      "n2OToAirOrganicSoilCultivationIndirect",
+      "nh4ToSurfaceWaterAquacultureSystems",
+      "nToSurfaceWaterInputsProduction",
+      "no3ToGroundwaterCropResidueDecomposition",
+      "no3ToGroundwaterSoilFlux",
+      "n2OToAirBackgroundSoilFluxDirect",
+      "noxToAirOrganicFertiliser",
+      "noxToAirNaturalVegetationBurning",
+      "nErosionSoilFlux",
+      "n2ToAirSoilFlux",
+      "no3ToGroundwaterWasteTreatment",
+      "co2ToAirSoilCarbonStockChange",
+      "n2ToAirAquacultureSystems",
+      "nh4ToGroundwaterWasteTreatment",
+      "so2ToAirFuelCombustion",
+      "ch4ToAirExcreta",
+      "noxToAirAquacultureSystems",
       "n2ToAirCropResidueDecomposition",
       "nmvocToAirWasteTreatment",
+      "pToGroundwaterInputsProduction",
+      "ch4ToAirEntericFermentation",
+      "nh3ToAirWasteTreatment",
+      "no3ToGroundwaterOrganicFertiliser",
+      "n2OToAirDiminishingSoilCarbonStocksDirect",
+      "no3ToSurfaceWaterInputsProduction",
+      "n2OToAirOrganicFertiliserDirect",
+      "no3ToGroundwaterInputsProduction",
+      "noxToAirOrganicSoilBurning",
+      "noxToAirInputsProduction",
+      "n2OToAirNaturalVegetationBurningDirect",
+      "h2SToAirInputsProduction",
+      "pToSurfaceWaterAquacultureSystems",
       "co2ToAirFuelCombustion",
       "pErosionSoilFlux",
       "nmvocToAirSilageFeeding",
-      "po43ToSurfaceWaterAquacultureSystems",
-      "nh4ToGroundwaterSoilFlux",
-      "n2OToAirNaturalVegetationBurningIndirect",
+      "ch4ToAirFloodedRice",
+      "nh3ToAirSoilFlux",
+      "hexaneToAirInputsProduction",
       "nh4ToSurfaceWaterInputsProduction",
       "ch4ToAirInputsProductionNonFossil",
+      "pm10ToAirInputsProduction",
       "n2OToAirInorganicFertiliserDirect",
       "ch4ToAirInputsProductionFossil",
       "n2ToAirInorganicFertiliser",
-      "noxToAirInputsProduction",
-      "n2OToAirNaturalVegetationBurningDirect",
-      "h2SToAirInputsProduction",
       "co2ToAirOrganicSoilCultivation",
+      "112TrichlorotrifluoroethaneToAirInputsProduction",
       "nh3ToAirOrganicFertiliser",
+      "pm10ToAirAnimalHousing",
       "n2OToAirExcretaIndirect",
       "noxToAirExcreta",
-      "nh3ToAirSoilFlux",
-      "pToGroundwaterInputsProduction",
-      "ch4ToAirEntericFermentation",
-      "nh3ToAirWasteTreatment",
-      "no3ToGroundwaterOrganicFertiliser",
-      "hexaneToAirInputsProduction",
-      "n2OToAirDiminishingSoilCarbonStocksDirect",
-      "no3ToSurfaceWaterInputsProduction",
-      "pm10ToAirInputsProduction",
-      "n2OToAirOrganicFertiliserDirect",
-      "no3ToGroundwaterInputsProduction",
-      "noxToAirOrganicSoilBurning",
-      "112TrichlorotrifluoroethaneToAirInputsProduction",
-      "pToSurfaceWaterAquacultureSystems",
-      "pm10ToAirAnimalHousing",
-      "ch4ToAirFloodedRice",
-      "nh4ToSurfaceWaterAquacultureSystems",
-      "nToSurfaceWaterInputsProduction",
-      "no3ToGroundwaterCropResidueDecomposition",
-      "no3ToGroundwaterSoilFlux",
-      "n2OToAirOrganicSoilCultivationDirect",
-      "n2OToAirBackgroundSoilFluxDirect",
-      "nmvocToAirFuelCombustion",
-      "pm10ToAirFuelCombustion",
-      "noxToAirCropResidueBurning",
-      "nErosionSoilFlux",
-      "n2ToAirSoilFlux",
-      "nh3ToAirOrganicSoilBurning",
-      "no3ToGroundwaterWasteTreatment",
-      "co2ToAirSoilCarbonStockChange",
-      "noToAirOrganicFertiliser",
-      "no3ToSurfaceWaterIndustrialProcesses",
-      "n2OToAirSoilFlux",
-      "n2ToAirAquacultureSystems",
-      "n2OToAirAquacultureSystemsDirect",
-      "noxToAirAquacultureSystems",
-      "ch4ToAirSoilFlux",
-      "nh3ToAirNaturalVegetationBurning",
-      "1112TetrafluoroethaneToAirInputsProduction",
-      "no3ToGroundwaterExcreta",
-      "noxToAirOrganicFertiliser",
-      "n2OToAirOrganicSoilBurningIndirect",
-      "noxToAirNaturalVegetationBurning",
-      "chlorodifluoromethaneToAirInputsProduction",
-      "n2OToAirOrganicSoilCultivationIndirect",
-      "nh4ToGroundwaterWasteTreatment",
-      "so2ToAirFuelCombustion",
-      "ch4ToAirExcreta"
+      "po43ToSurfaceWaterAquacultureSystems",
+      "nh4ToGroundwaterSoilFlux",
+      "n2OToAirNaturalVegetationBurningIndirect"
     ]
   },
   {
@@ -201,14 +201,14 @@
       }
     },
     "results": [
-      "residueIncorporated",
       "residueIncorporatedLessThan30DaysBeforeCultivation",
+      "residueIncorporated",
       "residueRemoved",
       "residueBurntBeforeAllowingForCombustionFactor",
       "residueIncorporatedMoreThan30DaysBeforeCultivation",
-      "residueBurnt",
       "residueLeftOnField",
-      "pastureRenewed"
+      "pastureRenewed",
+      "residueBurnt"
     ]
   },
   {
@@ -222,12 +222,12 @@
       "discardedCropTotal",
       "discardedCropIncorporated",
       "aboveGroundCropResidueRemoved",
-      "aboveGroundCropResidueIncorporated",
       "discardedCropRemoved",
       "aboveGroundCropResidueTotal",
+      "aboveGroundCropResidueIncorporated",
+      "aboveGroundCropResidueBurnt",
       "belowGroundCropResidue",
-      "aboveGroundCropResidueLeftOnField",
-      "aboveGroundCropResidueBurnt"
+      "aboveGroundCropResidueLeftOnField"
     ]
   },
   {
@@ -258,9 +258,9 @@
     },
     "results": [
       "digestibleEnergyRabbits",
-      "digestibleEnergyPigs",
-      "digestibleEnergySalmonids",
       "digestibleEnergyRuminants",
+      "digestibleEnergySalmonids",
+      "digestibleEnergyPigs",
       "digestibleEnergyPoultry",
       "digestibleEnergyAquaticSpecies",
       "digestibleEnergyOtherAnimals"
@@ -293,13 +293,13 @@
       }
     },
     "results": [
-      "energyDigestibilityRabbits",
       "energyDigestibilityPigs",
-      "energyDigestibilityPoultry",
-      "energyDigestibilityOtherAnimals",
-      "energyDigestibilityRuminants",
+      "energyDigestibilityRabbits",
       "energyDigestibilitySalmonids",
-      "energyDigestibilityAquaticSpecies"
+      "energyDigestibilityRuminants",
+      "energyDigestibilityPoultry",
+      "energyDigestibilityAquaticSpecies",
+      "energyDigestibilityOtherAnimals"
     ]
   },
   {
@@ -312,13 +312,13 @@
       "excretaBeefCattleFeedlotFedKgN",
       "excretaKgN",
       "excretaGeeseKgN",
-      "excretaSolidAndLiquidFishCrustaceansKgN",
-      "excretaBuffaloKgN",
       "excretaSolidFishCrustaceansKgN",
       "excretaPoultryKgN",
       "excretaSheepAndGoatsKgN",
       "excretaDucksKgN",
       "excretaBeefCattleExceptFeedlotFedKgN",
+      "excretaSolidAndLiquidFishCrustaceansKgN",
+      "excretaBuffaloKgN",
       "excretaHorsesMulesAndAssesKgN",
       "excretaPigsKgN",
       "excretaCamelsKgN",
@@ -389,14 +389,14 @@
       }
     },
     "results": [
-      "motorGasoline",
       "diesel1D",
-      "diesel2D",
-      "diesel4D",
-      "en590Diesel",
-      "aviationGasoline",
+      "motorGasoline",
       "gasolineTypeJetFuel",
-      "diesel"
+      "diesel",
+      "aviationGasoline",
+      "en590Diesel",
+      "diesel4D",
+      "diesel2D"
     ]
   },
   {
@@ -426,14 +426,14 @@
       }
     },
     "results": [
+      "milkYieldPerCowRaw",
       "milkYieldPerBuffaloFpcm",
-      "milkYieldPerSheepRaw",
       "milkYieldPerGoatRaw",
-      "milkYieldPerCowRaw",
-      "milkYieldPerBuffaloRaw",
-      "milkYieldPerCamelRaw",
+      "milkYieldPerSheepRaw",
       "milkYieldPerCowFpcm",
-      "milkYieldPerSheepFpcm"
+      "milkYieldPerSheepFpcm",
+      "milkYieldPerCamelRaw",
+      "milkYieldPerBuffaloRaw"
     ]
   },
   {
@@ -465,8 +465,8 @@
       }
     },
     "results": [
-      "ricePlantFlooded",
-      "riceGrainInHuskFlooded"
+      "riceGrainInHuskFlooded",
+      "ricePlantFlooded"
     ]
   },
   {
@@ -476,13 +476,13 @@
       "name": "tillage"
     },
     "results": [
+      "mulchTillage",
+      "stripTillage",
+      "deepTillage",
       "minimumTillage",
       "fullTillage",
-      "noTillage",
       "ridgeTillage",
-      "deepTillage",
-      "stripTillage",
-      "mulchTillage",
+      "noTillage",
       "fullInversionTillage"
     ]
   },
@@ -569,8 +569,8 @@
       }
     },
     "results": [
-      "woolSheepGreasy",
-      "woolGoatGreasy"
+      "woolGoatGreasy",
+      "woolSheepGreasy"
     ]
   }
 ]

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -33,7 +33,7 @@ REQUIREMENTS = {
             "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
             "term.units": "kg",
             "value": "> 0",
-            "fate": ["fed to animals", "grazed"],
+            "isAnimalFeed": "True",
             "optional": {
                 "properties": [
                     {"@type": "Property", "value": "", "term.@id": "nitrogenContent"},

hestia_earth/models/pooreNemecek2018/excretaKgVs.py

@@ -35,7 +35,7 @@ REQUIREMENTS = {
                     "term.termType": ["crop", "animalProduct", "feedFoodAdditive"],
                     "term.units": "kg",
                     "value": "> 0",
-                    "fate": ["fed to animals", "grazed"],
+                    "isAnimalFeed": "True",
                     "optional": {
                         "properties": [
                             {"@type": "Property", "value": "", "term.@id": "carbonContent"},

hestia_earth/models/utils/__init__.py

@@ -19,6 +19,16 @@ def _term_id(term): return term.get('@id') if isinstance(term, dict) else term
 def _omit(values: dict, keys: list): return {k: v for k, v in values.items() if k not in keys}
 
 
+def _include_model(node: dict, term_id: str):
+    term = download_hestia(term_id) or {}
+    return {**node, **({} if term.get('@id') is None else {'model': linked_node(term)})}
+
+
+def _include_method(node: dict, term_id: str):
+    term = download_hestia(term_id) or {}
+    return {**node, **({} if term.get('@id') is None else {'method': linked_node(term)})}
+
+
 def _include_methodModel(node: dict, term_id: str):
     term = download_hestia(term_id) or {}
     return {**node, **({} if term.get('@id') is None else {'methodModel': linked_node(term)})}

hestia_earth/models/utils/input.py

@@ -1,11 +1,11 @@
-from hestia_earth.schema import SchemaType, TermTermType, InputFate
+from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import find_term_match, linked_node, filter_list_term_type
 from hestia_earth.utils.tools import list_sum, non_empty_list, list_average
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 
 from ..log import debugValues, logger
-from . import _term_id, _include_methodModel, _filter_list_term_unit, _load_calculated_node
+from . import _term_id, _include_model, _filter_list_term_unit, _load_calculated_node
 from .constant import Units
 from .property import get_node_property_value, get_node_property_value_converted
 from .blank_node import get_total_value, get_total_value_converted
@@ -14,7 +14,7 @@ from .blank_node import get_total_value, get_total_value_converted
 def _new_input(term, model=None):
     node = {'@type': SchemaType.INPUT.value}
     node['term'] = linked_node(term if isinstance(term, dict) else download_hestia(_term_id(term)))
-    return _include_methodModel(node, model)
+    return _include_model(node, model)
 
 
 def load_impacts(inputs: list):
@@ -103,10 +103,7 @@ def _get_feed_inputs(inputs: list, termTypes: list = _FEED_DEFAULT_TERM_TYPES):
     return [input for input in inputs if all([
         input.get('term', {}).get('units') == Units.KG.value,
         input.get('term', {}).get('termType') in termTypes,
-        input.get('fate') in [
-            InputFate.FED_TO_ANIMALS.value,
-            InputFate.GRAZED.value
-        ]
+        input.get('isAnimalFeed', False) is True
     ])]
 
 

hestia_earth/models/utils/measurement.py

@@ -4,7 +4,7 @@ from hestia_earth.schema import SchemaType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
 
-from . import _term_id, _include_methodModel, _include_source
+from . import _term_id, _include_method, _include_source
 from .term import get_lookup_value
 
 # TODO verify those values
@@ -21,7 +21,7 @@ MEASUREMENT_REDUCE = {
 def _new_measurement(term, model=None, biblio_title=None):
     node = {'@type': SchemaType.MEASUREMENT.value}
     node['term'] = linked_node(term if isinstance(term, dict) else download_hestia(_term_id(term)))
-    return _include_methodModel(_include_source(node, biblio_title), model)
+    return _include_method(_include_source(node, biblio_title), model)
 
 
 def measurement_value(measurement: dict, is_larger_unit: bool = False) -> float:

hestia_earth/models/utils/practice.py

@@ -2,14 +2,14 @@ from hestia_earth.schema import SchemaType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
 
-from . import _term_id, _include_methodModel
+from . import _term_id, _include_model
 from .term import get_lookup_value
 
 
 def _new_practice(term, model=None):
     node = {'@type': SchemaType.PRACTICE.value}
     node['term'] = linked_node(term if isinstance(term, dict) else download_hestia(_term_id(term)))
-    return _include_methodModel(node, model)
+    return _include_model(node, model)
 
 
 def is_model_enabled(model: str, term_id: str, practice: dict = None):

hestia_earth/models/utils/product.py

@@ -4,7 +4,7 @@ from hestia_earth.utils.model import filter_list_term_type, find_term_match, lin
 from hestia_earth.utils.tools import flatten, list_sum
 
 from hestia_earth.models.utils.blank_node import get_total_value, get_total_value_converted
-from . import _term_id, _include_methodModel
+from . import _term_id, _include_model
 from .constant import Units
 from .currency import DEFAULT_CURRENCY
 from .property import _get_nitrogen_content, get_node_property
@@ -19,7 +19,7 @@ def _new_product(term, value: float = 0, model=None):
         node['economicValueShare'] = 0
         node['revenue'] = 0
         node['currency'] = DEFAULT_CURRENCY
-    return _include_methodModel(node, model)
+    return _include_model(node, model)
 
 
 def has_flooded_rice(products: list):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.43.0'
+VERSION = '0.44.1'

{hestia_earth_models-0.43.0.dist-info → hestia_earth_models-0.44.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.43.0
+Version: 0.44.1
 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
@@ -11,8 +11,8 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hestia-earth.schema (>=17.2.0)
-Requires-Dist: hestia-earth.utils (>=0.11.0)
+Requires-Dist: hestia-earth.schema (~=18.0.1)
+Requires-Dist: hestia-earth.utils (>=0.11.1)
 Requires-Dist: python-dateutil (>=2.8.1)
 Requires-Dist: CurrencyConverter (>=0.16.8)
 Requires-Dist: haversine (>=2.7.0)

{hestia_earth_models-0.43.0.dist-info → hestia_earth_models-0.44.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/log.py,sha256=rOgKa-gSrcS-Y1gO9eJXJaA3ofxcQW_45hGly2Lf00Y,2444
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=NYmJe0S48NocR8qX8aVJuvzZIBagbliu0kfeldqoVlM,19
+hestia_earth/models/version.py,sha256=_vVlCNH6wY4Hmj0gYEUhDwK6UFJdVkvCtP51PirWesQ,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=ztMnY6XTwsJD-lp62jJyzN2AUODvFHIs5d5CaFrlVGI,3567
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=10XV1fz_yBYlqmNJ3cxmT2I2Vp_0w7nT4zMIuBw2wCY,3294
@@ -52,22 +52,22 @@ hestia_earth/models/cycle/residueLeftOnField.py,sha256=PkpiuOWYlPZzWYw2Oqu0yM1dQ
 hestia_earth/models/cycle/residueRemoved.py,sha256=7_1pV0xWqp_IJSG-LSRPMksHaW9iUKzyynC7YI_dluM,2283
 hestia_earth/models/cycle/siteDuration.py,sha256=Hox20n3Y-tJ4ydmkrOreWOXAENxOnd827B7qH7_66T0,1058
 hestia_earth/models/cycle/transformation.py,sha256=06KTfVubh2I47dfnG9Iv6AbuUBbURM8BAVOkRu7XmHw,1255
-hestia_earth/models/cycle/completeness/__init__.py,sha256=EdutggDTWO-YKQCRamfphTq27lwdmzbdhgsGZ9BAMcg,1494
-hestia_earth/models/cycle/completeness/animalFeed.py,sha256=AHR7fzsNQlLdOaIEokvu9zMdQO0ELSFvEyEY7hrlyY4,965
-hestia_earth/models/cycle/completeness/cropResidue.py,sha256=1VKru7boaZJo8VTFtSJi9q9shgCVANjhWZhX3sPk6ew,1988
-hestia_earth/models/cycle/completeness/excreta.py,sha256=0ULg2FuHKUaes2Mau6farE42Wocgq_8UVXV_e_OMBRM,949
-hestia_earth/models/cycle/completeness/material.py,sha256=tAqvMQTDLluougRzIM2uCr5ZtRCLW6OasbcU5DAvEbQ,1214
-hestia_earth/models/cycle/completeness/other.py,sha256=VqigooEBnSZzzaVhcmHGyCEwjkzvNq_-CT_WnkXsg7w,1543
-hestia_earth/models/cycle/completeness/soilAmendments.py,sha256=Mspp9Ig4LwShlioWYuGJC5EiBN1gABTcj_0TlSgLOZM,1205
+hestia_earth/models/cycle/completeness/__init__.py,sha256=rkwGtxIay_AleJCT7al_ngnix_xRqySVie7qvHXMQI0,1517
+hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-LVxSyOdD8mDCOZMvjuj5W2uo,1012
+hestia_earth/models/cycle/completeness/cropResidue.py,sha256=zSiu9h0NxEBDUWlaKBh1QcX4jDIklrs0BC2NWMCQQ80,2549
+hestia_earth/models/cycle/completeness/excreta.py,sha256=2yVxcuWjAh4hoEukaMJ90VZpkCL7SfpwIgzigbjVaF4,996
+hestia_earth/models/cycle/completeness/material.py,sha256=UQH2oRnUY-Q-_MVuOlTAYqQxc7wWDM5mi_iFmp9PlIQ,1362
+hestia_earth/models/cycle/completeness/other.py,sha256=Hp3JbeapCvju1vSzdb1Dp9DIUiXSDf-ruRSY3fs4nlg,1652
+hestia_earth/models/cycle/completeness/soilAmendments.py,sha256=fdnTT9mO-LMqJLovY5vxLP-o9GZWYg8QH27fxca_yw8,1338
 hestia_earth/models/cycle/feedConversionRatio/__init__.py,sha256=boQFf5q4DszxQ_D1hnd4jscG2BIBfphDmZCA105ikM8,2491
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioCarbon.py,sha256=Kjrzvx2WxVDZYe8vRjcsbm2ShXg7qRPC2KzQBax7-xU,1331
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=tunDVYH-hB_Dm9oxa3MMIoaVPZhlhaHiJswkr4-dMI0,1726
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha256=o9RoS3KV2FaZ7_ctW5fjn_kVena2hTtRASVmein6xX8,1323
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=zZedbhCkrnODLTEi2eFFLZJxPgqwpzKyIwjxoxRKXpA,1586
-hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=3o6MAhtcBbH7OSAN4oGKBAkNruxnGFxtiwLtNdxt_tk,1843
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioCarbon.py,sha256=Oh680JRn5XNtR-lfHeLGYVofwjxs95-IbkY0bwfZX0Q,1317
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=qjAuU0Ug96Br5AxOL7HCBOGNSv1A_3c2DH13AYG50r4,1712
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha256=gRtqtRz5wyQSsNkX3CyLyeLiDmXGSWogy5tvLOHQ-v0,1309
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=sm-3WfM7xb4cRH8C4-HLkJm7jgEjzhPZvpe5VwY5djQ,1572
+hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=E4fz8n0JuRXhSqIsHs8ZXskB3i7uofxKZTwEo0QQRLk,1829
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/input/ecoinventV3.py,sha256=DlhrS9pTQgy3d0WThZVNCCDLZ51dENYDNMBWIiaEW3o,5474
-hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=Ve8LfTbiSly5fnb1qx3SL_6i4qVf7v3aDoXVS1d1CJ8,7884
+hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=b-kMRMFZO_CuWljUwTT2lVI_OjjXGfUd1Renvjt2Vno,7993
 hestia_earth/models/cycle/input/properties.py,sha256=gwQEJiPbED-tOL5GkxqZRnaaOFH3UK1E0KsqX4OkqAs,1965
 hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
 hestia_earth/models/cycle/post_checks/__init__.py,sha256=qCf8zID6j1Dv2GhSHzz6ZEYcWUyh_N8cjrechi0zfOg,318
@@ -202,7 +202,7 @@ hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=PTE0FEV5x7MZgWpA
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=wueXTY31eMDvc8wIYHgCVhsyXAe0EXpWIqOLTT1I3GQ,2998
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=2GZbLexELODq96rPQecOfN3sWDRFhETUgRQFqmzcayU,3212
-hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=hWG70DKDhNHvy8xAkHcqjAmrHmjfCPzomuurf4sVgQU,7295
+hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=Kk_QNMqZtmJpNWZvCqJYVddn0833x3zwT3Pa5KZVBdE,7281
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=hygInRO3bhwo3JgMwWT2pL0jCP0OrYU55Ntx3O3JyG0,6679
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=f-TJINDbpzK4puGW2Jfrv5-q3er5IL54wWk9O850RcE,6231
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=Q9CGcD1PizZJQ2qdeBQJXn3P_oIpAdbnn02re8HP0D4,2580
@@ -215,13 +215,13 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=WNfaopS9canZs5zePdijfD2HzTTYfqD1hiainuVfwmk,3004
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=X2WPGOiWi_1cQ5yiyjfrBU_rAm3EDsm4WnRJi8ea6g8,3007
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=Q6XLA-yUEJFQCrk1N4Tq2DiMSACI7XnsW_Mn595V1as,3102
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=s-KYXEEQRvUEV239DWXVgqcD9HWl1xjHtHm91ECj5HM,21029
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=V9sKff32359jErhDHqqjaF0Uy8ZtpWQ72Pdl0t7e2_k,21332
 hestia_earth/models/ipcc2019/utils.py,sha256=u-KBk8xVI0Rcn1_jwjGeSXpF83VHpAiNsjGD3DBrUfY,992
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=HEV4Misbe5h99qCqZeCaKNTs4FkFWmv6RdCty_U2pps,947
 hestia_earth/models/koble2014/__init__.py,sha256=jRciLONEhGHtMLu2rlWXEEVwcJqA-URsfH1cCt-Qti4,410
 hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=_gjXqDFQl6C6xSnYqDeHkpWjaqVgOVqSb20iwMD8WqU,5256
-hestia_earth/models/koble2014/cropResidueManagement.py,sha256=_GgVezlBDA3KoF8hvBuQW63bgs12ES28MGJN1BHF7gQ,2985
+hestia_earth/models/koble2014/cropResidueManagement.py,sha256=22guAEe6pyi7SS6pswz3H3lMzfygefB1Mlg3aL2k6PQ,2973
 hestia_earth/models/koble2014/residueBurnt.py,sha256=eKvzC4HOj8t7c2-50guVhqQMapTuxcHNBB-_zElHILY,2285
 hestia_earth/models/koble2014/residueLeftOnField.py,sha256=R3D6-21Za9CylMVFWePSUywL55d7n9ohlBHAJyXAwA4,421
 hestia_earth/models/koble2014/residueRemoved.py,sha256=NqYXLr5Te7m6EcGMJOEeXTB_DDMFKoJslJuiTIQ16RM,2035
@@ -315,13 +315,13 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=x6xsPu-Rwh-7HKsvHuKmgM1YML6fQy2z9Hsy9_BeO2Y,3565
 hestia_earth/models/mocking/__init__.py,sha256=Y39V6yj_3M1q8v9ShCHwPeJOstypOVIvb_FldMEbF7g,766
 hestia_earth/models/mocking/mock_search.py,sha256=pJPIRn8zWtZvOay5Iq9Gc9TUHLiOIfQ2Mq0nnDb8-h4,1797
-hestia_earth/models/mocking/search-results.json,sha256=hB7rkNQxnfUZyZcl4d9VDe7oxJPo2WsTlAcjAd2sK5U,14690
+hestia_earth/models/mocking/search-results.json,sha256=JwfES0TxPyTByYf6yE7ExlrWDzNlw3Tl3Py7bcBWNqk,14690
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=trQBxjc8V77q96sxvK4Y9HfpD64zgyGuB5o5_o0lHts,2189
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=do9zHHR8VuqFcWNLnql5t3tV478SCVc7tC3mEs5cdUk,2184
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=iPNQCPSF0oXzmR7KQqgySpeQAkPFgmBhbta6m6t6Y2U,6603
-hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=v8vYBQmqRpmSqdLFSgbRReYfxyhE3sRwl-yIXS-cfkU,5691
-hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=Fj1N5SsJQ-Mv2gmKsSOFrZMuwRlreRWrEINyucV3Ltc,7765
+hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=fHPbi6D6GluKhjaRBZQTx4TtzNewvHdnWrPyuGZecE4,5677
+hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=bsSZcyzBoVB6Ybk5CgElzPp7mTpQJXsPMdB3ROf6dcM,7751
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=Zlq4gfVPrneqTaahtUiEtmjNqct75AoIag33gOZbC3E,2820
 hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=RHrkBR-U2VSGpwPBs9RCWVlZtHin5BXESKE9jienrRw,1374
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=BgxKSBSRdyNU1_q8Vf9GULkIewuXKmgfDQU9Thzxc1g,2724
@@ -445,7 +445,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=m0zg-GlfyB-R3epWhenJBpCpXaQuczHyJD77DHOQnwE,5623
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialPaf.py,sha256=prp0wzAtEInGN0P6kcMR7JsaWxuZHgVH-_N1h37B-Mk,898
-hestia_earth/models/utils/__init__.py,sha256=ba6ShEUygJaywQdgY635W1pLtzVoypqALoz6jDrxvRI,3536
+hestia_earth/models/utils/__init__.py,sha256=G_9czuomgBup9tTzQdBZ35H2zUZryE_PGg_b-bGVMkA,3896
 hestia_earth/models/utils/animalProduct.py,sha256=JA-xGQiwsz-VPR_8UfI5hKa918bpQOWIok3--b_iVuM,681
 hestia_earth/models/utils/aquacultureManagement.py,sha256=3uSTSMDNNPa26NTJGZCYwByv3QZVyxj6bh2aFCoBzHk,126
 hestia_earth/models/utils/blank_node.py,sha256=jWLM1_s0Oarbby63Jhijv5RTr34d481MB4dE3y7XiGI,7763
@@ -461,13 +461,13 @@ hestia_earth/models/utils/fuel.py,sha256=CxzCM2fXfbW6n7sb8DLkJlVE77fY8yugh9vHv4_
 hestia_earth/models/utils/impact_assessment.py,sha256=IntMGB2gTjJIFKOnAev1SmgWG8qSUTo2EykATSYW9zA,6969
 hestia_earth/models/utils/indicator.py,sha256=fPq38ifd53xWbuOfoiVwiA0Nwa7jVPJLSAPpOMMil8Q,423
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=zJpNvDNaEsZ2T_V4APAQy4rmnLff4FvTiT-VfNFkKF4,1520
-hestia_earth/models/utils/input.py,sha256=IpthIC6ecFV2tkHaHaALrp5vTqx-o3T2AiVW7hhksAY,6892
+hestia_earth/models/utils/input.py,sha256=CsoMC_Jjnifl5mjPWhWOBhiHmNI5IGWRfPjshOV1Ipg,6798
 hestia_earth/models/utils/liveAnimal.py,sha256=u_Lym0hVinncCZMYF_KscCA3vuelWmlyHn4I-jVRDs4,1505
 hestia_earth/models/utils/lookup.py,sha256=Y9ekB_AGpmZKZI7NnYodvvF2pFHlkFHkryMk1SVWp60,5307
-hestia_earth/models/utils/measurement.py,sha256=qKhEfq8BfE6FQgqW8CFc4hzhc-Bv4hp1FhRj5AZiGwE,2617
+hestia_earth/models/utils/measurement.py,sha256=jeX82DPwVQHFBMe5V0yGvQEDDv4ymMtiMsMbOwgM9oU,2607
 hestia_earth/models/utils/pesticideAI.py,sha256=KQNXos2oG-TbDARxg3ksJAfAAYeiaQIZ5e3V2S0A-fA,1329
-hestia_earth/models/utils/practice.py,sha256=fjoOiHsEz7SjaHbbu4HOVnwEcEiWsBz4WEbKSy3yxVw,1103
-hestia_earth/models/utils/product.py,sha256=ZBfxvwLdyGHj55UOjHh68vFMRXdUoifnVm6MxHonfmk,8617
+hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
+hestia_earth/models/utils/product.py,sha256=OFzxe2mFdqUfhQ7tfXkhd-sYMqIxPLIgKJFq65oNrQE,8605
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
 hestia_earth/models/utils/property.py,sha256=X4DDQKHEVYqtW6nNxBhLZ40_avix2dLDxR22Ipeq0TA,4274
 hestia_earth/models/utils/site.py,sha256=RZHcftsauPtvC7ma6ea31m3tIjyAR_VRBTcvYAC9v7s,2153
@@ -613,7 +613,7 @@ tests/models/globalCropWaterModel2008/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 tests/models/globalCropWaterModel2008/test_rootingDepth.py,sha256=dyhojeVM9ge1XOuuiUVSkNeLy--A2xW81hqGELNvEWY,2468
 tests/models/haversineFormula/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/haversineFormula/transport/test_distance.py,sha256=7WhLoajc3cykO1XdZab_6BcGiJpHn06ZMYN7YqmsQrY,958
+tests/models/haversineFormula/transport/test_distance.py,sha256=hqzIOA1nGao8uiBE16J0ou52McwV4w30ZLpEAqtfi9k,970
 tests/models/hyde32/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/hyde32/test_landTransformationFromCropland100YearAverageDuringCycle.py,sha256=RKxRIxBg7MazL62Hf56ls-8uiyS1M-lk5mdvodgqqVE,706
 tests/models/hyde32/test_landTransformationFromCropland20YearAverageDuringCycle.py,sha256=XoNrnnyqk7WpIT8S_-GPy8Hxbz6Ve1FH25XZ-JB4PEs,705
@@ -911,18 +911,18 @@ tests/models/utils/test_dataCompleteness.py,sha256=mW6rA7ddhtjZsLxwo5xDnvBdxmqTs
 tests/models/utils/test_emission.py,sha256=8b2XnxrXajTlRGpHP_GnGXHrRHnPIi4m3SOT0mBlDbw,627
 tests/models/utils/test_impact_assessment.py,sha256=EYnbauTQLBDYfjIzFo7EWBGnCCle7wXGaCQ4rMLH_sU,1459
 tests/models/utils/test_indicator.py,sha256=GwYKV5N_yEPcJWz7FirRnK48rl62ofAn_TkAo0MioIM,639
-tests/models/utils/test_input.py,sha256=ZTnG9nKnb0yZ7JLjku8ew8aD1Hy2AH0tLfFuXpBUv64,591
+tests/models/utils/test_input.py,sha256=bSG6YKmT2ofY2oD5CGbNwR8-To-ihyNyr14Td5-jNRU,585
 tests/models/utils/test_liveAnimal.py,sha256=UH9zRqunCIy2H3JkJArCGHzC8Hzq-oYQ7peqPn78fXM,926
-tests/models/utils/test_measurement.py,sha256=s7b_OphiBEjHPOfTdEtUSr2YdirTgwtLss41NrYvk6s,2739
-tests/models/utils/test_practice.py,sha256=FosI7oInyiIYKCqN8S5BN0eeOWl3NO-1GuZP_FFIMLc,618
-tests/models/utils/test_product.py,sha256=rWpS3oRW7W-Jf92hKBNbxmCsFnzEKM6V-EPTpxFUDlI,1732
+tests/models/utils/test_measurement.py,sha256=k_L54NV97jKlPgTHQBPlo-IHP1cp-y-aGfuNrx0gpQE,2734
+tests/models/utils/test_practice.py,sha256=ILaxkb3qICor9AquAGYiOtA-YKnq0hppmJQzNC_VNyA,612
+tests/models/utils/test_product.py,sha256=heyd7zYUXaqiiPgBkWJr-OxMNcdVzC8jSRCfvMt4CQE,1726
 tests/models/utils/test_property.py,sha256=t2npw86IK7C6G4ypiPtanFi0db4PB7G5VBR1GjRGl34,618
 tests/models/utils/test_site.py,sha256=deEIYptl2MHEklSfHbZV9qA59YKqZLQr8y5rWYiD460,680
 tests/models/utils/test_term.py,sha256=jcANyHzzLpkq7AQReFmTa16vtMlwgCNfhDbr9FLlYX4,1808
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.43.0.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.43.0.dist-info/METADATA,sha256=FUJv9zwmdaE7SrGQzRa56m1j1BsMvzD2VmxFsLyCapo,3192
-hestia_earth_models-0.43.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-hestia_earth_models-0.43.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.43.0.dist-info/RECORD,,
+hestia_earth_models-0.44.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.44.1.dist-info/METADATA,sha256=ORplFPloCt085BqrUYz_gmsCRPnPTzUqyobdot3UQp0,3192
+hestia_earth_models-0.44.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+hestia_earth_models-0.44.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.44.1.dist-info/RECORD,,

{hestia_earth_models-0.43.0.dist-info → hestia_earth_models-0.44.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/models/haversineFormula/transport/test_distance.py

@@ -1,7 +1,7 @@
 from unittest.mock import patch
 import json
 
-from tests.utils import fixtures_path, _set_model
+from tests.utils import fixtures_path, _set_methodModel
 from hestia_earth.models.haversineFormula.transport.distance import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.transport.{MODEL_KEY}"
@@ -16,7 +16,7 @@ def fake_download_hestia(id: str, *args):
 
 
 @patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
-@patch(f"{class_path}._include_methodModel", side_effect=_set_model)
+@patch(f"{class_path}._include_methodModel", side_effect=_set_methodModel)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/utils/test_input.py

@@ -6,7 +6,7 @@ from hestia_earth.models.utils.input import _new_input
 class_path = 'hestia_earth.models.utils.input'
 
 
-@patch(f"{class_path}._include_methodModel", side_effect=lambda n, x: n)
+@patch(f"{class_path}._include_model", side_effect=lambda n, x: n)
 @patch(f"{class_path}.download_hestia", return_value=TERM)
 def test_new_input(*args):
     # with a Term as string

tests/models/utils/test_measurement.py

@@ -10,7 +10,7 @@ class_path = 'hestia_earth.models.utils.measurement'
 fixtures_folder = f"{fixtures_path}/utils/measurement"
 
 
-@patch(f"{class_path}._include_methodModel", side_effect=lambda n, x: n)
+@patch(f"{class_path}._include_method", side_effect=lambda n, x: n)
 @patch(f"{class_path}._include_source", side_effect=lambda n, x: n)
 @patch(f"{class_path}.download_hestia", return_value=TERM)
 def test_new_measurement(*args):

tests/models/utils/test_practice.py

@@ -4,7 +4,7 @@ from tests.utils import TERM
 from hestia_earth.models.utils.practice import _new_practice
 
 
-@patch('hestia_earth.models.utils.practice._include_methodModel', side_effect=lambda n, x: n)
+@patch('hestia_earth.models.utils.practice._include_model', side_effect=lambda n, x: n)
 @patch('hestia_earth.models.utils.practice.download_hestia', return_value=TERM)
 def test_new_practice(*args):
     # with a Term as string

tests/models/utils/test_product.py

@@ -10,7 +10,7 @@ class_path = 'hestia_earth.models.utils.product'
 fixtures_folder = f"{fixtures_path}/utils/product"
 
 
-@patch(f"{class_path}._include_methodModel", side_effect=lambda n, x: n)
+@patch(f"{class_path}._include_model", side_effect=lambda n, x: n)
 @patch(f"{class_path}.download_hestia", return_value=TERM)
 def test_new_product(*args):
     # with a Term as string