hestia-earth-models 0.65.8__py3-none-any.whl → 0.65.10__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py +3 -5
  2. hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py +1 -1
  3. hestia_earth/models/config/Cycle.json +368 -388
  4. hestia_earth/models/config/Site.json +18 -0
  5. hestia_earth/models/config/__init__.py +6 -0
  6. hestia_earth/models/config/run-calculations.json +5 -5
  7. hestia_earth/models/config/trigger-calculations.json +1 -1
  8. hestia_earth/models/cycle/materialAndSubstrate.py +1 -1
  9. hestia_earth/models/cycle/milkYield.py +9 -6
  10. hestia_earth/models/cycle/product/economicValueShare.py +8 -4
  11. hestia_earth/models/cycle/product/revenue.py +11 -7
  12. hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py +12 -4
  13. hestia_earth/models/faostat2018/product/price.py +1 -1
  14. hestia_earth/models/geospatialDatabase/utils.py +22 -17
  15. hestia_earth/models/hestia/landCover.py +2 -2
  16. hestia_earth/models/mocking/search-results.json +843 -843
  17. hestia_earth/models/site/defaultMethodClassification.py +35 -0
  18. hestia_earth/models/site/defaultMethodClassificationDescription.py +39 -0
  19. hestia_earth/models/site/management.py +34 -23
  20. hestia_earth/models/utils/impact_assessment.py +5 -3
  21. hestia_earth/models/utils/lookup.py +3 -3
  22. hestia_earth/models/version.py +1 -1
  23. {hestia_earth_models-0.65.8.dist-info → hestia_earth_models-0.65.10.dist-info}/METADATA +2 -2
  24. {hestia_earth_models-0.65.8.dist-info → hestia_earth_models-0.65.10.dist-info}/RECORD +39 -35
  25. tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py +2 -16
  26. tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py +2 -16
  27. tests/models/edip2003/test_ozoneDepletionPotential.py +0 -13
  28. tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py +8 -15
  29. tests/models/hestia/test_landCover.py +2 -1
  30. tests/models/ipcc2021/test_gwp100.py +0 -9
  31. tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py +0 -14
  32. tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py +0 -14
  33. tests/models/site/test_defaultMethodClassification.py +18 -0
  34. tests/models/site/test_defaultMethodClassificationDescription.py +18 -0
  35. tests/models/site/test_management.py +2 -1
  36. tests/models/test_config.py +11 -2
  37. {hestia_earth_models-0.65.8.dist-info → hestia_earth_models-0.65.10.dist-info}/LICENSE +0 -0
  38. {hestia_earth_models-0.65.8.dist-info → hestia_earth_models-0.65.10.dist-info}/WHEEL +0 -0
  39. {hestia_earth_models-0.65.8.dist-info → hestia_earth_models-0.65.10.dist-info}/top_level.txt +0 -0
hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py CHANGED
@@ -100,8 +100,8 @@ def download_all_non_renewable_terms(lookup_file_name: str) -> list:
100
100
 
101
101
  def _valid_resource_indicator(resource: dict) -> bool:
102
102
  return len(resource.get('inputs', [])) == 1 and \
103
- isinstance(_node_value(resource), (int, float)) and \
104
- _node_value(resource) > 0
103
+ isinstance(_node_value(resource), (int, float)) and \
104
+ _node_value(resource) > 0
105
105
 
106
106
 
107
107
  def _valid_input(input: dict) -> bool:
@@ -166,9 +166,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
166
166
  all_inputs_have_valid_mj_value=all_inputs_have_valid_mj_value,
167
167
  energy_resources_used=log_as_table(resource_uses_unpacked))
168
168
 
169
- should_run = has_resource_use_entries is False or all([has_resource_use_entries,
170
- has_valid_input_requirements,
171
- all_inputs_have_valid_mj_value])
169
+ should_run = all([has_resource_use_entries, has_valid_input_requirements, all_inputs_have_valid_mj_value])
172
170
 
173
171
  logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
174
172
  return should_run, valid_energy_resources_in_mj
hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py CHANGED
@@ -125,7 +125,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
125
125
  resource_uses=log_as_table(resource_uses_unpacked)
126
126
  )
127
127
 
128
- should_run = has_valid_input_requirements
128
+ should_run = all([has_valid_input_requirements, has_resource_use_entries])
129
129
 
130
130
  logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
131
131
  return should_run, valid_resources_with_cf