hestia-earth-models 0.64.3__py3-none-any.whl → 0.64.4__py3-none-any.whl

hestia_earth/models/fantkeEtAl2016/__init__.py

@@ -0,0 +1,13 @@
+from os.path import dirname, abspath
+import sys
+from importlib import import_module
+
+from hestia_earth.models.utils.blank_node import run_if_required
+
+CURRENT_DIR = dirname(abspath(__file__)) + '/'
+sys.path.append(CURRENT_DIR)
+MODEL = 'fantkeEtAl2016'
+PKG = '.'.join(['hestia_earth', 'models', MODEL])
+
+
+def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py

@@ -0,0 +1,49 @@
+from hestia_earth.utils.lookup import column_name
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from . import MODEL
+from ..utils.impact_assessment import impact_lookup_value
+from ..utils.indicator import _new_indicator
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "emissionsResourceUse": [
+            {
+                "@type": "Indicator", "value": "", "term.termType": "emission"
+            }
+        ]
+    }
+}
+
+TERM_ID = 'damageToHumanHealthParticulateMatterFormation'
+
+LOOKUPS = {
+    "emission": "damageToHumanHealthParticulateMatterFormationFantkeEtAl2016"
+}
+
+RETURNS = {
+    "Indicator": {
+        "value": ""
+    }
+}
+
+default_group_key = 'default'
+
+
+def _indicator(value: float):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    return indicator
+
+
+def run(impact_assessment: dict):
+    value = impact_lookup_value(model=MODEL, term_id=TERM_ID, impact=impact_assessment,
+                                lookup_col=column_name(LOOKUPS['emission']),
+                                grouped_key=default_group_key)
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    value=value)
+
+    should_run = all([value is not None])
+    logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
+
+    return _indicator(value) if should_run else None

hestia_earth/models/frischknechtEtAl2000/__init__.py

@@ -0,0 +1,13 @@
+from os.path import dirname, abspath
+import sys
+from importlib import import_module
+
+from hestia_earth.models.utils.blank_node import run_if_required
+
+CURRENT_DIR = dirname(abspath(__file__)) + '/'
+sys.path.append(CURRENT_DIR)
+MODEL = 'frischknechtEtAl2000'
+PKG = '.'.join(['hestia_earth', 'models', MODEL])
+
+
+def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py

@@ -0,0 +1,90 @@
+from functools import reduce
+from hestia_earth.schema import TermTermType
+from hestia_earth.utils.tools import list_sum, flatten, non_empty_list
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.emission import filter_emission_inputs
+from hestia_earth.models.utils.indicator import _new_indicator
+from hestia_earth.models.utils.lookup import factor_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "emissionsResourceUse": [{
+            "@type": "Indicator",
+            "value": "",
+            "term.@id": [
+                "ionisingCompoundsToAirInputsProduction",
+                "ionisingCompoundsToWaterInputsProduction",
+                "ionisingCompoundsToSaltwaterInputsProduction"
+            ],
+            "inputs": [{"@type": "Input", "term.termType": "waste"}]
+        }]
+    }
+}
+LOOKUPS = {
+    "waste": [
+        "ionisingCompoundsToAirInputsProduction",
+        "ionisingCompoundsToWaterInputsProduction",
+        "ionisingCompoundsToSaltwaterInputsProduction"
+    ]
+}
+RETURNS = {
+    "Indicator": {
+        "value": "",
+        "inputs": ""
+    }
+}
+
+TERM_ID = 'ionisingRadiationKbqU235Eq'
+
+
+def _indicator(value: float, input: dict):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    indicator['inputs'] = [input]
+    return indicator
+
+
+def _run(grouped_emissions_inputs: list):
+    input = grouped_emissions_inputs[0].get('input')
+    values = [
+        factor_value(
+            model=MODEL,
+            term_id=TERM_ID,
+            lookup_name=f"{TermTermType.WASTE.value}.csv",
+            lookup_col=i.get('emission').get('term', {}).get('@id')
+        )(data=i.get('emission') | {'term': i.get('input')})
+        for i in grouped_emissions_inputs
+    ]
+    value = list_sum(values)
+    return _indicator(value, input) if value else None
+
+
+def _should_run(impact_assessment: dict):
+    emissions = flatten([
+        ([
+            {'emission': emission, 'input': input}
+            for input in filter_emission_inputs(emission, TermTermType.WASTE)
+        ])
+        for emission in impact_assessment.get('emissionsResourceUse', [])
+        if emission.get('term', {}).get('@id') in LOOKUPS[TermTermType.WASTE.value]
+    ])
+    emissions_per_input = reduce(
+        lambda p, c: p | {c.get('input').get('@id'): p.get(c.get('input').get('@id'), []) + [c]},
+        emissions,
+        {}
+    )
+
+    logRequirements(impact_assessment, model=MODEL,
+                    has_emissions=bool(emissions_per_input))
+
+    should_run = all([emissions_per_input])
+
+    logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
+    return should_run, emissions_per_input
+
+
+def run(impact_assessment: dict):
+    should_run, emissions_per_input = _should_run(impact_assessment)
+    return non_empty_list(map(_run, emissions_per_input.values())) if should_run else []

hestia_earth/models/ipcc2019/animal/liveweightGain.py

@@ -65,10 +65,11 @@ def _should_run(cycle: dict):
     } for animal in live_animals]
 
     def _should_run_animal(value: dict):
+        animal = value.get('animal')
         lookup_value = value.get('value')
-        term_id = value.get('animal').get('term').get('@id')
+        term_id = animal.get('term').get('@id')
 
-        logRequirements(cycle, model=MODEL, term=term_id,
+        logRequirements(cycle, model=MODEL, term=term_id, property=TERM_ID,
                         country_id=country_id,
                         liveweightGain=lookup_value)
 
@@ -76,7 +77,7 @@ def _should_run(cycle: dict):
             country_id,
             lookup_value is not None
         ])
-        logShouldRun(cycle, MODEL, term_id, should_run)
+        logShouldRun(cycle, MODEL, term_id, should_run, property=TERM_ID)
 
         return should_run
 

hestia_earth/models/ipcc2019/animal/liveweightPerHead.py

@@ -65,10 +65,11 @@ def _should_run(cycle: dict):
     } for animal in live_animals]
 
     def _should_run_animal(value: dict):
+        animal = value.get('animal')
         lookup_value = value.get('value')
-        term_id = value.get('animal').get('term').get('@id')
+        term_id = animal.get('term').get('@id')
 
-        logRequirements(cycle, model=MODEL, term=term_id,
+        logRequirements(cycle, model=MODEL, term=term_id, property=TERM_ID,
                         country_id=country_id,
                         liveweightPerHead=lookup_value)
 
@@ -76,7 +77,7 @@ def _should_run(cycle: dict):
             country_id,
             lookup_value is not None
         ])
-        logShouldRun(cycle, MODEL, term_id, should_run)
+        logShouldRun(cycle, MODEL, term_id, should_run, property=TERM_ID)
 
         return should_run
 

hestia_earth/models/ipcc2019/animal/weightAtMaturity.py

@@ -76,12 +76,13 @@ def _should_run(cycle: dict):
     } for animal in live_animals]
 
     def _should_run_animal(value: dict):
+        animal = value.get('animal')
         lookup_value = value.get('value')
-        term_id = value.get('animal').get('term').get('@id')
-        liveweightPerHead = find_term_match(value.get('animal').get('properties', []), 'liveweightPerHead', {})
+        term_id = animal.get('term').get('@id')
+        liveweightPerHead = find_term_match(animal.get('properties', []), 'liveweightPerHead', {})
         liveweightPerHead_value = liveweightPerHead.get('value')
 
