hestia-earth-models 0.59.4__py3-none-any.whl → 0.59.6__py3-none-any.whl

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py

@@ -10,7 +10,7 @@ from hestia_earth.models.utils import first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.site import related_years
-from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from .utils import download, has_geospatial_data, should_download
 from . import MODEL
 
 REQUIREMENTS = {
@@ -48,9 +48,6 @@ def _measurement(site: dict, value: list, dates: list):
     return measurement | get_source(site, BIBLIO_TITLE)
 
 
-def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
-
-
 def _download(site: dict,  start_date: str, end_date: str):
     return download(
         TERM_ID,
@@ -63,6 +60,12 @@ def _download(site: dict,  start_date: str, end_date: str):
     )
 
 
+def _value_at(site: dict, start_date: str, end_date: str):
+    factor = 0.1
+    value = _download(site, start_date, end_date)
+    return (value * factor, start_date[0:7]) if value is not None else None
+
+
 def _run(site: dict, years: list):
     # fetch from first year to last
     years = range(years[0], years[-1] + 1) if len(years) > 1 else years
@@ -73,10 +76,8 @@ def _run(site: dict, years: list):
             for month in range(1, 13)
         ] for year in years
     ])
-    values = non_empty_list([
-        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
-    ])
-    return _measurement(site, [v for v, d in values], [d for v, d in values])
+    values = non_empty_list([_value_at(site, start_date, end_date) for start_date, end_date in dates])
+    return [_measurement(site, [v for v, d in values], [d for v, d in values])] if values else []
 
 
 def run(site: dict):

hestia_earth/models/geospatialDatabase/precipitationMonthly.py

@@ -10,7 +10,7 @@ from hestia_earth.models.utils import first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.site import related_years
-from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from .utils import download, has_geospatial_data, should_download
 from . import MODEL
 
 REQUIREMENTS = {
@@ -48,9 +48,6 @@ def _measurement(site: dict, value: list, dates: list):
     return measurement | get_source(site, BIBLIO_TITLE)
 
 
-def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
-
-
 def _download(site: dict,  start_date: str, end_date: str):
     return download(
         TERM_ID,
@@ -63,6 +60,13 @@ def _download(site: dict,  start_date: str, end_date: str):
     )
 
 
+def _value_at(site: dict, start_date: str, end_date: str):
+    # collection is in meters, convert to millimeters
+    factor = 1000
+    value = _download(site, start_date, end_date)
+    return (value * factor, start_date[0:7]) if value is not None else None
+
+
 def _run(site: dict, years: list):
     # fetch from first year to last
     years = range(years[0], years[-1] + 1) if len(years) > 1 else years
@@ -73,10 +77,8 @@ def _run(site: dict, years: list):
             for month in range(1, 13)
         ] for year in years
     ])
-    values = non_empty_list([
-        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
-    ])
-    return _measurement(site, [v for v, d in values], [d for v, d in values])
+    values = non_empty_list([_value_at(site, start_date, end_date) for start_date, end_date in dates])
+    return [_measurement(site, [v for v, d in values], [d for v, d in values])] if values else []
 
 
 def run(site: dict):

hestia_earth/models/geospatialDatabase/temperatureAnnual.py

