hestia-earth-models 0.65.8__tar.gz → 0.65.10__tar.gz

{hestia_earth_models-0.65.8 → hestia_earth_models-0.65.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia_earth_models
-Version: 0.65.8
+Version: 0.65.10
 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

{hestia_earth_models-0.65.8 → hestia_earth_models-0.65.10}/hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py

@@ -100,8 +100,8 @@ def download_all_non_renewable_terms(lookup_file_name: str) -> list:
 
 def _valid_resource_indicator(resource: dict) -> bool:
     return len(resource.get('inputs', [])) == 1 and \
-           isinstance(_node_value(resource), (int, float)) and \
-           _node_value(resource) > 0
+        isinstance(_node_value(resource), (int, float)) and \
+        _node_value(resource) > 0
 
 
 def _valid_input(input: dict) -> bool:
@@ -166,9 +166,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
                     all_inputs_have_valid_mj_value=all_inputs_have_valid_mj_value,
                     energy_resources_used=log_as_table(resource_uses_unpacked))
 
-    should_run = has_resource_use_entries is False or all([has_resource_use_entries,
-                                                           has_valid_input_requirements,
-                                                           all_inputs_have_valid_mj_value])
+    should_run = all([has_resource_use_entries, has_valid_input_requirements, all_inputs_have_valid_mj_value])
 
     logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
     return should_run, valid_energy_resources_in_mj

{hestia_earth_models-0.65.8 → hestia_earth_models-0.65.10}/hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py

@@ -125,7 +125,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
                     resource_uses=log_as_table(resource_uses_unpacked)
                     )
 
-    should_run = has_valid_input_requirements
+    should_run = all([has_valid_input_requirements, has_resource_use_entries])
 
     logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
     return should_run, valid_resources_with_cf