hestia-earth-models 0.73.2__py3-none-any.whl → 0.73.3__py3-none-any.whl

hestia_earth/models/schmidt2007/utils.py

@@ -10,8 +10,8 @@ from . import MODEL
 def get_waste_values(term_id: str, cycle: dict, lookup_col: str):
     products = filter_list_term_type(cycle.get('products', []), TermTermType.WASTE)
     value = all_factor_value(
-        model=MODEL,
-        term_id=term_id,
+        logs_model=MODEL,
+        logs_term_id=term_id,
         node=cycle,
         lookup_name=f"{TermTermType.WASTE.value}.csv",
         lookup_col=lookup_col,

hestia_earth/models/utils/__init__.py

@@ -55,7 +55,7 @@ def _unit_str(unit) -> str: return unit if isinstance(unit, str) else unit.value
 
 
 def _filter_list_term_unit(values: list, unit: Union[str, List[str]]):
-    units = unit if isinstance(unit, list) else[unit]
+    units = unit if isinstance(unit, list) else [unit]
     units = list(map(_unit_str, units))
     return list(filter(lambda i: i.get('term', {}).get('units') in units, values))
 

hestia_earth/models/utils/cycle.py

@@ -409,8 +409,8 @@ def impact_lookup_value(model: str, term_id: str, cycle: dict, blank_nodes: list
     """
     term_type = blank_nodes[0].get('term', {}).get('termType') if len(blank_nodes) > 0 else None
     return all_factor_value(
-        model=model,
-        term_id=term_id,
+        logs_model=model,
+        logs_term_id=term_id,
         node=cycle,
         lookup_name=f"{term_type}.csv",
         lookup_col=lookup_col,

hestia_earth/models/utils/impact_assessment.py

@@ -4,7 +4,7 @@ from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_date
 
 from hestia_earth.models.log import debugValues
-from .lookup import all_factor_value, _term_factor_value, _aware_factor_value, fallback_country
+from .lookup import all_factor_value, _region_factor_value, _aware_factor_value, fallback_country
 from .product import find_by_product
 from .site import region_level_1_id
 
@@ -131,8 +131,8 @@ def impact_emission_lookup_value(
         The impact total value.
     """
     return all_factor_value(
-        model=model,
-        term_id=term_id,
+        logs_model=model,
+        logs_term_id=term_id,
         node=impact,
         lookup_name='emission.csv',
         lookup_col=lookup_col,
@@ -143,8 +143,8 @@ def impact_emission_lookup_value(
 
 
 def impact_country_value(
-    model: str,
-    term_id: str,
+    logs_model: str,
+    logs_term_id: str,
     impact: dict,
     lookup: str,
     group_key: str = None,
@@ -156,9 +156,9 @@ def impact_country_value(
 
     Parameters
     ----------
-    model : str
+    logs_model : str
         The model to display in the logs only.
-    term_id : str
+    logs_term_id : str
         The term to display in the logs only.
     impact : dict
         The `ImpactAssessment`.
@@ -182,15 +182,15 @@ def impact_country_value(
     country_id = fallback_country(country_id, [lookup]) if country_fallback else country_id
 
     return all_factor_value(
-        model=model,
-        term_id=term_id,
+        logs_model=logs_model,
+        logs_term_id=logs_term_id,
         node=impact,
         lookup_name=lookup,
         lookup_col=country_id,
         blank_nodes=blank_nodes,
         grouped_key=group_key,
         default_no_values=default_no_values,
-        factor_value_func=_term_factor_value
+        factor_value_func=_region_factor_value
     )
 
 
@@ -223,8 +223,8 @@ def impact_aware_value(model: str, term_id: str, impact: dict, lookup: str, grou
         return None
 
     return all_factor_value(
-        model=model,
-        term_id=term_id,
+        logs_model=model,
+        logs_term_id=term_id,
         node=impact,
         lookup_name=lookup,
         lookup_col=aware_id,
@@ -260,8 +260,8 @@ def impact_endpoint_value(model: str, term_id: str, impact: dict, lookup_col: st
         not i.get('methodModel').get('@id').startswith(model[0:6])  # allow other non-related models to be accounted for
     )]
     return all_factor_value(
-        model=model,
-        term_id=term_id,
+        logs_model=model,
+        logs_term_id=term_id,
         node=impact,
         lookup_name='characterisedIndicator.csv',
         lookup_col=lookup_col,

hestia_earth/models/utils/lookup.py

@@ -8,7 +8,7 @@ from hestia_earth.utils.lookup import (
     _get_single_table_value,
     lookup_term_ids
 )
-from hestia_earth.utils.tools import list_sum, safe_parse_float
+from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
 
 from ..log import debugValues, log_as_table, debugMissingLookup
 
@@ -40,7 +40,7 @@ def _factor_value(model: str, term_id: str, lookup_name: str, lookup_col: str, g
     return get_value
 
 
-def _term_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_id: str, group_key: str = None):
+def _region_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_id: str, group_key: str = None):
     def get_value(data: dict):
         node_term_id = data.get('term', {}).get('@id')
         value = _node_value(data)
@@ -58,7 +58,7 @@ def _term_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_i
                         node=node_term_id,
                         value=value,
                         coefficient=coefficient)
-        return {'id': node_term_id, 'value': value, 'coefficient': coefficient}
+        return {'id': node_term_id, 'region-id': region_term_id, 'value': value, 'coefficient': coefficient}
     return get_value
 
 
@@ -89,8 +89,8 @@ def _aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: st
 
 
 def all_factor_value(
-    model: str,
-    term_id: str,
+    logs_model: str,
+    logs_term_id: str,
     node: dict,
     lookup_name: str,
     lookup_col: str,
@@ -99,18 +99,38 @@ def all_factor_value(
     default_no_values=0,
     factor_value_func=_factor_value
 ):
-    values = list(map(factor_value_func(model, term_id, lookup_name, lookup_col, grouped_key), blank_nodes))
+    values = list(map(factor_value_func(logs_model, logs_term_id, lookup_name, lookup_col, grouped_key), blank_nodes))
 
     has_values = len(values) > 0
-    missing_values = set([v.get('id') for v in values if v.get('value') and v.get('coefficient') is None])
+    missing_values = set([
+        '_'.join(non_empty_list([v.get('id'), v.get('region-id')]))
+        for v in values
+        if v.get('value') and v.get('coefficient') is None
+    ])
     all_with_factors = not missing_values
 
     for missing_value in missing_values:
-        debugMissingLookup(lookup_name, 'termid', missing_value, lookup_col, None, model=model, term=term_id)
+        debug_values = missing_value.split('_')
+        debugMissingLookup(
+            lookup_name=lookup_name,
+            row='termid',
+            row_value=debug_values[1] if len(debug_values) == 2 else debug_values[0],
+            col=debug_values[0] if len(debug_values) == 2 else lookup_col,
+            value=None,
+            model=logs_model,
+            term=logs_term_id
+        )
 
-    debugValues(node, model=model, term=term_id,
+    debugValues(node, model=logs_model, term=logs_term_id,
                 all_with_factors=all_with_factors,
-                missing_lookup_factor=';'.join(missing_values),
+                missing_lookup_factor=log_as_table([
+                    {
+                        'id': v.split('_')[0]
+                    } | ({
+                        'region-id': v.split('_')[1]
+                    } if len(v.split('_')) == 2 else {})
+                    for v in missing_values
+                ]),
                 has_values=has_values,
                 values_used=log_as_table(values))
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.73.2'
+VERSION = '0.73.3'

{hestia_earth_models-0.73.2.dist-info → hestia_earth_models-0.73.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.73.2
+Version: 0.73.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

{hestia_earth_models-0.73.2.dist-info → hestia_earth_models-0.73.3.dist-info}/RECORD

@@ -5,7 +5,7 @@ hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK
 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=6unV9BrcVtZBSQYzcEEo3l9MxEWoCRevShyTP8qA1uM,19
+hestia_earth/models/version.py,sha256=VT_6Vw43qRySd6SoTRY3kADgLF1HQDvEO1BvE5n3K1o,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
@@ -126,8 +126,8 @@ hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtu
 hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
 hestia_earth/models/environmentalFootprintV3_1/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=47raZTA3aUbBpgClTzKnzUI8Vfy9qUwYNdFDUKM3hJ0,1101
 hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=JhZB4qGQBQb7fF3ambBuILL7eKLG6B_4RYvIgbINNpY,1299
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=xCQUf4bUJuAqnPgaRZv0Qcc2zzIxhFBePPuNUdjHvLo,4739
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=HEIAG3VHYnv-XaLmnzXGvShVeT9MoRHBMODNQ9vNLAo,6796
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=JrDXWTdmeROyuCXYfr-zhWLPkSS7NsyXgHl4eZ4P8uc,4807
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=7eQUNCD-rQRuWwP_MB2DsY0wG3NM3KlLI5lqx77xDnk,6796
 hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=6g76wBf0XcQdAadE4BCD5-qUmpGbbYV9kfKsM6cKnHM,3075
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=683vgGM-m4cdFhbvlp9V1yobLHM7bQWYMwjByoozzZA,1724
@@ -145,7 +145,7 @@ hestia_earth/models/faostat2018/utils.py,sha256=bxd4dtML0z5D5LP7peZTcvt7U6GLxGdX
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/faostat2018/product/price.py,sha256=6oG8n-tGFRX2p4aC1RBeEvO7iexooFiRok39m8f4VN0,7734
 hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
-hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=W2R5rjnorfWhderyDy3iGpcIZdL3rYvRh5wh0wlvI0k,4430
+hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=4umFLvT0Pvr80E1qgtgRprG_3yO7l4VnzkWrDhXHjbs,4700
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
 hestia_earth/models/geospatialDatabase/altitude.py,sha256=B9FOuAIXLV4ip3MkTxFBm3xMex2BkELsOGybnsHkXVc,2015
 hestia_earth/models/geospatialDatabase/awareWaterBasinId.py,sha256=_4HFoZR5PQrEYZegMjj33rjUFR_kktt69D4J_moZXHo,1249
@@ -177,7 +177,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=y
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=E2k2kkhVDtmeFEB4_AZhhq5od57lRDMWu6AqaurgqvQ,3194
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=eajSzMCX201k_xrfZZSHtTzEIH29hqgJdztQgQeewig,2853
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=fL8wNpx-3WdD3k9riy6AaUnpdRMFNMzzc338jRIqfw8,2102
-hestia_earth/models/geospatialDatabase/utils.py,sha256=0jpP4xLhWXu4XfLpQrbuer1DQmLY6NpVVNI0zTxvMTQ,6884
+hestia_earth/models/geospatialDatabase/utils.py,sha256=WlHtjmawyDi9-i_vFVgbrxqzhq2DF4n-Rl48wkO9U6k,7281
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=UuFzMbDrvmll3LL6T887DZ76CHt3wrK-2hl9ymmg2FI,4089
@@ -194,18 +194,18 @@ hestia_earth/models/hestia/coldDressedCarcassWeightPerHead.py,sha256=NE1aw4-rmKs
 hestia_earth/models/hestia/concentrateFeed.py,sha256=HnuG3zAECtFVdPRbTATGz5ImO2Ve1NruqD8brbrO2c4,6647
 hestia_earth/models/hestia/cropResidueManagement.py,sha256=VlubB0q5MtvBM2dQSWdrENBMOYpvFbGu36TEwxoDl7A,2301
 hestia_earth/models/hestia/croppingIntensity.py,sha256=xev3GOE06nBJ8ZY3XtbnE0eR2YR_kqAFPnrTuKFtLrQ,1777
-hestia_earth/models/hestia/default_emissions.py,sha256=GiO9zQ_shIcdLsZAhW3uKX9vouKuhS2xxq65oG2VzkA,3408
-hestia_earth/models/hestia/default_resourceUse.py,sha256=M5_mC3_t_rzvfNoyKJjZ1tSrV1V9Ci_40LIv0iawVB4,3693
+hestia_earth/models/hestia/default_emissions.py,sha256=BJkdwoKMWSBdWD0XE55Oc1qbvuZzu7ulBczMgTolOCI,3457
+hestia_earth/models/hestia/default_resourceUse.py,sha256=BG7DouJDIr9JP_LPRSFwv9rb-dDsnJxn2xWFGg8fAHA,3724
 hestia_earth/models/hestia/energyContentLowerHeatingValue.py,sha256=2gR7Iu5nUUCGSXjFrkTnss6XBGtQz-yKwexCQoy8TJU,2214
-hestia_earth/models/hestia/excretaKgMass.py,sha256=Ct9nwTUXSv7FmJwDNCk45vkaW_2flu6A53ZJN6Wo4kI,3996
-hestia_earth/models/hestia/excretaKgN.py,sha256=-GfHPx6AECNPW2i_ioCuf-DhW7Xau201xqe-qWcK474,2857
-hestia_earth/models/hestia/excretaKgVs.py,sha256=fzBV7hgznevLTcvHyHKQk9upkCgmJ0xH1NuMETeSF8A,2860
+hestia_earth/models/hestia/excretaKgMass.py,sha256=pBhD3I2NPjJ-Dbnp_P508J7OCLI_fxOAyTi_wKtrkcg,4017
+hestia_earth/models/hestia/excretaKgN.py,sha256=J2TuRGzA8KHDgsRnZflF8LMcd8993YPguY-cdbQOJ8Y,2878
+hestia_earth/models/hestia/excretaKgVs.py,sha256=fhelFqI3xr-GW0ifzYB5oYklXv5tXzedTumFIUBe59Q,2881
 hestia_earth/models/hestia/flowingWater.py,sha256=Iy5PCWun7GMrr0zszd0zpp9lKADpXesjC3doqLY4n28,1603
 hestia_earth/models/hestia/freshWater.py,sha256=Q-dmFJLZfyYEyFyYkJUOjgmQR3G5YXCXB6X09Bu14hM,1269
 hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8smMz1UZBA,1612
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
-hestia_earth/models/hestia/landCover.py,sha256=TL0fLUoj0qIHj2kvVCxkYSrIHl6BGazmwvCSmIz1q8E,32958
+hestia_earth/models/hestia/landCover.py,sha256=FHJ98zDByDL3ofziHICQNKiz_OnmrdOqJC0ZJRHif7E,32953
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=hF7_DDvrs7swH6ott_ihgYx13UzEKHH6pccYCtzrN8o,1069
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=05SCH6ZjEV3mIleRusBg677zu0xgu5YK0f9FCddgNPg,1067
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
@@ -244,7 +244,7 @@ hestia_earth/models/hestia/totalNitrogenPerKgSoil.py,sha256=hpyYqMwO9TvZjrpQuSBA
 hestia_earth/models/hestia/unknownPreSeasonWaterRegime.py,sha256=Ix7Eg4NVW1iKvPKIOqOdSkahn7BlJNtPM8nlrogrfcM,1460
 hestia_earth/models/hestia/utils.py,sha256=oTdk7VKuaxDTKj9Cz4t3qp3RZ5wSt3bZXpPiImgIIto,4768
 hestia_earth/models/hestia/waterDepth.py,sha256=gnvd1kwbTCt9HjgxlKzuCGkPi8Sq7nQiHFbk8xBAZV0,1251
-hestia_earth/models/hestia/waterSalinity.py,sha256=2tE2LWhXTFikXu4gkHnKOAPJs8rHYVDbRwQmsC3gA2g,2667
+hestia_earth/models/hestia/waterSalinity.py,sha256=3-2PX7LZ5YBGvNYqkJHnNLiKoN01BYaawTFoxe7GsM0,3010
 hestia_earth/models/hestia/feedConversionRatio/__init__.py,sha256=G4T1jfN1OqERsywiWyrBiFneUZs5QXpChz7dgGfg9Ko,2512
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioCarbon.py,sha256=21_PXoKXJCxPOPOspKqqq-E7dh-2tVQnR4cnGZ9JGj8,1992
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
@@ -303,7 +303,7 @@ hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=4aRB
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=P6OxdUbvONaTVGchvogEnGeNxox-X1FaZ08yOdqqm6k,3879
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=X2fuBCr-mspLwJUGOlVis9lnyzdZ92vYqgDA6dgL5eo,3088
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=nAhwrl0b3pbGQnAycEESAzakdpXajONTnbhNwgPR7nw,7293
-hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py,sha256=K-3-pjH46Z3eEcFnOchBucuOYB2jcAA6C4q0C8i-ezo,1845
+hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py,sha256=F4FuhlCpsX-V5g_wwBZ70e3Z_3f2XXViLlXLQP4WB6c,1947
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py,sha256=_Oj6Jw8F4rce7FmhWkzeqyB7W3ZQWpOiA10p6xrfSwc,3777
 hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=RW_aFY409kplCYWo3oHHVk9FD3DkoEnGkprU9SaTdcw,2196
@@ -448,7 +448,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=7M-E7u35fIF0uMoA1hwcr
 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=uDp2q9czBpM_hJ9m852MWbA9Bh1l2GdcA-_ovagVR6s,162621
+hestia_earth/models/mocking/search-results.json,sha256=2nPCc9NKEcWMFzaR_L32EV4IVfOdyuMjuf2Hjp3Xepk,162621
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
@@ -545,7 +545,7 @@ hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py,sha256=YADAFxJl0UB_UCx
 hestia_earth/models/schmidt2007/h2SToAirWasteTreatment.py,sha256=Ma20xG4Crk7bp12FvpDQkyVwXyikFz9Bnn0pFoWSu64,1351
 hestia_earth/models/schmidt2007/n2OToAirWasteTreatmentDirect.py,sha256=a0uv1788OxF6Cw01y7SWywS9WevI6aimhPR3RETuXjI,1357
 hestia_earth/models/schmidt2007/nh3ToAirWasteTreatment.py,sha256=UOOcEOZsW9-UOlS8pcgBkSl1V1kFbURn1hNx20Ubtq0,1351
-hestia_earth/models/schmidt2007/utils.py,sha256=tbTFg5TXAyS12JCa-OXQg37M1YymHxKW8Gok_SslqAM,980
+hestia_earth/models/schmidt2007/utils.py,sha256=ytV6wGAuIMqu_Z_Ck8f0Zia_XETfno8fyr3IdvdP2ho,990
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
 hestia_earth/models/site/defaultMethodClassification.py,sha256=1EIWC99Fegu7B8GFlpysvWhuXaLDmABom3wDelIYUjc,1068
 hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=4YXf8grO9Zf5N7bPomKAqXKPOa7JhmLCXm6sO53I4is,1213
@@ -590,7 +590,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=tggXIoUujzu8O949_3KFog219k_bQ0IcytpCsJ8oMcc,5384
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
-hestia_earth/models/utils/__init__.py,sha256=hXSBcHSMYWjg_Fe_H5IVsxu_OmVCTummZ205t_GE6pY,6847
+hestia_earth/models/utils/__init__.py,sha256=8YXFDBdB7VJK9F4BTMeq_WoNAGySEGgoVbvW5EoZahA,6848
 hestia_earth/models/utils/aggregated.py,sha256=G7FNJfHqJ_eoXB66kGdjLyZGDOI_gsF56o7VnyW3bqA,4801
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
@@ -603,20 +603,20 @@ hestia_earth/models/utils/crop.py,sha256=GbYwrz3Zd4JU-cwUBijc8GeAK0XgurV3ubwcFIg
 hestia_earth/models/utils/cropResidue.py,sha256=6rwC2Fw4ZwuQwvb38ZYUfL1UIZ7eEIy1zeNFv5OxYSQ,1220
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
-hestia_earth/models/utils/cycle.py,sha256=FJWDPQ0utjtSTq-0SnewpqP_ateixs2XXCqN85l07Qw,16210
+hestia_earth/models/utils/cycle.py,sha256=J8ATBSDkhkEPRMRC0ufO8eC_JeGCpkpdvSz2xSTAg-8,16220
 hestia_earth/models/utils/ecoClimateZone.py,sha256=kJmXtRiq8-vWF7S1rNIA6WpWkPtt8JoNfWgG9azM_ts,4269
 hestia_earth/models/utils/emission.py,sha256=vzQQ4eKiC8KlmwFqT00lSV1V2dmTGMSzddOYNgFyka8,3636
 hestia_earth/models/utils/excretaManagement.py,sha256=PNZoaf6nvdt1t7B8Apa638rU8T4hI5VW2fy1fAoC64k,2265
 hestia_earth/models/utils/feedipedia.py,sha256=fVyEx2C5CSu0pv--tG6dOfQQ7WzThPoVuzM_FW9jP18,4009
 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=MW38yKehkrF7YWYCbDtG-xMjVhhAffxkcOiLYOdrmFI,8377
+hestia_earth/models/utils/impact_assessment.py,sha256=tGTlo2grQ9argk2cT8zWRToBKQWe3LB8jWEfU40ZHWs,8451
 hestia_earth/models/utils/indicator.py,sha256=qdXJP9PDQbEzcGYERp3d3exkDGFmgj1-2987Ls6Hums,772
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
 hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
-hestia_earth/models/utils/lookup.py,sha256=70dw7QcNAPqL8t0nDQc2aGEcrFXhZKF24Os36AvVDtA,6499
+hestia_earth/models/utils/lookup.py,sha256=uDye1fnvOdmR9ch5rVNI61qHRKAxzBLk3aPK93BxnfE,7196
 hestia_earth/models/utils/management.py,sha256=urvoHvTw5wrO12POjGQ50Or25X1Y4Gx26l4fDoVt-Ck,376
 hestia_earth/models/utils/measurement.py,sha256=1Da0CzWu_RDzVEqcBIl_EGsRq7PmafICyBva3-QtjVQ,11744
 hestia_earth/models/utils/method.py,sha256=ZYN2_Fyeiwr9pmvD84ZPg7ZHBlvaIY2A6XL4F_KByS0,740
@@ -764,7 +764,7 @@ tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.
 tests/models/environmentalFootprintV3_1/test_marineEutrophicationPotential.py,sha256=kY_pu_7SjSZl_l41mttMn4BpKl13TTV9jQYSHFMNXhI,968
 tests/models/environmentalFootprintV3_1/test_photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=Z4KGhYmnao0J1rC_jY9P_8Lu9UKe-_RyrdO5k56EIsg,1022
 tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=TJptYKhplwbwiDObmPMBJweDgtwvIUdwBzNwAPCpbTc,1265
-tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=-E8Q5JxIdfF11oqGwRJqcqGO0Ao_Bva164ELMR7sRsI,6197
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=67YdlYnvVWFDZ3avHSz3bpCLkHAwYfU3j4ZNcwN5DK0,6162
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=xRTBMfQ1Qxs_NIoEFtshM_uzAAcFb80k1qGuFLJa2Dw,7650
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py,sha256=ugM3qfvCuNQbzF5IPkEQQYF2V4IHxg3GQsXWqU9wqFE,2614
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -784,7 +784,7 @@ tests/models/faostat2018/test_utils.py,sha256=G4pOEwcM5k6FRbkE_4x6_G8vQxzDexNZnl
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/product/test_price.py,sha256=zehnEQjwggit9su5jd5q3TTlyNxcswbxJCNaKaw1ZI0,3903
 tests/models/frischknechtEtAl2000/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=rT75VNmpUKG6aIQLNgmMzKDyJegTm2_qGLaRHUYlzF8,4416
+tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=r3ZaTBvmzh4KUl1OZhJBAaVBR0_kijzkLj9Ru91Zj8w,5050
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_awareWaterBasinId.py,sha256=f9y70Yz5C3wX7mmc1KwC50gk_PWoD1iEZPRMGMbqPtc,869
 tests/models/geospatialDatabase/test_clayContent.py,sha256=GqFAPIOkXfDpJFkI-vK6l3hK0Ap36lLCWGhXCly-DME,1797
@@ -1249,8 +1249,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.73.2.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.73.2.dist-info/METADATA,sha256=-qFMuoq_tC3pT_ddflIl5MkFus_PxMYGTkNsd02NYHo,4065
-hestia_earth_models-0.73.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.73.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.73.2.dist-info/RECORD,,
+hestia_earth_models-0.73.3.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.73.3.dist-info/METADATA,sha256=BRMBkKCVov4GgcXFjjmLxQ5wBD9HPTrqc6UWdd5UYwE,4065
+hestia_earth_models-0.73.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.73.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.73.3.dist-info/RECORD,,

tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py

@@ -29,7 +29,7 @@ indicator_wrong_unit = {
     "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "ha*day"}, "value": 0.5,
     "landCover": crop_land}
 
-indicator_bad_area_time_value = {
+indicator_value_0 = {
     "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"}, "value": 0,
     "landCover": crop_land}
 
@@ -62,7 +62,7 @@ good_during_cycle_indicator_forest = {
         ([indicator_no_land_cover], False, 0),
         ([indicator_no_unit], False, 0),
         ([indicator_wrong_unit], False, 0),
-        ([indicator_bad_area_time_value], False, 0),
+        ([indicator_value_0], True, 1),
         ([inputs_production_indicator_no_cf], True, 0),
         ([good_during_cycle_indicator_cropland], True, 1),
         ([good_during_cycle_indicator_cropland, good_inputs_production_indicator_forest], True, 2),
@@ -76,7 +76,7 @@ good_during_cycle_indicator_forest = {
          "Indicator no landcover terms => no run",
          "Missing unit => no run",
          "Wrong unit => no run",
-         "Bad area*time value => no run",
+         "With 0 value => run",
          "Input with no cf => run, empty input",
          "One good input => run, 1 dict",
          "Two good input => run, 2 dict",

tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py

@@ -1,9 +1,10 @@
 import json
-import pytest
 from unittest.mock import patch
-from tests.utils import fixtures_path, fake_new_indicator
+
+import pytest
 
 from hestia_earth.models.frischknechtEtAl2000.ionisingRadiationKbqU235Eq import MODEL, TERM_ID, run, _should_run
+from tests.utils import fixtures_path, fake_new_indicator
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
@@ -15,32 +16,80 @@ uranium234_input = {"@id": "uranium234", "termType": "waste", "units": "kg"}
 iodine129_input = {"@id": "iodine129", "termType": "waste", "units": "kg"}
 no_cf_input = {"@id": "oilPalmMillEffluentWaste", "termType": "waste", "units": "kg"}
 
-wrong_indicator = {"term": {"@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange", "termType": "emission"},
-                   "value": 3, "inputs": [hydrogen3_input]}
-
-indicator_no_inputs = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                       "value": 3, "inputs": []}
-
-indicator_2_inputs = {"term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
-                      "value": 3, "inputs": [cesium134_input, cesium137_input]}
-
-indicator_no_unit = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                     "value": 3, "inputs": [{"@id": "hydrogen3", "termType": "waste"}]}
-
-indicator_wrong_unit = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                        "value": 3, "inputs": [{"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}]}
-
-indicator_no_cf_input = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                         "value": 3, "inputs": [no_cf_input]}
-
-indicator_hydrogen3_input = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                             "value": 3, "inputs": [hydrogen3_input]}
-
-indicator_cesium137_input = {"term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
-                             "value": 3, "inputs": [cesium137_input]}
-
-indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInputsProduction", "termType": "emission"},
-                              "value": 3, "inputs": [uranium234_input]}
+wrong_indicator = {
+    "term": {
+        "@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [hydrogen3_input],
+}
+
+indicator_no_inputs = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [],
+}
+
+indicator_2_inputs = {
+    "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium134_input, cesium137_input],
+}
+
+indicator_no_unit = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [{"@id": "hydrogen3", "termType": "waste"}],
+}
+
+indicator_wrong_unit = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [{"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}],
+}
+
+indicator_no_cf_input = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [no_cf_input],
+}
+
+indicator_hydrogen3_input = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [hydrogen3_input],
+}
+
+indicator_cesium137_water = {
+    "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_cesium137_air = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_cesium137_salt_water = {
+    "term": {
+        "@id": "ionisingCompoundsToSaltwaterInputsProduction",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_uranium234_input = {
+    "term": {
+        "@id": "ionisingCompoundsToSaltwaterInputsProduction",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [uranium234_input],
+}
 
 
 @pytest.mark.parametrize(
@@ -54,9 +103,11 @@ indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInput
         ([indicator_wrong_unit], False, 0),
         ([indicator_no_cf_input], True, 0),
         ([indicator_hydrogen3_input], True, 1),
-        ([indicator_cesium137_input], True, 1),
+        ([indicator_cesium137_water], True, 1),
         ([indicator_uranium234_input], True, 1),
-        ([indicator_cesium137_input, indicator_no_cf_input], True, 1),
+        ([indicator_cesium137_water, indicator_no_cf_input], True, 1),
+        ([indicator_cesium137_water, indicator_cesium137_water], True, 2),
+        ([indicator_cesium137_water, indicator_cesium137_salt_water, indicator_cesium137_air], True, 3),
     ],
     ids=["No emissionsResourceUse => run, empty input",
          "Wrong indicator termid => run, empty input",
@@ -68,7 +119,10 @@ indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInput
          "Good input ionisingCompoundsToAirInputsProduction => run, 1 input",
          "Good input ionisingCompoundsToWaterInputsProduction => run, 1 input",
          "Good input ionisingCompoundsToSaltwaterInputsProduction => run, 1 input",
-         "One good input => run, 1 input"]
+         "One good input => run, 1 input",
+         "2 identical indicators => run 2 input",
+         "3 different indicators common input => run 3 input",
+         ]
 )
 def test_should_run(resources, expected, num_inputs):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f: