hestia-earth-models 0.75.0__py3-none-any.whl → 0.75.2__py3-none-any.whl

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):