hestia-earth-models 0.64.10__py3-none-any.whl → 0.64.12__py3-none-any.whl

hestia_earth/models/recipe2016Egalitarian/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Egalitarian/freshwaterEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Egalitarian/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Egalitarian/marineEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Egalitarian/ozoneDepletionPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Egalitarian/terrestrialAcidificationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Hierarchist/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Hierarchist/freshwaterEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Hierarchist/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Hierarchist/marineEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Hierarchist/ozoneDepletionPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Hierarchist/terrestrialAcidificationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Individualist/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Individualist/freshwaterEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Individualist/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Individualist/marineEutrophicationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Individualist/ozoneDepletionPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/recipe2016Individualist/terrestrialAcidificationPotential.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/utils/impact_assessment.py

@@ -1,7 +1,7 @@
 from typing import Optional
-
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.lookup import download_lookup
-from hestia_earth.utils.model import find_term_match
+from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_date
 
 from hestia_earth.models.log import logRequirements, debugValues, log_as_table
@@ -88,8 +88,9 @@ def get_country_id(impact_assessment: dict) -> str:
     return impact_assessment.get('country', get_site(impact_assessment).get('country', {})).get('@id')
 
 
-def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str,
-                        grouped_key: Optional[str] = None) -> float:
+def impact_emission_lookup_value(
+    model: str, term_id: str, impact: dict, lookup_col: str, grouped_key: Optional[str] = None
+) -> float:
     """
     Calculate the value of the impact based on lookup factors and emissions value.
 
@@ -105,6 +106,7 @@ def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str,
         The lookup column to fetch the factors from.
     grouped_key : str
         key of grouped data to extract in a lookup table
+
     Returns
     -------
     int
@@ -116,13 +118,19 @@ def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str,
         node=impact,
         lookup_name='emission.csv',
         lookup_col=lookup_col,
-        blank_nodes=impact.get('emissionsResourceUse', []),
+        blank_nodes=filter_list_term_type(impact.get('emissionsResourceUse', []), TermTermType.EMISSION),
         grouped_key=grouped_key
     )
 
 
-def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, group_key: str = None,
-                         country_fallback: bool = False) -> float:
+def impact_country_value(
+    model: str,
+    term_id: str,
+    impact: dict,
+    lookup: str,
+    group_key: str = None,
+    country_fallback: bool = False,
+) -> float:
     """
     Calculate the value of the impact based on lookup factors and `site.country.@id`.
 
@@ -147,7 +155,9 @@ def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, gr
     int
         The impact total value.
     """
-    nodes = impact.get('emissionsResourceUse', [])
+    term_type = TermTermType.RESOURCEUSE.value if 'resourceUse' in lookup else TermTermType.EMISSION.value
+    nodes = filter_list_term_type(impact.get('emissionsResourceUse', []), term_type)
+
     country_id = get_country_id(impact)
     country_id = fallback_country(country_id, [download_lookup(lookup)]) if country_fallback else country_id
 

hestia_earth/models/utils/lookup.py

@@ -104,7 +104,8 @@ def _aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: st
 _ALLOW_ALL = 'all'
 
 
-def _is_site(site: dict): return site.get('@type', site.get('type')) == SchemaType.SITE.value
+def _is_site(site: dict):
+    return site.get('@type', site.get('type')) == SchemaType.SITE.value if site else None
 
 
 def _get_sites(node: dict):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.10'
+VERSION = '0.64.12'

{hestia_earth_models-0.64.10.dist-info → hestia_earth_models-0.64.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.10
+Version: 0.64.12
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hestia-earth.schema==30.*
-Requires-Dist: hestia-earth.utils>=0.13.9
+Requires-Dist: hestia-earth.utils>=0.13.10
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0