hestia-earth-models 0.70.2__py3-none-any.whl → 0.70.3__py3-none-any.whl

hestia_earth/models/config/Cycle.json

@@ -182,6 +182,14 @@
       "mergeStrategy": "list",
       "stage": 1
     },
+    {
+      "key": "practices",
+      "model": "cycle",
+      "value": "practice.landCover",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "stage": 1
+    },
     {
       "key": "products",
       "model": "hestia",

hestia_earth/models/cycle/practice/landCover.py

@@ -0,0 +1,181 @@
+from functools import reduce
+from hestia_earth.schema import TermTermType, SiteSiteType
+from hestia_earth.utils.model import filter_list_term_type
+from hestia_earth.utils.tools import non_empty_list, flatten, list_sum
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils import _omit, _include
+from hestia_earth.models.utils.practice import _new_practice
+from hestia_earth.models.utils.term import get_lookup_value
+from hestia_earth.models.utils.blank_node import condense_nodes
+from hestia_earth.models.utils.crop import get_landCover_term_id
+from .. import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "endDate": "",
+        "products": [
+            {
+                "@type": "Product",
+                "term.termType": ["crop", "forage"],
+                "optional": {
+                    "startDate": "",
+                    "endDate": ""
+                }
+            }
+        ],
+        "site": {
+            "@type": "Site",
+            "siteType": "cropland"
+        },
+        "none": {
+            "practices": [{"@type": "Practice", "term.termType": "landCover"}]
+        },
+        "optional": {
+            "startDate": ""
+        }
+    }
+}
+RETURNS = {
+    "Practice": [{
+        "term.termType": "landCover",
+        "value": "",
+        "endDate": "",
+        "startDate": ""
+    }]
+}
+LOOKUPS = {
+    "crop": ["landCoverTermId", "maximumCycleDuration"],
+    "forage": ["landCoverTermId"],
+    "property": ["GAP_FILL_TO_MANAGEMENT", "CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY"]
+}
+MODEL_KEY = 'landCover'
+
+
+def practice(data: dict):
+    node = _new_practice(data.get('id'))
+    node['value'] = [data['value']]
+    node['endDate'] = data['endDate']
+    if data.get('startDate'):
+        node['startDate'] = data['startDate']
+    if data.get('properties'):
+        node['properties'] = data['properties']
+    return node
+
+
+def _should_gap_fill(term: dict):
+    value = get_lookup_value(lookup_term=term, column='GAP_FILL_TO_MANAGEMENT')
+    return bool(value)
+
+
+def _filter_properties(blank_node: dict):
+    properties = list(filter(lambda p: _should_gap_fill(p.get('term', {})), blank_node.get('properties', [])))
+    return _omit(blank_node, ['properties']) | ({'properties': properties} if properties else {})
+
+
+def _map_to_value(value: dict):
+    return {
+        'id': value.get('term', {}).get('@id'),
+        'value': value.get('value'),
+        'startDate': value.get('startDate'),
+        'endDate': value.get('endDate'),
+        'properties': value.get('properties')
+    }
+
+
+def _copy_item_if_exists(source: dict, keys: list[str] = None, dest: dict = None) -> dict:
+    return reduce(lambda p, c: p | ({c: source[c]} if source.get(c) else {}), keys or [], dest or {})
+
+
+def _run(cycle: dict, products: list, total: float):
+    # remove any properties that should not get gap-filled
+    products = list(map(_filter_properties, products))
+
+    nodes = [
+        _map_to_value(_include(cycle, ["startDate", "endDate"]) | _copy_item_if_exists(
+            source=product,
+            keys=['properties', 'startDate', 'endDate'],
+            dest={
+                "term": {'@id': product.get('land-cover-id')},
+                "value": round((100 - total) / len(products), 2)
+            }
+        ))
+        for product in products
+    ]
+
+    return condense_nodes(list(map(practice, nodes)))
+
+
+def _should_group_landCover(term: dict):
+    value = get_lookup_value(lookup_term=term, column='CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY')
+    return bool(value)
+
+
+def _has_prop_grouped_with_landCover(product: dict):
+    return bool(
+        next((
+            p
+            for p in product.get('properties', [])
+            if _should_group_landCover(p.get('term', {}))
+        ), None)
+    )
+
+
+def _product_wit_landCover_id(product: dict):
+    landCover_id = get_landCover_term_id(product.get('term', {}))
+    return product | {'land-cover-id': landCover_id} if landCover_id else None
+
+
+def _should_run(cycle: dict):
+    is_cropland = cycle.get('site', {}).get('siteType') == SiteSiteType.CROPLAND.value
+
+    practices = filter_list_term_type(cycle.get('practices', []), TermTermType.LANDCOVER)
+    # split practices with properties that group with landCover
+    practices_max_100 = [
+        p for p in practices if _has_prop_grouped_with_landCover(p)
+    ]
+    total_practices_max_100 = list_sum([
+        list_sum(p.get('value', []))
+        for p in practices_max_100
+    ])
+    practices_without_grouped_props = [
+        p for p in practices if not _has_prop_grouped_with_landCover(p)
+    ]
+
+    products = filter_list_term_type(cycle.get('products', []), [TermTermType.CROP, TermTermType.FORAGE])
+    # only take products with a matching landCover term
+    products = non_empty_list(map(_product_wit_landCover_id, products))
+
+    # Products that can sum up to 100% => run if total is below 100%
+    products_max_100 = [
+        p for p in products
+        if _has_prop_grouped_with_landCover(p)
+    ] if total_practices_max_100 < 100 else []
+
+    # Products that must sum up to 100% => can not run practices already exist as already 100%
+    products_is_100 = [
+        p for p in products
+        if not _has_prop_grouped_with_landCover(p)
+    ] if not practices_without_grouped_props else []
+
+    has_crop_forage_products = bool(products_max_100 + products_is_100)
+
+    logRequirements(cycle, model=MODEL, model_key=MODEL_KEY,
+                    is_cropland=is_cropland,
+                    has_crop_forage_products=has_crop_forage_products)
+
+    should_run = all([is_cropland, has_crop_forage_products])
+    logShouldRun(cycle, MODEL, None, should_run, model_key=MODEL_KEY)
+
+    return should_run, [
+        (products_max_100, total_practices_max_100),
+        (products_is_100, 0)
+    ]
+
+
+def run(cycle: dict):
+    should_run, products_list = _should_run(cycle)
+    return flatten([
+        _run(cycle, products, total)
+        for products, total in products_list if products
+    ]) if should_run else []

