hestia-earth-models 0.62.4__py3-none-any.whl → 0.62.5__py3-none-any.whl

hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py

@@ -2,8 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_fuel_values
+from .utils import get_fuel_values, _emission
 from . import MODEL
 
 REQUIREMENTS = {
@@ -32,16 +31,9 @@ TERM_ID = 'co2ToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _run(fuel_values: list):
     value = list_sum(fuel_values)
-    return [_emission(value)]
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):

hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py

@@ -2,8 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_fuel_values
+from .utils import get_fuel_values, _emission
 from . import MODEL
 
 REQUIREMENTS = {
@@ -32,16 +31,9 @@ TERM_ID = 'n2OToAirFuelCombustionDirect'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _run(fuel_values: list):
     value = list_sum(fuel_values)
-    return [_emission(value)]
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):

hestia_earth/models/emepEea2019/nh3ToAirExcreta.py

@@ -7,9 +7,9 @@ from hestia_earth.models.log import logRequirements, debugMissingLookup, logShou
 from hestia_earth.models.utils import _filter_list_term_unit
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.input import total_excreta_tan
 from . import MODEL
+from .utils import _emission
 
 REQUIREMENTS = {
     "Cycle": {
@@ -40,13 +40,6 @@ TERM_ID = 'nh3ToAirExcreta'
 TIER = EmissionMethodTier.TIER_2.value
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _get_nh3_factor(term_id: str, input: dict):
     input_term_id = input.get('term', {}).get('@id')
     lookup_name = f"{list(LOOKUPS.keys())[0]}.csv"
@@ -57,7 +50,7 @@ def _get_nh3_factor(term_id: str, input: dict):
 
 def _run(excreta_EF_product: float):
     value = excreta_EF_product * get_atomic_conversion(Units.KG_NH3, Units.TO_N)
-    return [_emission(value)]
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):

hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py

@@ -10,7 +10,7 @@ from hestia_earth.models.utils.inorganicFertiliser import (
     get_NH3_emission_factor, get_terms, get_term_lookup, get_country_breakdown, get_cycle_inputs
 )
 from hestia_earth.models.utils.constant import Units
-from hestia_earth.models.utils.emission import _new_emission
+from .utils import _emission
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value
 from . import MODEL
 
@@ -58,13 +58,6 @@ TIER = EmissionMethodTier.TIER_2.value
 UNSPECIFIED_TERM_ID = 'inorganicNitrogenFertiliserUnspecifiedKgN'
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _input_with_factor(soilPh: float, temperature: float):
     def get_value(input: dict):
         term_id = input.get('term', {}).get('@id')
@@ -151,4 +144,4 @@ def _should_run(cycle: dict):
 def run(cycle: dict):
     should_run, N_inputs_with_factor = _should_run(cycle)
     value = list_sum([i.get('value') * i.get('factor') for i in N_inputs_with_factor]) if should_run else None
-    return [_emission(value)] if value is not None else []
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)] if value is not None else []

hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py

@@ -2,8 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_fuel_values
+from .utils import get_fuel_values, _emission
 from . import MODEL
 
 REQUIREMENTS = {
@@ -32,16 +31,9 @@ TERM_ID = 'noxToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _run(fuel_values: list):
     value = list_sum(fuel_values)
-    return [_emission(value)]
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):

hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py