-        logRequirements(cycle, model=MODEL, term=term_id,
+        logRequirements(cycle, model=MODEL, term=term_id, property=TERM_ID,
                         country_id=country_id,
                         weightAtMaturity=lookup_value,
                         liveweightPerHead=liveweightPerHead_value)
@@ -91,7 +92,7 @@ def _should_run(cycle: dict):
             lookup_value is not None,
             lookup_value is None or liveweightPerHead_value is None or lookup_value >= liveweightPerHead_value
         ])
-        logShouldRun(cycle, MODEL, term_id, should_run)
+        logShouldRun(cycle, MODEL, term_id, should_run, property=TERM_ID)
 
         return should_run
 

hestia_earth/models/mocking/search-results.json

@@ -1768,7 +1768,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.53753
+        "_score": 25.537537
       }
     ]
   },
@@ -2004,61 +2004,61 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 58.696724
+        "_score": 58.69941
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 49.890247
+        "_score": 49.892113
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 39.192566
+        "_score": 39.190735
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 30.290464
+        "_score": 30.287527
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 27.726015
+        "_score": 27.72403
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 26.558987
+        "_score": 26.560026
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 24.46354
+        "_score": 24.472519
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 23.214329
+        "_score": 23.215178
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 19.957129
+        "_score": 19.953989
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 19.569252
+        "_score": 19.567623
       }
     ]
   },
