hestia-earth-models 0.75.1__py3-none-any.whl → 0.75.2__py3-none-any.whl

hestia_earth/models/utils/blank_node.py

@@ -16,6 +16,7 @@ from dateutil import parser
 from dateutil.relativedelta import relativedelta
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.blank_node import ArrayTreatment, get_node_value
+from hestia_earth.utils.date import diff_in_days
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import (
     flatten,
@@ -532,6 +533,10 @@ def node_term_match(
     return node.get('term', {}).get('@id', None) in target_term_ids
 
 
+def filter_list_term_id(nodes: list[dict], target_term_ids: Union[str, set[str]]) -> list[dict]:
+    return [node for node in nodes if node_term_match(node, target_term_ids)]
+
+
 def node_lookup_match(
     node: dict,
     lookup: str,
@@ -1654,3 +1659,66 @@ def validate_start_date_end_date(node: dict) -> bool:
     end_date = _gapfill_datestr(node.get("endDate", OLDEST_DATE), DatestrGapfillMode.END)
 
     return safe_parse_date(start_date) < safe_parse_date(end_date)
+
+
+def closest_depth(
+    nodes: list[dict], target_depth_upper: float, target_depth_lower: float, depth_strict: bool = True
+) -> list[dict]:
+    DEFAULT_KEY = (None, None)
+
+    def group_by(result: dict, node: dict) -> dict:
+        upper = node.get("depthUpper")
+        lower = node.get("depthLower")
+        key = (upper, lower)
+
+        update_dict = {key: result.get(key, []) + [node]}
+        return result | update_dict
+
+    def depth_distance(key: tuple[Optional[float], Optional[float]]) -> float:
+        return sum(
+            abs(depth - target if isinstance(depth, (float, int)) else 9999)
+            for depth, target in zip(key, (target_depth_upper, target_depth_lower))
+        )
+
+    grouped = reduce(group_by, nodes, {})
+    nearest_key = min(grouped.keys(), key=depth_distance, default=DEFAULT_KEY)
+
+    return (
+        grouped.get(nearest_key, []) if depth_distance(nearest_key) <= 0 or not depth_strict else []
+    )
+
+
+def closest_end_date(
+    nodes: list[dict], target_date: str, mode: DatestrGapfillMode = DatestrGapfillMode.START
+) -> list[dict]:
+    DEFAULT_KEY = "no-dates"
+
+    def date_distance(date: str) -> float:
+        date_ = date if date != DEFAULT_KEY else OLDEST_DATE
+        return abs(diff_in_days(
+            _gapfill_datestr(date_, mode),
+            _gapfill_datestr(target_date, mode)
+        ))
+
+    grouped = group_nodes_by_last_date(nodes)
+    nearest_key = min(grouped.keys(), key=date_distance, default=DEFAULT_KEY)
+
+    return grouped.get(nearest_key, [])
+
+
+def pick_shallowest(nodes: list[dict], default=None):
+    return (
+        default if len(nodes) == 0 else _shallowest_node(nodes) if len(nodes) > 1 else nodes[0]
+    )
+
+
+def select_nodes_by(nodes: list[dict], filters: list[Callable[[list[dict]], list[dict]]]) -> Union[dict, list[dict]]:
+    """
+    Applies a series of filters to a list of blank nodes. Filters are applied in the order they are specifed in the
+    filters arg.
+    """
+    return reduce(
+        lambda result, func: func(result),
+        filters,
+        nodes
+    )

hestia_earth/models/utils/impact_assessment.py

@@ -226,6 +226,9 @@ def impact_aware_value(model: str, term_id: str, impact: dict, lookup: str, grou
     """
     # use cache version which is grouped
     blank_nodes = get_emissionsResourceUse(impact)
+    term_type = TermTermType.RESOURCEUSE.value if 'resourceUse' in lookup else TermTermType.EMISSION.value
+    blank_nodes = filter_list_term_type(blank_nodes, term_type)
+
     aware_id = get_site(impact).get('awareWaterBasinId')
 
     return None if aware_id is None else all_factor_value(

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.75.1'
+VERSION = '0.75.2'

hestia_earth/orchestrator/strategies/merge/merge_node.py

@@ -1,5 +1,6 @@
 import pydash
-from hestia_earth.schema import EmissionMethodTier
+from hestia_earth.schema import SCHEMA_TYPES, EmissionMethodTier
+from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.orchestrator.log import logger, logShouldMerge
 from hestia_earth.orchestrator.utils import update_node_version, _average
@@ -47,6 +48,35 @@ _MERGE_FROM_ARGS = {
 }
 
 
+def _merge_blank_node(source: dict, dest: dict):
+    # handle merging new value without min/max when source contained min/max
+    min_values = non_empty_list([
+        dest.get('value')[0] if isinstance(dest.get('value'), list) else None,
+        dest.get('min')[0] if isinstance(dest.get('min'), list) else None,
+        source.get('min')[0]
+    ]) if isinstance(source.get('min'), list) else None
+    min_value = min(min_values) if min_values else None
+
+    max_values = non_empty_list([
+        dest.get('value')[0] if isinstance(dest.get('value'), list) else None,
+        dest.get('max')[0] if isinstance(dest.get('max'), list) else None,
+        source.get('max')[0]
+    ]) if isinstance(source.get('max'), list) else None
+    max_value = max(max_values) if max_values else None
+
+    return (
+        {'min': [min_value]} if min_value else {}
+    ) | (
+        {'max': [max_value]} if max_value else {}
+    )
+
+
+def _merge_data(source: dict, dest: dict):
+    is_blank_node = dest.get('@type') in SCHEMA_TYPES
+    result = pydash.objects.merge({}, source, dest)
+    return result | (_merge_blank_node(source, dest) if is_blank_node else {})
+
+
 def merge(source: dict, dest: dict, version: str, model: dict = {}, merge_args: dict = {}, *args):
     merge_args = {
         key: func(source, dest, merge_args) for key, func in _MERGE_FROM_ARGS.items()
@@ -56,4 +86,4 @@ def merge(source: dict, dest: dict, version: str, model: dict = {}, merge_args:
     should_merge = all([v for _k, v in merge_args.items()])
     logShouldMerge(source, model.get('model'), term_id, should_merge, key=model.get('key'), value=term_id, **merge_args)
 
-    return update_node_version(version, pydash.objects.merge({}, source, dest), source) if should_merge else source
+    return update_node_version(version, _merge_data(source or {}, dest), source) if should_merge else source

{hestia_earth_models-0.75.1.dist-info → hestia_earth_models-0.75.2.dist-info}/METADATA

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

{hestia_earth_models-0.75.1.dist-info → hestia_earth_models-0.75.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=0TK08ewVobQkXQ-qph_uB_mfoOhEqcPr4KKwlP
 hestia_earth/models/log.py,sha256=8rZGVAztD5Cy-w9MJWVN7U3pKyxuYHTYnrtn_LmGebI,6524
 hestia_earth/models/preload_requests.py,sha256=-eb4TA4m-A4bLcdAwbKqr3TIsDteVSXhJGCp95mQCew,2504
 hestia_earth/models/requirements.py,sha256=zo8-3JuGOF3tPqdA5fjzfz27YCggXf31e0vM5UMgt5g,17338
-hestia_earth/models/version.py,sha256=naKG2iisQ2B5ED0ueMi3ppmSlGC0M6kJGExqIhe_eG8,19
+hestia_earth/models/version.py,sha256=Pg2K5_q_s8IAzrhGY8sBONp6X-Q4n38geyy_hka2wk0,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=FraWAl06a8OSqbAiHYYLv9e4fYZkVw42S9wikfjeTdw,4377
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=qRkDqpEt3WwleMfHdxMi2nezLmCAxa1TlJZ0IPHDTtI,2584
@@ -36,7 +36,7 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=i6zOr4KAe0FYBEnT9M7Aj1bQqtNqVYDZKYOJ4LLhHlE,972
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=JAzphWh_hY437frP0WLobRjnysMsESNcCaNthvCnGd8,966
-hestia_earth/models/config/Cycle.json,sha256=3QSThmSDNw0dDREXKnHnxyi1Jb8yCMprTmdjI2HcSlI,61355
+hestia_earth/models/config/Cycle.json,sha256=bYIEYKF7UlbWx0u8t0G5FsdWTHs5BM1hso5CWUh7qtA,61747
 hestia_earth/models/config/ImpactAssessment.json,sha256=0t8zv-zZXMwhYqjLhSgXPrIBu1KbEWskvW2Mrtn2EXk,60405
 hestia_earth/models/config/Site.json,sha256=ygHgsrrBHKlj7gY7p_9lGXOGPNFWjZnfnnCHkeLhdOM,14992
 hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
@@ -87,7 +87,7 @@ hestia_earth/models/cycle/pre_checks/otherSites.py,sha256=G1F8BREiOmq4etwJ0F84yC
 hestia_earth/models/cycle/pre_checks/site.py,sha256=nMvzSIeqC5KdLetvmGH3XpxtiWdyArVkUdcI6na5cmI,637
 hestia_earth/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/product/currency.py,sha256=hFhwhkgYCwXMf10rufYupTKv43-Hqr69IZOVn81An_E,2063
-hestia_earth/models/cycle/product/economicValueShare.py,sha256=DAqjgmZOw7oaelVqLnmLnE4J3__2zT9oOu2KjBxTLXA,8114
+hestia_earth/models/cycle/product/economicValueShare.py,sha256=6iIjflLQb9pxfVaL7-tWY8rH2PornXXXwXGwfildWWk,8177
 hestia_earth/models/cycle/product/price.py,sha256=uApxfOeWMjvjNeYQtrLMwZh-mxV0OchZE9_m1h1Vn1w,2300
 hestia_earth/models/cycle/product/primary.py,sha256=gRRHGcaIsmDBrz-LIrzOHNv-hMbWOBQD4zEIR2iMZdI,1737
 hestia_earth/models/cycle/product/properties.py,sha256=rnxRq-4kSjQMVyPEv1RBuF5xGJQEOBe51HuID2ytTbQ,1293
@@ -162,7 +162,7 @@ hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=yWYmeasZ9MYKufe0
 hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=Hr2zJd-KGmOB5PU6nAbTtnUDWMBwhFOUf8PwT-lcPis,1206
 hestia_earth/models/geospatialDatabase/erodibility.py,sha256=hSgfsbcsNfjJQhpGDHQuRtLg2PSpOiYH6hC8SDfpFoM,1826
 hestia_earth/models/geospatialDatabase/heavyWinterPrecipitation.py,sha256=dGVjdW_KUdNfdcPBVgVqtIDbkVmGBzHGyZt-n9He35o,1939
-hestia_earth/models/geospatialDatabase/histosol.py,sha256=KkSB_f1BOzNU5u_iokDOZy-SrQaN8PexdoCVk0OvZZY,2587
+hestia_earth/models/geospatialDatabase/histosol.py,sha256=nS4_n2fTQ4SZtpjKFv1LtUfIwQ1zU_nHKEG0bPouRWQ,3406
 hestia_earth/models/geospatialDatabase/longFallowRatio.py,sha256=xBloty9aEwaucwBAYns5c5kvOl5R6fOfJleHjlAtBqE,2438
 hestia_earth/models/geospatialDatabase/nutrientLossToAquaticEnvironment.py,sha256=nOsVZpWdjCQm-_Iv_XkUpEF60sUMRV3MYiNGKWKa0jU,1956
 hestia_earth/models/geospatialDatabase/organicCarbonPerKgSoil.py,sha256=FGn5HcfrC36v27tTtGHHtxh_7FO0B8ui-GUPaZMKIng,2845
@@ -192,7 +192,7 @@ hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=CJEeirdU-lm1QyJJBxNEFOSjOgItWTZhZUjTd8nLBZE,3983
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
 hestia_earth/models/hestia/aboveGroundCropResidue.py,sha256=eU2_CmrHfrUKhglV_Pd_DVjFzvtgqiG4OCXPRldRqgI,5990
-hestia_earth/models/hestia/aboveGroundCropResidueTotal.py,sha256=wa_PO-zS4j-f_9-jQbiqtmIpMbMcAzbTTopUEKPXMFE,2643
+hestia_earth/models/hestia/aboveGroundCropResidueTotal.py,sha256=nQaQjF4X5rtGKf2UdPIhWCh5FZF-8-Dy2eCLd1rlIvc,2643
 hestia_earth/models/hestia/brackishWater.py,sha256=HxuYBTi3lpP9y177kQ05geBJDKcRoVkrSc6zxWPtQo8,1288
 hestia_earth/models/hestia/cationExchangeCapacityPerKgSoil.py,sha256=zj0cNDP8QdoxGx4WVSfx8W0hvpTdQL_pznxTg_vGlJk,3656
 hestia_earth/models/hestia/coldCarcassWeightPerHead.py,sha256=IkOyrLYqSNidrTfuuZcAGXaT5XEDBFmRWPNxAEAORNU,2962
@@ -246,7 +246,7 @@ hestia_earth/models/hestia/salineWater.py,sha256=6P0L24tD0-r4VoFt0Uh8djiMgtivGAe
 hestia_earth/models/hestia/seed_emissions.py,sha256=PMcCx6EBcebIQrQy1NuGSHXvh3IHrpqMJh2vvs4mJKY,12428
 hestia_earth/models/hestia/slope.py,sha256=2LdcRvRecUkwmlGVqWBQIeaYfRMvsSWKfS9hWvV_DbU,1160
 hestia_earth/models/hestia/slopeLength.py,sha256=-EK4Kwh2MwFqdRyDWNl4O6zoA4Dz7QcD0RwdlTTaC_E,1166
-hestia_earth/models/hestia/soilClassification.py,sha256=HUYqlxHslS1UjBizEynR3iiQLZaESQNNf08wic_PIFc,9852
+hestia_earth/models/hestia/soilClassification.py,sha256=mIasxJbQLGgPWEaEieqdYDvVVBt9633OrIvrwSW7xG0,10373
 hestia_earth/models/hestia/soilMeasurement.py,sha256=_-3Ex9Lr3e7tseQ530b3axC4svTOQ47dY7vEkLMCNYo,7084
 hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py,sha256=seqIDyRefjFKaznXTZMaMov7fF_0DGiUij_UAEwP65g,1743
 hestia_earth/models/hestia/temperatureAnnual.py,sha256=ja2ts1YGTL5BSh-ccZFWnE6OxPq1B1I2Kw0Kb8XGO2Y,1959
@@ -303,22 +303,23 @@ hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=NOp8WaX1NJk0TawwJRGzdr
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=M9--7akmPWo7gfxEYnKobsJ0HyDzfAzRxLmrCt3Pg1Y,3505
 hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=1N4dsiRY_pyLvPcq3g8uBiAiVwSScLFocS9FFBxRW1s,12580
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=NkTPGMl-0tqvhUZKZ1rxW0XTBnZOvgFJki_IPzEEyu0,15796
-hestia_earth/models/ipcc2019/burning_utils.py,sha256=uq3ndASMuyMjDZLCqIcIRo2gHZnh0yi01HnLWhleaTA,1822
+hestia_earth/models/ipcc2019/burning_utils.py,sha256=GzuTWhddAsLQ64g1xA38AN16lRG7XeKto12fTjSU7hI,16566
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=XhXDu6DRQxANBsRsCEgw4f0UJDOgWsvhVyEwK1-4YT0,7263
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=n1hG-p67BTXkJATvX1em6255WY0mJxk7SojzBwebtnQ,3385
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=hVdx6atBXrnAyOnsBwxnT4u84L6hyF-yuLtVhme0MLI,12130
-hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=Sox2nY1f0_tDrqmv_lFeCruXt89HsrYP9afRAJ-wRXE,6491
+hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=GDmMtaISiZoONYXur5Q0yvK_smArs1IjojM3-YPTFWQ,7136
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=3173-WEI_4TpvPdl55VNpmXANPoM92o8hTqcGidj7ds,9979
-hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=0NX2SGFVXcT2bi-icSc-AiscLI2QqgVsOmWV05nOHpM,9552
+hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=zTIBhzwHg5ttUoPJwxKMCuxMGJD-qlcyMvWavhhfalM,9502
 hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=bt9JoG68MBg-u4tw_H7UdpOKj6MMz4QWLEa3ooerghw,4174
 hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=DmvEDPjZeDv8ikby7vPGHVH-T_099-XbiNq-zHPX_1U,3699
 hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py,sha256=khkNR2Z5aFNiF098YLSqr0yQdVlXVXX2_ZagmCzB9PA,3509
 hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=TtE72p3TYsPYV1cdUCNO1gDK2y94JZG8Ra_wnNWTRt8,63246
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=5ciisz0wFbjlwfshDzMlvRIjvw_E8NsphX0IulzVD3A,2479
-hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=MZGAlJEGs7DiiFw40tGzx-e8ZMze7sgC-R2X-FZl3aE,7613
+hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=P0JzCIGnX9cmhusWd1_FGKouvWnOc_78fayAlx8Uasc,7568
 hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=CmKMmW0O6pDcg-uCUIhLXm2xf3c2AktxGS6Cl939xpY,3712
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=IInWDQCfMQWd6rXDRZnLMQlaQGghVQJcwFSGtRMdkzo,3871
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=AEOnzVc8mbx0kHpm5BIEiXr1zP0IDUl9qKktNlgURnk,3080
+hestia_earth/models/ipcc2019/emissionsToAirOrganicSoilBurning.py,sha256=htQSKzFmWZZiZxl9eeyF01Y3x7gxwPbBiUGg7fghHHk,18816
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=nAhwrl0b3pbGQnAycEESAzakdpXajONTnbhNwgPR7nw,7293
 hestia_earth/models/ipcc2019/n2OToAirAquacultureSystemsIndirect.py,sha256=0LzQV6sRw4nnvu4mqJ1M7I0OVLkHCM14Hk1mN337ZyA,1433
 hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py,sha256=24tqCPLCFGSJ9cdiWM0hXNbnD5-2TfiFbdxi6odaoXM,1746
@@ -334,7 +335,7 @@ hestia_earth/models/ipcc2019/n2OToAirNaturalVegetationBurningIndirect.py,sha256=
 hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.py,sha256=RSNdJIVgnGs6Qe3SkR9yLYkwVIOjVPBUhqk7P29pv3I,4195
 hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=1izTtLx0iFsK5yRzbxoy_kN6oflHTfBEj-sFXBERAnU,1380
 hestia_earth/models/ipcc2019/n2OToAirOrganicSoilBurningIndirect.py,sha256=6nyMMrhpK5ZaG_Be0ivJB6MSdbYYg6RD67appp1wJiU,1301
-hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=tQvOTcqq642WWXs6xMExvwr-2Qb1L8HHHtOSm20vsrs,5807
+hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=KCoX0qC96kp1IB2P1uss-S6RGoV_pxDtFRuAWt55mQk,5767
 hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationIndirect.py,sha256=lXMSAIvWBsNf6TTbYIPTu_uMSBBgk_JDO6S6r630yvg,1321
 hestia_earth/models/ipcc2019/n2OToAir_indirect_emissions_utils.py,sha256=gsxEwd_WF4ZgUIGb8H1Co6AME_eIpCWPvSCNfDJCKbo,4467
 hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py,sha256=UGojWa9GJRf_JQxfvgX8ywwfoL7N-9FGDF7h679iLNM,4336
@@ -344,15 +345,15 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=BV7kdeGlDbSQASBtYZuLNTQktrteaMWGJzIbG97flH0,4319
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=zww-PDlLdz3XbrlXfW7F8nWzP3Iud1uLW-mRo8HZf2o,3250
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=AHCYaj_al-cLFtvWHhxZLlrZfpjIyWg2rKR435qqGxM,3184
-hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=1Xc54OBKOnEsv6iMAsxGJvvMDOc0N4zwM_nyXBFt3ac,32407
+hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=C44mPHp_85V96Sp--bhVMCRUj8J4BYZNkanQtMK-gAs,19095
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=nBBiKzGMUYtHkU49AKBxQ7OdD61cb9_Ehe7ixFWKHR4,4336
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=yONOR8ppiOXQlPPz68GQ2_3MFzvnOQTJTHpJ956ubW0,4008
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=qYR1iB95Uz841xPe727ZYUtrRhg_Unbktf1YEjZHqyU,8000
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=IfXans2CZLagxfr8A0GRxCF2pMu9-ZV8DjuUludaeRQ,79084
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=2kw9bhkR4o4ZSeC4ZFEIEe7OxZvE7Ft1f3Et94YPl3c,69231
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=DDP3nY-QVRU10FkFihNbnF66-Oa6O6Tkn7ycnetN110,9924
-hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=S5XaM7142_ShxFFXPZ4HaOdofRzMYucWc--5udxuin4,5361
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=V1PRJ17dYw0p9lvuyRVFuYzJrpmNOs0FjhNUXOuUkyU,10202
+hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=dnudbsJqzXPyVWD_DlLZkxAh57naINGtoQ8jVd__M2Q,5371
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=O__O4JNoXHxUetUFoT3JHKMtx2mXwHos-527fnqS7Pk,10330
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nJAup4ZUla90Ink_S2WLkB84FRKI2t1wDCFJNkttpZ4,14336
 hestia_earth/models/ipcc2019/utils.py,sha256=xkOtBl85yJu8RI9nQnscIeSJGdUf84dKteM7nvr9mkU,5945
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -361,7 +362,7 @@ hestia_earth/models/ipcc2019/animal/hoursWorkedPerDay.py,sha256=BBByUzgM7OymWnuU
 hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=TXEKI0PZFDj7zlg_pmgfwhRT0LS1x1hEswulQYD7Dkg,956
 hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=86HRowJnTbwHKDKU0rGaco2-8B1wIQ4nIe_KNqzdXsk,965
 hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py,sha256=Io-EsFBVpY80BdmS96POfZSN1CB835tu_J5AiQZm2do,2522
-hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=sBYLuZgfuvlewzoRK0yRKOXNd2qDalFhccGC3RSVQEY,12259
+hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=NYjtjqYdw6UkMXJTrkqJ62YIKpOAychUDa0nJOjVV4o,12391
 hestia_earth/models/ipcc2019/animal/pregnancyRateTotal.py,sha256=zib2AW3WJTL4NRYN4a0rRiqSJ5PZLRtwDYia7gigQFY,968
 hestia_earth/models/ipcc2019/animal/trueProteinContent.py,sha256=fgV0u4sEtLmCk-vUHF6mM03uy1w9nVPDzmxSkLXgPBo,1010
 hestia_earth/models/ipcc2019/animal/utils.py,sha256=49wX3K5fLDLc33MQJLsGefJ9vlGRwfkNXabc8CGgPQ4,4435
@@ -472,7 +473,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=uxRu5thfTDGpCNIuv3Nak
 hestia_earth/models/mocking/__init__.py,sha256=-mJ_zrVWZSGc3awWW2YJfXAK3Nku77sAUgmmFa99Xmo,733
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=uvklojTAbjDI7Jw43jGAUDcTHk1R3A3CWiYBJZI6rao,1493
-hestia_earth/models/mocking/search-results.json,sha256=adCQArTkXdnUQv9QU-Q03OtPIVwwWIGisHYfdnW6Loo,104036
+hestia_earth/models/mocking/search-results.json,sha256=H4OyZjQ6Srks4m5MWcRSQeQhlrCxbxUI_diVxQGRybk,104037
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=FoiRk-bULfC9VbhT7L-wgjehrUkG_74XiG2WnW1Rc-U,2402
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=r7Wqo5v29NrKfhDd0g1QCharR2k6H5XFyAsKZ6pvYKY,2321
@@ -619,7 +620,7 @@ hestia_earth/models/utils/aggregated.py,sha256=O7yoCeBkyAgmV9Fh33aI25Dq4r4GxVXKg
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/background_emissions.py,sha256=zxLM71M2Z5fMIfExZJQkyDKtUIDdlTMboN73-DDGvxk,7064
-hestia_earth/models/utils/blank_node.py,sha256=nUCnH0Tzpg5Lbf8yF1I1HgDM5DoWw9Vc_HuD_QAL20Y,57027
+hestia_earth/models/utils/blank_node.py,sha256=EnF4GJ7n7jfoDDygGD7r2SoRmoZHP9yWIiQGZiTqKbw,59302
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=1FtDzl1dQ-AZ4nCn1vfGqR4RK3yHItfkksVqsJzIWR0,1256
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -634,7 +635,7 @@ hestia_earth/models/utils/excretaManagement.py,sha256=zeXEAHhdl8Lj1P0M5KXkaV_iks
 hestia_earth/models/utils/feedipedia.py,sha256=xkdpqWADSK5K3ZdMsJG5hn8HB7mCZy3NbaRUUKe2WRA,3948
 hestia_earth/models/utils/fertiliser.py,sha256=9Kv7czDEPDvZ5Bz6Rr_2vy2MsXrPDvBC3921cEJSks8,810
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
-hestia_earth/models/utils/impact_assessment.py,sha256=AfIZo_ykkkqWYY2AG-kLzGtd3fwzGIQXxnEKEzL_oGk,8516
+hestia_earth/models/utils/impact_assessment.py,sha256=U35v8je4vrGxtXRS9K_1wFeX_pbFuYd1NBKYCxJRhsQ,8688
 hestia_earth/models/utils/indicator.py,sha256=OdPNIq_7UZJk8rXccUbDOpBZ2fxOHIcDwfJxWWJVl2A,1409
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
 hestia_earth/models/utils/input.py,sha256=n17YEoEdodE9I3QWLEjAH2f8YEdbzF4knYN7nGBSXgo,6674
@@ -670,13 +671,13 @@ hestia_earth/orchestrator/strategies/merge/__init__.py,sha256=rs9j1EbAAI1GvFKYZ3
 hestia_earth/orchestrator/strategies/merge/merge_append.py,sha256=5xJ8fqu2UqCDotVkSxj7yRDRdw0RM2tERsA4j_1Zlu8,915
 hestia_earth/orchestrator/strategies/merge/merge_default.py,sha256=ssKq5ZIoQr4k2HHpkyPqHJSQQj-AGqu8zUzEQIRafv8,45
 hestia_earth/orchestrator/strategies/merge/merge_list.py,sha256=k88Dp4GUYFD7LToKoTUCGN83_9RFGyG0G03TvaCb3IQ,4531
-hestia_earth/orchestrator/strategies/merge/merge_node.py,sha256=iAgxHVVR7y2kXtR_pdNzS4Fq-iLmwaqNHXMfjIBG6eE,2622
+hestia_earth/orchestrator/strategies/merge/merge_node.py,sha256=HUN_OnudmFE7HA2tAMQHWPvKn4wjX12Y05ENH6nGFqA,3828
 hestia_earth/orchestrator/strategies/run/__init__.py,sha256=At0V8CI4vyiSY-Vh2PHMhTYfnp7vl31gq78RyCeIqJk,307
 hestia_earth/orchestrator/strategies/run/add_blank_node_if_missing.py,sha256=lAfL-NK-gh2YQnTis2lIyb1uI_fsnwFWS10qwbga43M,2756
 hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87XpbtpsvjA_r0Ftm7MhNkGB0kcUSGFlKBIK_I,352
 hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj5cgFClxGvepZYqtYsjWVE,217
-hestia_earth_models-0.75.1.dist-info/licenses/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.75.1.dist-info/METADATA,sha256=KOjt7CWzx1fmpsDFelMpu4hcqz1vbUHzeEpsn1GFV08,4049
-hestia_earth_models-0.75.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hestia_earth_models-0.75.1.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
-hestia_earth_models-0.75.1.dist-info/RECORD,,
+hestia_earth_models-0.75.2.dist-info/licenses/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.75.2.dist-info/METADATA,sha256=dbi6VQnXa90X2jWquBiNPkwNCfAHs5ku8SPlzXJ3_gA,4049
+hestia_earth_models-0.75.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hestia_earth_models-0.75.2.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
+hestia_earth_models-0.75.2.dist-info/RECORD,,