@@ -0,0 +1,57 @@
+"""
+When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
+spend on each Site.
+"""
+from hestia_earth.schema import EmissionMethodTier
+
+from .utils import _emission, get_live_animal_emission_value, should_run_animal
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.animalPopulation": "True",
+        "site": {"@type": "Site"},
+        "siteDuration": "",
+        "animals": [
+            {
+                "@type": "Animal",
+                "term.termType": "liveAnimal",
+                "value": "",
+                "referencePeriod": "average"
+            }
+        ],
+        "optional": {
+            "otherSites": [{"@type": "Site"}],
+            "otherSitesDuration": ""
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+LOOKUPS = {
+    "liveAnimal": "pm10ToAirEea2019",
+    "operation": "pm10ToAirAnimalHousingEmepEea2019"
+}
+TERM_ID = 'pm10ToAirAnimalHousing'
+TIER = EmissionMethodTier.TIER_1.value
+
+
+def _run(animals: list[dict], total_duration: float):
+    return [
+        _emission(
+            value=get_live_animal_emission_value(animals, total_duration, lookup_col=LOOKUPS["liveAnimal"]),
+            tier=TIER,
+            term_id=TERM_ID
+        )
+    ]
+
+
+def run(cycle: dict):
+    should_run, animals, total_duration = should_run_animal(
+        cycle=cycle, model=MODEL, term=TERM_ID, tier=TIER
+    )
+    return _run(animals, total_duration) if should_run else []

hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py

@@ -0,0 +1,57 @@
+"""
+When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
+spend on each Site.
+"""
+from hestia_earth.schema import EmissionMethodTier
+
+from .utils import _emission, get_live_animal_emission_value, should_run_animal
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.animalPopulation": "True",
+        "site": {"@type": "Site"},
+        "siteDuration": "",
+        "animals": [
+            {
+                "@type": "Animal",
+                "term.termType": "liveAnimal",
+                "value": "",
+                "referencePeriod": "average"
+            }
+        ],
+        "optional": {
+            "otherSites": [{"@type": "Site"}],
+            "otherSitesDuration": ""
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+LOOKUPS = {
+    "liveAnimal": "pm25ToAirEea2019",
+    "operation": "pm25ToAirAnimalHousingEmepEea2019"
+}
+TERM_ID = 'pm25ToAirAnimalHousing'
+TIER = EmissionMethodTier.TIER_1.value
+
+
+def _run(animals: list[dict], total_duration: float):
+    return [
+        _emission(
+            value=get_live_animal_emission_value(animals, total_duration, lookup_col=LOOKUPS["liveAnimal"]),
+            tier=TIER,
+            term_id=TERM_ID
+        )
+    ]
+
+
+def run(cycle: dict):
+    should_run, animals, total_duration = should_run_animal(
+        cycle=cycle, model=MODEL, term=TERM_ID, tier=TIER
+    )
+    return _run(animals, total_duration) if should_run else []

hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py

@@ -2,8 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_fuel_values
+from .utils import get_fuel_values, _emission
 from . import MODEL
 
 REQUIREMENTS = {
@@ -32,16 +31,9 @@ TERM_ID = 'so2ToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['methodTier'] = TIER
-    return emission
-
-
 def _run(fuel_values: list):
     value = list_sum(fuel_values)
-    return [_emission(value)]
+    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):

hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py

@@ -0,0 +1,57 @@
+"""
+When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
+spend on each Site.
+"""
+from hestia_earth.schema import EmissionMethodTier
+
+from .utils import _emission, get_live_animal_emission_value, should_run_animal
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.animalPopulation": "True",
+        "site": {"@type": "Site"},
+        "siteDuration": "",
+        "animals": [
+            {
+                "@type": "Animal",
+                "term.termType": "liveAnimal",
+                "value": "",
+                "referencePeriod": "average"
+            }
+        ],
+        "optional": {
+            "otherSites": [{"@type": "Site"}],
+            "otherSitesDuration": ""
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+LOOKUPS = {
+    "liveAnimal": "tspToAirEea2019",
+    "operation": "tspToAirAnimalHousingEmepEea2019"
+}
+TERM_ID = 'tspToAirAnimalHousing'
+TIER = EmissionMethodTier.TIER_1.value
+
+
+def _run(animals: list[dict], total_duration: float):
+    return [
+        _emission(
+            value=get_live_animal_emission_value(animals, total_duration, lookup_col=LOOKUPS["liveAnimal"]),
+            tier=TIER,
+            term_id=TERM_ID
+        )
+    ]
+
+
+def run(cycle: dict):
+    should_run, animals, total_duration = should_run_animal(
+        cycle=cycle, model=MODEL, term=TERM_ID, tier=TIER
+    )
+    return _run(animals, total_duration) if should_run else []

hestia_earth/models/emepEea2019/utils.py

@@ -1,13 +1,23 @@
-from hestia_earth.schema import TermTermType
+from hestia_earth.schema import TermTermType, SiteSiteType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.lookup import extract_grouped_data
 from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
 
+from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.completeness import _is_term_type_complete
 from hestia_earth.models.utils.term import get_lookup_value
+from hestia_earth.models.utils.cycle import get_animals_by_period
+from hestia_earth.models.utils.emission import _new_emission
 from . import MODEL
 
 
+def _emission(value: float, tier: str, term_id: str):
+    emission = _new_emission(term_id, MODEL)
+    emission['value'] = [value]
+    emission['methodTier'] = tier
+    return emission
+
+
 def _get_fuel_input_value(term_id: str, lookup_col: str):
     def get_value(input: dict):
         input_term = input.get('term', {})
@@ -33,3 +43,52 @@ def get_fuel_values(term_id: str, cycle: dict, lookup_col: str):
         len(values) == 0,
         _is_term_type_complete(cycle, 'electricityFuel')
     ]) else values
+
+
+def _get_emissions_factor(animal: dict, lookup_col: str) -> float:
+    return safe_parse_float(
+        get_lookup_value(animal.get("term", {}), lookup_col, model=MODEL, term=animal.get("term", ""))
+    )
+
+
+def _duration_in_housing(cycle: dict) -> int:
+    other_sites = cycle.get("otherSites", [])
+    other_durations = cycle.get("otherSitesDuration", [])
+    return list_sum([
+        cycle.get("siteDuration", cycle.get("cycleDuration", 0))
+        if cycle.get("site", {}).get("siteType", "") == SiteSiteType.ANIMAL_HOUSING.value else 0
+    ] + ([
+        other_durations[x]
+        for x in range(len(other_sites))
+        if other_sites[x].get("siteType", "") == SiteSiteType.ANIMAL_HOUSING.value
+    ] if len(other_sites) == len(other_durations) else []))
+
+
+def get_live_animal_emission_value(animals: list[dict], duration: float, lookup_col: str) -> float:
+    return list_sum([
+        animal.get('value') * _get_emissions_factor(animal=animal, lookup_col=lookup_col)
+        for animal in animals
+    ]) * duration / 365
+
+
+def should_run_animal(cycle: dict, model: str, term: str, tier: str) -> tuple[list, bool]:
+    term_type_animalPopulation_complete = _is_term_type_complete(cycle=cycle, term="animalPopulation")
+
+    # models will be set as not relevant is primary `siteType` does not match, so check only `otherSites`.
+
+    total_duration = _duration_in_housing(cycle)
+
+    has_other_sites_and_duration = len(cycle.get("otherSites", [])) == len(cycle.get("otherSitesDuration", []))
+
+    animals = get_animals_by_period(cycle)
+    has_animals = len(animals) > 0
+
+    logRequirements(cycle, model=model, term=term,
+                    term_type_animalPopulation_complete=term_type_animalPopulation_complete,
+                    has_animals=has_animals,
+                    has_other_sites_and_duration=has_other_sites_and_duration,
+                    number_of_days_in_animal_housing=total_duration)
+
+    should_run = all([term_type_animalPopulation_complete, has_animals, has_other_sites_and_duration])
+    logShouldRun(cycle, model, term, should_run, methodTier=tier)
+    return should_run, animals, total_duration

hestia_earth/models/ipcc2019/animal/pastureGrass.py

@@ -18,6 +18,7 @@ from hestia_earth.models.utils.input import _new_input
 from hestia_earth.models.utils.term import get_wool_terms, get_lookup_value
 from hestia_earth.models.utils.completeness import _is_term_type_complete, _is_term_type_incomplete
 from hestia_earth.models.utils.property import get_node_property
+from hestia_earth.models.utils.cycle import get_animals_by_period
 from .. import MODEL
 from ..pastureGrass_utils import (
     practice_input_id,
@@ -29,7 +30,6 @@ from ..pastureGrass_utils import (
     calculate_NEfeed,
     calculate_GE,
     product_wool_energy,
-    get_animals,
     get_animal_values
 )
 
@@ -308,7 +308,7 @@ def _should_run(cycle: dict, animals: list, practices: dict):
 
 
 def run(cycle: dict):
-    animals = get_animals(cycle)
+    animals = get_animals_by_period(cycle)
     practices = list(filter(should_run_practice(cycle), cycle.get('practices', [])))
     should_run, meanDE, meanECHHV, system = _should_run(cycle, animals, practices)
     return list(map(_run_animal(cycle, meanDE, meanECHHV, system, practices), animals)) if should_run else []

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -17,6 +17,7 @@ from hestia_earth.models.utils.blank_node import lookups_logs, properties_logs
 from hestia_earth.models.utils.input import _new_input
 from hestia_earth.models.utils.term import get_wool_terms
 from hestia_earth.models.utils.completeness import _is_term_type_complete, _is_term_type_incomplete
+from hestia_earth.models.utils.cycle import get_animals_by_period
 from . import MODEL
 from .pastureGrass_utils import (
     practice_input_id,
@@ -28,7 +29,6 @@ from .pastureGrass_utils import (
     calculate_NEfeed,
     calculate_GE,
     product_wool_energy,
-    get_animals,
     get_animal_values
 )
 
@@ -164,7 +164,7 @@ def calculate_NEwool(cycle: dict) -> float:
 
 
 def _run_practice(cycle: dict, meanDE: float, meanECHHV: float, system: dict):
-    animals = get_animals(cycle)
+    animals = get_animals_by_period(cycle)
     REM = calculate_REM(meanDE)
     REG = calculate_REG(meanDE)
     NEwool = calculate_NEwool(cycle)

hestia_earth/models/ipcc2019/pastureGrass_utils.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import TermTermType, AnimalReferencePeriod
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
 from hestia_earth.utils.tools import list_sum, safe_parse_float
@@ -341,12 +341,3 @@ def should_run_practice(cycle: dict):
         return all([len(value) > 0, term_id == MODEL_KEY, key_term_type in KEY_TERM_TYPES])
 
     return should_run
-
-
-def get_animals(cycle: dict):
-    return [
-        a for a in cycle.get('animals', []) if all([
-            a.get('value'),
-            a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
-        ])
-    ]

hestia_earth/models/mocking/search-results.json

@@ -1486,7 +1486,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.968466
+        "_score": 26.312824
       }
     ]
   },
@@ -1722,61 +1722,61 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 60.694187
+        "_score": 59.49422
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 50.06671
+        "_score": 50.673336
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 40.722
+        "_score": 40.97334
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 31.252472
+        "_score": 31.583748
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 27.857792
+        "_score": 28.25857
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 26.769783
+        "_score": 27.218006
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 24.781918
+        "_score": 25.098145
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 23.502655
+        "_score": 23.833916
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 20.467493
+        "_score": 20.639563
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 19.942879
+        "_score": 20.246805
       }
     ]
   },

hestia_earth/models/site/management.py

@@ -18,7 +18,7 @@ from functools import reduce
 from hestia_earth.schema import SchemaType, TermTermType, SiteSiteType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import filter_list_term_type, linked_node
-from hestia_earth.utils.tools import safe_parse_float, flatten
+from hestia_earth.utils.tools import safe_parse_float, flatten, non_empty_list
 from hestia_earth.utils.blank_node import get_node_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_blank_nodes_id
@@ -48,7 +48,8 @@ REQUIREMENTS = {
                             "waterRegime",
                             "tillage",
                             "cropResidueManagement",
-                            "landUseManagement"
+                            "landUseManagement",
+                            "system"
                         ],
                         "units": ["% area", "boolean"],
                         "value": ""
