hestia-earth-models 0.67.0__py3-none-any.whl → 0.67.1__py3-none-any.whl

hestia_earth/models/utils/blank_node.py

@@ -12,7 +12,6 @@ from typing import (
     Optional,
     Union
 )
-
 from dateutil import parser
 from dateutil.relativedelta import relativedelta
 from hestia_earth.schema import TermTermType
@@ -22,6 +21,7 @@ from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import (
     flatten,
     list_sum,
+    list_average,
     safe_parse_date,
     safe_parse_float,
     non_empty_list
@@ -44,6 +44,14 @@ MAX_DEPTH = 1000
 OLDEST_DATE = '1800'
 
 
+def group_by_term(values: list):
+    def group_by(groups: dict, value: dict):
+        key = value.get('term', {}).get('@id')
+        groups[key] = groups.get(key, []) + [value]
+        return groups
+    return reduce(group_by, values, {})
+
+
 def merge_blank_nodes(source: list, new_values: list):
     """
     Merge a list of blank nodes into an existing list of blank nodes.
@@ -1335,11 +1343,14 @@ def _node_from_group(nodes: list):
     # `nodes` contain list with consecutive dates
     return nodes[0] if len(nodes) == 1 else (
         # if all nodes have the same dates, sum up the values
-        nodes[0] | {'value': _sum_nodes_value(nodes)} if _same_dates(nodes)
-        else nodes[0] | {
-            'startDate': min(n.get('startDate') for n in nodes),
-            'endDate': max(n.get('endDate') for n in nodes)
-        }
+        nodes[0] | (
+            {
+                'value': _sum_nodes_value(nodes)
+            } if _same_dates(nodes) else {
+                'startDate': min(n.get('startDate') for n in nodes),
+                'endDate': max(n.get('endDate') for n in nodes)
+            }
+        )
     )
 
 
@@ -1349,7 +1360,7 @@ def _condense_nodes(nodes: list):
     return flatten(map(_node_from_group, grouped_nodes))
 
 
-def _group_nodes_to_condense(nodes: list) -> dict:
+def _group_nodes_by_value_and_properties(nodes: list) -> dict:
     def _group_node(group: dict, node: dict):
         value = node.get('value', [])
         value = '-'.join(map(str, value if isinstance(value, list) else [value]))
@@ -1359,7 +1370,6 @@ def _group_nodes_to_condense(nodes: list) -> dict:
                 f"{p.get('value')}"
             ])) for p in node.get('properties', [])
         ]))
-        # group by term, value, and properties
         group_key = '-'.join(non_empty_list([
             node.get('term', {}).get('@id', ''),
             value,
@@ -1371,8 +1381,51 @@ def _group_nodes_to_condense(nodes: list) -> dict:
     return reduce(_group_node, nodes, {})
 
 
+def _group_nodes_by_dates(nodes: list) -> dict:
+    def _group_node(group: dict, node: dict):
+        group_key = '-'.join(non_empty_list([
+            node.get('term', {}).get('@id', ''),
+            node.get('startDate'),
+            node.get('endDate'),
+        ]))
+        group[group_key] = group.get(group_key, []) + [node]
+        return group
+
+    return reduce(_group_node, nodes, {})
+
+
+def _average_properties(properties: list):
+    # group properties by term
+    grouped_properties = group_by_term(properties)
+    return [
+        props[0] | {
+            'value': list_average(non_empty_list([p.get('value') for p in props]), default=props[0].get('value'))
+        }
+        for props in grouped_properties.values()
+    ]
+
+
+def _merge_same_dates(nodes: list):
+    # group by term, startDate and endDate
+    grouped_nodes = _group_nodes_by_dates(nodes)
+
+    def merge_nodes(nodes: list):
+        properties = flatten([n.get('properties', []) for n in nodes])
+        return nodes[0] | (
+            {
+                'value': _sum_nodes_value(nodes)
+            } | ({
+                'properties': _average_properties(properties)
+            } if properties else {})
+        ) if len(nodes) > 1 else nodes[0]
+
+    return list(map(merge_nodes, grouped_nodes.values()))
+
+
 def condense_nodes(nodes: list) -> list:
-    grouped_nodes = _group_nodes_to_condense(nodes)
+    # merge nodes with the same term and dates as they need to be unique
+    values = _merge_same_dates(nodes)
+    grouped_nodes = _group_nodes_by_value_and_properties(values)
     return flatten(map(_condense_nodes, grouped_nodes.values()))
 
 
@@ -1446,13 +1499,13 @@ def most_relevant_blank_node_by_id(nodes: list, term_id: str, date: str):
 PROPERTY_UNITS_CONVERSIONS = {
     Units.KG.value: {
         Units.MJ.value: [
-            'energyContentHigherHeatingValue',  # "kg" to "mj"
+            'energyContentLowerHeatingValue',  # "kg" to "mj"
         ]
     },
     Units.M3.value: {
         Units.MJ.value: [
             'density',  # "m3" to "kg"
-            'energyContentHigherHeatingValue',  # "kg" to "mj"
+            'energyContentLowerHeatingValue',  # "kg" to "mj"
         ]
     }
 }

hestia_earth/models/utils/ecoClimateZone.py

@@ -36,8 +36,8 @@ def get_eco_climate_zone_value(node: dict, as_enum: bool = False) -> Union[int,
     Parameters
     ----------
     node : dict
-        A HESTIA [Site](https://www-staging.hestia.earth/schema/Site) or
-        [Cycle](https://www-staging.hestia.earth/schema/Cycle).
+        A HESTIA [Site](https://hestia.earth/schema/Site) or
+        [Cycle](https://hestia.earth/schema/Cycle).
 
     Returns
     -------

hestia_earth/models/utils/impact_assessment.py

@@ -131,6 +131,7 @@ def impact_country_value(
     lookup: str,
     group_key: str = None,
     country_fallback: bool = False,
+    default_no_values=None
 ) -> float:
     """
     Calculate the value of the impact based on lookup factors and `site.country.@id`.
@@ -166,13 +167,13 @@ def impact_country_value(
     debugValues(impact, model=model, term=term_id,
                 values_used=log_as_table(values))
 
-    all_with_factors = all([v.get('coefficient') is not None for v in values if v.get('value') is not None])
+    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])
+    all_with_factors = not missing_values
     values = [float((v.get('value') or 0) * (v.get('coefficient') or 0)) for v in values]
 
     # fail if some factors are missing
-    return None if not all_with_factors else (
-        list_sum(values) if len(values) > 0 else None
-    )
+    return None if not all_with_factors else (list_sum(values) if has_values else default_no_values)
 
 
 def impact_aware_value(model: str, term_id: str, impact: dict, lookup: str, group_key: str = None) -> float:

hestia_earth/models/utils/lookup.py

@@ -50,8 +50,8 @@ def all_factor_value(
     values = list(map(_factor_value(model, 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') is not None and v.get('coefficient') is None])
-    all_with_factors = all([v.get('coefficient') is not None for v in values if v.get('value') is not None])
+    missing_values = set([v.get('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)
@@ -65,9 +65,7 @@ def all_factor_value(
     values = [float((v.get('value') or 0) * (v.get('coefficient') or 0)) for v in values]
 
     # fail if some factors are missing
-    return None if not all_with_factors else (
-        list_sum(values) if has_values else default_no_values
-    )
+    return None if not all_with_factors else (list_sum(values) if has_values else default_no_values)
 
 
 def _term_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_id: str, group_key: str = None):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.67.0'
+VERSION = '0.67.1'

{hestia_earth_models-0.67.0.dist-info → hestia_earth_models-0.67.1.dist-info}/METADATA

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

{hestia_earth_models-0.67.0.dist-info → hestia_earth_models-0.67.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=tApCGZ55bRG3rl7a-jjwZokgF3dxGbg8WlKfwo
 hestia_earth/models/log.py,sha256=3NzkAEgxMGCMolQbC6nDuAJEb7ZpQNXLekhbRNjedSo,3561
 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=AtpxzttjHgdl8EuXNyJH8_i6hGILXOxlpbooRi2a3sE,19
+hestia_earth/models/version.py,sha256=rFzSUNBZgH06WHZggrqjYhfDC7R4tScObDyCGmEYcOs,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -30,7 +30,7 @@ hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZ
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=6CvHcrSANH4UAWY58y2Ow00DzqitJVAteCzjsmi5cwA,6070
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=yXie6UW0_I4VQcADn7Uvk4n1RmrFAauJ7ZVh7OgBUyA,5952
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
-hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py,sha256=3MGkwcuyQ8LcIrqb0gCs0PYr0Im0L_r4SWrdoRXr05k,5686
+hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py,sha256=UUzdnKE4J9KHvFdJVRgVfVkTuMfSxK_nW-aMkTuNoCk,5546
 hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionInputsProduction.py,sha256=hXGdx1IA5yeVLHrRrSZWCP0s7ucSRWelYNr6aQ9YTyU,1205
 hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsDuringCycle.py,sha256=WUIA2tDBoAdTQ6Aa5GgEpvOGyR-O6KuJeeIffUpTh2U,2708
 hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsInputsProduction.py,sha256=WfFL9n_KyR2XXPwliHu6gpgixFrOWB4XAO1VsJWgIio,1200
@@ -57,7 +57,7 @@ hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3
 hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
 hestia_earth/models/cycle/excretaKgN.py,sha256=mgJTneQIYJ9Su-rTK5ppb_k3YhICFNWsfPZtGR98RI0,2968
 hestia_earth/models/cycle/excretaKgVs.py,sha256=ed-DcQoQXZgWF8UZDs2N-G6EBIOPmpXu3BD6jdmh0V0,2973
-hestia_earth/models/cycle/inorganicFertiliser.py,sha256=Yt5NcP9FQEzWwlritrPGbhh2W9wR378OM3lDPBzDiL4,6967
+hestia_earth/models/cycle/inorganicFertiliser.py,sha256=pH4jHB6wEQnr5YQ9AhVsuROfEFb07SNcBMPlHvf1Fjo,9127
 hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kpw0rMlRjCK25CExaW58DEvc9w,2125
 hestia_earth/models/cycle/liveAnimal.py,sha256=5dlvuVAu24hLLOVXsozcVzWyDVzddzoungUBwrBDS-g,3986
 hestia_earth/models/cycle/longFallowRatio.py,sha256=_h0kub99sACO87IfjMeiu8IgdK2jaeBlgGA9A9-ViZA,1683
@@ -92,7 +92,7 @@ hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-L
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=Jpmm5SAiyUkaFp8EsBIQ55jiCyn3C20a3au_zaPRnEk,2837
 hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=uEXMyfMCvvZKD3jcQGAIZOv1cZLrhpXZiyCn_56kxig,2125
 hestia_earth/models/cycle/completeness/excreta.py,sha256=2yVxcuWjAh4hoEukaMJ90VZpkCL7SfpwIgzigbjVaF4,996
-hestia_earth/models/cycle/completeness/freshForage.py,sha256=bfPoOvhQU6nztSTGYlonv5ungk5TmtV0x89gk3aT_Dw,2256
+hestia_earth/models/cycle/completeness/freshForage.py,sha256=qxo2MoVCgrMtcj-h_uHfbVZpOn-THx8DkyyRXCXixLk,2412
 hestia_earth/models/cycle/completeness/material.py,sha256=UQH2oRnUY-Q-_MVuOlTAYqQxc7wWDM5mi_iFmp9PlIQ,1362
 hestia_earth/models/cycle/completeness/seed.py,sha256=rLNar7q39YqdtyFLBiyXeRbsVSWFRd8H7Bhjx7ATISU,1932
 hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=AXGtO1d8oLWgvmVLoNBqknsH2lmr5y15E2xkgZpkCSU,1392
@@ -150,13 +150,13 @@ hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=hHHhu_EZWhxAKhGJ
 hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvEZsVHUPliZpQ,4014
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=NkP635TDNs7bQBv2n9tUTLwScZHfUkSC4XzLVwjxWtg,2240
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
-hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=Jlenb5nh0DKCoh8Pdd6-3Bxvyg9fB3bw1ww3_y7nE9w,5796
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=pNiL6WNAuRqTQ9lwEasxAAiAm7vhZUs5bxLIQTCSb70,5733
 hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
 hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
 hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=2m_vX-Ziy8rrVqf1fBpKzLc1FFXs48XQRygvCKS7i-0,1263
 hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=D_le-V9J0JFcCT5YBXYWv_Z1IQ67EjvwDiaoDuVeJ6w,7072
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=SIjFYPv4n3mziohW2nlycaMssHQ3ws79hqHa4i3sCVI,2997
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=KJfcFqVYDLLkymWUAf7NI_7JSwcEPgjw9PKVwyhXShQ,7318
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=OS746_21QBMN7D-B04HU-rWwXFuaVD6qy-TTd_Ea5zU,3318
 hestia_earth/models/environmentalFootprintV3_1/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
@@ -214,8 +214,8 @@ hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=163KrmKzlEQuKYT1ZvpPgmKlv_-mmvxp0A1_uKya99w,4203
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
 hestia_earth/models/hestia/landCover.py,sha256=L0TsEzDAF4tczU_TSa-UrtUbJiBjuUYxDY64-oOeT-o,30224
-hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=-7ToRvCVPD6AAcjxorPS5jSWio7JAglHrdSS9PPyPqQ,1551
-hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=TCskVLhYXBMxdeZM-gN4Tdixk5ua7eVn-o5dfIT_H7o,1543
+hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=JdiCiy8nEH7i59vcDOi2F4-3jANqtlfHanMhR4rBFNQ,1539
+hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=WxSZZ3wDJefZ3MFOulXtbcLW-YtGehpjdhvAzNL6gJ8,1531
 hestia_earth/models/hestia/residueRemoved.py,sha256=VdB00ZdwQMIj7qsZ7549DQmbqWtCQtFZpsUlc_11yt8,2857
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=7DJE4yGUl0BCiNdtr8u_41Uz8m9yY7tdlC9ggkGwh7c,8639
 hestia_earth/models/hestia/seed_emissions.py,sha256=58hmHAgemOuGVIsij-FWF7EsGmEbCSfzFAEfXkXSyEE,11566
@@ -254,9 +254,9 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=2fFEHTXxel_XPiMX
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=HR2vnOc64mg_fxe9m5NmqxBZ8-aFuKb44gmItyuRL1s,1041
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
-hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=3OizoSpsHtHG2evmH9A-kxVl3FqqrIfZeFcVCv9BOi8,19956
+hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=hfiDkbsiSkx-CrravYwF8C0McK4w9-PZL5sQWIdHrLM,19944
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQqZRfPEvFT_bMTayMXgIsFLnx8I6iYzw,3089
-hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=VpYI_BT4D4R5dASC13kn9_QPxVMiojY_gc32StUPvwM,18961
+hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=QclpcQh58qlUIFn1wXH3pktfQ-x5lw0YpEFUdMSr68I,18949
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=R7t-YWq5K-AMHihlWh8hWHfhaoGZMmDf8SNFM6-wGdU,15895
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
@@ -290,8 +290,8 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-u
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=C9ef41fd-gYixEV3sTs9VMHHdnSZJ14kbEEmMG116hY,8653
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=NNiFGHRErIgyYw7l9uoMaUNpAd0OhkUOKEqwQ1863xM,76251
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=4VSVL0qHVzwvi7lVAY5VMkGscUsu3PIyvJENFyTKYgM,64040
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=XynerdHDnIx1BOeu_dc-R3F4fOACxdBAUm0don3OINY,76203
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=HgvM6PpfSvSBae4idOHkunD7zffT3z6hTX6YVIocGSs,64028
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=FFcjdkYq5NJwAu4bWZJUao4MoDHvgbXmXCnUNKD-a3w,9842
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=HWRkpYpGqvMfol2dPb9pFkNzoGj7n6sRpyIjGSVM9lQ,10306
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=KvjIQ3xwbq1rk3thHlkGgQaWKgh0hCkNnzC53JW9634,14178
@@ -414,7 +414,7 @@ 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=4Lktf7Rv2YObXMbIxFDPQ1jynfsn14WXh9EptNX5P9U,102054
+hestia_earth/models/mocking/search-results.json,sha256=ZEwud-KZeXQ0-UYWoP9METNQ_llbCJhbmUXTqITgk6k,105086
 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
@@ -581,7 +581,7 @@ hestia_earth/models/utils/aggregated.py,sha256=cTUzS60t44_viF1wMnTTVpFq8-6cKJTQu
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
-hestia_earth/models/utils/blank_node.py,sha256=p0ikM08UygbF-zXfJsf_OtePCxkCMjkBqTpmFhshHSQ,52261
+hestia_earth/models/utils/blank_node.py,sha256=dvVv9JXrexEAzACs-CIObZlFZ4NrwxIND5MhQgbIlIc,53935
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=6wLx8xb2R8HtpEpVy5e-PbioOo7QCu2n-W72fs6OvgE,3411
@@ -591,19 +591,19 @@ hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDy
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
 hestia_earth/models/utils/cycle.py,sha256=PmloVCSU4TtXnEe0ltP--bTIZBXVB-rEFJrV6IYsdeo,16209
 hestia_earth/models/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
-hestia_earth/models/utils/ecoClimateZone.py,sha256=kD5DGActHAfMCJykKQGkwEEicWt7PQlEIX9_PkqXfP0,4265
+hestia_earth/models/utils/ecoClimateZone.py,sha256=etsWsAQeYHCnDJJi-ezTrzjoaFILC1e3SMfSNsdRnPs,4241
 hestia_earth/models/utils/emission.py,sha256=H_apu-Og9SJTLVU2lU56IsvSU22-9J7OrqXk1b2qnSE,3638
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
 hestia_earth/models/utils/feedipedia.py,sha256=wzzrMbYlda1XCpWiObLz4bFLXbAZejHcxsXJFr4U_AM,3953
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
-hestia_earth/models/utils/impact_assessment.py,sha256=VoJVgSVJkXFvlIukCBm054KGMCBeot17k3DRwo_3_QI,8137
+hestia_earth/models/utils/impact_assessment.py,sha256=fA2hK7xpHKYBZTiz3xvMgO8yTrUtDptoKQRAXdPsahU,8231
 hestia_earth/models/utils/indicator.py,sha256=UuuraMUdKLqjcm_zEoF8BaMb76qW23djIA_2DeaoiEw,700
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF2uwc2PB4JPrHFSksMEQ,1900
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=IkVB-T2Ab_jA7RTZUKn6yp3VBIvmqes26JbAG-Obnd8,8793
+hestia_earth/models/utils/lookup.py,sha256=HR0uvZ1--KviBaUbYYyzlZDs7YioTI1NtyoQqFweMbc,8700
 hestia_earth/models/utils/management.py,sha256=W5M9k0arraVUGh4ZccVqgb8rSSLxHM6rkmi4MSzV6Dw,413
 hestia_earth/models/utils/measurement.py,sha256=izEiPszUcPA22zaIc0OuF7Yk82JWu5cxi0Sbz_9YgBo,11142
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
@@ -668,7 +668,7 @@ tests/models/cml2001Baseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=XseqzU8JE3MOeIM_3cBIlNhTInucG_VNfgyUIpKAdrU,5663
 tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=y-E5t5x2VcgPsy3cPFBWyULd6vieaGjDY_J2GVJMtUo,4081
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
-tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py,sha256=kgtJd2sI6BwL-pOGnNA6b-huPpJGgcO6cbZdme_lKmQ,4772
+tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py,sha256=QzQg_AdpZ_5jUprevm8F_FOTHbDnxEkxnjSpKCNxyKY,4719
 tests/models/cml2001Baseline/test_resourceUseEnergyDepletionInputsProduction.py,sha256=KPEC2CXgO78Kkcbi_Iu0AzKRZMYJSfkeEV-kspSyLYA,910
 tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsDuringCycle.py,sha256=kko6cV3YRmcxfYdJ8xQuTeo9Bro9BuBbgGBO2gklxWM,2085
 tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsInputsProduction.py,sha256=_UqFak1-DX6b-brX2xt3zpfYUhjFPRoUMhgF9l3cw3I,912
@@ -770,12 +770,12 @@ tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=zRTyeeQM1fRdRVFWb
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_DqsqdYaPnzR_I,8761
 tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=B0cXRUV66Qs5nq9etFxWRrmNJgm3bDFEDje7u7UFroo,3437
+tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=F4oz4UadhpBlyh4JvLPOWAxGSIKnJVTTDaSzOT3Ihgk,4909
 tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.py,sha256=WE-DcerljCjXMYE4f3Sv5ZCVHP0oTjbWkOGuvaa4p10,926
 tests/models/environmentalFootprintV3_1/test_marineEutrophicationPotential.py,sha256=kY_pu_7SjSZl_l41mttMn4BpKl13TTV9jQYSHFMNXhI,968
 tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=zEdWXjtlZv5Nyv0EZxvLxe4BQ-4_ME38bMfNvFZXjl8,1169
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=-E8Q5JxIdfF11oqGwRJqcqGO0Ao_Bva164ELMR7sRsI,6197
-tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=OqVVxAbfXEdqzgEcPx1wQbTrsjT9ENYG-KW8HP0rTOc,5885
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=xRTBMfQ1Qxs_NIoEFtshM_uzAAcFb80k1qGuFLJa2Dw,7650
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py,sha256=oeLb8kQ2yabnlCaBw7MYF_fMfVNea4ogr9lWJ-u3SXM,2389
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
@@ -1127,7 +1127,7 @@ tests/models/site/test_defaultMethodClassification.py,sha256=MoG9inlu5GrNL2QJpO0
 tests/models/site/test_defaultMethodClassificationDescription.py,sha256=7Dg40MLSZnW1X3ZXg2dXMzc1hUqIUIuiga5KX9cVscU,767
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
 tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
-tests/models/site/test_management.py,sha256=Z6wwL-UcOktgE026ePskAo78FTwBU6RqZtCg4VO_PYM,1746
+tests/models/site/test_management.py,sha256=iMA9SpP7yOhHpsvCyizCsSbvw0ZSayvJ5koEZ-Kjbs0,1736
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=XtGrE7ZqthTF0x8lDxJ1slNd_GvYHEyEydcRgA46jEc,3207
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=0M-NMg_T3UXzGT_VlKOKhSxg4cZ0_zhd3FRgY5Hpj6o,1087
@@ -1181,7 +1181,7 @@ tests/models/usetoxV2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 tests/models/usetoxV2/test_freshwaterEcotoxicityPotentialCtue.py,sha256=eq7Gcmfya9g0eOKKkuBhz8vq7xi_CmZ_LTSxueBwZt4,835
 tests/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/utils/test_array_builders.py,sha256=4giHf3bTNd2ReAgcKinKjLpQOOcmfF0qSInngW7UdYc,8434
-tests/models/utils/test_blank_node.py,sha256=G_hH-Gk3__1ZtHQcsdYMbUMwVNSTmYcVBs5jcReIYGM,39945
+tests/models/utils/test_blank_node.py,sha256=gWdKjXEDkfHGkYjkZwyCOfkESsE5X23OTqgm0OxkzPA,32974
 tests/models/utils/test_cache_sources.py,sha256=xcGMVbYoV23YC4HLBTL_4qZP1ME2cp3DFebgJMxI2TE,721
 tests/models/utils/test_crop.py,sha256=d508vQdtB_Q_6hEahNueXed5PaEiLeN7ScbwZIKCiDI,862
 tests/models/utils/test_cropResidueManagement.py,sha256=RQt8lexeJzCyxZceIutgDpw7BpcqmjsUB0C0yZC2QpY,930
@@ -1212,7 +1212,7 @@ tests/orchestrator/test_models.py,sha256=v5VnyELmrSEcTOtw4lyk2U0r016z8Xx34EFs0FJ
 tests/orchestrator/test_orchestrator.py,sha256=dlO4CKn04m__SZhDtvy1npvQUavVNhdcRe4Unj7wg6g,742
 tests/orchestrator/test_utils.py,sha256=Sqysl2ocifLUeSbgGUdeRn0Sof0xVEeH4dgoXfe18yw,3050
 tests/orchestrator/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/orchestrator/models/test_transformations.py,sha256=cQdk8rEtSJJr27th8SmacsOpC7BP_YVXDrmFDDY4Iks,1080
+tests/orchestrator/models/test_transformations.py,sha256=5s6Ts6_DzNvvxpgtqoA2YTnsTJFr_6xbwTNUkQmWr14,1441
 tests/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/orchestrator/models/emissions/test_deleted.py,sha256=55WOjXR2oeKxdRgXmJg4DgIY3f0asPMvez8b5fkT7LI,767
 tests/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1225,8 +1225,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=lGqeebvgAwGathB8NLZ14Js5JV_-KyHueaD6I8IH8mU,3615
 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.67.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.67.0.dist-info/METADATA,sha256=c4dTeGL714DeJCCzVf5M-SuXV8p8SBIKVbyDHnY_67Q,4046
-hestia_earth_models-0.67.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.67.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.67.0.dist-info/RECORD,,
+hestia_earth_models-0.67.1.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.67.1.dist-info/METADATA,sha256=0rZS_1PvrGQF1RreEZE_EjDXwvIQgjDSyknNAhRL2HI,4046
+hestia_earth_models-0.67.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.67.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.67.1.dist-info/RECORD,,

tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py

@@ -9,38 +9,72 @@ 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}"
 
-diesel_input = {"term": {"termType": "fuel", "units": "kg", "@id": "diesel"}, "value": 2}
-diesel_input_in_mj = {"term": {"termType": "fuel", "units": "MJ", "@id": "diesel"}, "value": 111}
-diesel_input_wrong_unit = {"term": {"termType": "fuel", "units": "foobedoos", "@id": "diesel"}, "value": 2}
-diesel_input_no_unit = {"term": {"termType": "fuel", "@id": "diesel"}, "value": 2}
-diesel_input_with_properties = {"term": {"termType": "fuel", "units": "kg", "@id": "diesel"},
-                                "value": 2,
-                                "properties": [{"term": {"@id": "energyContentHigherHeatingValue", }, "value": 70}]
-                                }
-diesel_input_with_properties2 = {"term": {"termType": "fuel", "units": "kg", "@id": "diesel"},
-                                 "value": 2,
-                                 "properties": [{"term": {"@id": "energyContentHigherHeatingValue", }, "value": 4}]
-                                 }
-
-electricity_input = {"term": {"termType": "electricity", "units": "kWh", "@id": "electricityGridOil"}, "value": 30}
-
-input_coal_tar_kg = {"term": {"@id": "coalTar", "termType": "fuel", "units": "kg",
-                              "name": "Coal tar unknown energy Content"},
-                     "value": 5}
-
-input_crude_oil_kg_property = {"term": {"@id": "conventionalCrudeOil", "termType": "fuel", "units": "kg"},
-                               "value": 5,
-                               "properties": [{"@type": "Property", "value": 45.8,
-                                               "term": {"@type": "Term", "@id": "energyContentHigherHeatingValue",
-                                                        "units": "MJ / kg"}, }]}
-
-input_crude_oil_kg_no_property = {"term": {"@id": "conventionalCrudeOil", "termType": "fuel", "units": "kg"},
-                                  "value": 5}
-
-input_natural_gas_m3 = {"term": {"@id": "naturalGas", "termType": "fuel", "units": "m3"}, "value": 5}
-
-input_nuclear_fuel_kwh = {"term": {"@id": "electricityGridNuclear", "termType": "electricity", "units": "kWh"},
-                          "value": 1.3889}
+diesel_input = {
+    "term": {"termType": "fuel", "units": "kg", "@id": "diesel"},
+    "value": 2,
+    "properties": [{"term": {"@id": "energyContentLowerHeatingValue", }, "value": 70}]
+}
+diesel_input_in_mj = {
+    "term": {"termType": "fuel", "units": "MJ", "@id": "diesel"},
+    "value": 111
+}
+diesel_input_wrong_unit = {
+    "term": {"termType": "fuel", "units": "foobedoos", "@id": "diesel"},
+    "value": 2
+}
+diesel_input_no_unit = {
+    "term": {"termType": "fuel", "@id": "diesel"},
+    "value": 2
+}
+diesel_input_with_properties = {
+    "term": {"termType": "fuel", "units": "kg", "@id": "diesel"},
+    "value": 2,
+    "properties": [{"term": {"@id": "energyContentLowerHeatingValue", }, "value": 70}]
+}
+diesel_input_with_properties2 = {
+    "term": {"termType": "fuel", "units": "kg", "@id": "diesel"},
+    "value": 2,
+    "properties": [{"term": {"@id": "energyContentLowerHeatingValue", }, "value": 4}]
+}
+
+electricity_input = {
+    "term": {"termType": "electricity", "units": "kWh", "@id": "electricityGridOil"},
+    "value": 30
+}
+
+input_coal_tar_kg = {
+    "term": {"@id": "coalTar", "termType": "fuel", "units": "kg", "name": "Coal tar unknown energy Content"},
+    "value": 5
+}
+
+input_crude_oil_kg_property = {
+    "term": {"@id": "conventionalCrudeOil", "termType": "fuel", "units": "kg"},
+    "value": 5,
+    "properties": [{
+        "@type": "Property",
+        "value": 45.8,
+        "term": {"@type": "Term", "@id": "energyContentLowerHeatingValue", "units": "MJ / kg"},
+    }]
+}
+
+input_natural_gas_m3 = {
+    "term": {"@id": "naturalGas", "termType": "fuel", "units": "m3"},
+    "value": 5,
+    "properties": [{
+        "@type": "Property",
+        "value": 45.8,
+        "term": {"@type": "Term", "@id": "energyContentLowerHeatingValue", "units": "MJ / kg"},
+    }, {
+        "@type": "Property",
+        "value": 45.8,
+        "term": {"@type": "Term", "@id": "density", "units": "kg / m3"},
+    }]
+}
+
+input_nuclear_fuel_kwh = {
+    "term": {"@id": "electricityGridNuclear", "termType": "electricity", "units": "kWh"},
+    "value": 1.3889
+}
 
 
 @pytest.mark.parametrize(
@@ -57,7 +91,6 @@ input_nuclear_fuel_kwh = {"term": {"@id": "electricityGridNuclear", "termType":
         ([electricity_input], True, 1),
         ([electricity_input, electricity_input, electricity_input], True, 1),
         ([input_crude_oil_kg_property], True, 1),
-        ([input_crude_oil_kg_no_property], True, 1),
         ([input_natural_gas_m3], True, 1),
         ([input_nuclear_fuel_kwh], True, 1),
         ([input_coal_tar_kg], False, 0),
@@ -74,13 +107,13 @@ input_nuclear_fuel_kwh = {"term": {"@id": "electricityGridNuclear", "termType":
         "good electric input => run",
         "multiple good merg-able electric inputs => run",
         "good fuel with input property",
-        "good fuel with no input property",
         "good fuel in m^3",
         "good nuclear fuel use indicator in kWh",
         "bad indicator input in kg no property to convert to mj"
     ]
 )
-def test_should_run(inputs, expected, num_inputs):
+@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
+def test_should_run(mock_download, inputs, expected, num_inputs):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 

tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py

@@ -18,31 +18,55 @@ def fake_rounded_indicator(value: float):
     return indicator
 
 
+methodModelEFV31 = {"@type": "Term", "@id": "environmentalFootprintV3-1"}
+methodModelFantkeEtAl2016 = {"@type": "Term", "@id": "fantkeEtAl2016"}
+
 ozone_indicator = {"@type": "Indicator",
                    "term": {"@id": "ozoneDepletionPotential", "termType": "characterisedIndicator"},
-                   "value": 0}
+                   "value": 0,
+                   "methodModel": {"@type": "Term", "@id": "edip2003"}}
 
+other_valid_ozone_indicator = {"@type": "Indicator",
+                               "term": {"@id": "ozoneDepletionPotential", "termType": "characterisedIndicator"},
+                               "value": 0,
+                               "methodModel": {"@type": "Term", "@id": "recipe2016Hierarchist"}}
 acid_indicator = {
     "@type": "Indicator",
     "term": {"@id": "terrestrialAcidificationPotentialAccumulatedExceedance", "termType": "characterisedIndicator"},
-    "value": 0.000420443840380047}
+    "value": 0.000420443840380047,
+    "methodModel": {"@type": "Term", "@id": "poschEtAl2008"}
+}
 
 bad_indicator_id = {"@type": "Indicator",
                     "term": {"@id": "no_a_real_id", "termType": "characterisedIndicator"},
-                    "value": 0.000420443840380047}
+                    "value": 0.000420443840380047,
+                    "methodModel": methodModelEFV31
+                    }
 
 not_pef_indicator = {"@type": "Indicator",
                      "term": {"@id": "gwpStar", "termType": "characterisedIndicator"},
-                     "value": 0.000420443840380047}
+                     "value": 0.000420443840380047,
+                     "methodModel": methodModelEFV31
+                     }
 
 bad_indicator_no_val = {"@type": "Indicator",
                         "term": {"@id": "damageToHumanHealthParticulateMatterFormation",
-                                 "termType": "characterisedIndicator"}}
+                                 "termType": "characterisedIndicator"},
+                        "methodModel": methodModelFantkeEtAl2016
+                        }
 
 bad_indicator_bad_val = {"@type": "Indicator",
                          "term": {"@id": "damageToHumanHealthParticulateMatterFormation",
                                   "termType": "characterisedIndicator"},
-                         "value": None}
+                         "value": None,
+                         "methodModel": methodModelFantkeEtAl2016
+                         }
+
+bad_indicator_no_method_model = {
+    "@type": "Indicator",
+    "term": {"@id": "terrestrialAcidificationPotentialAccumulatedExceedance", "termType": "characterisedIndicator"},
+    "value": 0.000420443840380047
+}
 
 
 @mark.parametrize(
@@ -53,10 +77,13 @@ bad_indicator_bad_val = {"@type": "Indicator",
         ([not_pef_indicator], False, 0),
         ([bad_indicator_no_val], False, 0),
         ([bad_indicator_bad_val], False, 0),
+        ([bad_indicator_no_method_model], False, 0),
+        ([other_valid_ozone_indicator], False, 0),
         ([ozone_indicator], True, 1),
         ([ozone_indicator, ozone_indicator], False, 2),
         ([ozone_indicator, acid_indicator], True, 2),
-        ([bad_indicator_no_val, acid_indicator], False, 1)
+        ([ozone_indicator, other_valid_ozone_indicator], True, 1),
+        ([bad_indicator_no_val, acid_indicator], False, 1),
     ],
     ids=[
         "No indicators => no run",
@@ -64,9 +91,12 @@ bad_indicator_bad_val = {"@type": "Indicator",
         "not_pef_indicator => no run",
         "bad_indicator_no_val => no run",
         "bad_indicator_bad_val => no run",
-        "ozone_indicator => run",
+        "bad_indicator_no_method_model =>  no run",
+        "ozone_indicator not pef=> no run",
+        "ozone_indicator pef => run",
         "2 ozone_indicator => no run",
         "2 good indicators => run",
+        "2 ozone_indicator different methodModel => run with 1",
         "one bad one good indicator => no run",
     ]
 )