hestia_earth/models/emepEea2019/nh3ToAirExcreta.py

@@ -46,7 +46,7 @@ def _run(excreta_EF_input: float):
 def _should_run(cycle: dict):
     excreta_complete = _is_term_type_complete(cycle, TermTermType.EXCRETA)
     excreta_EF_input = get_excreta_inputs_with_factor(
-        cycle, f"{list(LOOKUPS.keys())[0]}.csv", excreta_convertion_func=total_excreta_tan, model=MODEL, term=TERM_ID
+        cycle, f"{list(LOOKUPS.keys())[0]}.csv", excreta_conversion_func=total_excreta_tan, model=MODEL, term=TERM_ID
     )
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,

hestia_earth/models/hestia/management.py

@@ -1,6 +1,5 @@
 from typing import List
 from datetime import timedelta, datetime
-from functools import reduce
 from hestia_earth.schema import SchemaType, TermTermType, SiteSiteType, COMPLETENESS_MAPPING
 from hestia_earth.utils.lookup import column_name, get_table_value, download_lookup
 from hestia_earth.utils.model import filter_list_term_type
@@ -8,7 +7,7 @@ from hestia_earth.utils.tools import safe_parse_float, flatten
 from hestia_earth.utils.blank_node import get_node_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
-from hestia_earth.models.utils import _include, _omit, group_by
+from hestia_earth.models.utils import _include, group_by
 from hestia_earth.models.utils.management import _new_management
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.blank_node import condense_nodes, DatestrFormat, _gapfill_datestr, DatestrGapfillMode
@@ -24,20 +23,16 @@ REQUIREMENTS = {
             "Cycle": [{
                 "@type": "Cycle",
                 "endDate": "",
-                "products": [
-                    {
-                        "@type": "Product",
-                        "term.termType": ["crop", "forage", "landCover"]
-                    }
-                ],
                 "practices": [
                     {
+                        "@type": "Practice",
                         "term.termType": [
                             "waterRegime",
                             "tillage",
                             "cropResidueManagement",
                             "landUseManagement",
-                            "system"
+                            "system",
+                            "landCover"
                         ],
                         "value": ""
                     }
@@ -62,7 +57,6 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Management": [{
-        "@type": "Management",
         "term.termType": [
             "landCover", "waterRegime", "tillage", "cropResidueManagement", "landUseManagement", "system"
         ],
@@ -78,7 +72,7 @@ LOOKUPS = {
     "organicFertiliser": "ANIMAL_MANURE",
     "soilAmendment": "PRACTICE_INCREASING_C_INPUT",
     "landUseManagement": "GAP_FILL_TO_MANAGEMENT",
-    "property": ["GAP_FILL_TO_MANAGEMENT", "CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY"]
+    "property": "GAP_FILL_TO_MANAGEMENT"
 }
 MODEL_KEY = 'management'
 
@@ -87,7 +81,8 @@ _PRACTICES_TERM_TYPES = [
     TermTermType.TILLAGE,
     TermTermType.CROPRESIDUEMANAGEMENT,
     TermTermType.LANDUSEMANAGEMENT,
-    TermTermType.SYSTEM
+    TermTermType.SYSTEM,
+    TermTermType.LANDCOVER
 ]
 _PRACTICES_COMPLETENESS_MAPPING = COMPLETENESS_MAPPING.get(SchemaType.PRACTICE.value, {})
 _ANIMAL_MANURE_USED_TERM_ID = "animalManureUsed"
@@ -125,7 +120,6 @@ _INPUT_RULES = {
 _SKIP_LAND_COVER_SITE_TYPES = [
     SiteSiteType.CROPLAND.value
 ]
-_CYCLE_DATE_TERM_TYPES = {TermTermType.CROP.value, TermTermType.FORAGE.value}
 
 
 def management(data: dict):
@@ -188,11 +182,6 @@ def _should_gap_fill(term: dict):
     return bool(value)
 
 
-def _filter_properties(blank_node: dict):
-    properties = list(filter(lambda p: _should_gap_fill(p.get('term', {})), blank_node.get('properties', [])))
-    return _omit(blank_node, ['properties']) | ({'properties': properties} if properties else {})
-
-
 def _map_to_value(value: dict):
     return {
         'id': value.get('term', {}).get('@id'),
@@ -207,10 +196,6 @@ def _extract_node_value(node: dict) -> dict:
     return node | {'value': get_node_value(node)}
 
 
-def _copy_item_if_exists(source: dict, keys: list[str] = None, dest: dict = None) -> dict:
-    return reduce(lambda p, c: p | ({c: source[c]} if source.get(c) else {}), keys or [], dest or {})
-
-
 def _get_relevant_items(cycle: dict, item_name: str, term_types: List[TermTermType], completeness_mapping: dict = {}):
     """
     Get items from the list of cycles with any of the relevant terms.
@@ -278,84 +263,6 @@ def _run_from_siteType(site: dict, cycle: dict):
     }] if should_run else []
 
 
-def _run_products(cycle: dict, products: list, total_products: int = None, use_cycle_dates: bool = False):
-    default_dates = _include_with_date_gap_fill(cycle, ["startDate", "endDate"])
-    return [
-        _map_to_value(default_dates | _copy_item_if_exists(
-            source=product,
-            keys=['properties', 'startDate', 'endDate'],
-            dest={
-                "term": {'@id': get_landCover_term_id(product.get('term', {}))},
-                "value": round(100 / (total_products or len(products)), 2)
-            }
-        ) | (
-            default_dates if use_cycle_dates or product.get("term", {}).get("termType") in _CYCLE_DATE_TERM_TYPES
-            else {}
-        ))
-        for product in products
-    ]
-
-
-def _run_from_landCover(cycle: dict, crop_forage_products: list):
-    """
-    Copy landCover items, and include crop/forage landCover items with properties to count in ratio.
-    """
-    land_cover_products = [
-        _map_to_value(_extract_node_value(
-            _include_with_date_gap_fill(
-                value=product,
-                keys=["term", "value", "startDate", "endDate", "properties"]
-            )
-        )) for product in _get_relevant_items(
-            cycle=cycle,
-            item_name="products",
-            term_types=[TermTermType.LANDCOVER]
-        )
-    ]
-    return land_cover_products + _run_products(
-        cycle,
-        crop_forage_products,
-        total_products=len(crop_forage_products) + len(land_cover_products),
-        use_cycle_dates=True
-    )
-
-
-def _should_group_landCover(term: dict):
-    value = get_lookup_value(lookup_term=term, column='CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY')
-    return bool(value)
-
-
-def _has_prop_grouped_with_landCover(product: dict):
-    return bool(
-        next((
-            p
-            for p in product.get('properties', [])
-            if _should_group_landCover(p.get('term', {}))
-        ), None)
-    )
-
-
-def _run_from_crop_forage(cycle: dict, site: dict):
-    products = _get_relevant_items(
-        cycle=cycle,
-        item_name="products",
-        term_types=[TermTermType.CROP, TermTermType.FORAGE]
-    ) if site.get("siteType", "") == SiteSiteType.CROPLAND.value else []
-    # only take products with a matching landCover term
-    products = [p for p in products if get_landCover_term_id(p.get('term', {}))]
-    # remove any properties that should not get gap-filled
-    products = list(map(_filter_properties, products))
-
-    # split products with properties that group with landCover
-    products_with_gap_filled_props = [p for p in products if _has_prop_grouped_with_landCover(p)]
-    products_without_gap_filled_props = [p for p in products if not _has_prop_grouped_with_landCover(p)]
-
-    return _run_from_landCover(
-        cycle=cycle,
-        crop_forage_products=products_with_gap_filled_props
-    ) + _run_products(cycle, products_without_gap_filled_props, use_cycle_dates=False)
-
-
 def _should_run_practice(practice: dict):
     """
     Include only landUseManagement practices where GAP_FILL_TO_MANAGEMENT = True
@@ -369,7 +276,7 @@ def _run_from_practices(cycle: dict):
         _extract_node_value(
             _include_with_date_gap_fill(
                 value=practice,
-                keys=["term", "value", "startDate", "endDate"]
+                keys=["term", "value", "startDate", "endDate", "properties"]
             )
         ) for practice in _get_relevant_items(
             cycle=cycle,
@@ -378,18 +285,16 @@ def _run_from_practices(cycle: dict):
             completeness_mapping=_PRACTICES_COMPLETENESS_MAPPING
         )
     ]
-    practices = list(map(_map_to_value, filter(_should_run_practice, practices)))
-    return practices
+    return list(map(_map_to_value, filter(_should_run_practice, practices)))
 
 
 def _run_cycle(site: dict, cycle: dict):
     inputs = _run_from_inputs(site, cycle)
-    products = _run_from_crop_forage(site=site, cycle=cycle)
     site_types = _run_from_siteType(site=site, cycle=cycle)
     practices = _run_from_practices(cycle)
     return [
         node | {'cycle-id': cycle.get('@id')}
-        for node in inputs + products + site_types + practices
+        for node in inputs + site_types + practices
     ]
 
 
@@ -409,5 +314,4 @@ def run(site: dict):
         )
         logShouldRun(site, MODEL, id, True, model_key=MODEL_KEY)
 
-    management_nodes = condense_nodes(list(map(management, nodes)))
-    return management_nodes
+    return condense_nodes(list(map(management, nodes)))

hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py

@@ -98,7 +98,7 @@ def _should_run(cycle: dict):
 
     use_excreta_management = _should_run_with_excreta_management(cycle)
     excreta_EF_input = get_excreta_inputs_with_factor(
-        cycle, f"{list(LOOKUPS.keys())[0]}.csv", excreta_convertion_func=total_excreta, model=MODEL, term=TERM_ID
+        cycle, f"{list(LOOKUPS.keys())[0]}.csv", excreta_conversion_func=total_excreta, model=MODEL, term=TERM_ID
     ) if use_excreta_management else None
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py

@@ -204,11 +204,19 @@ _CARBON_INPUT_PROPERTY_TERM_IDS = [
     _DRY_MATTER_TERM_ID
 ]
 
-_CARBON_SOURCE_TERM_TYPES = [
+_INPUT_CARBON_SOURCE_TERM_TYPES = [
     TermTermType.ORGANICFERTILISER.value,
     TermTermType.SOILAMENDMENT.value
 ]
 
+_PRACTICE_CARBON_SOURCE_TERM_TYPES = [
+    TermTermType.LANDCOVER
+]
+
+_PRODUCT_CARBON_SOURCE_TERM_TYPES = [
+    TermTermType.CROPRESIDUE
+]
+
 _VALID_SITE_TYPES = [
     SiteSiteType.CROPLAND.value
 ]
@@ -1447,7 +1455,10 @@ def _get_carbon_sources(cycle: dict) -> list[CarbonSource]:
     list[CarbonSource]
         A formatted list of `CarbonSource`s.
     """
-    inputs_and_products = cycle.get("inputs", []) + cycle.get("products", [])
+    carbon_source_nodes = filter_list_term_type(
+        cycle.get("inputs", []) + cycle.get("practices", []) + cycle.get("products", []),
+        _INPUT_CARBON_SOURCE_TERM_TYPES + _PRACTICE_CARBON_SOURCE_TERM_TYPES + _PRODUCT_CARBON_SOURCE_TERM_TYPES
+    )
 
     group_fac = cycle.get('fraction_of_group_duration')
     node_fac = cycle.get('fraction_of_node_duration')
@@ -1466,7 +1477,7 @@ def _get_carbon_sources(cycle: dict) -> list[CarbonSource]:
                 if validator(node)
             ),
             None
-        ) for node in inputs_and_products
+        ) for node in carbon_source_nodes
     ])
 
 
@@ -1603,7 +1614,7 @@ def _should_run_carbon_source(node: dict) -> bool:
     """
     return any([
         node.get("term", {}).get("@id") in _CARBON_SOURCE_TERM_IDS,
-        node.get("term", {}).get("termType") in _CARBON_SOURCE_TERM_TYPES
+        node.get("term", {}).get("termType") in _INPUT_CARBON_SOURCE_TERM_TYPES
     ])
 
 

hestia_earth/models/mocking/search-results.json

@@ -3925,11 +3925,11 @@
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityOtherAnimals"
+        "@id": "energyDigestibilityPoultry"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPoultry"
+        "@id": "energyDigestibilityOtherAnimals"
       },
       {
         "@type": "Term",
@@ -3954,27 +3954,27 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
@@ -3996,10 +3996,6 @@
         "@type": "Term",
         "@id": "excretaTurkeysKgN"
       },
-      {
-        "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
-      },
       {
         "@type": "Term",
         "@id": "excretaKgN"
@@ -4012,6 +4008,10 @@
         "@type": "Term",
         "@id": "excretaInsectsKgN"
       },
+      {
+        "@type": "Term",
+        "@id": "excretaBeefCattleFeedlotFedKgN"
+      },
       {
         "@type": "Term",
         "@id": "excretaSheepKgN"
@@ -4067,15 +4067,15 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
@@ -4111,19 +4111,19 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
+        "@id": "excretaBeefCattleFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgVs"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgVs"
+        "@id": "excretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgVs"
+        "@id": "excretaDeerKgVs"
       }
     ]
   },
@@ -4180,7 +4180,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 22.649164
+        "_score": 22.662407
       }
     ]
   },
