hestia-earth-models 0.74.17__py3-none-any.whl → 0.75.1__py3-none-any.whl

hestia_earth/models/__init__.py

@@ -1,3 +0,0 @@
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)

hestia_earth/models/aware/scarcityWeightedWaterUse.py

@@ -1,6 +1,6 @@
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_term_match
-from hestia_earth.utils.lookup import download_lookup, _get_single_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.tools import safe_parse_float
 
 from hestia_earth.models.log import logRequirements, debugMissingLookup, logShouldRun
@@ -57,9 +57,7 @@ def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, v
 
 def _get_factor_from_basinId(site: dict, aware_id: str):
     lookup_col = 'YR_IRRI' if site.get('siteType') in IRRIGATED_SITE_TYPES else 'YR_NONIRRI'
-    value = _get_single_table_value(
-        download_lookup(_AWARE_LOOKUP), column_name(AWARE_KEY), int(aware_id), column_name(lookup_col)
-    )
+    value = get_table_value(download_lookup(_AWARE_LOOKUP), AWARE_KEY, int(aware_id), lookup_col)
     debugMissingLookup(_AWARE_LOOKUP, AWARE_KEY, aware_id, lookup_col, value, model=MODEL, term=TERM_ID)
     return safe_parse_float(value, default=None)
 

hestia_earth/models/aware2_0/scarcityWeightedWaterUse.py

@@ -1,6 +1,6 @@
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_term_match
-from hestia_earth.utils.lookup import download_lookup, _get_single_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.tools import safe_parse_float
 
 from hestia_earth.models.log import logRequirements, debugMissingLookup, logShouldRun
@@ -67,10 +67,7 @@ def _lookup_column(site: dict):
 def _get_factor_from_basinId(site: dict, aware_id: str):
     lookup_col = _lookup_column(site)
     lookup = download_lookup(_AWARE_LOOKUP)
-    try:
-        value = _get_single_table_value(lookup, column_name(AWARE_KEY), int(aware_id), column_name(lookup_col))
-    except Exception:
-        value = None
+    value = get_table_value(lookup, AWARE_KEY, int(aware_id), lookup_col)
     debugMissingLookup(_AWARE_LOOKUP, AWARE_KEY, aware_id, lookup_col, value, model=MODEL, term=TERM_ID)
     return safe_parse_float(value, default=None)
 

hestia_earth/models/chaudharyBrooks2018/utils.py

@@ -1,4 +1,4 @@
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
+from hestia_earth.utils.lookup import download_lookup, get_table_value, extract_grouped_data
 from hestia_earth.utils.tools import safe_parse_float
 
 from hestia_earth.models.log import debugMissingLookup, logRequirements
@@ -8,7 +8,7 @@ from . import MODEL
 
 
 def _lookup_value(term_id: str, lookup_name: str, col_match: str, col_val: str, column: str):
-    value = get_table_value(download_lookup(lookup_name), col_match, col_val, column_name(column))
+    value = get_table_value(download_lookup(lookup_name), col_match, col_val, column)
     debugMissingLookup(lookup_name, col_match, col_val, column, value, model=MODEL, term=term_id)
     return value
 

hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py

@@ -1,5 +1,5 @@
 from itertools import chain
-from hestia_earth.utils.lookup import download_lookup, column_name, find_term_ids_by
+from hestia_earth.utils.lookup import download_lookup, find_term_ids_by
 from hestia_earth.utils.tools import list_sum, flatten
 
 from hestia_earth.models.log import logShouldRun, logRequirements, log_as_table
