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

hestia_earth/models/ipcc2019/ch4ToAirExcreta.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from hestia_earth.schema import EmissionMethodTier, TermTermType
-from hestia_earth.utils.lookup import column_name, download_lookup, get_table_value, extract_grouped_data
+from hestia_earth.utils.lookup import download_lookup, get_table_value, extract_grouped_data
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import safe_parse_float, list_sum
 
@@ -12,6 +12,7 @@ from hestia_earth.models.utils.productivity import PRODUCTIVITY, get_productivit
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value
 from hestia_earth.models.utils.input import total_excreta
+from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -29,8 +30,8 @@ REQUIREMENTS = {
 }
 LOOKUPS = {
     "region": "HDI",
-    "region-excreta-excretaManagement-ch4B0": "use input `@id`",
-    "excretaManagement-ecoClimateZone-CH4conv": "use `ecoClimateZone` from site measurements"
+    "region-excreta-excretaManagement-ch4B0": "",
+    "excretaManagement-ecoClimateZone-CH4conv": ""
 }
 RETURNS = {
     "Emission": [{
@@ -83,11 +84,9 @@ def _get_excreta_b0(country: dict, input: dict):
     # a high or low value is stored in the lookup as "high"
     # therefore this model defaults to "high" productivity in these cases to ascertain this value
     productivity_key = get_productivity(country)
-    lookup_name = 'region-excreta-excretaManagement-ch4B0.csv'
-    lookup = download_lookup(lookup_name)
     term_id = input.get('term', {}).get('@id')
-    data_values = get_table_value(lookup, 'termid', country.get('@id'), column_name(term_id))
-    debugMissingLookup(lookup_name, 'termid', country.get('@id'), term_id, data_values, model=MODEL, term=TERM_ID)
+    lookup_name = 'region-excreta-excretaManagement-ch4B0.csv'
+    data_values = get_region_lookup_value(lookup_name, country.get('@id'), term_id, model=MODEL, term=TERM_ID)
     return safe_parse_float(
         extract_grouped_data(data_values, productivity_key.value) or
         extract_grouped_data(data_values, PRODUCTIVITY.HIGH.value)  # defaults to high if low is not found

hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py

@@ -1,6 +1,5 @@
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
@@ -8,6 +7,7 @@ from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.product import has_flooded_rice
 from hestia_earth.models.utils.organicFertiliser import get_cycle_inputs as get_organicFertiliser_inputs
+from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -82,8 +82,10 @@ def _emission(value: float, min: float, max: float, sd: float):
 
 
 def _get_CH4_ef(country: str, suffix: str = ''):
-    lookup = download_lookup('region-ch4ef-IPCC2019.csv')
-    return safe_parse_float(get_table_value(lookup, 'termid', country, column_name('CH4_ef' + suffix)))
+    lookup_name = 'region-ch4ef-IPCC2019.csv'
+    return safe_parse_float(
+        get_region_lookup_value(lookup_name, country, 'CH4_ef' + suffix, model=MODEL, term=TERM_ID)
+    )
 
 
 def _get_practice_lookup(term: dict, col: str):

hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py

@@ -410,7 +410,7 @@ def create_should_run_function(
         cycle_end_date = cycle.get("endDate")
 
         site = _get_site(cycle)
-        cycles = related_cycles(site)
+        cycles = related_cycles(site, cycles_mapping={cycle_id: cycle})
 
         carbon_stock_measurements = [
             node for node in site.get("measurements", [])

hestia_earth/models/ipcc2019/croppingDuration.py

@@ -4,12 +4,12 @@
 The model will only run for rice crops as this is the only crop which requires the value for emission recalculations.
 """
 from hestia_earth.schema import PracticeStatsDefinition
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import safe_parse_float
 
-from hestia_earth.models.log import logRequirements, debugMissingLookup, logShouldRun
+from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.practice import _new_practice
 from hestia_earth.models.utils.product import has_flooded_rice
+from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -59,10 +59,7 @@ def _practice(value: float, min: float, max: float, sd: float):
 
 
 def _get_value(country: str, col: str):
-    lookup = download_lookup(LOOKUP_TABLE)
-    value = safe_parse_float(get_table_value(lookup, 'termid', country, column_name(col)))
-    debugMissingLookup(LOOKUP_TABLE, 'termid', country, col, value, model=MODEL, term=TERM_ID)
-    return value
+    return safe_parse_float(get_region_lookup_value(LOOKUP_TABLE, country, col, model=MODEL, term=TERM_ID))
 
 
 def _run(country: str):