@@ -4462,169 +4462,169 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 61.805214
+        "_score": 61.776108
       },
       {
         "@type": "Term",
         "name": "Sea or ocean",
         "@id": "seaOrOcean",
-        "_score": 51.3974
+        "_score": 50.309784
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 48.80929
+        "_score": 48.736115
       },
       {
         "@type": "Term",
-        "name": "Other natural vegetation",
-        "@id": "otherNaturalVegetation",
-        "_score": 41.345604
+        "name": "Agri-food processor",
+        "@id": "agriFoodProcessor",
+        "_score": 41.47336
       },
       {
         "@type": "Term",
-        "name": "Agri-food processor",
-        "@id": "agriFoodProcessor",
-        "_score": 41.200302
+        "name": "Other natural vegetation",
+        "@id": "otherNaturalVegetation",
+        "_score": 41.24772
       },
       {
         "@type": "Term",
         "name": "Food retailer",
         "@id": "foodRetailer",
-        "_score": 39.40757
+        "_score": 39.13082
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 30.954716
+        "_score": 30.847563
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 28.733797
+        "_score": 28.668303
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 27.314993
+        "_score": 27.123905
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 25.612892
+        "_score": 25.500269
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 25.085224
+        "_score": 25.064548
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 20.495056
+        "_score": 20.20596
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 19.183342
+        "_score": 19.290152
       },
       {
         "@type": "Term",
-        "name": "Other land",
-        "@id": "otherLand",
-        "_score": 18.45823
+        "name": "Primary forest",
+        "@id": "primaryForest",
+        "_score": 18.45046
       },
       {
         "@type": "Term",
-        "name": "Lake",
-        "@id": "lake",
-        "_score": 18.216282
+        "name": "Other land",
+        "@id": "otherLand",
+        "_score": 18.418287
       },
       {
         "@type": "Term",
-        "name": "Primary forest",
-        "@id": "primaryForest",
-        "_score": 18.14983
+        "name": "Plantation forest",
+        "@id": "plantationForest",
+        "_score": 18.265854
       },
       {
         "@type": "Term",
-        "name": "Plantation forest",
-        "@id": "plantationForest",
-        "_score": 18.021662
+        "name": "Lake",
+        "@id": "lake",
+        "_score": 18.230291
       },
       {
         "@type": "Term",
         "name": "Improved pasture",
         "@id": "improvedPasture",
-        "_score": 17.772917
+        "_score": 17.785988
       },
       {
         "@type": "Term",
         "name": "Secondary forest",
         "@id": "secondaryForest",
-        "_score": 17.765026
+        "_score": 17.757538
       },
       {
         "@type": "Term",
         "name": "Native pasture",
         "@id": "nativePasture",
-        "_score": 17.518377
+        "_score": 17.527752
       },
       {
         "@type": "Term",
         "name": "Nominally managed pasture",
         "@id": "nominallyManagedPasture",
-        "_score": 16.49458
+        "_score": 16.500256
+      },
+      {
+        "@type": "Term",
+        "name": "Sea kale plant",
+        "@id": "seaKalePlant",
+        "_score": 16.128777
       },
       {
         "@type": "Term",
         "name": "Red sea plume alga",
         "@id": "redSeaPlumeAlga",
-        "_score": 16.421041
+        "_score": 16.10274
       },
       {
         "@type": "Term",
         "name": "Severely degraded pasture",
         "@id": "severelyDegradedPasture",
-        "_score": 16.277512
-      },
-      {
-        "@type": "Term",
-        "name": "Sea kale plant",
-        "@id": "seaKalePlant",
-        "_score": 16.218529
+        "_score": 15.984688
       },
       {
         "@type": "Term",
         "name": "Pond",
         "@id": "pond",
-        "_score": 13.82317
+        "_score": 13.815231
       },
       {
         "@type": "Term",
         "name": "River tamarind tree",
         "@id": "riverTamarindTree",
-        "_score": 12.985474
+        "_score": 12.997887
       },
       {
         "@type": "Term",
         "name": "Cropland",
         "@id": "cropland",
-        "_score": 9.878035
+        "_score": 9.890675
       },
       {
         "@type": "Term",
         "name": "Annual cropland",
         "@id": "annualCropland",
-        "_score": 9.241321
+        "_score": 8.967179
       }
     ]
   },