@@ -49,7 +49,8 @@ def get_all_non_renewable_terms(lookup_file_name: str, column: str) -> list:
     returns all non renewable term ids in lookup files like `electricity.csv` or `fuel.csv`
     """
     lookup = download_lookup(lookup_file_name)
-    return find_term_ids_by(lookup, column_name(column), True)
+
+    return find_term_ids_by(lookup, column, True)
 
 
 def _valid_resource_indicator(resource: dict) -> bool:

hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py

@@ -1,7 +1,8 @@
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
+from hestia_earth.utils.lookup import get_table_value, download_lookup
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, flatten
+from hestia_earth.utils.lookup import is_missing_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from . import MODEL
@@ -81,16 +82,22 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
                     "value": _node_value(resource_indicator),
                     "coefficient": get_table_value(
                         lookup=download_lookup(filename=f"{input.get('termType')}.csv"),
-                        col_match='termid',
+                        col_match='term.id',
                         col_match_with=input.get('@id'),
-                        col_val=column_name(LOOKUPS.get(input.get('termType'), ''))) if input else None
+                        col_val=LOOKUPS.get(input.get('termType', '')),
+                        default_value=None
+                    ) if input else None
                 } for input in resource_indicator['inputs'] or [{}]]
             for resource_indicator in emissions_resource_use
         ]
     )
-    valid_resources_with_cf = [em for em in resource_uses_unpacked if em['coefficient'] is not None
-                               and em['indicator-is-valid'] is True
-                               and em['indicator-input-is-valid'] is True]
+    valid_resources_with_cf = [
+        em for em in resource_uses_unpacked if all([
+            not is_missing_value(em['coefficient']),
+            em['indicator-is-valid'] is True,
+            em['indicator-input-is-valid'] is True,
+        ])
+    ]
 
     has_valid_input_requirements = all([
         all([

hestia_earth/models/ecoalimV9/utils.py

@@ -1,13 +1,13 @@
 import os
 from functools import lru_cache
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.tools import non_empty_list, safe_parse_float, omit
 
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.background_emissions import convert_background_lookup
 
-_LOOKUP_INDEX_KEY = column_name('ecoalimMappingName')
+_LOOKUP_INDEX_KEY = 'ecoalimMappingName'
 
 
 def get_input_mappings(model: str, input: dict):
@@ -58,7 +58,7 @@ def _cutoff_id(term_id: str, country_id: str = None, key_id: str = None):
 def cutoff_value(cutoff_lookup, term_id: str, country_id: str = None, key_id: str = None):
     cutoff_id = _cutoff_id(term_id=term_id, country_id=country_id, key_id=key_id)
     return None if cutoff_lookup is None else safe_parse_float(
-        get_table_value(cutoff_lookup, 'termid', cutoff_id, 'percentage'),
+        get_table_value(cutoff_lookup, 'term.id', cutoff_id, 'percentage'),
         default=None
     )
 

hestia_earth/models/ecoinventV3/utils.py

@@ -1,13 +1,13 @@
 from functools import lru_cache
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.lookup import column_name, load_lookup
+from hestia_earth.utils.lookup import load_lookup
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.data.ecoinventV3 import get_filepath
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.background_emissions import convert_background_lookup
 
-_LOOKUP_INDEX_KEY = column_name('ecoinventName')
+_LOOKUP_INDEX_KEY = 'ecoinventName'
 
 
 def get_input_mappings(model: str, input: dict):

hestia_earth/models/ecoinventV3AndEmberClimate/utils.py

@@ -1,4 +1,4 @@
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
+from hestia_earth.utils.lookup import download_lookup, get_table_value, extract_grouped_data
 from hestia_earth.utils.tools import safe_parse_float
 
 from hestia_earth.models.utils.cycle import cycle_end_year
@@ -14,7 +14,7 @@ def get_input_coefficient(model: str, cycle: dict, country_id: str, ecoinventNam
     # find the matching ember source with the ecoinventName.
     # example: "electricity, high voltage, electricity production, hard coal" > "Coal"
     ember_ecoinvent_lookup = download_lookup(EMBER_ECOINVENT_LOOKUP_NAME)
-    source_name = get_table_value(ember_ecoinvent_lookup, column_name('ecoinventName'), ecoinventName, 'ember')
+    source_name = get_table_value(ember_ecoinvent_lookup, 'ecoinventName', ecoinventName, 'ember')
 
     # find the ratio for the country / year
     data = get_region_lookup_value(REGION_EMBER_SOURCES_LOOKUP_NAME, country_id, source_name, model=model)

hestia_earth/models/emissionNotRelevant/__init__.py

@@ -1,5 +1,5 @@
 from hestia_earth.schema import NodeType, EmissionMethodTier, TermTermType
-from hestia_earth.utils.lookup import download_lookup, lookup_term_ids, lookup_columns, column_name
+from hestia_earth.utils.lookup import download_lookup, lookup_term_ids, lookup_columns
 from hestia_earth.utils.lookup_utils import is_in_system_boundary
 from hestia_earth.utils.tools import flatten
 
@@ -49,7 +49,7 @@ def _emission_ids():
 def _model_ids(lookup_suffix: str):
     return [
         col for col in lookup_columns(download_lookup(f"emission-model-{lookup_suffix}.csv"))
-        if col != column_name('term.id')
+        if col != 'term.id'
     ]
 
 

hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py

@@ -53,8 +53,7 @@ def _is_a_PEF_indicator(indicator: dict) -> bool:
 
 
 def _get_factor(term: dict, column: str) -> Optional[float]:
-    factor = get_lookup_value(term, column, model=MODEL, term=TERM_ID)
-    return float(factor) if factor is not None else None
+    return get_lookup_value(term, column, model=MODEL, term=TERM_ID)
 
 
 def _get_pef_method_model(term: dict) -> List[str]:

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py

@@ -1,8 +1,8 @@
 from typing import Tuple
-
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum
+from hestia_earth.utils.lookup import is_missing_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.indicator import _new_indicator
@@ -86,10 +86,13 @@ def _should_run(impact_assessment: dict) -> Tuple[bool, list]:
             for indicator in found_land_occupation_indicators
         ]) if found_land_occupation_indicators else False
 
-    valid_indicator_with_coef = [indicator for indicator in found_indicators_with_coefficient if
-                                 indicator['coefficient'] is not None and
-                                 indicator['area-by-year-is-valid'] and
-                                 indicator['area-unit-is-valid']]
+    valid_indicator_with_coef = [
+        indicator for indicator in found_indicators_with_coefficient if all([
+            not is_missing_value(indicator['coefficient']),
+            indicator['area-by-year-is-valid'],
+            indicator['area-unit-is-valid']
+        ])
+    ]
 
     has_land_occupation_indicators = bool(land_occupation_indicators)
 

hestia_earth/models/faostat2018/utils.py

@@ -1,6 +1,6 @@
 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_closest_date
+from hestia_earth.utils.lookup import download_lookup, get_table_value, extract_grouped_data_closest_date
 from hestia_earth.utils.tools import safe_parse_float, flatten, non_empty_list
 
 from hestia_earth.models.log import logger, debugMissingLookup, logRequirements, logShouldRun, debugValues, log_as_table
@@ -20,8 +20,8 @@ FAOSTAT_AREA_LOOKUP = 'region-faostatArea.csv'
 def get_liveAnimal_to_animalProduct_id(product_term_id: str, column: str, **log_args):
     lookup_name = 'liveAnimal.csv'
     lookup = download_lookup(lookup_name)
-    value = get_table_value(lookup, 'termid', product_term_id, column_name(column))
-    debugMissingLookup(lookup_name, 'termid', product_term_id, column, value, model=MODEL, **log_args)
+    value = get_table_value(lookup, 'term.id', product_term_id, column)
+    debugMissingLookup(lookup_name, 'term.id', product_term_id, column, value, model=MODEL, **log_args)
     return value
 
 

hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py

@@ -1,5 +1,5 @@
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
+from hestia_earth.utils.lookup import get_table_value, download_lookup, is_missing_value
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, omit, pick, unique_values
 from hestia_earth.utils.blank_node import group_by_keys
@@ -82,9 +82,10 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
             "value": _node_value(emission),
             "coefficient": get_table_value(
                 lookup=download_lookup(filename="waste.csv"),
-                col_match='termid',
+                col_match='term.id',
                 col_match_with=emission['key'].get('@id'),
-                col_val=column_name(emission['term']['@id'])
+                col_val=emission['term']['@id'],
+                default_value=None
             )
         } | pick(emission, ['key', 'inputs'])
         for emission in emissions
@@ -93,7 +94,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
 
     valid_emission_with_cf = [
         em for em in emissions_unpacked if all([
-            em['coefficient'] is not None,
+            not is_missing_value(em['coefficient']),
             em['key-is-valid'] is True
         ])
     ]

hestia_earth/models/geospatialDatabase/ecoClimateZone.py

@@ -1,5 +1,5 @@
 from hestia_earth.schema import MeasurementMethodClassification
-from hestia_earth.utils.lookup import download_lookup, _get_single_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.measurement import _new_measurement
@@ -44,7 +44,7 @@ def _measurement(site: dict, value: int):
 
 def _name(value: int):
     lookup = download_lookup(f"{TERM_ID}.csv")
-    return _get_single_table_value(lookup, column_name(TERM_ID), value, 'name')
+    return get_table_value(lookup, TERM_ID, value, 'name')
 
 
 def _run(site: dict):

hestia_earth/models/hestia/landCover_utils.py

@@ -3,7 +3,7 @@ from functools import lru_cache
 from collections import defaultdict
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.lookup import (
-    download_lookup, get_table_value, column_name, _is_missing_value, extract_grouped_data, lookup_columns
+    download_lookup, get_table_value, is_missing_value, extract_grouped_data, lookup_columns, lookup_term_ids
 )
 from hestia_earth.utils.tools import safe_parse_float
 
@@ -57,10 +57,6 @@ def _get_lookup_with_cache(lookup_term: dict, column: str):
 def _get_faostat_name(term: dict) -> str: return _get_lookup_with_cache(term, "cropGroupingFaostatArea")
 
 
-def _is_missing_or_none(value) -> bool:
-    return value is None or _is_missing_value(value)
-
-
 def _safe_divide(numerator, denominator, default=0) -> float:
     return default if not denominator else numerator / denominator
 
@@ -354,15 +350,15 @@ def _get_most_common_or_alphabetically_first(crop_terms: list) -> str:
     return sorted([term for term, freq in histogram.items() if freq == max_freq])[0]
 
 
+@lru_cache()
 def _get_complete_faostat_to_crop_mapping() -> dict:
     """Returns mapping in the format: {faostat_name: IPCC_LAND_USE_CATEGORY, ...}"""
     term_type = TermTermType.CROP.value
     lookup = download_lookup(f"{term_type}.csv")
+    term_ids = lookup_term_ids(lookup)
     mappings = defaultdict(list)
-    for crop_term_id in [row[0] for row in lookup]:
-        key = column_name(
-            get_table_value(lookup, 'termid', crop_term_id, column_name("cropGroupingFaostatArea"))
-        )
+    for crop_term_id in term_ids:
+        key = get_table_value(lookup, 'term.id', crop_term_id, "cropGroupingFaostatArea")
         if key:
             mappings[key].append(crop_ipcc_land_use_category(crop_term_id=crop_term_id, lookup_term_type="crop"))
     return {
@@ -409,7 +405,7 @@ def _get_sum_for_land_category(
     return sum([
         safe_parse_float(value=extract_grouped_data(table_value, str(year)), default=None)
         for fao_name, table_value in values.items()
-        if not _is_missing_or_none(extract_grouped_data(table_value, str(year))) and
+        if not is_missing_value(extract_grouped_data(table_value, str(year))) and
         fao_stat_to_ipcc_type[fao_name] == ipcc_land_use_category and
         (
             include_negatives or
@@ -426,8 +422,8 @@ def _get_sums_of_crop_expansion(country_id: str, year: int, include_negatives: b
     lookup = get_region_lookup(lookup_name=_LOOKUP_EXPANSION, term_id=country_id)
     columns = lookup_columns(lookup)
     values = {
-        name: get_table_value(lookup, 'termid', country_id, column_name(name))
-        for name in columns if name != "termid"
+        name: get_table_value(lookup, 'term.id', country_id, name)
+        for name in columns if name != 'term.id'
     }
 
     fao_stat_to_ipcc_type = _get_complete_faostat_to_crop_mapping()

hestia_earth/models/hestia/management.py

@@ -1,7 +1,7 @@
 from typing import List
 from datetime import timedelta, datetime
 from hestia_earth.schema import SchemaType, TermTermType, COMPLETENESS_MAPPING
-from hestia_earth.utils.lookup import column_name, get_table_value, download_lookup
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import safe_parse_float, flatten, is_number, is_boolean, pick
 from hestia_earth.utils.blank_node import get_node_value
@@ -117,9 +117,9 @@ def _get_cycle_duration(cycle: dict, land_cover_id: str = None):
     cycle_duration = cycle.get('cycleDuration')
     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'),
+        'landCoverTermId',
         land_cover_id,
-        column_name('maximumCycleDuration')
+        'maximumCycleDuration'
     ), default=None)
     return cycle_duration or lookup_value
 

hestia_earth/models/hestia/seed_emissions.py

@@ -1,7 +1,7 @@
 from functools import reduce
 from hestia_earth.schema import TermTermType, EmissionMethodTier, SiteSiteType
 from hestia_earth.utils.lookup import (
-    download_lookup, column_name, extract_grouped_data_closest_date, find_term_ids_by
+    download_lookup, extract_grouped_data_closest_date, find_term_ids_by
 )
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list, flatten, list_sum, safe_parse_float, omit
@@ -103,7 +103,7 @@ def _map_group_emissions(group_id: str, required_emission_term_ids: list, emissi
     lookup = download_lookup('emission.csv')
     emissions = list(filter(
         lambda id: id in required_emission_term_ids,
-        find_term_ids_by(lookup, column_name('inputProductionGroupId'), group_id)
+        find_term_ids_by(lookup, 'inputProductionGroupId', group_id)
     ))
     included_emissions = list(filter(lambda v: v in emission_ids, emissions))
     missing_emissions = list(filter(lambda v: v not in emission_ids, emissions))

hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -1,5 +1,5 @@
 from hestia_earth.schema import EmissionMethodTier
-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 find_primary_product, find_term_match
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
@@ -168,9 +168,12 @@ def _extract_groupped_data(value: str, DE: float, NDF: float, ionophore: bool, m
 
 def _get_lookup_value(lookup, term: dict, lookup_col: str, DE: float, NDF: float, ionophore: bool, milk_yield: float):
     term_id = term.get('@id')
-    value = get_table_value(lookup, 'termid', term_id, column_name(lookup_col)) if term_id else None
-    debugMissingLookup(f"{term.get('termType')}.csv", 'termid', term_id, lookup_col, value, model=MODEL, term=TERM_ID)
-    return value if value is None or ':' not in value else _extract_groupped_data(value, DE, NDF, ionophore, milk_yield)
+    value = get_table_value(lookup, 'term.id', term_id, lookup_col) if term_id else None
+    debugMissingLookup(f"{term.get('termType')}.csv", 'term.id', term_id, lookup_col, value, model=MODEL, term=TERM_ID)
+    return (
+        value if value is None or not isinstance(value, str) else
+        _extract_groupped_data(value, DE, NDF, ionophore, milk_yield)
+    )
 
 
 def _get_milk_yield(cycle: dict):
@@ -180,8 +183,8 @@ def _get_milk_yield(cycle: dict):
 
 def _get_DE_type(lookup, term_id: str, term_type: str):
     lookup_col = LOOKUPS.get(term_type, [None])[0]
-    value = get_table_value(lookup, 'termid', term_id, column_name(lookup_col)) if lookup_col else None
-    debugMissingLookup(f"{term_type}.csv", 'termid', term_id, lookup_col, value, model=MODEL, term=TERM_ID)
+    value = get_table_value(lookup, 'term.id', term_id, lookup_col) if lookup_col else None
+    debugMissingLookup(f"{term_type}.csv", 'term.id', term_id, lookup_col, value, model=MODEL, term=TERM_ID)
     return value
 
 
@@ -202,9 +205,9 @@ def _is_ionophore(cycle: dict, total_feed: float):
 
 def _get_default_values(lookup, term: dict):
     term_id = term.get('@id')
-    value = get_table_value(lookup, 'termid', term_id, column_name(LOOKUPS['liveAnimal'][3])) if term_id else None
-    min = get_table_value(lookup, 'termid', term_id, column_name(LOOKUPS['liveAnimal'][4])) if term_id else None
-    max = get_table_value(lookup, 'termid', term_id, column_name(LOOKUPS['liveAnimal'][5])) if term_id else None
+    value = get_table_value(lookup, 'term.id', term_id, LOOKUPS['liveAnimal'][3]) if term_id else None
+    min = get_table_value(lookup, 'term.id', term_id, LOOKUPS['liveAnimal'][4]) if term_id else None
+    max = get_table_value(lookup, 'term.id', term_id, LOOKUPS['liveAnimal'][5]) if term_id else None
     return {
         'value': safe_parse_float(value, default=None),
         'min': safe_parse_float(min, default=None),

hestia_earth/models/ipcc2019/ch4ToAirExcreta.py

@@ -94,8 +94,8 @@ def _get_excreta_b0(country: dict, input: dict):
 def _get_excretaManagement_MCF_from_lookup(term_id: str, ecoClimateZone: int, duration_key: DURATION):
     lookup_name = 'excretaManagement-ecoClimateZone-CH4conv.csv'
     lookup = download_lookup(lookup_name)
-    data_values = get_table_value(lookup, 'termid', term_id, str(ecoClimateZone))
-    debugMissingLookup(lookup_name, 'termid', term_id, ecoClimateZone, data_values, model=MODEL, term=TERM_ID)
+    data_values = get_table_value(lookup, 'term.id', term_id, str(ecoClimateZone))
+    debugMissingLookup(lookup_name, 'term.id', term_id, ecoClimateZone, data_values, model=MODEL, term=TERM_ID)
     return safe_parse_float(
         extract_grouped_data(data_values, duration_key.value)
         or extract_grouped_data(data_values, DEFAULT_DURATION.value),  # defaults to 12 months if no duration specified

hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -5,7 +5,7 @@ import numpy as np
 import numpy.typing as npt
 from typing import Any, Callable, Literal, Optional, TypedDict, Union
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, SiteSiteType
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.tools import safe_parse_float
 from hestia_earth.utils.stats import gen_seed, repeat_single, truncated_normal_1d
 from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
@@ -289,7 +289,7 @@ def _get_fuel_factor(fuel_category: FuelCategory) -> dict:
     lookup = download_lookup(LOOKUP_FILENAME)
 
     data = {
-        target: get_table_value(lookup, column_name("FuelCategory"), row, column_name(target))
+        target: get_table_value(lookup, "FuelCategory", row, target)
         for target in TARGET_DATA
     }
 

hestia_earth/models/ipcc2019/pastureGrass_utils.py

@@ -1,6 +1,6 @@
 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.lookup import download_lookup, get_table_value, extract_grouped_data
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import debugValues
@@ -33,7 +33,7 @@ def _get_activityCoefficient(animal: dict, systems: list) -> float:
 
     values = [(
         safe_parse_float(
-            get_table_value(lookup, 'termid', system.get('term', {}).get('@id'), column_name(term_id)),
+            get_table_value(lookup, 'term.id', system.get('term', {}).get('@id'), term_id),
             default=0
         ),
         list_sum(system.get('value', [0]))
@@ -153,7 +153,10 @@ def _get_pregnancy_ratio_per_birth(animal: dict, value: str) -> float:
 def _get_pregnancy_ratio(animal: dict) -> float:
     term = animal.get('term', {})
     value = get_lookup_value(term, 'ratioCPregnancyNetEnergyPregnancyIpcc2019', model=MODEL, model_key=MODEL_KEY)
-    return _get_pregnancy_ratio_per_birth(animal, value) if ';' in value else safe_parse_float(value, default=0)
+    return (
+        _get_pregnancy_ratio_per_birth(animal, value) if isinstance(value, str) and ';' in value else
+        safe_parse_float(value, default=0)
+    )
 
 
 def _calculate_NEp(cycle: dict, animal: dict, NEm: float) -> float:

hestia_earth/models/ipcc2019/utils.py

@@ -1,12 +1,12 @@
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import safe_parse_float
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 
 from hestia_earth.models.log import debugValues
 from hestia_earth.models.utils.input import get_total_irrigation_m3
 from hestia_earth.models.utils.cycle import get_ecoClimateZone
 from hestia_earth.models.utils.term import get_lookup_value, get_milkYield_terms
-from hestia_earth.models.utils.ecoClimateZone import get_ecoClimateZone_lookup_value
 from . import MODEL
 
 # From IPCC2019 Indirect N2O emission factor, in N [avg, min, max, std]
@@ -129,7 +129,8 @@ def _get_waterRegime_lookup(model_term_id: str, practice: dict, col: str):
 
 
 def _is_wet(ecoClimateZone: str = None):
-    return get_ecoClimateZone_lookup_value(ecoClimateZone, 'wet') == 1 if ecoClimateZone else None
+    lookup = download_lookup('ecoClimateZone.csv')
+    return None if ecoClimateZone is None else get_table_value(lookup, 'ecoClimateZone', int(ecoClimateZone), 'wet')
 
 
 def ecoClimate_factors(factors: dict, input_term_type: TermTermType = None, ecoClimateZone: str = None):

hestia_earth/models/linkedImpactAssessment/emissions.py

@@ -1,6 +1,6 @@
 from functools import reduce
 from hestia_earth.schema import EmissionMethodTier
-from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
+from hestia_earth.utils.lookup import download_lookup, get_table_value
 from hestia_earth.utils.tools import flatten, list_sum, pick
 from hestia_earth.utils.blank_node import group_by_keys
 
@@ -100,7 +100,7 @@ def _run_emission(cycle: dict, emission_term_id: str, data: dict):
 
 def _emission_group(term_id: str):
     lookup = download_lookup('emission.csv', True)
-    return get_table_value(lookup, 'termid', term_id, column_name('inputProductionGroupId'))
+    return get_table_value(lookup, 'term.id', term_id, 'inputProductionGroupId')
 
 
 def _group_emissions(impact: dict):