PyPI - hestia-earth-models - Versions diffs - 0.54.2__py3-none-any.whl → 0.55.0__py3-none-any.whl - Mend

hestia-earth-models 0.54.2py3-none-any.whl → 0.55.0py3-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.

Potentially problematic release.

This version of hestia-earth-models might be problematic. Click here for more details.

Files changed (91) hide show

hestia_earth/models/cycle/completeness/{other.py → seed.py} RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Completeness Other
+Completeness Seed
 This model checks if we have the requirements below and updates the
-[Data Completeness](https://hestia.earth/schema/Completeness#other) value.
+[Data Completeness](https://hestia.earth/schema/Completeness#seed) value.
 """
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_term_match, find_primary_product
@@ -13,7 +13,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.other": "False",
+        "completeness.seed": "False",
         "inputs": [
             {"@type": "Input", "value": "", "term.@id": ["seed", "saplings"]}
         ],
@@ -25,13 +25,13 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Completeness": {
-        "other": ""
+        "seed": ""
     }
 }
 LOOKUPS = {
     "crop": "isPlantation"
 }
-MODEL_KEY = 'other'
+MODEL_KEY = 'seed'
 ALLOWED_SITE_TYPES = [
     SiteSiteType.CROPLAND.value,
     SiteSiteType.GLASS_OR_HIGH_ACCESSIBLE_COVER.value

hestia_earth/models/cycle/completeness/{soilAmendments.py → soilAmendment.py} RENAMED Viewed

@@ -2,7 +2,7 @@
 Completeness Soil Amendments
 This model checks if we have the requirements below and updates the
-[Data Completeness](https://hestia.earth/schema/Completeness#soilAmendments) value.
+[Data Completeness](https://hestia.earth/schema/Completeness#soilAmendment) value.
 """
 from hestia_earth.models.log import logRequirements
 from hestia_earth.models.utils import is_from_model
@@ -11,7 +11,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.soilAmendments": "False",
+        "completeness.soilAmendment": "False",
         "endDate": "",
         "site": {
             "@type": "Site",
@@ -21,10 +21,10 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Completeness": {
-        "soilAmendments": ""
+        "soilAmendment": ""
     }
 }
-MODEL_KEY = 'soilAmendments'
+MODEL_KEY = 'soilAmendment'
 def run(cycle: dict):

hestia_earth/models/cycle/product/economicValueShare.py CHANGED Viewed

@@ -30,7 +30,7 @@ REQUIREMENTS = {
             "currency": ""
         }],
         "optional": {
-            "completeness.products": ""
+            "completeness.product": ""
         }
     }
 }
@@ -54,7 +54,7 @@ def _product(product: dict, value: float):
     return {**product, MODEL_KEY: value}
-def _is_complete(cycle: dict): return cycle.get('completeness', {}).get('products', False)
+def _is_complete(cycle: dict): return cycle.get('completeness', {}).get('product', False)
 def _no_yield(product): return list_sum(product.get('value', [-1]), -1) == 0

hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/geospatialDatabase/drainageClass.py CHANGED Viewed

@@ -24,11 +24,11 @@ RETURNS = {
 }
 TERM_ID = 'drainageClass'
 EE_PARAMS = {
-    'collection': 'drainage-xy1',
+    'collection': 'DRAINAGE_v2',
     'ee_type': 'raster',
     'reducer': 'mode'
 }
-BIBLIO_TITLE = 'Harmonized World Soil Database Version 1.2. Food and Agriculture Organization of the United Nations (FAO).'  # noqa: E501
+BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 def _measurement(site: dict, value: float):

hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py CHANGED Viewed

@@ -40,7 +40,9 @@ def _emission(value: float):
 def _get_lime_values(cycle: dict, inputs: list):
     # TODO: use lookup table
     values = [convert_to_unit(i, Units.KG_CO2) for i in inputs if len(i.get('value', [])) > 0]
-    return [0] if len(values) == 0 and _is_term_type_complete(cycle, {'termType': 'soilAmendments'}) else values
+    return [0] if (
+        len(values) == 0 and _is_term_type_complete(cycle, {'termType': TermTermType.SOILAMENDMENT.value})
+    ) else values
 def _run(CaCO3_values: list, MgCO3_values: list):

hestia_earth/models/ipcc2019/organicCarbonPerHa.py CHANGED Viewed

@@ -178,7 +178,7 @@ PROPERTY_TERM_IDS = [
 CARBON_SOURCE_TERM_TYPES = [
     TermTermType.ORGANICFERTILISER.value,
     TermTermType.SOILAMENDMENT.value,
-    TermTermType.OTHER.value
+    TermTermType.SEED.value
 ]
 PERCENT_THRESHOLD = 30
@@ -1541,7 +1541,7 @@ def _check_consecutive(ints: list[int]) -> bool:
     bool
         Whether or not the list of integers is consecutive.
     """
-    range_list = list(range(min(ints), max(ints)+1))
+    range_list = list(range(min(ints), max(ints)+1)) if ints else []
     return all(a == b for a, b in zip(ints, range_list))
@@ -1941,38 +1941,37 @@ def _should_run_tier_2(
         grouped_data.items()
     ))
-    start_year = list(complete_data.keys())[0]
-    end_year = list(complete_data.keys())[-1]
+    timestamps = list(complete_data)
+    start_year = timestamps[0] if timestamps else 0
+    end_year = timestamps[-1] if timestamps else 0
     measurements = site.get('measurements', [])
-    sand_content_data = most_relevant_measurement_value_by_depth_and_date(
+    sand_content_value, _ = most_relevant_measurement_value_by_depth_and_date(
         measurements,
         SAND_CONTENT_TERM_ID,
         f"{start_year}-12-31",
         DEPTH_UPPER,
         DEPTH_LOWER,
         depth_strict=False
-    )
-    sand_content = sand_content_data[0]/100 if sand_content_data else None
+    ) if timestamps else (None, None)
+    sand_content = sand_content_value/100 if sand_content_value else None
-    initial_soc_stock_data = most_relevant_measurement_value_by_depth_and_date(
+    initial_soc_stock_value, initial_soc_stock_date = most_relevant_measurement_value_by_depth_and_date(
         measurements,
         TERM_ID,
         f"{end_year}-12-31",
         DEPTH_UPPER,
         DEPTH_LOWER,
         depth_strict=True
-    )
+    ) if timestamps else (None, None)
-    run_with_initial_soc_stock = bool(initial_soc_stock_data)
+    run_with_initial_soc_stock = bool(initial_soc_stock_value and initial_soc_stock_date)
-    initial_soc_stock = initial_soc_stock_data[0] if run_with_initial_soc_stock else None
-    initial_soc_stock_date = initial_soc_stock_data[1] if run_with_initial_soc_stock else None
     run_in_period = (
         int(abs(diff_in_years(f"{start_year}-12-31", initial_soc_stock_date)) + 1)
         if run_with_initial_soc_stock else MIN_RUN_IN_PERIOD
-    )
+    ) if timestamps else 0
     timestamps = list(complete_data.keys())
     temperatures = [complete_data[year][_InnerKey.TEMPERATURES] for year in timestamps]
@@ -1988,7 +1987,7 @@ def _should_run_tier_2(
         should_run_t,
         should_run_w,
         should_run_c,
-        0 < sand_content <= 1,
+        sand_content is not None and 0 < sand_content <= 1,
         run_in_period >= MIN_RUN_IN_PERIOD,
         len(timestamps) >= run_in_period,
         check_cycle_site_ids_identical(cycles),
@@ -2017,7 +2016,7 @@ def _should_run_tier_2(
         sand_content,
         is_irrigateds,
         run_in_period,
-        initial_soc_stock
+        initial_soc_stock_value
     )

hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityNonCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffects100Years/damageToMarineEcosystemsMarineEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthHumanToxicityCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthHumanToxicityNonCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffectsInfinite/damageToMarineEcosystemsMarineEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactAllEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthHumanToxicityCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthHumanToxicityNonCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffects100Years/damageToMarineEcosystemsMarineEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthHumanToxicityCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthHumanToxicityNonCancerogenic.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToMarineEcosystemsMarineEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py CHANGED Viewed

@@ -6,7 +6,7 @@ REQUIREMENTS = {
     "ImpactAssessment": {
         "cycle": {
             "@type": "Cycle",
-            "completeness.pesticidesAntibiotics": "True",
+            "completeness.pesticideVeterinaryDrug": "True",
             "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
         }
     }

hestia-earth-models 0.54.2__py3-none-any.whl → 0.55.0__py3-none-any.whl

Potentially problematic release.

hestia-earth-models 0.54.2py3-none-any.whl → 0.55.0py3-none-any.whl