@@ -7449,39 +7449,39 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "stripTillage"
+        "@id": "ridgeTillage"
       },
       {
         "@type": "Term",
-        "@id": "mulchTillage"
+        "@id": "noTillage"
       },
       {
         "@type": "Term",
-        "@id": "deepTillage"
+        "@id": "verticalTillage"
       },
       {
         "@type": "Term",
-        "@id": "ridgeTillage"
+        "@id": "stripTillage"
       },
       {
         "@type": "Term",
-        "@id": "noTillage"
+        "@id": "mulchTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "deepTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "fullInversionTillage"
       },
       {
         "@type": "Term",
-        "@id": "verticalTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullInversionTillage"
+        "@id": "minimumTillage"
       }
     ]
   },

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -129,7 +129,9 @@ def _should_run(cycle: dict):
             logRequirements(cycle, model=MODEL, term=term_id, model_key=MODEL_KEY,
                             is_liveAquaticSpecies=is_liveAquaticSpecies,
                             product_value=product_value,
-                            nitrogen_content=nitrogen_content)
+                            nitrogen_content=nitrogen_content,
+                            inputs_n=inputs_n,
+                            products_n=products_n)
 
         else:
             logRequirements(cycle, model=MODEL, term=term_id, model_key=MODEL_KEY,

hestia_earth/models/utils/blank_node.py

@@ -434,11 +434,11 @@ def convert_to_nitrogen(node: dict, model: str, blank_nodes: list, **log_args):
     missing_nitrogen_property = [i.get('term', {}).get('@id') for i, value in values if not value]
 
     debugValues(node, model=model,
-                convertion_details=log_as_table([
+                conversion_details=log_as_table([
                     {
                         'id': i.get('term', {}).get('@id'),
                         'value': list_sum(i.get('value', [])),
-                        'conversion-factor': value
+                        'nitrogenContent': value
                     }
                     for i, value in values
                 ]),

hestia_earth/models/utils/excretaManagement.py

@@ -22,7 +22,7 @@ def _get_nh3_factor(lookup_name: str, term_id: str, input: dict, **log_args):
     return safe_parse_float(value, None)
 
 
-def get_excreta_inputs_with_factor(cycle: dict, lookup_name: str, excreta_convertion_func, **log_args):
+def get_excreta_inputs_with_factor(cycle: dict, lookup_name: str, excreta_conversion_func, **log_args):
     practices = filter_list_term_type(cycle.get('practices', []), TermTermType.EXCRETAMANAGEMENT)
     practice_id = practices[0].get('term', {}).get('@id') if len(practices) > 0 else None
 
@@ -32,7 +32,7 @@ def get_excreta_inputs_with_factor(cycle: dict, lookup_name: str, excreta_conver
     excreta_values = [
         (
             i.get('term', {}).get('@id'),
-            excreta_convertion_func([i]),
+            excreta_conversion_func([i]),
             _get_nh3_factor(lookup_name, practice_id, i, **log_args)
         ) for i in excreta_inputs
     ]

hestia_earth/models/utils/property.py

@@ -77,14 +77,16 @@ def get_node_property(
     Returns
     -------
     dict
-        The property if found, `None` otherwise.
+        The property if found, `{}` otherwise.
     """
-    prop = find_term_match(node.get('properties', []), property, None)
-    return find_term_property(node.get('term', {}), property, {}) if all([
-        find_default_property,
-        prop is None
-    ]) else (
-        prop or ({'term': download_term(property, TermTermType.PROPERTY)} if download_from_hestia else {})
+    return (
+        (
+            find_term_match(node.get('properties', []), property, None)
+        ) or (
+            find_term_property(node.get('term', {}), property, None) if find_default_property else None
+        ) or (
+            {'term': download_term(property, TermTermType.PROPERTY)} if download_from_hestia else None
+        ) or {}
     )
 
 
@@ -113,9 +115,12 @@ def node_property_lookup_value(model: str, node_term: dict, prop_id: str, defaul
 
 def get_node_property_value(model: str, node: dict, prop_id: str, default=None, handle_percents=True, **log_args):
     prop = get_node_property(node, prop_id, download_from_hestia=True)
-    term = (prop or {}).get('term')
+    term = prop.get('term')
     units = (term or {}).get('units')
-    value = prop.get('value') if prop else node_property_lookup_value(model, node.get('term', {}), prop_id, **log_args)
+    value = (
+        prop['value'] if 'value' in prop else
+        node_property_lookup_value(model, node.get('term', {}), prop_id, **log_args)
+    )
     return default if value is None else (value / 100 if units == '%' and handle_percents else value)
 
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.70.2'
+VERSION = '0.70.3'

{hestia_earth_models-0.70.2.dist-info → hestia_earth_models-0.70.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.70.2
+Version: 0.70.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
@@ -11,7 +11,7 @@ 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==31.*
+Requires-Dist: hestia-earth-schema==32.*
 Requires-Dist: hestia-earth-utils>=0.14.1
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8

{hestia_earth_models-0.70.2.dist-info → hestia_earth_models-0.70.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=BOhLkkdVWLJ-4Z7kxfQ8swqrYgZ43sACn1uzxY
 hestia_earth/models/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=FXrFGVyUGmPydZ629i9Ewt-kg-xGSch4AgpWPfJW1KM,19
+hestia_earth/models/version.py,sha256=jUQOtVONNdxYTZJhNPAQhnoFAofSEOWuStWZoZfrmEc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -33,7 +33,7 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=AfkdbmDl0rZxl_2Wk8nMKx1QHiOSacemVubBhcvPobQ,58758
+hestia_earth/models/config/Cycle.json,sha256=fJmIc9GK16Ob3m3Qv_jqD7Po5vB1C2R6hPJ9yDfEDCM,58937
 hestia_earth/models/config/ImpactAssessment.json,sha256=R22Pa6Szl05s13xFGKmrVZ4EgKD4UyUrruxxVujsJt4,56201
 hestia_earth/models/config/Site.json,sha256=vOjDsstMWe4i6PDDfpJ236Qb7gif5I0MMmscK1-LgKM,13866
 hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
@@ -75,6 +75,7 @@ hestia_earth/models/cycle/post_checks/cache.py,sha256=UNWR3IxZyv7GvBUZOkdj1HqMDa
 hestia_earth/models/cycle/post_checks/otherSites.py,sha256=lDiMPWduqpeYn5Z59AgcUH4ffiyLe5B6mg3tIe61hEs,694
 hestia_earth/models/cycle/post_checks/site.py,sha256=Z6lWAG_R5vTL2tiD5EAHwz2j_bvn-51iG1dq60-62ec,551
 hestia_earth/models/cycle/practice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hestia_earth/models/cycle/practice/landCover.py,sha256=QDXEaY3Rin9wsXEuoHoCeh7q_1fUM8UAWYYbRoeb-x0,5989
 hestia_earth/models/cycle/practice/value.py,sha256=WtMLlJLX3O6K2V2EMNp0zgKprYD0iIVzCsYxhg6zWJ0,1773
 hestia_earth/models/cycle/pre_checks/__init__.py,sha256=T8NfEXznq7Q1VUxqBOBP7Rz_DwoYvWYoYqe-Txznu24,352
 hestia_earth/models/cycle/pre_checks/cache_sources.py,sha256=fbWmlI0q6z9iVF1YNUOwBl0GeEYDgszozl3NkTxx6GI,184
@@ -108,7 +109,7 @@ hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=YkBct4eDUidGukaVd
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ib_xzEbIg-iQwvW2L4BosD9lV6EYOXAiIs8gYhSD9GE,1431
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=H4dgGqDuvYN4S7TRxYsX3hms1xMWr8clR2gkyyO8T18,1438
-hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=t1qdd6B8DOFOpkdan0kW2PVo7dIgWbsWtOXg8XukD08,2153
+hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=DssSjl_Kug9jE5laqJs9X4xOdOrJBnsXSnk-uA_anyE,2153
 hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=7G0_S0G6X9slTykxs6CDb68DvtXB7yfq1iSKg0ReXS8,6036
 hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=2--8lI6C6WaYtd9LQe-WZnhvW1eUsjBVAgzT8jclcsc,1431
 hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=7LhOEQokWMWEPspYSQO3PtsmWkygbVAonj_Nq6JAL6c,1384
@@ -204,7 +205,7 @@ hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=1StzrYhMsX-hdwBTeLnLMZWl5EEnCoEYpGPRkqy8a-A,1016
 hestia_earth/models/hestia/liveAnimal.py,sha256=95HfqgFA_qRhdIeR2X5MJ9zzIm4nMHDvJ0BCnuTYe5Q,3860
 hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
-hestia_earth/models/hestia/management.py,sha256=qkYAlCwuyrfmgoDx0R23MA6ZXzH9Glf__74SxraUbqM,14758
+hestia_earth/models/hestia/management.py,sha256=e1horZLE0th9hazG1sGod_yWs8Hk8FiHFYzJXLNTzFA,10975
 hestia_earth/models/hestia/materialAndSubstrate.py,sha256=abmM_7FOY5yaNb2yZEm-ncI4wFFcbzaebtnG9XWEA6M,5130
 hestia_earth/models/hestia/milkYield.py,sha256=__3AdxRTUTWwS_GsqxFpPGklmTnnpADiN0khlRCMAss,5541
 hestia_earth/models/hestia/netPrimaryProduction.py,sha256=uU4AZ7X6tbtWgR5YClA_aLpYWtlivq9lPQGZgt3-qoQ,1856
@@ -312,7 +313,7 @@ hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py,sha256=gvfv4VBHmEkpp
 hestia_earth/models/ipcc2019/nh3ToAirOrganicFertiliser.py,sha256=Oih-34cGl7AZ_sIYWXktOWrzmj3_onvk3EW5f8-7QKI,4152
 hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=YxlcDF0D9F79rYHTeuhl5kEtmb01UcspFInKi6I_zKM,7209
 hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=8NOjbqJuQ-wnLz3bYmwaygSzKBdaF3N7hoELGNnO4YQ,3115
-hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=07Eb9XmziJjYymyXQowESZklbKbqvjP_ookZKi4_GX0,4517
+hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=kf8KzTALAQ_pRVNEfpAG-aM94UgP6Q9T47UrXfOp_go,4517
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=eyPfyIi8EqigOTsEA0BSyoUePyy_AjMlQNJ6Z8yyJ_Q,3413
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-uaus2cftXzlsYCUAxLuon6BnDXmaFI9xhQrgU,3347
 hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=vvq-GAzFtPw9BTKs7RnwRJwzZJDmU3vPVAzIC7WxrhM,34600
@@ -320,7 +321,7 @@ hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2Tr
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=D8Lph5clGjXb5F7sk-jlnqE30C2lokhqndpA0hUMwTk,7791
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=8g1kJbxCnXAOFUdbB9zzMsuDOzMgvVy7A5MwtJvGUaY,78547
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=UVf85mcq-cNqkNEldg7h6RY5qa0RAtlXVKeb-GaFmAA,68913
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=5_AltohTyRMBT8dFdULOdTS79Ydpbb2CaYZGlYQEFQY,69244
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=s_F3fyHhPuqragrHxluqdK0GCGnEor17jGlGKue0UsA,9867
 hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=hRMzbGqscOcIO1MvD_31mbgxhVcPsvHtjJRcOCkEOhI,5405
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=_EwlAooSfrkcSy4rl_rk4PpeX1pcIiQcb7HE2lQkyn8,9847
@@ -443,12 +444,12 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=lDhLUw6th-m6HxfUcTO3kDsCECtQ4qWK2OcwgGrXPek,162881
+hestia_earth/models/mocking/search-results.json,sha256=ENYYYNBFWQ0jSSQpY_cf-ychVMeM6UOT2SQZBVtkF8k,162883
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=k_dB5iwOg6swQWb4fvfMCZ1dm1PnRff8Rpm1aclKOqA,6517
-hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=RstXknuNCB-BeCOIV0LHf3QRwOG2gQlxLzaGXWKG4hc,5858
+hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=EKVQK_wfDGRvj3lsSYp4xCjVEobOVt04fNhiZZXXfDk,5956
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=eIiiZPWjLya0ZOqiYXFKH10K693cAKFygP2p-WPcLyg,9278
 hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=QWWS9P_q_mPruvCYm4PJ0PNcYJJ8QS3WEV7HN-6MneY,3920
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=gSUzPuzzLwQsBiX_Tgx6mWJ4pEB5qhlKoOtaEdmDGQ4,3431
@@ -590,7 +591,7 @@ hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWAp
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
 hestia_earth/models/utils/background_emissions.py,sha256=R0tCA63q1_2DaZ87oI7FFjZsxAZ4Zds3Rr4fDf9KhkM,1850
-hestia_earth/models/utils/blank_node.py,sha256=AveekcsdZz7UNgLPQXrcFq30CjKA7H-WyWB3GbgwffQ,55963
+hestia_earth/models/utils/blank_node.py,sha256=KZizahEIqZafxJ_OXL0za7QILc4AledEnHDQoxyaNI8,55961
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -602,7 +603,7 @@ hestia_earth/models/utils/cycle.py,sha256=Lx085Eonp2W7EOi9BSlLWqtwY0ocZ5F1KY9dDG
 hestia_earth/models/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
 hestia_earth/models/utils/ecoClimateZone.py,sha256=etsWsAQeYHCnDJJi-ezTrzjoaFILC1e3SMfSNsdRnPs,4241
 hestia_earth/models/utils/emission.py,sha256=vzQQ4eKiC8KlmwFqT00lSV1V2dmTGMSzddOYNgFyka8,3636
-hestia_earth/models/utils/excretaManagement.py,sha256=U8OeSILHMfCGR5x7Pw8R2tpzCv3C_AfSAX8As8WDVlM,2257
+hestia_earth/models/utils/excretaManagement.py,sha256=cez_Rm69n8CzXuoil0fhi8XSOIEh2yfJzYFzhf9T5EM,2257
 hestia_earth/models/utils/feedipedia.py,sha256=mfGd3EaTQGh9aZaF9pxVJRH_vLEIqktwbwTKQWHv7hs,3967
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
@@ -621,7 +622,7 @@ hestia_earth/models/utils/pesticideAI.py,sha256=_mlhKnA1TxF-x39CPNnOGXk6754SoSQq
 hestia_earth/models/utils/practice.py,sha256=GEu2G2yMPbcIHldOzgv5OFp8bQ1Jt9OFgj0c_0F_kUc,372
 hestia_earth/models/utils/product.py,sha256=Oha4lMvediC1Lc5DksA6sAUT94Q1Cs9F4LFVe_uaqP4,11177
 hestia_earth/models/utils/productivity.py,sha256=rTJX_nemxHpOcPN7jiM2hFHknoLUIW8y-hFxVxIkg70,593
-hestia_earth/models/utils/property.py,sha256=3jeA__YBHZvIOqcfDmbV1IOLfqtU1pA74aVrEVcHsNE,5340
+hestia_earth/models/utils/property.py,sha256=oz3x-sJkNmORlDwb4o1q5I-azj0hteriUSZBP7S5idc,5390
 hestia_earth/models/utils/site.py,sha256=ZYCxaBXZ3Zh4judbzOM_E5SNROiMH-S2LEkkklN5HK4,4041
 hestia_earth/models/utils/source.py,sha256=D_QlW7Ul_NV1iOucMNE3szT64b1RdSdecIEm6OukYhw,2459
 hestia_earth/models/utils/stats.py,sha256=-0vvhSDAhp4ZYXD1l6sO2hdok8_HgUM6OjCSYGSTHqU,15291
@@ -719,6 +720,7 @@ tests/models/cycle/post_checks/test_cache.py,sha256=5QD8Yk9HbDePHSIXOJUM_ptZCroO
 tests/models/cycle/post_checks/test_otherSites.py,sha256=SHCA82MvWy-CsuquvLgmiwAhIKJQONIc07z51QH5RpQ,359
 tests/models/cycle/post_checks/test_site.py,sha256=In0Q0Tw3w_hV8_uAnOcL_iS2FoI_75lsq7MdoWLa5js,621
 tests/models/cycle/practice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/cycle/practice/test_landCover.py,sha256=3Fi-p0-ArgTbrBPnm02vikpFrInIFQuXx7VVpPtjmVI,955
 tests/models/cycle/practice/test_value.py,sha256=sYPoTkllrEt2oB92uA2q37FFtOjSX49749Nv1pUvqdw,1315
 tests/models/cycle/pre_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/cycle/pre_checks/test_otherSites.py,sha256=IEWvG2hwmladHctZUy6jTg01ZnCvWJUtPgD4GHKcumQ,502
@@ -914,7 +916,7 @@ tests/models/ipcc2019/test_belowGroundCropResidue.py,sha256=no71pfxgOhn_tEWc_Ewu
 tests/models/ipcc2019/test_biomass_utils.py,sha256=I2q4pDGAD0aY_kpZCMPJoC-KbRYxdzY1rhr4xtJFWIA,3592
 tests/models/ipcc2019/test_carbonContent.py,sha256=_GWF5nGy-PxiqBZ5V7W_sHMz75YRzmxr79R-sZZg7yk,4146
 tests/models/ipcc2019/test_ch4ToAirAquacultureSystems.py,sha256=o7bHOS4JkwexRrDhLzpfr8nyYCctgRL32YZbam5RBrI,1891
-tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py,sha256=7v0a5CcdpHixRbe4jhhIH2t4hlNsZInlEoHuipUBseg,8571
+tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py,sha256=nmmxxJFX_VFOgvNxmj4q825vVEtEq-B61DVNo3inirs,8567
 tests/models/ipcc2019/test_ch4ToAirExcreta.py,sha256=e58NXmBW2SNVLUqQO9A66Xq6jiGTyhdFZDZk51JApF8,2902
 tests/models/ipcc2019/test_ch4ToAirFloodedRice.py,sha256=YRyxNaGPAgsCJBRXhwhEsZ6r44dawHMSN-Qmi-yS0xI,1025
 tests/models/ipcc2019/test_ch4ToAirOrganicSoilCultivation.py,sha256=HJNE-M38eXCvjTDfOj70XlevSQgXut8w5EDzj1HKeyY,1703
@@ -1241,8 +1243,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.70.2.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.70.2.dist-info/METADATA,sha256=vzarmK_NB5tg_ymkLsxwangcpt6RyzbBcGrm81A39BQ,4045
-hestia_earth_models-0.70.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.70.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.70.2.dist-info/RECORD,,
+hestia_earth_models-0.70.3.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.70.3.dist-info/METADATA,sha256=9u8GduYX4WwwaaEc7Tdis5CggZOQB2YImDLZQSYU2gk,4045
+hestia_earth_models-0.70.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.70.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.70.3.dist-info/RECORD,,

tests/models/cycle/practice/test_landCover.py

@@ -0,0 +1,27 @@
+import os
+import json
+import pytest
+from unittest.mock import Mock, patch
+
+from tests.utils import fixtures_path, fake_new_practice
+from hestia_earth.models.cycle.practice.landCover import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.practice.{MODEL_KEY}"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'practice', MODEL_KEY)
+
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
+
+
+@pytest.mark.parametrize('folder', _folders)
+@patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
+def test_run(mock_new_practice: Mock, folder: str):
+    fixture_path = os.path.join(fixtures_folder, folder)
+
+    with open(f"{fixture_path}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixture_path}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected, fixture_path

tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py

@@ -55,7 +55,7 @@ def test_should_run(mock_feed, mock_lookup_value, *args):
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
-@patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
+@patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding="utf-8") as f:
@@ -72,7 +72,7 @@ def test_run(*args):
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
-@patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
+@patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_dairy(*args):
     with open(f"{fixtures_folder}/dairy-buffalo-cows/cycle.jsonld", encoding="utf-8") as f: