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

hestia_earth/models/utils/emission.py

@@ -3,7 +3,7 @@ from typing import Optional, Union
 from hestia_earth.schema import EmissionMethodTier, SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
-from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
+
 
 from . import _term_id, _include_methodModel, flatten_args
 from .blank_node import find_terms_value
@@ -19,13 +19,6 @@ def _new_emission(term, model=None):
     return _include_methodModel(node, model)
 
 
-def is_in_system_boundary(term_id: str):
-    lookup = download_lookup('emission.csv')
-    value = get_table_value(lookup, 'termid', term_id, column_name('inHestiaDefaultSystemBoundary'))
-    # handle numpy boolean
-    return not (not value)
-
-
 def get_nh3_no3_nox_to_n(cycle: dict, nh3_term_id: str, no3_term_id: str, nox_term_id: str, allow_none: bool = False):
     default_value = 0 if allow_none else None
 

hestia_earth/models/utils/management.py

@@ -0,0 +1,11 @@
+from hestia_earth.schema import SchemaType
+from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.api import download_hestia
+
+from . import _term_id, _include_model
+
+
+def _new_management(term, model=None):
+    node = {'@type': SchemaType.MANAGEMENT.value}
+    node['term'] = linked_node(term if isinstance(term, dict) else download_hestia(_term_id(term)))
+    return _include_model(node, model)

hestia_earth/models/utils/pesticideAI.py

@@ -22,29 +22,23 @@ def impact_lookup_value(model: str, term_id: str, impact_assessment: dict, looku
         get_pesticides_from_inputs(cycle)
     has_pesticides_inputs = len(pesticides) > 0
     pesticides_total_value = convert_value_from_cycle(
-        product, cycle_lookup_value(model, term_id, cycle, pesticides, lookup_col), model=model, term_id=term_id
-    ) if has_pesticides_inputs else None
+        product=product,
+        value=cycle_lookup_value(model, term_id, cycle, pesticides, lookup_col),
+        default=None,
+        model=model,
+        term_id=term_id
+    ) if has_pesticides_inputs else 0
 
     logRequirements(impact_assessment, model=model, term=term_id,
+                    lookup_col=lookup_col,
                     term_type_pesticideVeterinaryDrug_complete=is_complete,
                     has_pesticides_inputs=has_pesticides_inputs,
                     pesticides_total_value=pesticides_total_value)
 
-    should_run = any([
-        is_complete and not has_pesticides_inputs,
-        is_complete and pesticides_total_value is not None
+    should_run = is_complete and any([
+        len(pesticides) == 0,
+        pesticides_total_value is not None
     ])
     logShouldRun(impact_assessment, model, term_id, should_run)
 
-    return (pesticides_total_value or 0) if should_run else None
-
-
-def impact_value_set_none(impact_assessment: dict):
-    # set Indicator to None for those that only use data from the Cycle
-    completeness = impact_assessment.get('cycle', {}).get('completeness', {})
-    product = get_product(impact_assessment)
-
-    return not completeness.get('pesticideVeterinaryDrug', False) and any([
-        not completeness.get('product', False),
-        product.get('economicValueShare') is None
-    ])
+    return pesticides_total_value if should_run else None

hestia_earth/models/utils/term.py

@@ -5,7 +5,8 @@ from hestia_earth.utils.lookup import download_lookup, get_table_value, column_n
 from .constant import Units
 from ..log import debugMissingLookup
 
-LIMIT = 1000
+# avoid running scroll
+LIMIT = 9999
 
 
 def get_lookup_value(lookup_term: dict, column: str, skip_debug: bool = False, **log_args):

hestia_earth/models/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.12
+Version: 0.64.13
 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
@@ -11,14 +11,14 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 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.10
+Requires-Dist: hestia-earth-schema==30.*
+Requires-Dist: hestia-earth-utils>=0.13.11
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0
 Requires-Dist: pydash
 Provides-Extra: spatial
-Requires-Dist: hestia-earth.earth-engine>=0.4.7; extra == "spatial"
+Requires-Dist: hestia-earth-earth-engine>=0.4.7; extra == "spatial"
 
 # HESTIA Engine Models