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

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -140,7 +140,7 @@ LOOKUPS = {
         "mjKgABNetEnergyGrowthSheepGoatsIpcc2019",
         "isWoolProducingAnimal"
     ],
-    "system-liveAnimal-activityCoefficient-ipcc2019": "using animal term @id",
+    "system-liveAnimal-activityCoefficient-ipcc2019": "",
     "landCover": "grazedPastureGrassInputId",
     "crop-property": ["energyDigestibilityRuminants", "energyContentHigherHeatingValue"],
     "crop": "grazedPastureGrassInputId",

hestia_earth/models/koble2014/residueBurnt.py

@@ -1,8 +1,8 @@
-from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
 from hestia_earth.utils.tools import safe_parse_float
 
-from hestia_earth.models.log import logRequirements, debugMissingLookup
+from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils.term import get_lookup_value
+from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 from .utils import _should_run, _practice
 
@@ -17,7 +17,7 @@ REQUIREMENTS = {
 }
 LOOKUPS = {
     "crop": ["cropGroupingResidue", "Combustion_Factor_crop_residue"],
-    "region-crop-cropGroupingResidue-burnt": "using result from `cropGroupingResidue`"
+    "region-crop-cropGroupingResidue-burnt": ""
 }
 RETURNS = {
     "Practice": [{
@@ -30,12 +30,10 @@ LOOKUP_NAME = 'region-crop-cropGroupingResidue-burnt.csv'
 
 def _get_default_percent(cycle: dict, term: dict, country_id: str):
     crop_grouping = get_lookup_value(term, LOOKUPS['crop'][0], model=MODEL, term=TERM_ID)
-    lookup = download_lookup(LOOKUP_NAME)
     percent = safe_parse_float(
-        get_table_value(lookup, 'termid', country_id, column_name(crop_grouping)), None
+        get_region_lookup_value(LOOKUP_NAME, country_id, crop_grouping, model=MODEL, term=TERM_ID), None
     ) if crop_grouping else None
-    debugMissingLookup(LOOKUP_NAME, 'termid', country_id, crop_grouping, percent, model=MODEL)
-    comb_factor = safe_parse_float(get_lookup_value(term, LOOKUPS['crop'][1], model=MODEL, term=TERM_ID))
+    comb_factor = safe_parse_float(get_lookup_value(term, LOOKUPS['crop'][1]))
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     crop_grouping=crop_grouping,
                     country_id=country_id,

hestia_earth/models/koble2014/residueRemoved.py

@@ -1,8 +1,8 @@
-from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
 from hestia_earth.utils.tools import safe_parse_float
 
-from hestia_earth.models.log import logRequirements, debugMissingLookup
+from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils.term import get_lookup_value
+from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 from .utils import _should_run, _practice
 
@@ -17,7 +17,7 @@ REQUIREMENTS = {
 }
 LOOKUPS = {
     "crop": "cropGroupingResidue",
-    "region-crop-cropGroupingResidue-removed": "using result from `cropGroupingResidue`"
+    "region-crop-cropGroupingResidue-removed": ""
 }
 RETURNS = {
     "Practice": [{
@@ -30,11 +30,9 @@ LOOKUP_NAME = 'region-crop-cropGroupingResidue-removed.csv'
 
 def _get_default_percent(cycle: dict, term: dict, country_id: str):
     crop_grouping = get_lookup_value(term, LOOKUPS['crop'], model=MODEL, term=TERM_ID)
-    percent = get_table_value(
-        download_lookup(LOOKUP_NAME), 'termid', country_id, column_name(crop_grouping)
+    percent = get_region_lookup_value(
+        LOOKUP_NAME, country_id, crop_grouping, model=MODEL, term=TERM_ID
     ) if crop_grouping else None
-    debugMissingLookup(LOOKUP_NAME, 'termid', country_id, crop_grouping, percent,
-                       model=MODEL, term=TERM_ID)
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     crop_grouping=crop_grouping,
                     country_id=country_id,

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthWaterStress.py

@@ -22,8 +22,8 @@ RETURNS = {
 }
 LOOKUPS = {
     "@doc": "Different lookup files are used depending on the situation",
-    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `awareWaterBasinId`",
-    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `region`"
+    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "",
+    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": ""
 }
 TERM_ID = 'damageToHumanHealthWaterStress'
 LOOKUP_SUFFIX = 'resourceUse-WaterStressDamageToHumanHealthLCImpactCF'

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthWaterStress.py

@@ -22,8 +22,8 @@ RETURNS = {
 }
 LOOKUPS = {
     "@doc": "Different lookup files are used depending on the situation",
-    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `awareWaterBasinId`",
-    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `region`"
+    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "",
+    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": ""
 }
 TERM_ID = 'damageToHumanHealthWaterStress'
 LOOKUP_SUFFIX = 'resourceUse-WaterStressDamageToHumanHealthLCImpactCF'

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthWaterStress.py

@@ -22,8 +22,8 @@ RETURNS = {
 }
 LOOKUPS = {
     "@doc": "Different lookup files are used depending on the situation",
-    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `awareWaterBasinId`",
-    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `region`"
+    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "",
+    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": ""
 }
 TERM_ID = 'damageToHumanHealthWaterStress'
 LOOKUP_SUFFIX = 'resourceUse-WaterStressDamageToHumanHealthLCImpactCF'

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthWaterStress.py

@@ -22,8 +22,8 @@ RETURNS = {
 }
 LOOKUPS = {
     "@doc": "Different lookup files are used depending on the situation",
-    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `awareWaterBasinId`",
-    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "using `region`"
+    "awareWaterBasinId-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": "",
+    "region-resourceUse-WaterStressDamageToHumanHealthLCImpactCF": ""
 }
 TERM_ID = 'damageToHumanHealthWaterStress'
 LOOKUP_SUFFIX = 'resourceUse-WaterStressDamageToHumanHealthLCImpactCF'

hestia_earth/models/log.py

@@ -65,7 +65,7 @@ def logShouldRun(log_node: dict, model: str, term: Union[str, None], should_run:
 def debugMissingLookup(lookup_name: str, row: str, row_value: str, col: str, value, **kwargs):
     if value is None or value == '':
         extra = (', ' + _join_args(**kwargs)) if len(kwargs.keys()) > 0 else ''
-        logger.warning('Missing lookup=%s, %s=%s, column=%s' + extra, lookup_name, row, row_value, col)
+        logger.warning(f'Missing lookup={lookup_name}, {row}={row_value}, column={col}' + extra)
 
 
 def logErrorRun(model: str, term: str, error: str):