hestia-earth-models 0.66.0__py3-none-any.whl → 0.67.0__py3-none-any.whl

hestia_earth/models/cycle/input/hestiaAggregatedData.py

@@ -77,19 +77,22 @@ def _run_seed(cycle: dict, primary_product: dict, seed_input: dict, product_term
     # to avoid double counting seed => aggregated impact => seed, we need to get the impact of the previous decade
     # if the data does not exist, use the aggregated impact of generic crop instead
     date = aggregated_end_date(cycle.get('endDate'))
-    match_end_date = [
-        {'match': {'endDate': date - 10}}
-    ]
+    match_end_date = [{'match': {'endDate': date - 10}}]
+    default_product = get_generic_crop()
 
-    impact = find_closest_impact(cycle, date, {'term': product}, region, country, match_end_date) or \
-        find_closest_impact(cycle, date, primary_product, region, country, match_end_date) or \
-        find_closest_impact(cycle, date, {'term': get_generic_crop()}, region, country)
+    impact = (
+        find_closest_impact(cycle, date, product, region, country, match_end_date) or
+        find_closest_impact(cycle, date, primary_product.get('term', {}), region, country, match_end_date) or
+        find_closest_impact(cycle, date, default_product, region, country)
+    )
 
+    search_by_product_term_id = (product or primary_product or default_product).get('@id')
+    search_by_region_id = (region or country or {}).get('@id') or 'region-world'
     debugValues(cycle, model=MODEL_ID, term=seed_input.get('term', {}).get('@id'), key=MODEL_KEY,
-                input_region=(region or {}).get('@id'),
-                input_country=(country or {}).get('@id'),
-                date=date,
-                impact=(impact or {}).get('@id'))
+                search_by_product_term_id=search_by_product_term_id,
+                search_by_region_id=search_by_region_id,
+                search_by_end_date=str(date),
+                impact_assessment_id_found=(impact or {}).get('@id'))
 
     return seed_input | {MODEL_KEY: linked_node(impact), 'impactAssessmentIsProxy': True} if impact else None
 

hestia_earth/models/{environmentalFootprintV3 → environmentalFootprintV3_1}/__init__.py

@@ -1,13 +1,14 @@
-from os.path import dirname, abspath
 import sys
 from importlib import import_module
+from os.path import dirname, abspath
 
 from hestia_earth.models.utils.blank_node import run_if_required
 
 CURRENT_DIR = dirname(abspath(__file__)) + '/'
 sys.path.append(CURRENT_DIR)
-MODEL = 'environmentalFootprintV3'
-PKG = '.'.join(['hestia_earth', 'models', MODEL])
+MODEL = 'environmentalFootprintV3-1'
+MODEL_FOLDER = MODEL.replace('-', '_')
+PKG = '.'.join(['hestia_earth', 'models', MODEL_FOLDER])
 
 
 def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py

@@ -0,0 +1,36 @@
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
+from hestia_earth.models.utils.indicator import _new_indicator
+from . import MODEL
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "emissionsResourceUse": [{"@type": "Indicator", "value": "", "term.termType": "emission"}]
+    }
+}
+
+RETURNS = {
+    "Indicator": {
+        "value": ""
+    }
+}
+
+LOOKUPS = {
+    "emission": "nEqMarineEutrophicationEnvironmentalFootprintV3"
+}
+
+TERM_ID = 'marineEutrophicationPotential'
+
+
+def _indicator(value: float):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    return indicator
+
+
+def run(impact_assessment: dict):
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    value=value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return _indicator(value) if value is not None else None

hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py

@@ -0,0 +1,40 @@
+from hestia_earth.models.log import logRequirements, logShouldRun
+from . import MODEL
+from ..utils.impact_assessment import impact_country_value
+from ..utils.indicator import _new_indicator
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "emissionsResourceUse": [{"@type": "Indicator",
+                                  "term.@id": "freshwaterWithdrawalsDuringCycle",
+                                  "value": ""
+                                  }],
+        "optional": {"country": {"@type": "Term", "termType": "region"}}
+    }
+}
+
+LOOKUPS = {
+    "region-resourceUse-environmentalFootprintV31WaterUse": ""
+}
+
+RETURNS = {
+    "Indicator": {
+        "value": ""
+    }
+}
+TERM_ID = 'scarcityWeightedWaterUse'
+
+
+def _indicator(value: float):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    return indicator
+
+
+def run(impact_assessment: dict):
+    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
+                                 country_fallback=True)
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    value=value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/impact_assessment/product/value.py

