hestia-earth-models 0.70.4__py3-none-any.whl → 0.70.6__py3-none-any.whl

hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py

@@ -118,6 +118,7 @@ def _run_input(cycle: dict):
                         has_ecoinvent_mappings=has_mappings,
                         ecoinvent_mappings=';'.join([v[0] for v in mappings]),
                         has_no_gap_filled_background_emissions=has_no_gap_filled_background_emissions,
+                        termType_electricityFuel_complete=electricity_complete,
                         input_value=input_value)
 
         should_run = all([electricity_complete, has_mappings, has_no_gap_filled_background_emissions, input_value])

hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py

@@ -1,8 +1,8 @@
 from hestia_earth.schema import EmissionMethodTier
-from hestia_earth.utils.tools import list_sum
 
-from hestia_earth.models.log import logRequirements, logShouldRun
-from .utils import get_fuel_values, _emission
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from .utils import get_fuel_inputs, group_fuel_inputs, _emission, _run_inputs
 from . import MODEL
 
 REQUIREMENTS = {
@@ -20,6 +20,8 @@ REQUIREMENTS = {
 RETURNS = {
     "Emission": [{
         "value": "",
+        "inputs": "",
+        "operation": "",
         "methodTier": "tier 1"
     }]
 }
@@ -31,23 +33,26 @@ TERM_ID = 'co2ToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _run(fuel_values: list):
-    value = list_sum(fuel_values)
-    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
-
-
 def _should_run(cycle: dict):
-    fuel_values = get_fuel_values(TERM_ID, cycle, LOOKUPS['fuel'])
-    has_fuel = len(fuel_values) > 0
+    electricity_complete = _is_term_type_complete(cycle, 'electricityFuel')
+    fuel_inputs, valid_inputs = get_fuel_inputs(TERM_ID, cycle, LOOKUPS['fuel'])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    has_fuel=has_fuel)
+                    termType_electricityFuel_complete=electricity_complete,
+                    fuel_inputs=log_as_table(fuel_inputs))
 