@@ -9,7 +9,7 @@ from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.site import related_years
-from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from .utils import to_celcius, download, has_geospatial_data, should_download
 from . import MODEL
 
 REQUIREMENTS = {
@@ -49,9 +49,6 @@ def _measurement(site: dict, value: float, year: int):
     return measurement | get_source(site, BIBLIO_TITLE)
 
 
-def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
-
-
 def _download(site: dict, year: int):
     return download(
         TERM_ID,
@@ -64,7 +61,7 @@ def _download(site: dict, year: int):
 
 
 def _run(site: dict, year: int):
-    value = _to_celcius(_download(site, year))
+    value = to_celcius(_download(site, year))
     return _measurement(site, value, year) if value else None
 
 

hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py

@@ -3,9 +3,8 @@ from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
-from .utils import download, has_geospatial_data, should_download
+from .utils import to_celcius, download, has_geospatial_data, should_download
 from . import MODEL
-from .temperatureAnnual import _to_celcius
 
 REQUIREMENTS = {
     "Site": {
@@ -50,7 +49,7 @@ def _measurement(site: dict, value: float):
 
 
 def _run(site: dict):
-    value = _to_celcius(download(TERM_ID, site, EE_PARAMS))
+    value = to_celcius(download(TERM_ID, site, EE_PARAMS))
     return [_measurement(site, value)] if value is not None else []
 
 

hestia_earth/models/geospatialDatabase/temperatureMonthly.py

@@ -10,7 +10,7 @@ from hestia_earth.models.utils import first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.site import related_years
-from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from .utils import to_celcius, download, has_geospatial_data, should_download
 from . import MODEL
 
 REQUIREMENTS = {
@@ -48,9 +48,6 @@ def _measurement(site: dict, value: list, dates: list):
     return measurement | get_source(site, BIBLIO_TITLE)
 
 
-def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
-
-
 def _download(site: dict,  start_date: str, end_date: str):
     return download(
         TERM_ID,
@@ -63,6 +60,11 @@ def _download(site: dict,  start_date: str, end_date: str):
     )
 
 
+def _value_at(site: dict, start_date: str, end_date: str):
+    value = _download(site, start_date, end_date)
+    return (to_celcius(value), start_date[0:7]) if value is not None else None
+
+
 def _run(site: dict, years: list):
     # fetch from first year to last
     years = range(years[0], years[-1] + 1) if len(years) > 1 else years
@@ -73,10 +75,8 @@ def _run(site: dict, years: list):
             for month in range(1, 13)
         ] for year in years
     ])
-    values = non_empty_list([
-        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
-    ])
-    return _measurement(site, [v for v, d in values], [d for v, d in values])
+    values = non_empty_list([_value_at(site, start_date, end_date) for start_date, end_date in dates])
+    return [_measurement(site, [v for v, d in values], [d for v, d in values])] if values else []
 
 
 def run(site: dict):

hestia_earth/models/geospatialDatabase/utils.py

@@ -23,6 +23,9 @@ GEOPANDAS_COLLECTION_NAME = {
 KELVIN_0 = 273.15
 
 
+def to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
+
+
 def use_geopandas(): return os.getenv('HEE_USE_GEOPANDAS', 'false') == 'true'
 
 
@@ -139,7 +142,9 @@ def _get_cached_data(term: str, site: dict, data: dict):
         data.get('end_date')
     ]))
     # data can be grouped by year when required
-    value = cache.get(cache_sub_key) if cache_sub_key and cache is not None else cache
+    value = cache.get(cache_sub_key) if (
+        isinstance(cache, dict) and cache_sub_key in cache and cache is not None
+     ) else cache
     if value is not None:
         debugValues(site, model=MODEL, term=term, value_from_cache=value)
     return value

hestia_earth/models/haversineFormula/transport/distance.py

@@ -27,8 +27,11 @@ REQUIREMENTS = {
     }
 }
 RETURNS = {
-    "Transport": [{
-        "distance": ""
+    "Input": [{
+        "transport": [{
+            "@type": "Transport",
+            "distance": ""
+        }]
     }]
 }
 MODEL_KEY = 'distance'
@@ -98,7 +101,7 @@ def _should_run(cycle: dict):
     # can only run if the site country has centroid coordinates
     logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
                     latitude=country.get('latitude'),
-                    longitude=country.get('latitude'),
+                    longitude=country.get('longitude'),
                     has_inputs_transport=len(inputs) > 0)
     should_run = all([country.get('latitude'), country.get('latitude'), len(inputs) > 0])
     logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY)

hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py

@@ -55,7 +55,7 @@ def _run(cycle: dict, N_total: float):
                 nh3_n=nh3_n,
                 nox_n=nox_n)
     value = COEFF_NH3NOX_N2O * (
-        sum_values([nh3_n, nox_n]) or N_total * 0.2
+        sum_values([nh3_n, nox_n]) or N_total * 0.1
     ) + COEFF_NO3_N2O * (
         no3_n or N_total * 0.3
     )

hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -2,7 +2,13 @@
 The IPCC model for estimating soil organic carbon stock changes in the 0 - 30cm depth interval due to management
 changes. This model combines the Tier 1 & Tier 2 methodologies. It first tries to run Tier 2 (only on croplands
 remaining croplands). If Tier 2 cannot run, it will try to run Tier 1 (for croplands remaining croplands and for
-grasslands remaining grasslands). Source:
+grasslands remaining grasslands).
+
+More information on this model, including data requirements **and** recommendations, tier methodologies, and examples,
+can be found in the
+[Hestia SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
+
+Source:
 [IPCC 2019, Vol. 4, Chapter 10](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch05_Cropland.pdf).
 """
 from enum import Enum
@@ -46,7 +52,6 @@ from hestia_earth.models.utils.term import (
     get_cover_crop_property_terms,
     get_crop_residue_incorporated_or_left_on_field_terms,
     get_irrigated_terms,
-    get_long_fallow_land_cover_terms,
     get_residue_removed_or_burnt_terms,
     get_upland_rice_crop_terms,
     get_upland_rice_land_cover_terms
@@ -610,25 +615,26 @@ A dictionary mapping IPCC soil categories to corresponding soil type and USDA so
 `"IPCC_SOIL_CATEGORY"` column.
 """
 
-IPCC_LAND_USE_CATEGORY_TO_SITE_TYPE = {
-    IpccLandUseCategory.GRASSLAND: SiteSiteType.PERMANENT_PASTURE.value,
-    IpccLandUseCategory.PERENNIAL_CROPS: SiteSiteType.CROPLAND.value,
-    IpccLandUseCategory.PADDY_RICE_CULTIVATION: SiteSiteType.CROPLAND.value,
-    IpccLandUseCategory.ANNUAL_CROPS_WET: SiteSiteType.CROPLAND.value,
-    IpccLandUseCategory.ANNUAL_CROPS: SiteSiteType.CROPLAND.value,
-    IpccLandUseCategory.SET_ASIDE: SiteSiteType.CROPLAND.value,
-    IpccLandUseCategory.FOREST: SiteSiteType.FOREST.value,
-    IpccLandUseCategory.NATIVE: SiteSiteType.OTHER_NATURAL_VEGETATION.value
+SITE_TYPE_TO_IPCC_LAND_USE_CATEGORY = {
+    SiteSiteType.PERMANENT_PASTURE.value: IpccLandUseCategory.GRASSLAND,
+    SiteSiteType.FOREST.value: IpccLandUseCategory.FOREST,
+    SiteSiteType.OTHER_NATURAL_VEGETATION.value: IpccLandUseCategory.NATIVE
 }
 """
-A dictionary mapping IPCC land use categories to corresponding site types.
+A dictionary mapping site types to corresponding IPCC land use categories.
 """
 
 IPCC_LAND_USE_CATEGORY_TO_LAND_COVER_LOOKUP_VALUE = {
+    IpccLandUseCategory.GRASSLAND: "Grassland",
     IpccLandUseCategory.PERENNIAL_CROPS: "Perennial crops",
     IpccLandUseCategory.PADDY_RICE_CULTIVATION: "Paddy rice cultivation",
     IpccLandUseCategory.ANNUAL_CROPS_WET: "Annual crops",
-    IpccLandUseCategory.ANNUAL_CROPS: "Annual crops"
+    IpccLandUseCategory.ANNUAL_CROPS: "Annual crops",
+    IpccLandUseCategory.SET_ASIDE: [
+        "Annual crops", "Paddy rice cultivation", "Perennial crops", "Set aside"
+    ],
+    IpccLandUseCategory.FOREST: "Forest",
+    IpccLandUseCategory.NATIVE: "Native"
 }
 """
 A dictionary mapping IPCC land use categories to corresponding land cover lookup values in the
@@ -846,7 +852,7 @@ def _calc_water_factor(
     float
         The water effect on decomposition for a given month, dimensionless, between `0.2129` and `1.5`.
     """
-    mappet = min(1.25, precipitation / pet)
+    mappet = min(1.25, precipitation / pet) if pet else 1.25
     return 0.775 if is_irrigated else 0.2129 + (water_factor_slope * (mappet)) - (0.2413 * pow(mappet, 2))
 
 
@@ -937,7 +943,8 @@ def _calc_average_nitrogen_content_of_organic_carbon_sources(
     weighted_values = [
         c.mass * (c.nitrogen_content if c.nitrogen_content else default_nitrogen_content) for c in carbon_sources
     ]
-    return sum(weighted_values) / total_weight if total_weight > 0 else default_nitrogen_content
+    should_run = total_weight > 0
+    return sum(weighted_values) / total_weight if should_run else 0
 
 
 def _calc_average_lignin_content_of_organic_carbon_sources(
@@ -963,7 +970,8 @@ def _calc_average_lignin_content_of_organic_carbon_sources(
     weighted_values = [
         c.mass * (c.lignin_content if c.lignin_content else default_lignin_content) for c in carbon_sources
     ]
-    return sum(weighted_values) / total_weight if total_weight > 0 else default_lignin_content
+    should_run = total_weight > 0
+    return sum(weighted_values) / total_weight if should_run else 0
 
 
 # --- TIER 2 FUNCTIONS: ACTIVE SUB-POOL SOC STOCK ---
@@ -2525,7 +2533,7 @@ def _has_irrigation(water_regime_nodes: list[dict]) -> bool:
 
     Parameters
     ----------
-    water_regime_nodes : List[dict]
+    water_regime_nodes : list[dict]
         List of water regime nodes to be checked.
 
     Returns
@@ -2542,13 +2550,13 @@ def _has_irrigation(water_regime_nodes: list[dict]) -> bool:
 
 def _has_long_fallow(land_cover_nodes: list[dict]) -> bool:
     """
-    Check if long fallow terms is present in the land cover nodes.
+    Check if long fallow terms are present in the land cover nodes.
 
     n.b., a super majority of the site area must be under long fallow for it to be classified as set aside.
 
     Parameters
     ----------
-    land_cover_nodes : List[dict]
+    land_cover_nodes : list[dict]
         List of land cover nodes to be checked.
 
     Returns
@@ -2556,9 +2564,12 @@ def _has_long_fallow(land_cover_nodes: list[dict]) -> bool:
     bool
         `True` if long fallow is present, `False` otherwise.
     """
-    return cumulative_nodes_term_match(
+    LOOKUP = LOOKUPS["landCover"][0]
+    TARGET_LOOKUP_VALUE = "Set aside"
+    return cumulative_nodes_lookup_match(
         land_cover_nodes,
-        target_term_ids=get_long_fallow_land_cover_terms(),
+        lookup=LOOKUP,
+        target_lookup_values=TARGET_LOOKUP_VALUE,
         cumulative_threshold=SUPER_MAJORITY_AREA_THRESHOLD
     ) or cumulative_nodes_match(
         lambda node: get_node_property(node, LONG_FALLOW_CROP_TERM_ID, False).get("value", 0),
@@ -2573,7 +2584,7 @@ def _has_upland_rice(land_cover_nodes: list[dict]) -> bool:
 
     Parameters
     ----------
-    land_cover_nodes : List[dict]
+    land_cover_nodes : list[dict]
         List of land cover nodes to be checked.
 
     Returns
@@ -2589,63 +2600,39 @@ def _has_upland_rice(land_cover_nodes: list[dict]) -> bool:
 
 
 IPCC_LAND_USE_CATEGORY_TO_VALIDATION_KWARGS = {
+    IpccLandUseCategory.ANNUAL_CROPS_WET: {"has_wetland_soils"},
     IpccLandUseCategory.SET_ASIDE: {"has_long_fallow"},
-    IpccLandUseCategory.ANNUAL_CROPS_WET: {"has_wetland_soils"}
 }
 """
-Keyword arguments that need to be checked for specific `IpccLandUseCategory`s.
+Keyword arguments that need to be validated in addition to the `landCover` lookup match for specific
+`IpccLandUseCategory`s.
 """
 
-
-def _check_ipcc_land_use_category(*, key: IpccLandUseCategory, site_type: str, **kwargs) -> bool:
-    """
-    Check if the site type matches the target site type for the given key.
-
-    Parameters
-    ----------
-    key : IpccLandUseCategory
-        The IPCC land use category to check.
-    site_type : str
-        The site type to check.
-
-    Keyword Args
-    ------------
-    has_long_fallow : bool
-        Indicates whether long fallow is present on more than 30% of the site.
-    has_wetland_soils : bool
-        Indicates whether wetland soils are present to more than 30% of the site.
-
-    Returns
-    -------
-    bool
-        `True` if the conditions match the specified land use category, `False` otherwise.
-
-    """
-    target_site_type = IPCC_LAND_USE_CATEGORY_TO_SITE_TYPE.get(key, None)
-    validation_kwargs = IPCC_LAND_USE_CATEGORY_TO_VALIDATION_KWARGS.get(key, set())
-    valid_kwargs = all(v for k, v in kwargs.items() if k in validation_kwargs)
-    return site_type == target_site_type and valid_kwargs
+IPCC_LAND_USE_CATEGORY_TO_OVERRIDE_KWARGS = {
+    IpccLandUseCategory.PADDY_RICE_CULTIVATION: {"has_irrigated_upland_rice"}
+}
+"""
+Keyword arguments that can override the `landCover` lookup match for specific `IpccLandUseCategory`s.
+"""
 
 
-def _check_cropland_land_use_category(
-    *, key: IpccLandUseCategory, site_type: str, land_cover_nodes: list[dict], **kwargs
-) -> bool:
+def _check_ipcc_land_use_category(*, key: IpccLandUseCategory, land_cover_nodes: list[dict], **kwargs) -> bool:
     """
-    Check if the site type and land cover nodes match the target conditions for a cropland IpccLandUseCategory.
-
-    This function is special case of `_check_ipcc_land_use_category`.
+    Check if the land cover nodes and keyword args satisfy the requirements for the given key.
 
     Parameters
     ----------
     key : IpccLandUseCategory
         The IPCC land use category to check.
-    site_type : str
-        The site type to check.
+    land_cover_nodes : list[dict]
+        List of land cover nodes to be checked.
 
     Keyword Args
     ------------
+    has_irrigated_upland_rice : bool
+        Indicates whether irrigated upland rice is present on more than 30% of the site.
     has_long_fallow : bool
-        Indicates whether long fallow is present on more than 30% of the site.
+        Indicates whether long fallow is present on more than 70% of the site.
     has_wetland_soils : bool
         Indicates whether wetland soils are present to more than 30% of the site.
 
@@ -2662,48 +2649,23 @@ def _check_cropland_land_use_category(
         target_lookup_values=target_lookup_values,
         cumulative_threshold=MIN_AREA_THRESHOLD
     )
-    return _check_ipcc_land_use_category(key=key, site_type=site_type, **kwargs) and valid_lookup
 
+    validation_kwargs = IPCC_LAND_USE_CATEGORY_TO_VALIDATION_KWARGS.get(key, set())
+    valid_kwargs = all(v for k, v in kwargs.items() if k in validation_kwargs)
 
-def _check_paddy_rice_cultivation_land_use_category(
-    *, key: IpccLandUseCategory, site_type: str, has_irrigated_upland_rice: bool, **kwargs
-) -> bool:
-    """
-    Check if the site type and land cover nodes match the target conditions for a cropland IpccLandUseCategory.
+    override_kwargs = IPCC_LAND_USE_CATEGORY_TO_OVERRIDE_KWARGS.get(key, set())
+    valid_override = any(v for k, v in kwargs.items() if k in override_kwargs)
 
-    This function is special case of `_check_cropland_land_use_category`.
-
-    Parameters
-    ----------
-    key : IpccLandUseCategory
-        The IPCC land use category to check.
-    site_type : str
-        The site type to check.
-
-    Keyword Args
-    ------------
-    has_irrigated_upland_rice : bool
-        Indicates whether irrigated upland rice is present on more than 30% of the site.
-    has_long_fallow : bool
-        Indicates whether long fallow is present on more than 30% of the site.
-    has_wetland_soils : bool
-        Indicates whether wetland soils are present to more than 30% of the site.
-
-    Returns
-    -------
-    bool
-        `True` if the conditions match the specified land use category, `False` otherwise.
-    """
-    return _check_cropland_land_use_category(key=key, site_type=site_type, **kwargs) or has_irrigated_upland_rice
+    return (valid_lookup and valid_kwargs) or valid_override
 
 
 LAND_USE_CATEGORY_DECISION_TREE = {
     IpccLandUseCategory.GRASSLAND: _check_ipcc_land_use_category,
     IpccLandUseCategory.SET_ASIDE: _check_ipcc_land_use_category,
-    IpccLandUseCategory.PERENNIAL_CROPS: _check_cropland_land_use_category,
-    IpccLandUseCategory.PADDY_RICE_CULTIVATION: _check_paddy_rice_cultivation_land_use_category,
-    IpccLandUseCategory.ANNUAL_CROPS_WET: _check_cropland_land_use_category,
-    IpccLandUseCategory.ANNUAL_CROPS: _check_cropland_land_use_category,
+    IpccLandUseCategory.PERENNIAL_CROPS: _check_ipcc_land_use_category,
+    IpccLandUseCategory.PADDY_RICE_CULTIVATION: _check_ipcc_land_use_category,
+    IpccLandUseCategory.ANNUAL_CROPS_WET: _check_ipcc_land_use_category,
+    IpccLandUseCategory.ANNUAL_CROPS: _check_ipcc_land_use_category,
     IpccLandUseCategory.FOREST: _check_ipcc_land_use_category,
     IpccLandUseCategory.NATIVE: _check_ipcc_land_use_category,
     IpccLandUseCategory.OTHER: _check_ipcc_land_use_category
@@ -2712,21 +2674,19 @@ LAND_USE_CATEGORY_DECISION_TREE = {
 A decision tree mapping IPCC soil categories to corresponding check functions.
 
 Key: IpccLandUseCategory
-Value: Corresponding function for checking the match of the given land use category based on site type
-and land cover nodes.
+Value: Corresponding function for checking the match of the given land use category based on land cover nodes
+and additional kwargs.
 """
 
 
 def _assign_ipcc_land_use_category(
-    site_type: str, management_nodes: list[dict], ipcc_soil_category: IpccSoilCategory
+    management_nodes: list[dict], ipcc_soil_category: IpccSoilCategory,
 ) -> IpccLandUseCategory:
     """
-    Assigns IPCC land use category based on site type, management nodes, and soil category.
+    Assigns IPCC land use category based on management nodes and soil category.
 
     Parameters
     ----------
-    site_type : str
-        The type of the site.
     management_nodes : list[dict]
         List of management nodes.
     ipcc_soil_category : IpccSoilCategory
@@ -2749,14 +2709,13 @@ def _assign_ipcc_land_use_category(
     has_long_fallow = _has_long_fallow(land_cover_nodes)
     has_wetland_soils = ipcc_soil_category is IpccSoilCategory.WETLAND_SOILS
 
-    should_run = bool(site_type)
+    should_run = bool(land_cover_nodes)
 
     return next(
         (
             key for key in DECISION_TREE
             if DECISION_TREE[key](
                 key=key,
-                site_type=site_type,
                 land_cover_nodes=land_cover_nodes,
                 has_long_fallow=has_long_fallow,
                 has_irrigated_upland_rice=has_irrigated_upland_rice,
@@ -2780,7 +2739,7 @@ def _check_grassland_ipcc_management_category(
     ----------
     key : IpccManagementCategory
         The IPCC management category to check.
-    land_cover_nodes : List[dict]
+    land_cover_nodes : list[dict]
         List of land cover nodes to be checked.
 
     Returns
@@ -2806,7 +2765,7 @@ def _check_tillage_ipcc_management_category(
     ----------
     key : IpccManagementCategory
         The IPCC management category to check.
-    tillage_nodes : List[dict]
+    tillage_nodes : list[dict]
         List of tillage nodes to be checked.
 
     Returns
@@ -3773,9 +3732,16 @@ def _should_run_inventory_year_tier_2(group: dict) -> bool:
         }
     )
 
+    carbon_input_data_complete = all([
+        group.get(_InventoryKey.CARBON_INPUT, 0) > 0,
+        group.get(_InventoryKey.N_CONTENT, 0) > 0,
+        group.get(_InventoryKey.LIGNIN_CONTENT, 0) > 0,
+    ])
+
     return all([
         not group.get(_InventoryKey.IS_PADDY_RICE),
         monthly_data_complete,
+        carbon_input_data_complete,
         all(key in group.keys() for key in REQUIRED_KEYS_TIER_2),
     ])
 
@@ -3783,11 +3749,15 @@ def _should_run_inventory_year_tier_2(group: dict) -> bool:
 def _get_grouped_climate_measurements(grouped_measurements: dict) -> dict:
     return {
         year: {
-            _InventoryKey.TEMP_MONTHLY: find_term_match(measurements, TEMPERATURE_MONTHLY_TERM_ID, {}).get("value", []),
-            _InventoryKey.PRECIP_MONTHLY: (
+            _InventoryKey.TEMP_MONTHLY: non_empty_list(
+                find_term_match(measurements, TEMPERATURE_MONTHLY_TERM_ID, {}).get("value", [])
+            ),
+            _InventoryKey.PRECIP_MONTHLY: non_empty_list(
                 find_term_match(measurements, PRECIPITATION_MONTHLY_TERM_ID, {}).get("value", [])
             ),
-            _InventoryKey.PET_MONTHLY: find_term_match(measurements, PET_MONTHLY_TERM_ID, {}).get("value", [])
+            _InventoryKey.PET_MONTHLY: non_empty_list(
+                find_term_match(measurements, PET_MONTHLY_TERM_ID, {}).get("value", [])
+            )
         } for year, measurements in grouped_measurements.items()
     }
 
@@ -3917,15 +3887,19 @@ def _build_inventory_tier_1(
     eco_climate_zone = _get_eco_climate_zone(measurement_nodes)
     ipcc_soil_category = _assign_ipcc_soil_category(measurement_nodes)
     soc_ref = _retrieve_soc_ref(eco_climate_zone, ipcc_soil_category)
+    grouped_management = group_nodes_by_year(management_nodes)
+
+    # If no `landCover` nodes in `site.management` use `site.siteType` to assign static `IpccLandUseCategory`
+    run_with_site_type = len(filter_list_term_type(management_nodes, [TermTermType.LANDCOVER])) == 0
+    site_type_ipcc_land_use_category = SITE_TYPE_TO_IPCC_LAND_USE_CATEGORY.get(site_type, IpccLandUseCategory.OTHER)
 
     grouped_management = group_nodes_by_year(management_nodes)
 
     grouped_land_use_categories = {
         year: {
-            _InventoryKey.LU_CATEGORY: _assign_ipcc_land_use_category(
-                site_type,
-                nodes,
-                ipcc_soil_category
+            _InventoryKey.LU_CATEGORY: (
+                site_type_ipcc_land_use_category if run_with_site_type
+                else _assign_ipcc_land_use_category(nodes, ipcc_soil_category)
             )
         } for year, nodes in grouped_management.items()
     }
@@ -3963,7 +3937,8 @@ def _build_inventory_tier_1(
     kwargs = {
         "eco_climate_zone": eco_climate_zone,
         "ipcc_soil_category": ipcc_soil_category,
-        "soc_ref": soc_ref,
+        "run_with_site_type": run_with_site_type,
+        "soc_ref": soc_ref
     }
 
     return inventory, kwargs

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -497,7 +497,8 @@ def _sum_values(values): return sum([value for term_id, value in values])
 def _calculate_GE(cycle: dict, meanDE: float, system: dict):
     animals = [
         a for a in cycle.get('animals', []) if all([
-            a.get('value') and a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
+            a.get('value'),
+            a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
         ])
     ]