@@ -25,7 +25,7 @@ MODEL_KEY = 'value'
 
 
 def _run(impact: dict, product: dict):
-    return {**impact.get('product'), MODEL_KEY: product.get(MODEL_KEY, [])}
+    return impact.get('product') | {MODEL_KEY: product.get(MODEL_KEY, [])}
 
 
 def _should_run(impact: dict):

hestia_earth/models/ipcc2019/aboveGroundBiomass.py

@@ -170,7 +170,7 @@ def _should_run(site: dict) -> tuple[bool, dict, dict]:
     inventory = _compile_inventory(land_cover) if should_compile_inventory else {}
     kwargs = {
         "eco_climate_zone": eco_climate_zone,
-        "seed": gen_seed(site)
+        "seed": gen_seed(site, MODEL, TERM_ID)
     }
 
     logRequirements(

hestia_earth/models/ipcc2019/belowGroundBiomass.py

@@ -167,7 +167,7 @@ def _should_run(site: dict) -> tuple[bool, dict, dict]:
     inventory = _compile_inventory(land_cover) if should_compile_inventory else {}
     kwargs = {
         "eco_climate_zone": eco_climate_zone,
-        "seed": gen_seed(site)
+        "seed": gen_seed(site, MODEL, TERM_ID)
     }
 
     logRequirements(

hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py

@@ -38,6 +38,7 @@ from hestia_earth.models.utils.time_series import (
 )
 
 from .utils import check_consecutive
+from . import MODEL
 
 _ITERATIONS = 10000
 _MAX_CORRELATION = 1
@@ -424,7 +425,7 @@ def create_should_run_function(
 
         land_cover_nodes = get_valid_management_nodes_func(site)
 
-        seed = gen_seed(site)  # All cycles linked to the same site should be consistent
+        seed = gen_seed(site, MODEL, carbon_stock_term_id)  # All cycles linked to the same site should be consistent
         rng = random.default_rng(seed)
 
         should_compile_inventory, should_compile_logs = should_compile_inventory_func(

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py

@@ -41,6 +41,7 @@ from .organicCarbonPerHa_utils import (
     sample_plus_minus_error, sample_plus_minus_uncertainty, SITE_TYPE_TO_IPCC_LAND_USE_CATEGORY,
     SUPER_MAJORITY_AREA_THRESHOLD, STATS_DEFINITION
 )
+from . import MODEL
 
 _LOOKUPS = {
     "crop": "IPCC_LAND_USE_CATEGORY",
@@ -555,7 +556,7 @@ def should_run(site: dict) -> tuple[bool, dict, dict]:
     )
 
     kwargs = {
-        "seed": gen_seed(site),
+        "seed": gen_seed(site, MODEL, _TERM_ID),
         "eco_climate_zone": eco_climate_zone,
         "ipcc_soil_category": ipcc_soil_category,
     }

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py

@@ -41,6 +41,7 @@ from .organicCarbonPerHa_utils import (
     IpccLandUseCategory, IpccManagementCategory, is_cover_crop, MIN_AREA_THRESHOLD, MIN_YIELD_THRESHOLD,
     sample_constant, sample_plus_minus_uncertainty, sample_truncated_normal, STATS_DEFINITION
 )
+from . import MODEL
 
 _LOOKUPS = {
     "crop": "IPCC_LAND_USE_CATEGORY",
@@ -412,7 +413,7 @@ def should_run(site: dict) -> tuple[bool, dict, dict]:
         _compile_inventory(cycles, measurement_nodes)
         if should_compile_inventory else ({}, {})
     )
-    kwargs["seed"] = gen_seed(site)
+    kwargs["seed"] = gen_seed(site, MODEL, _TERM_ID)
 
     valid_years = [year for year, group in inventory.items() if group.get(_InventoryKey.SHOULD_RUN)]