@@ -2101,15 +2101,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "marineDieselOil"
+        "@id": "diesel1D"
       },
       {
         "@type": "Term",
-        "@id": "petrolBurntIn2StrokeEngine"
+        "@id": "marineDieselOil"
       },
       {
         "@type": "Term",
-        "@id": "diesel1D"
+        "@id": "petrolBurntIn2StrokeEngine"
       },
       {
         "@type": "Term",
@@ -2125,11 +2125,11 @@
       },
       {
         "@type": "Term",
-        "@id": "petrol"
+        "@id": "petrolBurntIn4StrokeEngine"
       },
       {
         "@type": "Term",
-        "@id": "petrolBurntIn4StrokeEngine"
+        "@id": "petrol"
       },
       {
         "@type": "Term",

hestia_earth/models/site/soilMeasurement.py

@@ -152,7 +152,6 @@ def _get_depths_from_measurements(measurements: list) -> list:
 
 
 def _should_run(site: dict):
-    # we only work with measurements with depths
     measurements = site.get("measurements", [])
     measurement_sensitivity = {
         m.get('term', {}).get('@id'): get_lookup_value(
@@ -160,6 +159,7 @@ def _should_run(site: dict):
         )
         for m in measurements
     }
+    # we only work with measurements with depths
     measurements_with_depths = [m for m in measurements if all([
         not measurement_sensitivity[m.get("term", {}).get('@id')],
         m.get('value', []),
@@ -175,7 +175,7 @@ def _should_run(site: dict):
     should_run = has_measurements_with_depths
     for measurement in measurements_with_depths:
         term_id = measurement.get("term", {}).get("@id", {})
-        logShouldRun(site, MODEL, term_id, should_run)
+        logShouldRun(site, MODEL, term_id, should_run, model_key=MODEL_KEY)
     return should_run, measurements_with_depths
 
 

hestia_earth/models/utils/emission.py

@@ -1,7 +1,6 @@
 from collections.abc import Iterable
 from typing import Optional, Union
-
-from hestia_earth.schema import EmissionMethodTier, SchemaType
+from hestia_earth.schema import EmissionMethodTier, SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
 from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
@@ -103,3 +102,8 @@ def to_emission_method_tier(method: Union[EmissionMethodTier, str]) -> Optional[
         else EmissionMethodTier(method) if method in EMISSION_METHOD_TIERS
         else None
     )
+
+
+def filter_emission_inputs(emission: dict, term_type: TermTermType):
+    inputs = emission.get('inputs', [])
+    return [i for i in inputs if i.get('termType') == term_type.value]

hestia_earth/models/utils/impact_assessment.py

@@ -1,10 +1,12 @@
+from typing import Optional
+
 from hestia_earth.utils.model import find_term_match
 from hestia_earth.utils.tools import list_sum, safe_parse_date
 
-from ..log import logRequirements
 from .lookup import factor_value, _term_factor_value, _aware_factor_value
 from .product import find_by_product
 from .site import region_level_1_id
+from ..log import logRequirements
 
 
 def impact_end_year(impact_assessment: dict) -> int:
@@ -85,7 +87,8 @@ def get_country_id(impact_assessment: dict) -> str:
     return impact_assessment.get('country', get_site(impact_assessment).get('country', {})).get('@id')
 
 
-def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str) -> float:
+def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str,
+                        grouped_key: Optional[str] = None) -> float:
     """
     Calculate the value of the impact based on lookup factors and emissions value.
 
@@ -95,18 +98,20 @@ def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str)
         The model to display in the logs only.
     term_id : str
         The term to display in the logs only.
-    impact_assessment : dict
+    impact : dict
         The `ImpactAssessment`.
     lookup_col : str
         The lookup column to fetch the factors from.
-
+    grouped_key : str
+        key of grouped data to extract in a lookup table
     Returns
     -------
     int
         The impact total value.
     """
     nodes = impact.get('emissionsResourceUse', [])
-    factors = list(map(factor_value(model, term_id, 'emission.csv', lookup_col), nodes))
+
+    factors = list(map(factor_value(model, term_id, 'emission.csv', lookup_col, grouped_key), nodes))
     values = [value for value in factors if value is not None]
     return list_sum(values) if len(values) > 0 else None
 

hestia_earth/models/utils/lookup.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.lookup import (
     download_lookup, get_table_value, column_name, extract_grouped_data, _get_single_table_value
@@ -12,17 +14,17 @@ def _node_value(node):
     return list_sum(value) if isinstance(value, list) else value
 
 
-def factor_value(model: str, term_id: str, lookup_name: str, lookup_col: str):
+def factor_value(model: str, term_id: str, lookup_name: str, lookup_col: str, grouped_key: Optional[str] = None):
     lookup = download_lookup(lookup_name)
 
     def get_value(data: dict):
         node_term_id = data.get('term', {}).get('@id')
-        node_model_id = data.get('methodModel', {}).get('@id')
+        grouped_data_key = grouped_key or data.get('methodModel', {}).get('@id')
         value = _node_value(data)
         coefficient = get_table_value(lookup, 'termid', node_term_id, column_name(lookup_col))
         # value is either a number or matching between a model and a value (restrict value to specific model only)
         coefficient = safe_parse_float(
-            extract_grouped_data(coefficient, node_model_id), None
+            extract_grouped_data(coefficient, grouped_data_key), None
         ) if ':' in str(coefficient) else safe_parse_float(coefficient, None)
         if value is not None and coefficient is not None:
             if model:

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.3'
+VERSION = '0.64.4'

{hestia_earth_models-0.64.3.dist-info → hestia_earth_models-0.64.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.3
+Version: 0.64.4
 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.64.3.dist-info → hestia_earth_models-0.64.4.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=DbfNcGzaC5hzkuMDxQqW6XYoNBI4Uxw4SIoOYoZA6og,3474
 hestia_earth/models/preload_requests.py,sha256=Ibx-YOhR_1yuyFBxsLUbvJHVK7PLyMLoPu5l9jDN_Qk,1342
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=cWRcfrSfUqZXz_T4QMCr6gCvhrQsvhSQIXauvglcjCA,19
+hestia_earth/models/version.py,sha256=LaDtOBoFznCDnauZfj0nYNmRMiVXWIWV8CNR0xo5dqc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=tnGxBmJdPfPFfehLUQcefEqy1lHvzsSpx_s7O8nf3Zs,4412
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -138,6 +138,8 @@ hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=X62-4v0NJdM_Z5kLK3NuU4GNEeSrXlKlMZQB_o4JZ6c,1018
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
+hestia_earth/models/fantkeEtAl2016/__init__.py,sha256=NtOlRmjTA4e8i0nW8erwdm-DDtfYlbLiARqqv82bkU4,415
+hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py,sha256=OX9mWisIrOId_ZeagUMsvWCzKt_yNzXKxHUdJTzaeFk,1341
 hestia_earth/models/faostat2018/__init__.py,sha256=ecN-pKF1pkFnzmooBrg1VAxJkG76q9v4piiaKGP_vbo,412
 hestia_earth/models/faostat2018/coldCarcassWeightPerHead.py,sha256=y1ouj5FBrnGWxd4dIC7luG6iQwiMrm1CGgYbXCcKS8E,3139
 hestia_earth/models/faostat2018/coldDressedCarcassWeightPerHead.py,sha256=Aphq7r06Q5-RDer4i1CneOLifVQCKTiVPTIWE3AxLfE,3230
@@ -149,6 +151,8 @@ hestia_earth/models/faostat2018/seed.py,sha256=ts9PKs9UnZnJ9nPFlL7etL1Qb9uIWIES8
 hestia_earth/models/faostat2018/utils.py,sha256=Ud2vu_8ze5VFfeBFBzUKdJTWRfxVJO4VUTdgwaLJU-w,3715
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/faostat2018/product/price.py,sha256=X7Zxa-rXthzYdgw2lzybbHc-oKGE5nyXpBn-BfZC_7w,7753
+hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
+hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=8Y5-dIlswtrQYjDth3ahJ5z2CKwh3OnhV3rRSinMGrE,2885
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
 hestia_earth/models/geospatialDatabase/aware.py,sha256=cbxFnShXW8QUCIjU4uuO1DdK9KhYiLf41ZVjS9hSppI,1358
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=u8SQKx-zu3vhMQ-XOJgqyUn-tlCCIy-VG7zpl5AyjtY,3386
@@ -269,11 +273,11 @@ hestia_earth/models/ipcc2019/pastureGrass.py,sha256=w8LMbxJTdZtC2nrWoooPA0jrA9-F
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=Bzz4yPDdA7YVUhhJhQCCVu0uKONeO3b6a48_ZITZgzU,13889
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=FssMhdOvPpLqzojWTgnpZYGd3w1FC5CUd9fwdiYJRzU,2558
-hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=UKr1JvZyDv38ThvJdBO_OO09TzlSiSX49M-HOZ6CN9E,2574
+hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=Gwd6J6k-W84EAsC_cNMLaNy3p4-2pqCSc3grBfPvanw,2618
+hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=Lhnk58SvVtM2FayljOBPHFFx5OBFFqsiaVG8ZjwCaXA,2634
 hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=edBXCVjJB5ZBGJ9_zE3H6xKpT84hPqe3dv5JF879tXw,12066
 hestia_earth/models/ipcc2019/animal/utils.py,sha256=ziyphGLEO_eitOLtBG0BLpJfmN3csqUetFZuDo8FX2U,990
-hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=snbCjA2AZImd3yr4DIl5XwwoVoX9xF7djTuHI1qJmCA,3329
+hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=IHrG6cqLVhOiIbrvK0w5xDu4bHmy5om-1qBKMmkFC2o,3376
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
 hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB5lqiBCss9OZcbjxeeG8E,418
@@ -386,7 +390,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
 hestia_earth/models/mocking/mock_search.py,sha256=qgABw-sZK37XtsALKt8AHF2VJPUrZSnHv5Qj1Dn93oA,2405
-hestia_earth/models/mocking/search-results.json,sha256=MG2gaJm0DPR-7nRYr3IN5_cRvNcquom-gY02_5hMP5k,53136
+hestia_earth/models/mocking/search-results.json,sha256=1YcAYDF-b_Qv_I2sSi0GgXvsSsv4QwUotHAmADSWwSw,53136
 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
@@ -502,7 +506,7 @@ hestia_earth/models/site/precipitationMonthly.py,sha256=yGUbiUCu1Prp3qVHuZodGrcf
 hestia_earth/models/site/rainfallAnnual.py,sha256=Ix_B8Ny7IIRkJ_3lUvoHOjPgqCyR9I0U3_ADUUtMqsY,2003
 hestia_earth/models/site/rainfallMonthly.py,sha256=2Uo8F-YxnTK0_txlHmiAyVp1bGfWD4bneRKyg4tdQkI,1881
 hestia_earth/models/site/salineWater.py,sha256=wO_Dyufqni66qSCpunrJUr0ou45QrcpZc8-GtZDH9VU,1256
-hestia_earth/models/site/soilMeasurement.py,sha256=8xUDajU_KzBVFEj7yfwIZxVXJ14C_AKAxEs4uSnFyps,7164
+hestia_earth/models/site/soilMeasurement.py,sha256=YMKeChGcj9lxM9c7p68LlQhqMPHAD9AEsNsDr69Q1Kw,7185
 hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXHjV8-akXT9vB0cbwc,2012
 hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
 hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=8ERrTZpN_yCRUyFg_EYaX4abE9jLcyX3lx3MO4Bi6CE,1938
@@ -561,17 +565,17 @@ hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXK
 hestia_earth/models/utils/cycle.py,sha256=W-VIReb1OVooV6EIj-P6gUlr-W17_6USdnnj4ihMTTc,16741
 hestia_earth/models/utils/descriptive_stats.py,sha256=qOyG8_TpWYmaxZ0h99n9L71gDLLiVMrMf0ChtxnZLjw,8559
 hestia_earth/models/utils/ecoClimateZone.py,sha256=A3ZtF_B2wr6v7clbVi0zWQ-bOXRoOKq4vGq8mhNf9Ec,4316
-hestia_earth/models/utils/emission.py,sha256=5Dz8Z4P6QXbYSvOzVcqJy3R_oZMrp77_Iwj5xZsxsKc,3769
+hestia_earth/models/utils/emission.py,sha256=YqglUfZSyyvlgfRriZuXmJUDmjwWz5dM5AebIgLwvgk,3964
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
 hestia_earth/models/utils/feedipedia.py,sha256=ImUAURcwJDtSvu1s4MDeM1VpbU8mVTp9jh9ENNOB0Mw,3515
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=r1MKMMxg-PYiVlRutP83RuvY2rsdCQ1iN6ekSGGQGpA,1379
-hestia_earth/models/utils/impact_assessment.py,sha256=H1_cvLwC8nb3A5ckS9uvWrLqUDU_9i9BdQiPpn52xIg,6890
+hestia_earth/models/utils/impact_assessment.py,sha256=ma2oINLTIL1qplqC5D1_DbQu4EILpMXSgYNEslxIa2Y,7059
 hestia_earth/models/utils/indicator.py,sha256=IFrVIUYpmdVLOR1SKkrTReDbG1Tzq2b6daVvLMYpCs4,537
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF2uwc2PB4JPrHFSksMEQ,1900
 hestia_earth/models/utils/input.py,sha256=YycsAbSBfVDMu6PftDsisMFGnEp87wOj-3rrnHnOgzo,4927
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=cPFzUXUsgyvmm98quNJs5J1FbMdl1I7DxlTtmw0IWsw,6673
+hestia_earth/models/utils/lookup.py,sha256=yJB5IzsK7mZ_jQIdwb3TA5KZQL7Vneuvqr_O0GPjBDs,6758
 hestia_earth/models/utils/measurement.py,sha256=rxrrOVdkDm-J0QVjCEapa4z4KY3hUw-brAeb0pW1nIc,12221
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=6f8b-dFm3qr-eY049_eOvj_iDk4XBam61csozdDAvyA,2361
@@ -712,6 +716,8 @@ tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=lIgsdGh_0eDi-rPcCOrSSjVYNiET2GCSRkAHdugAkDk,851
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
+tests/models/fantkeEtAl2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/fantkeEtAl2016/test_damageToHumanHealthParticulateMatterFormation.py,sha256=yeN5w1_xKed10nHIlkb8dEOLcZ81TEAI41YvgnkB9n4,726
 tests/models/faostat2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/test_coldCarcassWeightPerHead.py,sha256=RImhLygwrJ2RoEHjDwhuymvLEitOtNleP_lLoBhiNOs,1736
 tests/models/faostat2018/test_coldDressedCarcassWeightPerHead.py,sha256=hZVKMtf-F5Iz7igZVahDJoqzfm2VtcIlwWBPCry7kqw,1594
@@ -722,6 +728,8 @@ tests/models/faostat2018/test_readyToCookWeightPerHead.py,sha256=pMDcONs0WUvANcJ
 tests/models/faostat2018/test_seed.py,sha256=tUXoNVveX0m0ed9UXB4zXxIZsPxktXyUXlbWuUKG0sQ,1705
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/product/test_price.py,sha256=vUTT-FZVbXnDrwQVOgq8PWTDuFK_gAT6aqJ9ZK6Qcsc,3493
+tests/models/frischknechtEtAl2000/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=Fa44zHKi0XZPq_68g7BtOuFlpciefH9yIEgsVDWhlBg,2096
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_aware.py,sha256=tbBBvXrOqdO0cMPJTa02UfhlwfosH8iNoJLzZNFs1NU,857
 tests/models/geospatialDatabase/test_clayContent.py,sha256=GqFAPIOkXfDpJFkI-vK6l3hK0Ap36lLCWGhXCly-DME,1797
@@ -1132,8 +1140,8 @@ tests/models/utils/test_source.py,sha256=_Ol-OrJs2Tt9iZAZ_RY2qRuSbnE4yz5OuEGkDSb
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.64.3.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.3.dist-info/METADATA,sha256=oHbT7czZE9hSI1j9SqhXt2G2cy3LZgsY-whn_0Ybxpc,3343
-hestia_earth_models-0.64.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.64.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.3.dist-info/RECORD,,
+hestia_earth_models-0.64.4.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.4.dist-info/METADATA,sha256=C3SCtTmEIhSB6heG-RANYgdLAN6qncOUSZra2tgwG3E,3343
+hestia_earth_models-0.64.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.64.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.4.dist-info/RECORD,,

tests/models/fantkeEtAl2016/test_damageToHumanHealthParticulateMatterFormation.py

@@ -0,0 +1,20 @@
+import json
+from unittest.mock import patch
+
+from hestia_earth.models.fantkeEtAl2016.damageToHumanHealthParticulateMatterFormation import MODEL, TERM_ID, 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}"
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(mocked_indicator):
+    with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
+        impactassessment = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impactassessment)
+    assert value == expected

tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py

@@ -0,0 +1,70 @@
+import json
+import pytest
+from unittest.mock import patch
+from tests.utils import fixtures_path, fake_new_indicator
+
+from hestia_earth.models.frischknechtEtAl2000.ionisingRadiationKbqU235Eq import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@pytest.mark.parametrize(
+    'test_name,impact,expected_should_run',
+    [
+        (
+            'no emissionsResourceUse => no run',
+            {},
+            False
+        ),
+        (
+            'no emissions in the lookups list => no run',
+            {
+                'emissionsResourceUse': [
+                    {
+                        'term': {'@id': 'co2ToAirInputsProduction'}
+                    }
+                ]
+            },
+            False
+        ),
+        (
+            'with emissions in the lookup list but no waste inputs => no run',
+            {
+                'emissionsResourceUse': [
+                    {
+                        'term': {'@id': 'ionisingCompoundsToAirInputsProduction'}
+                    }
+                ]
+            },
+            False
+        ),
+        (
+            'with emissions in the lookup list and waste inputs => run',
+            {
+                'emissionsResourceUse': [
+                    {
+                        'term': {'@id': 'ionisingCompoundsToAirInputsProduction'},
+                        'inputs': [{'termType': 'waste'}]
+                    }
+                ]
+            },
+            True
+        )
+    ]
+)
+def test_should_run(test_name, impact, expected_should_run):
+    should_run, *args = _should_run(impact)
+    assert should_run == expected_should_run, test_name
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        impactassessment = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impactassessment)
+    assert value == expected