hestia-earth-models 0.69.1__py3-none-any.whl → 0.70.1__py3-none-any.whl

hestia_earth/models/aware/scarcityWeightedWaterUse.py

@@ -74,7 +74,7 @@ def _get_factor_from_region(impact_assessment: dict, site: dict):
     return safe_parse_float(value, None)
 
 
-def _run(impact_assessment: dict):
+def run(impact_assessment: dict):
     cycle = impact_assessment.get('cycle', {})
     product = get_product(impact_assessment)
     fresh_water = emission_value(impact_assessment, 'freshwaterWithdrawalsDuringCycle')
@@ -87,26 +87,18 @@ def _run(impact_assessment: dict):
         impact_assessment, product, sum_input_impacts(cycle.get('inputs', []), TERM_ID), model=MODEL, term_id=TERM_ID
     )
 
-    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
-                    fresh_water=fresh_water,
-                    aware_id=aware_id,
-                    factor=factor,
-                    inputs_value=inputs_value)
-
     value = sum_values([
         multiply_values([fresh_water, factor]),
         inputs_value
     ])
-    return _indicator(value) if value is not None else None
 
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    fresh_water=fresh_water,
+                    aware_id=aware_id,
+                    factor=factor,
+                    inputs_value=inputs_value)
 
-def _should_run(impact_assessment: dict):
-    site = get_site(impact_assessment)
-    # does not run without a site as data is geospatial
-    should_run = all([site])
+    should_run = all([value is not None])
     logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
-    return should_run
-
 
-def run(impact_assessment: dict):
-    return _run(impact_assessment) if _should_run(impact_assessment) else None
+    return [_indicator(value)] if should_run else []

hestia_earth/models/cache_sites.py

@@ -1,12 +1,13 @@
 from functools import reduce
 from enum import Enum
 from pydash.objects import merge
-from hestia_earth.utils.api import download_hestia
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.tools import flatten, non_empty_list
 
 from .log import logger
 from .utils import CACHE_KEY, cached_value
 from .utils.site import CACHE_YEARS_KEY
+from .utils.term import download_term
 from .site.pre_checks.cache_geospatialDatabase import (
     list_vectors, list_rasters, cache_site_results, _should_run
 )
@@ -92,7 +93,7 @@ def _should_preload_region_area_size(site: dict): return not has_coordinates(sit
 
 def _preload_regions_area_size(sites: dict):
     region_ids = set(map(_site_gadm_id, filter(_should_preload_region_area_size, sites)))
-    return {term_id: download_hestia(term_id).get('area') for term_id in region_ids}
+    return {term_id: download_term(term_id, TermTermType.REGION).get('area') for term_id in region_ids}
 
 
 def _group_sites(sites: dict, check_has_cache: bool = True):

hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py

@@ -17,12 +17,13 @@ REQUIREMENTS = {
                 "term.@id": ["resourceUseEnergyDepletionInputsProduction", "resourceUseEnergyDepletionDuringCycle"],
                 "term.units": "MJ",
                 "value": "> 0",
-                "inputs":
+                "inputs": [
                     {
                         "@type": "Input",
                         "term.name": "non-renewable\" energy terms only,\"",
                         "term.termType": ["fuel", "electricity"]
                     }
+                ]
             }
         ]
     }

hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py

@@ -14,10 +14,11 @@ REQUIREMENTS = {
             {
                 "@type": "Indicator", "value": "", "term.termType": "resourceUse",
                 "term.@id": ["resourceUseMineralsAndMetalsInputsProduction", "resourceUseMineralsAndMetalsDuringCycle"],
-                "inputs": {
+                "inputs": [{
                     "@type": "Term",
                     "term.units": "kg",
-                    "term.termType": ["material", "soilAmendment", "otherInorganicChemical"]}
+                    "term.termType": ["material", "soilAmendment", "otherInorganicChemical"]
+                }]
             }]
     }
 }

hestia_earth/models/config/Cycle.json

@@ -28,7 +28,7 @@
     },
     {
       "key": "practices",
-      "model": "cycle",
+      "model": "hestia",
       "value": "croppingIntensity",
       "runStrategy": "add_blank_node_if_missing",
       "mergeStrategy": "list",
@@ -93,7 +93,7 @@
       },
       {
         "key": "inputs",
-        "model": "cycle",
+        "model": "hestia",
         "value": "materialAndSubstrate",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -103,7 +103,7 @@
     [
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "residueBurnt",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -111,7 +111,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "residueIncorporated",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -119,7 +119,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "residueLeftOnField",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -127,7 +127,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "residueRemoved",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -169,14 +169,6 @@
     {
       "key": "practices",
       "model": "hestia",
-      "value": "residueRemoved",
-      "runStrategy": "add_blank_node_if_missing",
-      "mergeStrategy": "list",
-      "stage": 1
-    },
-    {
-      "key": "practices",
-      "model": "cycle",
       "value": "cropResidueManagement",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -192,7 +184,7 @@
     },
     {
       "key": "products",
-      "model": "cycle",
+      "model": "hestia",
       "value": "aboveGroundCropResidueTotal",
       "runStrategy": "add_blank_node_if_missing",
       "mergeStrategy": "list",
@@ -224,7 +216,7 @@
     },
     {
       "key": "products",
-      "model": "koble2014",
+      "model": "hestia",
       "value": "aboveGroundCropResidue",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -238,6 +230,40 @@
       "mergeStrategy": "list",
       "stage": 1
     },
+    [
+      {
+        "key": "practices",
+        "model": "hestia",
+        "value": "residueBurnt",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "hestia",
+        "value": "residueIncorporated",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "hestia",
+        "value": "residueLeftOnField",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "hestia",
+        "value": "residueRemoved",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      }
+    ],
     {
       "key": "products",
       "model": "ipcc2006",
@@ -289,7 +315,7 @@
     [
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "longFallowRatio",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -297,7 +323,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "irrigatedTypeUnspecified",
         "runStrategy": "add_blank_node_if_missing",
         "runArgs": {
@@ -308,7 +334,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "unknownPreSeasonWaterRegime",
         "runStrategy": "add_blank_node_if_missing",
         "runArgs": {
@@ -319,7 +345,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "stockingDensityAnimalHousingAverage",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -407,7 +433,7 @@
       },
       {
         "key": "inputs",
-        "model": "cycle",
+        "model": "hestia",
         "value": "inorganicFertiliser",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -560,7 +586,7 @@
     [
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "coldCarcassWeightPerHead",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -568,7 +594,7 @@
       },
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "coldDressedCarcassWeightPerHead",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -576,7 +602,7 @@
       },
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "readyToCookWeightPerHead",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -636,7 +662,7 @@
       },
       {
         "key": "animals",
-        "model": "cycle",
+        "model": "hestia",
         "value": "milkYield",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -645,7 +671,7 @@
     ],
     {
       "key": "inputs",
-      "model": "cycle",
+      "model": "hestia",
       "value": "energyContentLowerHeatingValue",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -701,7 +727,7 @@
     },
     {
       "key": "practices",
-      "model": "cycle",
+      "model": "hestia",
       "value": "pastureSystem",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -709,7 +735,7 @@
     },
     {
       "key": "practices",
-      "model": "cycle",
+      "model": "hestia",
       "value": "pastureGrass",
       "runStrategy": "add_blank_node_if_missing",
       "mergeStrategy": "list",
@@ -742,7 +768,7 @@
       },
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "liveAnimal",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -750,7 +776,7 @@
       },
       {
         "key": "practices",
-        "model": "cycle",
+        "model": "hestia",
         "value": "feedConversionRatio",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -810,7 +836,7 @@
       },
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "concentrateFeed",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -819,7 +845,7 @@
     ],
     {
       "key": "products",
-      "model": "cycle",
+      "model": "hestia",
       "value": "excretaKgMass",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -828,7 +854,7 @@
     [
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "excretaKgN",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -836,7 +862,7 @@
       },
       {
         "key": "products",
-        "model": "cycle",
+        "model": "hestia",
         "value": "excretaKgVs",
         "runStrategy": "always",
         "mergeStrategy": "list",
@@ -898,6 +924,28 @@
       "mergeStrategy": "list",
       "stage": 2
     },
+    {
+      "key": "emissions",
+      "model": "linkedImpactAssessment",
+      "value": "emissions",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      },
+      "stage": 2
+    },
+    {
+      "key": "emissions",
+      "model": "ecoalimV9",
+      "value": "cycle",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      },
+      "stage": 2
+    },
     {
       "key": "emissions",
       "model": "ecoinventV3AndEmberClimate",
@@ -2044,17 +2092,6 @@
         "stage": 2
       }
     ],