-    should_run = any([has_fuel])
+    should_run = any([bool(valid_inputs), electricity_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, fuel_values
+    return should_run, group_fuel_inputs(valid_inputs)
 
 
 def run(cycle: dict):
-    should_run, fuel_values = _should_run(cycle)
-    return _run(fuel_values) if should_run else []
+    should_run, fuel_inputs = _should_run(cycle)
+    return (
+        [
+            _run_inputs(inputs, tier=TIER, term_id=TERM_ID)
+            for inputs in fuel_inputs.values()
+        ] if fuel_inputs else [
+            _emission(value=0, tier=TIER, term_id=TERM_ID)
+        ]
+    ) if should_run else []

hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py

@@ -1,8 +1,8 @@
 from hestia_earth.schema import EmissionMethodTier
-from hestia_earth.utils.tools import list_sum
 
-from hestia_earth.models.log import logRequirements, logShouldRun
-from .utils import get_fuel_values, _emission
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from .utils import get_fuel_inputs, group_fuel_inputs, _emission, _run_inputs
 from . import MODEL
 
 REQUIREMENTS = {
@@ -10,7 +10,7 @@ REQUIREMENTS = {
         "or": {
             "inputs": [
                 {"@type": "Input", "value": "", "term.termType": "fuel", "optional": {
-                     "operation": ""
+                    "operation": ""
                 }}
             ],
             "completeness.electricityFuel": "True"
@@ -20,6 +20,8 @@ REQUIREMENTS = {
 RETURNS = {
     "Emission": [{
         "value": "",
+        "inputs": "",
+        "operation": "",
         "methodTier": "tier 1"
     }]
 }
@@ -31,23 +33,26 @@ TERM_ID = 'n2OToAirFuelCombustionDirect'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _run(fuel_values: list):
-    value = list_sum(fuel_values)
-    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
-
-
 def _should_run(cycle: dict):
-    fuel_values = get_fuel_values(TERM_ID, cycle, LOOKUPS['fuel'])
-    has_fuel = len(fuel_values) > 0
+    electricity_complete = _is_term_type_complete(cycle, 'electricityFuel')
+    fuel_inputs, valid_inputs = get_fuel_inputs(TERM_ID, cycle, LOOKUPS['fuel'])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    has_fuel=has_fuel)
+                    termType_electricityFuel_complete=electricity_complete,
+                    fuel_inputs=log_as_table(fuel_inputs))
 
-    should_run = any([has_fuel])
+    should_run = any([bool(valid_inputs), electricity_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, fuel_values
+    return should_run, group_fuel_inputs(valid_inputs)
 
 
 def run(cycle: dict):
-    should_run, fuel_values = _should_run(cycle)
-    return _run(fuel_values) if should_run else []
+    should_run, fuel_inputs = _should_run(cycle)
+    return (
+        [
+            _run_inputs(inputs, tier=TIER, term_id=TERM_ID)
+            for inputs in fuel_inputs.values()
+        ] if fuel_inputs else [
+            _emission(value=0, tier=TIER, term_id=TERM_ID)
+        ]
+    ) if should_run else []

hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py

@@ -1,8 +1,8 @@
 from hestia_earth.schema import EmissionMethodTier
-from hestia_earth.utils.tools import list_sum
 
-from hestia_earth.models.log import logRequirements, logShouldRun
-from .utils import get_fuel_values, _emission
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from .utils import get_fuel_inputs, group_fuel_inputs, _emission, _run_inputs
 from . import MODEL
 
 REQUIREMENTS = {
@@ -20,6 +20,8 @@ REQUIREMENTS = {
 RETURNS = {
     "Emission": [{
         "value": "",
+        "inputs": "",
+        "operation": "",
         "methodTier": "tier 1"
     }]
 }
@@ -31,23 +33,26 @@ TERM_ID = 'noxToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _run(fuel_values: list):
-    value = list_sum(fuel_values)
-    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
-
-
 def _should_run(cycle: dict):
-    fuel_values = get_fuel_values(TERM_ID, cycle, LOOKUPS['fuel'])
-    has_fuel = len(fuel_values) > 0
+    electricity_complete = _is_term_type_complete(cycle, 'electricityFuel')
+    fuel_inputs, valid_inputs = get_fuel_inputs(TERM_ID, cycle, LOOKUPS['fuel'])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    has_fuel=has_fuel)
+                    termType_electricityFuel_complete=electricity_complete,
+                    fuel_inputs=log_as_table(fuel_inputs))
 
-    should_run = any([has_fuel])
+    should_run = any([bool(valid_inputs), electricity_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, fuel_values
+    return should_run, group_fuel_inputs(valid_inputs)
 
 
 def run(cycle: dict):
-    should_run, fuel_values = _should_run(cycle)
-    return _run(fuel_values) if should_run else []
+    should_run, fuel_inputs = _should_run(cycle)
+    return (
+        [
+            _run_inputs(inputs, tier=TIER, term_id=TERM_ID)
+            for inputs in fuel_inputs.values()
+        ] if fuel_inputs else [
+            _emission(value=0, tier=TIER, term_id=TERM_ID)
+        ]
+    ) if should_run else []

hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py

@@ -1,8 +1,8 @@
 from hestia_earth.schema import EmissionMethodTier
-from hestia_earth.utils.tools import list_sum
 
-from hestia_earth.models.log import logRequirements, logShouldRun
-from .utils import get_fuel_values, _emission
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from .utils import get_fuel_inputs, group_fuel_inputs, _emission, _run_inputs
 from . import MODEL
 
 REQUIREMENTS = {
@@ -20,6 +20,8 @@ REQUIREMENTS = {
 RETURNS = {
     "Emission": [{
         "value": "",
+        "inputs": "",
+        "operation": "",
         "methodTier": "tier 1"
     }]
 }
@@ -31,23 +33,26 @@ TERM_ID = 'so2ToAirFuelCombustion'
 TIER = EmissionMethodTier.TIER_1.value
 
 
-def _run(fuel_values: list):
-    value = list_sum(fuel_values)
-    return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
-
-
 def _should_run(cycle: dict):
-    fuel_values = get_fuel_values(TERM_ID, cycle, LOOKUPS['fuel'])
-    has_fuel = len(fuel_values) > 0
+    electricity_complete = _is_term_type_complete(cycle, 'electricityFuel')
+    fuel_inputs, valid_inputs = get_fuel_inputs(TERM_ID, cycle, LOOKUPS['fuel'])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    has_fuel=has_fuel)
+                    termType_electricityFuel_complete=electricity_complete,
+                    fuel_inputs=log_as_table(fuel_inputs))
 
-    should_run = any([has_fuel])
+    should_run = any([bool(valid_inputs), electricity_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, fuel_values
+    return should_run, group_fuel_inputs(valid_inputs)
 
 
 def run(cycle: dict):
-    should_run, fuel_values = _should_run(cycle)
-    return _run(fuel_values) if should_run else []
+    should_run, fuel_inputs = _should_run(cycle)
+    return (
+        [
+            _run_inputs(inputs, tier=TIER, term_id=TERM_ID)
+            for inputs in fuel_inputs.values()
+        ] if fuel_inputs else [
+            _emission(value=0, tier=TIER, term_id=TERM_ID)
+        ]
+    ) if should_run else []

hestia_earth/models/emepEea2019/utils.py

@@ -1,48 +1,96 @@
+from functools import reduce
 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.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.completeness import _is_term_type_complete
+from hestia_earth.models.utils.blank_node import group_by_keys
 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):
+def _emission(value: float, tier: str, term_id: str, input: dict = None, operation: dict = None):
     emission = _new_emission(term_id, MODEL)
     emission['value'] = [value]
     emission['methodTier'] = tier
+    if input:
+        emission['inputs'] = [input]
+    if operation:
+        emission['operation'] = operation
     return emission
 
 
-def _get_fuel_input_value(term_id: str, lookup_col: str):
-    def get_value(input: dict):
-        input_term = input.get('term', {})
-        input_term_id = input_term.get('@id')
-        operation_term = input.get('operation', {})
-        input_value = list_sum(input.get('value', []))
-
-        operation_factor = extract_grouped_data(
-            get_lookup_value(operation_term, lookup_col, model=MODEL, term=term_id), input_term_id
-        ) if operation_term else None
-        input_factor = operation_factor or get_lookup_value(input_term, lookup_col, model=MODEL, term=term_id)
-        factor = safe_parse_float(input_factor, None)
-
-        return input_value * factor if factor is not None else None
-    return get_value
-
+def _run_inputs(inputs: list, tier: str, term_id: str):
+    total_value = list_sum([
+        (i.get('input-value') or 0) * (i.get('operation-factor') or i.get('input-default-factor') or 0)
+        for i in inputs
+    ])
+    input_term = {
+        '@type': 'Term',
+        '@id': inputs[0].get('input-id'),
+        'termType': inputs[0].get('input-termType'),
+        'units': inputs[0].get('input-units'),
+    }
+    operation_term = {
+        '@type': 'Term',
+        '@id': inputs[0].get('operation-id'),
+        'termType': inputs[0].get('operation-termType'),
+        'units': inputs[0].get('operation-units'),
+    } if inputs[0].get('operation-id') else None
+    return _emission(
+        value=total_value,
+        tier=tier,
+        term_id=term_id,
+        input=input_term,
+        operation=operation_term
+    )
 
-def get_fuel_values(term_id: str, cycle: dict, lookup_col: str):
-    inputs = filter_list_term_type(cycle.get('inputs', []), TermTermType.FUEL)
-    values = non_empty_list(map(_get_fuel_input_value(term_id, lookup_col), inputs))
 
-    return [0] if all([
-        len(values) == 0,
-        _is_term_type_complete(cycle, 'electricityFuel')
-    ]) else values
+def _fuel_input_data(term_id: str, lookup_col: str, input: dict):
+    input_term = input.get('term', {})
+    input_term_id = input_term.get('@id')
+    operation_term = input.get('operation', {})
+    input_value = list_sum(input.get('value', []), None)
+
+    operation_factor = extract_grouped_data(
+        data=get_lookup_value(operation_term, lookup_col, model=MODEL, term=term_id),
+        key=input_term_id
+    ) if operation_term else None
+    input_factor = get_lookup_value(input_term, lookup_col, model=MODEL, term=term_id)
+
+    return {
+        'input-id': input_term_id,
+        'input-termType': input_term.get('termType'),
+        'input-units': input_term.get('units'),
+        'input-value': input_value,
+        'input-default-factor': safe_parse_float(input_factor, default=None),
+        'operation-id': operation_term.get('@id'),
+        'operation-termType': operation_term.get('termType'),
+        'operation-units': operation_term.get('units'),
+        'operation-factor': safe_parse_float(operation_factor, default=None)
+    }
+
+
+def get_fuel_inputs(term_id: str, cycle: dict, lookup_col: str):
+    inputs = [
+        _fuel_input_data(term_id, lookup_col, i)
+        for i in filter_list_term_type(cycle.get('inputs', []), TermTermType.FUEL)
+    ]
+    valid_inputs = [
+        i for i in inputs if all([
+            i.get('input-value') is not None,
+            (i.get('operation-factor') or i.get('input-default-factor')) is not None
+        ])
+    ]
+    return inputs, valid_inputs
+
+
+def group_fuel_inputs(inputs: list):
+    return reduce(group_by_keys(['input-id', 'operation-id']), inputs, {}) if len(inputs) > 0 else None
 
 
 def _get_emissions_factor(animal: dict, lookup_col: str) -> float:

hestia_earth/models/hestia/management.py

@@ -31,6 +31,7 @@ REQUIREMENTS = {
                             "tillage",
                             "cropResidueManagement",
                             "landUseManagement",
+                            "pastureManagement",
                             "system",
                             "landCover"
                         ],
@@ -81,6 +82,7 @@ _PRACTICES_TERM_TYPES = [
     TermTermType.TILLAGE,
     TermTermType.CROPRESIDUEMANAGEMENT,
     TermTermType.LANDUSEMANAGEMENT,
+    TermTermType.PASTUREMANAGEMENT,
     TermTermType.SYSTEM,
     TermTermType.LANDCOVER
 ]
@@ -133,9 +135,9 @@ def management(data: dict):
     return node
 
 
-def _get_cycle_duration(cycle: dict, land_cover_id: str):
+def _get_cycle_duration(cycle: dict, land_cover_id: str = None):
     cycle_duration = cycle.get('cycleDuration')
-    lookup_value = None if cycle_duration else safe_parse_float(get_table_value(
+    lookup_value = None if cycle_duration or not land_cover_id else safe_parse_float(get_table_value(
         download_lookup("crop.csv"),
         column_name('landCoverTermId'),
         land_cover_id,
@@ -155,7 +157,7 @@ def _gap_filled_date_obj(date_str: str, mode: str = DatestrGapfillMode.END) -> d
     )
 
 
-def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> dict:
+def _gap_filled_start_date(cycle: dict, end_date: str, land_cover_id: str = None) -> dict:
     """If possible, gap-fill the startDate based on the endDate - cycleDuration"""
     cycle_duration = _get_cycle_duration(cycle, land_cover_id)
     return {
@@ -214,9 +216,9 @@ def _get_relevant_items(cycle: dict, item_name: str, term_types: List[TermTermTy
         _include_with_date_gap_fill(cycle, ["startDate", "endDate"]) |
         _include(
             _gap_filled_start_date(
-                land_cover_id=get_landCover_term_id(item.get('term', {})),
+                cycle=cycle,
                 end_date=item.get("endDate") if "endDate" in item else cycle.get("endDate", ""),
-                cycle=cycle
+                land_cover_id=get_landCover_term_id(item.get('term', {})),
             ) if "startDate" not in item else {},
             "startDate"
         ) |
@@ -253,12 +255,17 @@ def _run_from_siteType(site: dict, cycle: dict):
     site_type = site.get('siteType')
     site_type_id = get_landCover_term_id_from_site_type(site_type) if site_type not in _SKIP_LAND_COVER_SITE_TYPES \
         else None
+    start_date = cycle.get('startDate') or _gap_filled_start_date(
+        cycle=cycle,
+        end_date=cycle.get('endDate'),
+        land_cover_id=site_type_id
+    ).get('startDate')
 
-    should_run = all([site_type_id])
+    should_run = all([site_type_id, start_date])
     return [{
         'id': site_type_id,
         'value': 100,
-        'startDate': cycle.get('startDate'),
+        'startDate': start_date,
         'endDate': cycle.get('endDate')
     }] if should_run else []
 

hestia_earth/models/mocking/search-results.json

@@ -3714,11 +3714,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporated"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
@@ -3770,27 +3770,27 @@
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueIncorporated"
+        "@id": "aboveGroundCropResidueBurnt"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueTotal"
+        "@id": "belowGroundCropResidue"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropRemoved"
+        "@id": "aboveGroundCropResidueLeftOnField"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueBurnt"
+        "@id": "aboveGroundCropResidueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "belowGroundCropResidue"
+        "@id": "aboveGroundCropResidueTotal"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueLeftOnField"
+        "@id": "discardedCropRemoved"
       }
     ]
   },
@@ -3824,15 +3824,15 @@
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPigs"
+        "@id": "digestibleEnergyPoultry"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergySalmonids"
+        "@id": "digestibleEnergyPigs"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPoultry"
+        "@id": "digestibleEnergySalmonids"
       },
       {
         "@type": "Term",
@@ -3954,43 +3954,43 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgN"
+        "@id": "excretaBeefCattleFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgN"
+        "@id": "excretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaInsectsKgN"
+        "@id": "excretaGeeseKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
+        "@id": "excretaInsectsKgN"
       },
       {
         "@type": "Term",
@@ -4067,15 +4067,15 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
@@ -4111,19 +4111,19 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
+        "@id": "excretaBeefCattleFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgVs"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgVs"
+        "@id": "excretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgVs"
+        "@id": "excretaDeerKgVs"
       }
     ]
   },
@@ -4180,7 +4180,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 22.501667
+        "_score": 22.555262
       }
     ]
   },
@@ -4462,139 +4462,139 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 60.218697
+        "_score": 59.47878
       },
       {
         "@type": "Term",
         "name": "Sea or ocean",
         "@id": "seaOrOcean",
-        "_score": 51.201225
+        "_score": 50.576153
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 47.790024
+        "_score": 47.491074
       },
       {
         "@type": "Term",
         "name": "Agri-food processor",
         "@id": "agriFoodProcessor",
-        "_score": 40.49057
+        "_score": 40.75738
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 39.96792
+        "_score": 40.4433
       },
       {
         "@type": "Term",
         "name": "Food retailer",
         "@id": "foodRetailer",
-        "_score": 39.138306
+        "_score": 38.745514
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 30.200647
+        "_score": 30.624483
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 27.085962
+        "_score": 26.857834
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 26.270697
+        "_score": 26.749058
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 25.623035
+        "_score": 24.92852
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 18.975834
+        "_score": 19.406992
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 18.592783
+        "_score": 18.911707
       },
       {
         "@type": "Term",
         "name": "Primary forest",
         "@id": "primaryForest",
-        "_score": 18.581348
+        "_score": 18.139027
       },
       {
         "@type": "Term",
-        "name": "Lake",
-        "@id": "lake",
-        "_score": 17.686426
+        "name": "Other land",
+        "@id": "otherLand",
+        "_score": 17.894175
       },
       {
         "@type": "Term",
-        "name": "Plantation forest",
-        "@id": "plantationForest",
-        "_score": 17.621328
+        "name": "Lake",
+        "@id": "lake",
+        "_score": 17.666122
       },
       {
         "@type": "Term",
-        "name": "Other land",
-        "@id": "otherLand",
-        "_score": 17.56675
+        "name": "Secondary forest",
+        "@id": "secondaryForest",
+        "_score": 17.617908
       },
       {
         "@type": "Term",
-        "name": "Secondary forest",
-        "@id": "secondaryForest",
-        "_score": 17.368475
+        "name": "Plantation forest",
+        "@id": "plantationForest",
+        "_score": 17.53842
       },
       {
         "@type": "Term",
         "name": "Red sea plume alga",
         "@id": "redSeaPlumeAlga",
-        "_score": 16.392815
+        "_score": 16.275637
       },
       {
         "@type": "Term",
         "name": "Sea kale plant",
         "@id": "seaKalePlant",
-        "_score": 15.716124
+        "_score": 15.965439
       },
       {
         "@type": "Term",
         "name": "Pond",
         "@id": "pond",
-        "_score": 13.998917
+        "_score": 13.767712
       },
       {
         "@type": "Term",
         "name": "River tamarind tree",
         "@id": "riverTamarindTree",
-        "_score": 12.513928
+        "_score": 12.494918
       },
       {
         "@type": "Term",
         "name": "Cropland",
         "@id": "cropland",
-        "_score": 9.387705
+        "_score": 9.371357
       },
       {
         "@type": "Term",
         "name": "Annual cropland",
         "@id": "annualCropland",
-        "_score": 8.634094
+        "_score": 8.962797
       }
     ]
   },
@@ -7435,11 +7435,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "ridgeTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "noTillage"
       },
       {
         "@type": "Term",
@@ -7455,15 +7455,15 @@
       },
       {
         "@type": "Term",
-        "@id": "ridgeTillage"
+        "@id": "verticalTillage"
       },
       {
         "@type": "Term",
-        "@id": "noTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "verticalTillage"
+        "@id": "minimumTillage"
       },
       {
         "@type": "Term",

hestia_earth/models/utils/blank_node.py

@@ -113,7 +113,10 @@ def properties_logs(blank_nodes: list, properties: Union[dict, list]):
 
 def group_by_keys(group_keys: list = ['term']):
     def run(group: dict, node: dict):
-        group_key = '-'.join(non_empty_list(map(lambda v: node.get(v, {}).get('@id'), group_keys)))
+        group_key = '-'.join(non_empty_list([
+            node.get(v, {}).get('@id') if isinstance(node.get(v), dict) else node.get(v)
+            for v in group_keys
+        ]))
         group[group_key] = group.get(group_key, []) + [node]
         return group
     return run

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.70.4'
+VERSION = '0.70.6'

{hestia_earth_models-0.70.4.dist-info → hestia_earth_models-0.70.6.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=BOhLkkdVWLJ-4Z7kxfQ8swqrYgZ43sACn1uzxY
 hestia_earth/models/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=7q8eaZImIkwl8HS2xJTe4a8IOQPn1y4oCngs2Qu-BuM,19
+hestia_earth/models/version.py,sha256=kHvvtSr85q7ToIOOm0D5M9RTwVyE-adBX6WrA6LbJ68,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -102,21 +102,21 @@ hestia_earth/models/ecoalimV9/impact_assessment.py,sha256=HY2hvAq9Fv-rreroHdWpXx
 hestia_earth/models/ecoalimV9/utils.py,sha256=AWmWQhjvze3J6s35bH-EQIGc58xCeMA8_56hQD7CX8A,1170
 hestia_earth/models/ecoinventV3/__init__.py,sha256=qKJRphRIlcE52yxUARkolijZgXoB27t3hJeU6nRDKpA,5084
 hestia_earth/models/ecoinventV3/utils.py,sha256=RxqaHB9hr0RdTKSjfvDN0pC8DIOyxMCr4I_xjas1POw,460
-hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=7deu8P0SUfYe1u-Y2MOgI2psddgzr3U9BN6H3oU6n0E,5764
+hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=N2XY-DADYgxHvPsery5wg7K_m_S83o-HMR0LtHd4uHE,5844
 hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=AzslK6YB0jxVMLfkLVmhHpkM7mx639N0mIWbErD6GMw,1133
 hestia_earth/models/edip2003/__init__.py,sha256=nyB0CI2gNmRAXj-203aJHQMmETYhcY-dHbMABOhJ7YI,409
 hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=YkBct4eDUidGukaVdd2iaEouq_FckuG8l_7pgBQgCBw,1033
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
-hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ib_xzEbIg-iQwvW2L4BosD9lV6EYOXAiIs8gYhSD9GE,1431
-hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=H4dgGqDuvYN4S7TRxYsX3hms1xMWr8clR2gkyyO8T18,1438
+hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=TPzbKxV-AZ9yx_tJNGhuNsfRJQNfH4a0JEtPGLKc-tA,1833
+hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=y0N_GhixisN6ScfKCpahrZe2CWOwl9ayDesO_erXX68,1839
 hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=DssSjl_Kug9jE5laqJs9X4xOdOrJBnsXSnk-uA_anyE,2153
 hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=7G0_S0G6X9slTykxs6CDb68DvtXB7yfq1iSKg0ReXS8,6036
-hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=2--8lI6C6WaYtd9LQe-WZnhvW1eUsjBVAgzT8jclcsc,1431
+hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=OlrCPBuOBGlvPh_ufO8fFzSvxvkJduX7tlqzEab6qzs,1833
 hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=7LhOEQokWMWEPspYSQO3PtsmWkygbVAonj_Nq6JAL6c,1384
 hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py,sha256=IzGQrRv9Pk0o1Vq18HRWZ10jhmjFG59ijfn_VYAUJIA,1384
-hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=8B1GVsn5gEXVW3iZYBct-s_OTRaH-asXo6JvGW_jls0,1431
+hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=OC53aE0uCmUxgZcqQjyhjjFPZ5U5Rdfv8l8wYihcYY4,1833
 hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=TaT5GyYK6MyJQHKApBe-u4fMjqXXdmuBEtUcRYnkhac,1381
-hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvEZsVHUPliZpQ,4014
+hestia_earth/models/emepEea2019/utils.py,sha256=YIHxVu4GwCbxBI5FzsmJ91itWNGx0vnBTCePSwlCnz8,5629
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=yAunIZI_4nGV0khRiGhbZAmXmMiuICzEH-pvzWX1lpM,3000
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
 hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=tRx2rRlSDupAWTfB9MqvqwrUCWHy-r-3gHjbgVOYLTs,5239
@@ -205,7 +205,7 @@ hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=1StzrYhMsX-hdwBTeLnLMZWl5EEnCoEYpGPRkqy8a-A,1016
 hestia_earth/models/hestia/liveAnimal.py,sha256=95HfqgFA_qRhdIeR2X5MJ9zzIm4nMHDvJ0BCnuTYe5Q,3860
 hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
-hestia_earth/models/hestia/management.py,sha256=e1horZLE0th9hazG1sGod_yWs8Hk8FiHFYzJXLNTzFA,10975
+hestia_earth/models/hestia/management.py,sha256=TJRdiV5XQBtK3YBOZsC-Off-9RMYrvYgkzylpPVRizw,11281
 hestia_earth/models/hestia/materialAndSubstrate.py,sha256=abmM_7FOY5yaNb2yZEm-ncI4wFFcbzaebtnG9XWEA6M,5130
 hestia_earth/models/hestia/milkYield.py,sha256=__3AdxRTUTWwS_GsqxFpPGklmTnnpADiN0khlRCMAss,5541
 hestia_earth/models/hestia/netPrimaryProduction.py,sha256=uU4AZ7X6tbtWgR5YClA_aLpYWtlivq9lPQGZgt3-qoQ,1856
@@ -444,7 +444,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=F6U3nD8mxFGo1q8NNatlR0mkjOYL4kjvaN2eXLN_xH0,162465
+hestia_earth/models/mocking/search-results.json,sha256=lb0aRVXU24w4ofPm58jtYWOzq32DTopjaUDnD0SeBDQ,162462
 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
@@ -591,7 +591,7 @@ hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWAp
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
 hestia_earth/models/utils/background_emissions.py,sha256=R0tCA63q1_2DaZ87oI7FFjZsxAZ4Zds3Rr4fDf9KhkM,1850
-hestia_earth/models/utils/blank_node.py,sha256=KZizahEIqZafxJ_OXL0za7QILc4AledEnHDQoxyaNI8,55961
+hestia_earth/models/utils/blank_node.py,sha256=zQhMFG4o7kUQY0J_7g84E8E1hwatSRZINTUb6fELB2s,56040
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -743,16 +743,16 @@ tests/models/ecoalimV9/test_impact_assessment.py,sha256=9Br_jis2MT85kS1IvBfPE9x7
 tests/models/edip2003/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/edip2003/test_ozoneDepletionPotential.py,sha256=z0kimdTxzSr8_K5eScbkxq2SB9nbBp41IHqVNR4Nh4Y,688
 tests/models/emepEea2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=z1H17R_Erox2dMg8xylGB0qt9BMZSwfLAoEMVv9z878,1518
-tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=4uemriZAyJBSn-xMttRpxqVHOFNBXlboVODHQYl65zQ,1524
+tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=SrCx1-mW0s-flisF9Zf6W_A8VtJ67sWga8pGgS713b8,1135
+tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=dTkrj2i5QibBuHaCgV8n2dB02y0nJAwhR35WcOquHOQ,1141
 tests/models/emepEea2019/test_nh3ToAirExcreta.py,sha256=lTPftCJinvokmgUcUikl8hN_axFa8OyCTXvL0PaSRFg,1111
 tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py,sha256=f623Pp6XTt9YPDr2QymAJEQ_yfx0_TZGndmawD8ZX98,2134
-tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=HpuzWyFmfatFXwTZd8TVpHb6Kfj2Ru3IO1gHnSiuKtQ,1518
+tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=iFVQVYImXxB5JE8b38UAUG4q8grfbniZi1cWdLQoViE,1135
 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_so2ToAirFuelCombustion.py,sha256=RkC_ux5bxo6bIdcXIG_97uRstWXBnmZO3DOW4IfgRx0,1135
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
-tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_DqsqdYaPnzR_I,8761
+tests/models/emepEea2019/test_utils.py,sha256=MUIeHgcCHLhbYWgleKIiKqO2Q4RX321J53YpOt9cogA,7060
 tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=F4oz4UadhpBlyh4JvLPOWAxGSIKnJVTTDaSzOT3Ihgk,4909
 tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.py,sha256=WE-DcerljCjXMYE4f3Sv5ZCVHP0oTjbWkOGuvaa4p10,926
@@ -841,7 +841,7 @@ tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3
 tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=bUByojQuVeuCfko1_2YtNJi1PT9yktHlcbPi_p-MPvk,1001
 tests/models/hestia/test_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
 tests/models/hestia/test_longFallowRatio.py,sha256=OVd6NByAXeCAOx9ux_m8IJwnEF-fqIaBOoKFSGWhyO0,1513
-tests/models/hestia/test_management.py,sha256=h5rNqAgh3ehTlH4MEGBp4ryhZOoA2EXj_Q3lZcufbUk,1738
+tests/models/hestia/test_management.py,sha256=p7j5ooACr0XBf2-hZWwwYE0-sfsoakIa2qKZhE32ZUQ,1800
 tests/models/hestia/test_materialsAndSubstrate.py,sha256=szM6aBBc1_9MDQFM1-OiW4SOKvEIO6mYYEpjHB-wI9g,1430
 tests/models/hestia/test_milkYield.py,sha256=m7SRiKb_u8SDF7Q5gX39AKr4bsrNqibXgMgzSmJJEPA,1778
 tests/models/hestia/test_netPrimaryProduction.py,sha256=--q6NB90gmpeJNBR16l3AgBsXGXwww_d1vOcWiMa-k8,1110
@@ -1243,8 +1243,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.70.4.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.70.4.dist-info/METADATA,sha256=HEELN8DDxe3Qa6j7Ach7OnNlGpjQnMIVXWkW6dUVyNo,4045
-hestia_earth_models-0.70.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.70.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.70.4.dist-info/RECORD,,
+hestia_earth_models-0.70.6.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.70.6.dist-info/METADATA,sha256=UeHwB1HpSIPArmEhOgJPi80K2xc9CP3Ux_fDfaJ617w,4045
+hestia_earth_models-0.70.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.70.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.70.6.dist-info/RECORD,,

tests/models/emepEea2019/test_co2ToAirFuelCombustion.py

@@ -2,26 +2,13 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.co2ToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.emepEea2019.co2ToAirFuelCombustion 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"{class_path}.get_fuel_values")
-def test_should_run(mock_get_fuel_values):
-    # no fuel values => no run
-    mock_get_fuel_values.return_value = []
-    should_run, *args = _should_run({})
-    assert not should_run
-
-    # with fuel values => run
-    mock_get_fuel_values.return_value = [0]
-    should_run, *args = _should_run({})
-    assert should_run is True
-
-
 @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:

tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py

@@ -2,26 +2,13 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.n2OToAirFuelCombustionDirect import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.emepEea2019.n2OToAirFuelCombustionDirect 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"{class_path}.get_fuel_values")
-def test_should_run(mock_get_fuel_values):
-    # no fuel values => no run
-    mock_get_fuel_values.return_value = []
-    should_run, *args = _should_run({})
-    assert not should_run
-
-    # with fuel values => run
-    mock_get_fuel_values.return_value = [0]
-    should_run, *args = _should_run({})
-    assert should_run is True
-
-
 @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:

tests/models/emepEea2019/test_noxToAirFuelCombustion.py

@@ -2,26 +2,13 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.noxToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.emepEea2019.noxToAirFuelCombustion 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"{class_path}.get_fuel_values")
-def test_should_run(mock_get_fuel_values):
-    # no fuel values => no run
-    mock_get_fuel_values.return_value = []
-    should_run, *args = _should_run({})
-    assert not should_run
-
-    # with fuel values => run
-    mock_get_fuel_values.return_value = [0]
-    should_run, *args = _should_run({})
-    assert should_run is True
-
-
 @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:

tests/models/emepEea2019/test_so2ToAirFuelCombustion.py

@@ -2,26 +2,13 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.so2ToAirFuelCombustion import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.emepEea2019.so2ToAirFuelCombustion 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"{class_path}.get_fuel_values")
-def test_should_run(mock_get_fuel_values):
-    # no fuel values => no run
-    mock_get_fuel_values.return_value = []
-    should_run, *args = _should_run({})
-    assert not should_run
-
-    # with fuel values => run
-    mock_get_fuel_values.return_value = [0]
-    should_run, *args = _should_run({})
-    assert should_run is True
-
-
 @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:

tests/models/emepEea2019/test_utils.py

@@ -1,8 +1,6 @@
-from unittest.mock import patch
-
 import pytest
 
-from hestia_earth.models.emepEea2019.utils import get_fuel_values, should_run_animal, _duration_in_housing
+from hestia_earth.models.emepEea2019.utils import should_run_animal, _duration_in_housing
 
 class_path = 'hestia_earth.models.emepEea2019.utils'
 TERMS = [
@@ -11,52 +9,6 @@ TERMS = [
 ]
 
 
-@patch(f"{class_path}._is_term_type_complete", return_value=True)
-def test_get_fuel_values_no_inputs_complete(*args):
-    cycle = {'@type': 'Cycle', 'inputs': []}
-    assert get_fuel_values('co2ToAirFuelCombustion', cycle, '') == [0]
-
-
-@patch(f"{class_path}._is_term_type_complete", return_value=False)
-def test_get_fuel_values_no_inputs_incomplete(*args):
-    cycle = {'@type': 'Cycle', 'inputs': []}
-    assert get_fuel_values('co2ToAirFuelCombustion', cycle, '') == []
-
-    cycle = {'@type': 'Transformation', 'inputs': []}
-    assert get_fuel_values('co2ToAirFuelCombustion', cycle, '') == []
-
-
-def test_get_fuel_values(*args):
-    cycle = {
-        '@type': 'Cycle',
-        'inputs': [
-            {
-                'term': {'@id': 'diesel', 'termType': 'fuel'},
-                'value': [100]
-            },
-            {
-
-                'term': {'@id': 'diesel', 'termType': 'fuel'},
-                'operation': {'@id': 'crushingWoodMachineUnspecified', 'termType': 'operation'},
-                'value': [200]
-            },
-            {
-
-                'term': {'@id': 'diesel', 'termType': 'fuel'},
-                'operation': {'@id': 'helicopterUseOperationUnspecified', 'termType': 'operation'},
-                'value': [150]
-            },
-            {
-                'term': {'@id': 'marineGasOil', 'termType': 'fuel'},
-                'operation': {'@id': 'crushingWoodMachineUnspecified', 'termType': 'operation'},
-                'value': [50]
-            }
-        ]
-    }
-    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",
     [

tests/models/hestia/test_management.py

@@ -13,7 +13,8 @@ fixtures_folder = os.path.join(fixtures_path, MODEL, MODEL_KEY)
 _LAND_COVER_TERM_BY_SITE_TYPE = {
     SiteSiteType.ANIMAL_HOUSING.value: "animalHousing",
     SiteSiteType.CROPLAND.value: "cropland",
-    SiteSiteType.AGRI_FOOD_PROCESSOR.value: "agriFoodProcessor"
+    SiteSiteType.AGRI_FOOD_PROCESSOR.value: "agriFoodProcessor",
+    SiteSiteType.PERMANENT_PASTURE.value: "permanentPasture"
 }
 _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]