@@ -72,7 +73,7 @@ RETURNS = {
     "Management": [{
         "@type": "Management",
         "term.termType": [
-            "landCover", "waterRegime", "tillage", "cropResidueManagement", "landUseManagement"
+            "landCover", "waterRegime", "tillage", "cropResidueManagement", "landUseManagement", "system"
         ],
         "value": "",
         "endDate": "",
@@ -247,7 +248,7 @@ def _should_run_all_products(cycles: list, site_type: str):
         for product in list(filter(_get_landCover_term_id, [i for i in products_crop_forage]))
     ] if site_type else []
     dates = sorted(list(set(
-        flatten([[cycle.get('startDate'), cycle.get('endDate')] for cycle in cycles])
+        non_empty_list(flatten([[cycle.get('startDate'), cycle.get('endDate')] for cycle in cycles]))
     ))) if site_type not in _SKIP_LAND_COVER_SITE_TYPES else []
     site_type_term = download_hestia(get_landCover_term_id_from_site_type(site_type)) if all([
         len(dates) >= 2,
@@ -286,7 +287,8 @@ def _should_run(site: dict):
                 TermTermType.WATERREGIME,
                 TermTermType.TILLAGE,
                 TermTermType.CROPRESIDUEMANAGEMENT,
-                TermTermType.LANDUSEMANAGEMENT
+                TermTermType.LANDUSEMANAGEMENT,
+                TermTermType.SYSTEM
             ]
         )
     ]

hestia_earth/models/utils/cycle.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import CycleFunctionalUnit, SiteSiteType, TermTermType
+from hestia_earth.schema import CycleFunctionalUnit, SiteSiteType, TermTermType, AnimalReferencePeriod
 from hestia_earth.utils.model import filter_list_term_type, find_term_match, find_primary_product
 from hestia_earth.utils.tools import list_sum, safe_parse_float, safe_parse_date
 
@@ -455,3 +455,12 @@ def check_cycle_site_ids_identical(cycles: list[dict]) -> bool:
         Whether or not all of the cycles associated site ids are identical.
     """
     return len(set(cycle.get('site', {}).get('@id', None) for cycle in cycles)) <= 1
+
+
+def get_animals_by_period(cycle: dict, period: AnimalReferencePeriod = AnimalReferencePeriod.AVERAGE):
+    return [
+        a for a in cycle.get('animals', []) if all([
+            a.get('value'),
+            a.get('referencePeriod') == period.value
+        ])
+    ]

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.62.4'
+VERSION = '0.62.5'

{hestia_earth_models-0.62.4.dist-info → hestia_earth_models-0.62.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.62.4
+Version: 0.62.5
 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.62.4.dist-info → hestia_earth_models-0.62.5.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=y_okcYzSbqODvmzkw-wOK2cOZEzkJq3pmRfxRsPsUw0,1012
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=VvAcSTPsHvm2Agla-EjyZ04Gq8k08dRvMyQy3jw2KbM,19
+hestia_earth/models/version.py,sha256=nhEXCAlUUnEUnxeP_S43AOWaQmufkzv4hRSHjCAeqR0,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=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -114,13 +114,16 @@ hestia_earth/models/ecoinventV3/utils.py,sha256=HqtD8MzK9C_RCJ-ME-5G4J1KoCn5FqmA
 hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=XYFDUNpQpzbjPgLus0YlM3UdiXX7LLwn-XJqjrH9ywM,5801
 hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=INWB7gyhzk49GQ0KAcBS-Kzwdoyd5MQJcsCtuT6XxZA,1352
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
-hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=DfoGlB5HjA1gafO0OutJjfsA6yPP_PsAd-p16evwCiQ,1609
-hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=R3lRF5-Md4Jd7irvTe8WJZJPc9-wa1pD6UWVk7lnGtQ,1616
-hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=lWo1AaorIk4HtTCQAND3RFbCHO-em1DbA5ZOxv0Ldn8,3750
-hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=AMZlOpeajrhbjGWIq_mLJJHfOF9RH9GswkbvVyrqop0,6201
-hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=y49RvO5OkrZ4iK7o2Kmx5xW52y8SS9xEKAmlXlTQtWc,1609
-hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=bo_0mFcwicpOkPsvZRAnL2tDBDRBAQqsPD_Wc5e20K4,1609
-hestia_earth/models/emepEea2019/utils.py,sha256=JcynSOdMU_jGuTptO0LLoK_JLkYtvn2gLPtYQBnM9Yo,1486
+hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ib_xzEbIg-iQwvW2L4BosD9lV6EYOXAiIs8gYhSD9GE,1431
+hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=H4dgGqDuvYN4S7TRxYsX3hms1xMWr8clR2gkyyO8T18,1438
+hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=HNz3w35V0X1Av7if4ZPlDxozrSMurjiy7Hl4iAVEoNg,3590
+hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=n_lpGX6pnJdOy1GJoVSLgA9LnnnWOb_ZHBueZAEDCbk,6041
+hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=2--8lI6C6WaYtd9LQe-WZnhvW1eUsjBVAgzT8jclcsc,1431
+hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=ZxiyoKpT0JbwgEnK9HlselO5-nIq_CTpcGK5a8X5UkM,1527
+hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py,sha256=MYMRoFrmu3lhqS9aYE-GCWHfE-NFIgk9Q3Uj1osTlKA,1527
+hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=8B1GVsn5gEXVW3iZYBct-s_OTRaH-asXo6JvGW_jls0,1431
+hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=hHHhu_EZWhxAKhGJgrHY3vNI7Kuy6h8-JyOuas7KRXk,1524
+hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvEZsVHUPliZpQ,4014
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=nIuPIkQR1ghv_T_Ab4Ckq5wmGdWVmgbaOjhtKfIJ-WE,2183
 hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=X62-4v0NJdM_Z5kLK3NuU4GNEeSrXlKlMZQB_o4JZ6c,1018
@@ -249,11 +252,11 @@ hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=iRUSVxMpBGgsVDkuBABPKI
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=JxVJ9mRml63VhwNSNq7H3O7YQJoXLgP4j9fIRs3ms5o,82431
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=A84r6u45HFk5jEb2nTWGTFTwX1qjq8F6qwkNUuiyH48,63542
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=jIhRks8ewCtQNIIN89N_4A4Tp529YMQnk4YmZV6FOCY,10668
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Dg94o-tMVR-SWW6dIK5kwbV4pcMBHEWtcSS2JhAtpXY,9491
-hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=TqGHj4yZmEO6cVV3VeqSTl11TGRpipnliMMUIOqTy1k,13744
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=4ZPbLlaIVf4-_ItoLU8fFhRhkWIUFIOcX2isSUOtLco,9550
+hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=KA5MAnaPXBgrNncBhcQtOF-cdLwEKI6O2F_DPEz5oTM,13502
 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/pastureGrass.py,sha256=QyT0qRO0lAJJU0Tp3PlDtXzbs7J6BXSX9kWo57T9GMw,11417
+hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=fSsWwf6lBlro4DIwbcAHSv0L-UMFe-liljfNr-kXWYw,11476
 hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=5smSAmKVCIlELCD6S_3I16YuSWNFhcClGDOdvrIuYsE,3657
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
@@ -367,7 +370,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=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
-hestia_earth/models/mocking/search-results.json,sha256=_2VGybtuYwXO05Oj4wCr0t8HbJ7a0KZqDJnmqoITAVM,46411
+hestia_earth/models/mocking/search-results.json,sha256=1hltFd6NwJIu9ThIGHJHatLsd3EflzRDnpShgM9vm60,46412
 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
@@ -466,7 +469,7 @@ hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZX
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=n980WNeTQpoXgTrH4KbwHFaaAJRdMmIqeCz_MvvSKqg,10655
+hestia_earth/models/site/management.py,sha256=LlvXibkqJyHCQQarn1uGUp8HJRmA8PW208pp1wCuSWk,10772
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -536,7 +539,7 @@ hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO
 hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
 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=78J3pS0nW-S296OPl9RrPlHxDQdXY-3W66tKo_mANXU,15927
+hestia_earth/models/utils/cycle.py,sha256=Q6NE5LWvoHng0l980r1i8lpmHWOL0HyMW6uXWhAf_Pw,16219
 hestia_earth/models/utils/descriptive_stats.py,sha256=qOyG8_TpWYmaxZ0h99n9L71gDLLiVMrMf0ChtxnZLjw,8559
 hestia_earth/models/utils/ecoClimateZone.py,sha256=NHFt-A9EiWXC6tUNIxkgOWUZOjj4I4uwJIP9ddDZegw,1112
 hestia_earth/models/utils/emission.py,sha256=5Dz8Z4P6QXbYSvOzVcqJy3R_oZMrp77_Iwj5xZsxsKc,3769
@@ -667,13 +670,16 @@ tests/models/dammgen2009/test_noxToAirExcreta.py,sha256=RWd9QvzmJtN9M6UC6KDHkXwt
 tests/models/deRuijterEtAl2010/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/deRuijterEtAl2010/test_nh3ToAirCropResidueDecomposition.py,sha256=kS1nUBVohOSCb386g6Wq7iVclmx0haekUDYo7VQ4NCA,2030
 tests/models/emepEea2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=HXQTSIkJzCKsb-9fGStkxtkcK65KS3sJlvShW2F6EaU,1450
-tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=vmZAAUkxfJyaRoioEEFmz8EtR3X_MCeaA-0VjjNNmQE,1456
-tests/models/emepEea2019/test_nh3ToAirExcreta.py,sha256=VtZFVWaHjqlxdge1Qir-OghNZtfsIJvLpg_8UNp0akU,1363
-tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py,sha256=ZRU-mQiQLGX3xxOIP7r7iv08vCuRa6ElnKJs2AZ7a1E,2060
-tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=drCeoaGo6Ag3fdEDDSC3D880OXxzillzHk7rPYcVwmE,1450
-tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=CNaT_z02DHDpBJ2IIkG0K7ra87WBg_iDkhx9QGAjk00,1450
-tests/models/emepEea2019/test_utils.py,sha256=jNb4T4yXWowUvY_1d_nxDTOBX-2K8jIG2TZ6SokxYP0,1843
+tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=z1H17R_Erox2dMg8xylGB0qt9BMZSwfLAoEMVv9z878,1518
+tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=4uemriZAyJBSn-xMttRpxqVHOFNBXlboVODHQYl65zQ,1524
+tests/models/emepEea2019/test_nh3ToAirExcreta.py,sha256=LsRynnkVjtkgxFjDS6CQBMUgN4O8qedQDuoNVClgdKQ,1425
+tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py,sha256=f623Pp6XTt9YPDr2QymAJEQ_yfx0_TZGndmawD8ZX98,2134
+tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=HpuzWyFmfatFXwTZd8TVpHb6Kfj2Ru3IO1gHnSiuKtQ,1518
+tests/models/emepEea2019/test_pm10ToAirAnimalHousing.py,sha256=xGlQeJkdP638zbHivxAqvliZCRpcogMFZYVCMWw6j3c,715
+tests/models/emepEea2019/test_pm25ToAirAnimalHousing.py,sha256=cs3UaJ7ucCryOaQy0sbL9AiuC8l_N7uywmPZHcr3pC0,715
+tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=zRTyeeQM1fRdRVFWbtCNndaddDbKHU1xLzmp_psDceE,1518
+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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=lIgsdGh_0eDi-rPcCOrSSjVYNiET2GCSRkAHdugAkDk,851
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1009,7 +1015,7 @@ tests/models/site/test_brackishWater.py,sha256=YGCp4glaWudKklYBSp-50KbfvIRtp3F4Q
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
 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=b6CyvJ35Qa5utjsH6d5jo5AHnrb3k3Uv-ez0P6PWask,14102
+tests/models/site/test_management.py,sha256=eIZN1PKB3rlUVrHK_Bkwc3hald3-y68rIl8cRVGEDgk,14160
 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
@@ -1088,8 +1094,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 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.62.4.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.62.4.dist-info/METADATA,sha256=WJCEsKRmOjSYJeIm86qjEAHu6PX_HQK_KQwrUrabBDQ,3343
-hestia_earth_models-0.62.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.62.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.62.4.dist-info/RECORD,,
+hestia_earth_models-0.62.5.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.62.5.dist-info/METADATA,sha256=OAujkDOEp9WGRnmAyJHbKMy1QeXRDfjmsedbSU3dwBo,3343
+hestia_earth_models-0.62.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.62.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.62.5.dist-info/RECORD,,

tests/models/emepEea2019/test_co2ToAirFuelCombustion.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.co2ToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -21,7 +22,7 @@ def test_should_run(mock_get_fuel_values):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -33,7 +34,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_data_complete(*args):
     with open(f"{fixtures_folder}/no-input-data-complete/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.n2OToAirFuelCombustionDirect import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -21,7 +22,7 @@ def test_should_run(mock_get_fuel_values):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -33,7 +34,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_data_complete(*args):
     with open(f"{fixtures_folder}/no-input-data-complete/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_nh3ToAirExcreta.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.nh3ToAirExcreta import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -34,7 +35,7 @@ def test_should_run(mock_get_lookup_factor, mock_excreta, *args):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.nh3ToAirInorganicFertiliser import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -27,7 +28,7 @@ def test_should_run(mock_measurement, *args):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -39,7 +40,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_with_unspecified(*args):
     with open(f"{fixtures_folder}/with-unspecified/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -51,7 +52,7 @@ def test_run_with_unspecified(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_complete(*args):
     with open(f"{fixtures_folder}/is-complete/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_noxToAirFuelCombustion.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.noxToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -21,7 +22,7 @@ def test_should_run(mock_get_fuel_values):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -33,7 +34,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_data_complete(*args):
     with open(f"{fixtures_folder}/no-input-data-complete/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_pm10ToAirAnimalHousing.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+import json
+
+from tests.utils import fixtures_path, fake_new_emission
+from hestia_earth.models.emepEea2019.pm10ToAirAnimalHousing import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/emepEea2019/test_pm25ToAirAnimalHousing.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+import json
+
+from tests.utils import fixtures_path, fake_new_emission
+from hestia_earth.models.emepEea2019.pm25ToAirAnimalHousing import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/emepEea2019/test_so2ToAirFuelCombustion.py

@@ -5,6 +5,7 @@ from tests.utils import fixtures_path, fake_new_emission
 from hestia_earth.models.emepEea2019.so2ToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
@@ -21,7 +22,7 @@ def test_should_run(mock_get_fuel_values):
     assert should_run is True
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -33,7 +34,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
 def test_run_data_complete(*args):
     with open(f"{fixtures_folder}/no-input-data-complete/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/emepEea2019/test_tspToAirAnimalHousing.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+import json
+
+from tests.utils import fixtures_path, fake_new_emission
+from hestia_earth.models.emepEea2019.tspToAirAnimalHousing import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/emepEea2019/test_utils.py

@@ -1,6 +1,8 @@
 from unittest.mock import patch
 
-from hestia_earth.models.emepEea2019.utils import get_fuel_values
+import pytest
+
+from hestia_earth.models.emepEea2019.utils import get_fuel_values, should_run_animal, _duration_in_housing
 
 class_path = 'hestia_earth.models.emepEea2019.utils'
 TERMS = [
@@ -53,3 +55,198 @@ def test_get_fuel_values(*args):
     }
     result = get_fuel_values('co2ToAirFuelCombustion', cycle, 'co2ToAirFuelCombustionEmepEea2019')
     assert result == [317.0, 632.0, 475.5, 158.5]
+
+
+@pytest.mark.parametrize(
+    "test_name,cycle,expected_duration",
+    [
+        (
+            "no sites => 0",
+            {"completeness": {"@type": "Completeness", "animalPopulation": False}},
+            0
+        ),
+        (
+            "site and other sites have wrong type => 0",
+            {
+                "site": {"@type": "Site", "siteType": "permanent pasture"},
+                "siteDuration": 15,
+                "otherSites": [
+                    {"@type": "Site", "siteType": "pond"},
+                    {"@type": "Site", "siteType": "pond"},
+                    {"@type": "Site", "siteType": "pond"},
+                ],
+                "otherSitesDuration": [20, 21, 22],
+            },
+            0
+        ),
+        (
+            "only second other site is animal housing => 12",
+            {
+                "site": {"@type": "Site", "siteType": "pond"},
+                "siteDuration": 20,
+                "otherSites": [
+                    {"@type": "Site", "siteType": "pond"},
+                    {"@type": "Site", "siteType": "animal housing"},
+                    {"@type": "Site", "siteType": "pond"},
+                ],
+                "otherSitesDuration": [11, 12, 13],
+            },
+            12
+        ),
+        (
+            "only site is animal housing => 20",
+            {
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [
+                    {"@type": "Site", "siteType": "forest"},
+                    {"@type": "Site", "siteType": "forest"},
+                    {"@type": "Site", "siteType": "forest"},
+                ],
+                "siteDuration": 20,
+                "otherSitesDuration": [12, 13, 14],
+            },
+            20
+        ),
+        (
+            "site and otherSites are animal housing, sum all values => 59",
+            {
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [
+                    {"@type": "Site", "siteType": "animal housing"},
+                    {"@type": "Site", "siteType": "animal housing"},
+                    {"@type": "Site", "siteType": "animal housing"},
+                ],
+                "siteDuration": 20,
+                "otherSitesDuration": [12, 13, 14],
+            },
+            59
+        )
+
+    ]
+)
+def test_duration_in_housing(test_name, cycle, expected_duration):
+    assert _duration_in_housing(cycle) == expected_duration
+
+
+@pytest.mark.parametrize(
+    "test_name,cycle,expected_should_run",
+    [
+        (
+            "not complete => no run",
+            {"completeness": {"@type": "Completeness", "animalPopulation": False}},
+            False
+        ),
+        (
+            "no site or other sites => no run",
+            {"completeness": {"@type": "Completeness", "animalPopulation": True}},
+            False
+        ),
+        (
+            "no site or other sites with 'animal housing' type => no run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "permanent pasture"},
+                "otherSites": [{"@type": "Site", "siteType": "pond"}]
+            },
+            False
+        ),
+        (
+            "no site or other sites with 'animal housing' type and duration => no run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [{"@type": "Site", "siteType": "pond"}],
+                "siteDuration": ""
+            },
+            False
+        ),
+        (
+            "no animal values => no run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [{"@type": "Site", "siteType": "pond"}],
+                "siteDuration": 150,
+                "animals": [
+                    {"value": ""}
+                ]
+            },
+            False
+        ),
+        (
+            "animal values reference period is not 'average' => no run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [{"@type": "Site", "siteType": "pond"}],
+                "siteDuration": 150,
+                "animals": [
+                    {
+                        "@type": "Animal",
+                        "value": 1
+                    },
+                    {
+                        "@type": "Animal",
+                        "value": 2,
+                        "referencePeriod": ""
+                    },
+                    {
+                        "@type": "Animal",
+                        "value": 3,
+                        "referencePeriod": "start of Cycle"
+                    },
+                ]
+            },
+            False
+        ),
+        (
+            "missing otherSitesDuration => no run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "animal housing"},
+                "otherSites": [{"@type": "Site", "siteType": "pond"}],
+                "siteDuration": 150,
+                "animals": [
+                    {
+                        "@type": "Animal",
+                        "value": 2,
+                        "referencePeriod": ""
+                    },
+                    {
+                        "@type": "Animal",
+                        "value": 3,
+                        "referencePeriod": "average"
+                    },
+                ]
+            },
+            False
+        ),
+        (
+            "all requirements met with otherSites => run",
+            {
+                "completeness": {"@type": "Completeness", "animalPopulation": True},
+                "site": {"@type": "Site", "siteType": "pond"},
+                "siteDuration": "",
+                "otherSites": [{"@type": "Site", "siteType": "animal housing"}],
+                "otherSitesDuration": [200],
+                "animals": [
+                    {
+                        "@type": "Animal",
+                        "value": 2,
+                        "referencePeriod": ""
+                    },
+                    {
+                        "@type": "Animal",
+                        "value": 3,
+                        "referencePeriod": "average"
+                    },
+                ]
+            },
+            True
+        ),
+
+    ]
+)
+def test_should_run_animal(test_name, cycle, expected_should_run):
+    should_run, *args = should_run_animal(cycle, 'model', 'term', 'tier')
+    assert should_run == expected_should_run, test_name

tests/models/site/test_management.py

@@ -297,6 +297,7 @@ def test_should_run(mock_related_cycles, *args):
 @pytest.mark.parametrize(
     "test_name,fixture_path",
     [
+        ("Products and practices", f"{fixtures_folder}"),
         ("Example 1", f"{fixtures_folder}/inputs/example1"),
         ("Example 2", f"{fixtures_folder}/inputs/example2"),
         ("Example 3", f"{fixtures_folder}/inputs/example3"),