-    {
-      "key": "emissions",
-      "model": "linkedImpactAssessment",
-      "value": "emissions",
-      "runStrategy": "always",
-      "mergeStrategy": "list",
-      "mergeArgs": {
-        "replaceThreshold": ["value", 0.01]
-      },
-      "stage": 2
-    },
     {
       "key": "emissions",
       "model": "emissionNotRelevant",
@@ -2141,21 +2178,6 @@
           "replaceThreshold": ["value", 0.01]
         },
         "stage": 2
-      },
-      {
-        "key": "emissions",
-        "model": "hestia",
-        "value": "nh3ToSurfaceWaterAquacultureSystems",
-        "runStrategy": "add_blank_node_if_missing",
-        "runArgs": {
-          "runNonMeasured": true,
-          "runNonAddedTerm": true
-        },
-        "mergeStrategy": "list",
-        "mergeArgs": {
-          "replaceThreshold": ["value", 0.01]
-        },
-        "stage": 2
       }
     ],
     {

hestia_earth/models/config/ImpactAssessment.json

@@ -45,6 +45,17 @@
       },
       "stage": 1
     },
+    {
+      "key": "emissionsResourceUse",
+      "model": "ecoalimV9",
+      "value": "impact_assessment",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      },
+      "stage": 1
+    },
     {
       "key": "emissionsResourceUse",
       "model": "pooreNemecek2018",
@@ -872,10 +883,7 @@
       "runStrategy": "always",
       "mergeStrategy": "list",
       "mergeArgs": {
-        "replaceThreshold": [
-          "value",
-          0.01
-        ]
+        "replaceThreshold": ["value", 0.01]
       },
       "stage": 1
     },

hestia_earth/models/config/Site.json

@@ -3,7 +3,7 @@
     [
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "organicCarbonPerKgSoil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -11,7 +11,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "organicCarbonPerM3Soil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -19,7 +19,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "organicMatterPerKgSoil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -27,7 +27,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "organicMatterPerM3Soil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -35,7 +35,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "potentialEvapotranspirationMonthly",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -43,7 +43,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "precipitationMonthly",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -51,7 +51,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "rainfallMonthly",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -59,7 +59,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "temperatureMonthly",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -67,7 +67,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "brackishWater",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -75,7 +75,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "freshWater",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -83,7 +83,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "salineWater",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -93,7 +93,7 @@
     [
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "potentialEvapotranspirationAnnual",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -101,7 +101,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "precipitationAnnual",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -109,7 +109,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "rainfallAnnual",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -117,7 +117,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "temperatureAnnual",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -361,7 +361,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "totalNitrogenPerKgSoil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -369,7 +369,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "netPrimaryProduction",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -377,7 +377,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "waterDepth",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -385,7 +385,7 @@
       },
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
         "value": "cationExchangeCapacityPerKgSoil",
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
@@ -402,7 +402,7 @@
     },
     {
       "key": "measurements",
-      "model": "site",
+      "model": "hestia",
       "value": "soilMeasurement",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -410,7 +410,7 @@
     },
     {
       "key": "management",
-      "model": "site",
+      "model": "hestia",
       "value": "management",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -422,7 +422,18 @@
     [
       {
         "key": "measurements",
-        "model": "site",
+        "model": "hestia",
+        "value": "waterSalinity",
+        "runStrategy": "always",
+        "mergeStrategy": "list",
+        "mergeArgs": {
+          "replaceThreshold": ["value", 0.01]
+        },
+        "stage": 2
+      },
+      {
+        "key": "measurements",
+        "model": "hestia",
         "value": "organicCarbonPerHa",
         "runStrategy": "always",
         "mergeStrategy": "list",

hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py

@@ -9,7 +9,7 @@ REQUIREMENTS = {
                 "@type": "Input",
                 "value": "",
                 "none": {
-                    "impactAssessment": "",
+                    "impactAssessment": {"@type": "ImpactAssessment"},
                     "fromCycle": "True",
                     "producedInCycle": "True"
                 },