hestia-earth-models 0.69.0__py3-none-any.whl → 0.70.0__py3-none-any.whl

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

@@ -224,7 +224,7 @@
     },
     {
       "key": "products",
-      "model": "koble2014",
+      "model": "cycle",
       "value": "aboveGroundCropResidue",
       "runStrategy": "always",
       "mergeStrategy": "list",
@@ -238,6 +238,40 @@
       "mergeStrategy": "list",
       "stage": 1
     },
+    [
+      {
+        "key": "practices",
+        "model": "cycle",
+        "value": "residueBurnt",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "cycle",
+        "value": "residueIncorporated",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "cycle",
+        "value": "residueLeftOnField",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "practices",
+        "model": "cycle",
+        "value": "residueRemoved",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      }
+    ],
     {
       "key": "products",
       "model": "ipcc2006",

hestia_earth/models/{koble2014 → cycle}/aboveGroundCropResidue.py

@@ -50,9 +50,7 @@ def _get_practice_value(term_ids: list, cycle: dict) -> float:
     return list_sum(values) / 100 if len(values) > 0 else None
 
 
-def _product(term_id: str, value: float):
-    product = _new_product(term_id, round(value, 2), MODEL)
-    return product
+def _product(term_id: str, value: float): return _new_product(term_id, round(value, 7))
 
 
 def _should_run_model(model, cycle: dict, total_value: float):

hestia_earth/models/cycle/aboveGroundCropResidueTotal.py

@@ -30,7 +30,7 @@ def _run(practice: dict, product: dict):
     practice_value = list_sum(practice.get('value', []))
     product_value = list_sum(product.get('value', []))
     value = product_value / (practice_value / 100)
-    return [_product(round(value, 2))]
+    return [_product(round(value, 7))]
 
 
 def _matching_product_by_practice(term_id: str):

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"
                 },

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

@@ -15,7 +15,7 @@ REQUIREMENTS = {
             "inputs": [{
                 "@type": "Input",
                 "or": {
-                    "impactAssessment": "",
+                    "impactAssessment": {"@type": "ImpactAssessment"},
                     "properties": [{"@type": "Property", "@id": "dryMatter"}]
                 }
             }]

hestia_earth/models/cycle/cycleDuration.py

@@ -11,11 +11,11 @@ REQUIREMENTS = {
         "endDate": "",
         "optional": {
             "startDate": "",
-            "products": {
+            "products": [{
                 "@type": "Product",
                 "primary": "True",
                 "term.termType": "crop"
-            },
+            }],
             "practices": [{"@type": "Practice", "value": "", "term.@id": "croppingIntensity"}]
         }
     }

hestia_earth/models/cycle/energyContentLowerHeatingValue.py

@@ -9,7 +9,7 @@ REQUIREMENTS = {
     "Cycle": {
         "inputs": [{
             "@type": "Input",
-            "term.termType": ["woodFuel", "woodPellets"],
+            "term.@id": ["woodFuel", "woodPellets"],
             "properties": [{"@type": "Property", "value": "", "term.@id": "dryMatter"}]
         }]
     }

hestia_earth/models/cycle/input/hestiaAggregatedData.py

@@ -1,12 +1,11 @@
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import find_primary_product, linked_node, filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
 from hestia_earth.models.utils.crop import valid_site_type
 from hestia_earth.models.utils.blank_node import get_lookup_value
-from hestia_earth.models.utils.term import get_generic_crop
+from hestia_earth.models.utils.term import get_generic_crop, download_term
 from hestia_earth.models.utils.aggregated import (
     should_link_input_to_impact, link_inputs_to_impact, find_closest_impact, aggregated_end_date
 )
@@ -17,7 +16,7 @@ REQUIREMENTS = {
             "@type": "Input",
             "value": "",
             "none": {
-                "impactAssessment": "",
+                "impactAssessment": {"@type": "ImpactAssessment"},
                 "fromCycle": "True",
                 "producedInCycle": "True"
             },
@@ -37,7 +36,7 @@ REQUIREMENTS = {
                 "term.@id": "seed",
                 "value": "",
                 "none": {
-                    "impactAssessment": ""
+                    "impactAssessment": {"@type": "ImpactAssessment"}
                 }
             }],
             "products": [{"@type": "Product", "value": "", "primary": "True"}]
@@ -58,8 +57,7 @@ MODEL_KEY = 'impactAssessment'
 
 
 def _run_seed(cycle: dict, primary_product: dict, seed_input: dict, product_term_id: str):
-    product = download_hestia(product_term_id)
-    region = seed_input.get('region')
+    product = download_term(product_term_id, TermTermType.SEED)
     country = seed_input.get('country')
     # 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
@@ -68,16 +66,16 @@ def _run_seed(cycle: dict, primary_product: dict, seed_input: dict, product_term
     default_product = get_generic_crop()
 
     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)
+        find_closest_impact(cycle, date, product, country, must_queries=match_end_date) or
+        find_closest_impact(cycle, date, primary_product.get('term', {}), country, must_queries=match_end_date) or
+        find_closest_impact(cycle, date, default_product, 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'
+    search_by_country_id = (country or {}).get('@id') or 'region-world'
     debugValues(cycle, model=MODEL_ID, term=seed_input.get('term', {}).get('@id'), key=MODEL_KEY,
                 search_by_product_term_id=search_by_product_term_id,
-                search_by_region_id=search_by_region_id,
+                search_by_country_id=search_by_country_id,
                 search_by_end_date=str(date),
                 impact_assessment_id_found=(impact or {}).get('@id'))
 
@@ -95,7 +93,7 @@ def _should_run_seed(cycle: dict):
     seed_inputs = [
         {
             'input': seed_input,
-            'product': get_lookup_value(seed_input.get('term', {}), LOOKUPS['seed'], key=MODEL_KEY)
+            'product-id': get_lookup_value(seed_input.get('term', {}), LOOKUPS['seed'], key=MODEL_KEY)
         }
         for seed_input in seed_inputs
     ]
@@ -104,7 +102,7 @@ def _should_run_seed(cycle: dict):
 
     for seed_input in seed_inputs:
         term_id = seed_input.get('input').get('term', {}).get('@id')
-        linked_product_id = seed_input.get('product')
+        linked_product_id = seed_input.get('product-id')
 
         logRequirements(cycle, model=MODEL_ID, term=term_id, key=MODEL_KEY,
                         site_type_valid=site_type_valid,
@@ -140,7 +138,7 @@ def run(cycle: dict):
         link_inputs_to_impact(MODEL_ID, cycle, inputs) if should_run else []
     ) + (
         non_empty_list([
-            _run_seed(cycle, primary_product, seed_input.get('input'), seed_input.get('product'))
+            _run_seed(cycle, primary_product, seed_input.get('input'), seed_input.get('product-id'))
             for seed_input in seed_inputs
         ]) if should_run_seed else []
     )

hestia_earth/models/cycle/input/properties.py

@@ -12,7 +12,7 @@ REQUIREMENTS = {
         "inputs": [{
             "@type": "Input",
             "or": {
-                "impactAssessment": "",
+                "impactAssessment": {"@type": "ImpactAssessment"},
                 "properties": [{"@type": "Property", "@id": "dryMatter"}]
             }
         }]

hestia_earth/models/cycle/siteDuration.py

@@ -9,14 +9,14 @@ REQUIREMENTS = {
     "Cycle": {
         "cycleDuration": "> 0",
         "none": {
-            "otherSites": ""
+            "otherSites": [{"@type": "Site"}]
         },
         "optional": {
-            "products": {
+            "products": [{
                 "@type": "Product",
                 "primary": "True",
                 "term.termType": "crop"
-            },
+            }],
             "startDateDefinition": ""
         }
     }

hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py

@@ -18,7 +18,7 @@ REQUIREMENTS = {
                 "ionisingCompoundsToWaterInputsProduction",
                 "ionisingCompoundsToSaltwaterInputsProduction"
             ],
-            "inputs": {"@type": "Term", "term.termType": "waste", "term.units": "kg"}
+            "inputs": [{"@type": "Term", "term.termType": "waste", "term.units": "kg"}]
         }]
     }
 }

hestia_earth/models/geospatialDatabase/croppingIntensity.py

@@ -14,8 +14,8 @@ REQUIREMENTS = {
         "site": {
             "@type": "Site",
             "or": [
-                {"region": {"@type": "Term"}},
-                {"country": {"@type": "Term"}}
+                {"region": {"@type": "Term", "termType": "region"}},
+                {"country": {"@type": "Term", "termType": "region"}}
             ]
         },
         "optional": {
@@ -23,8 +23,8 @@ REQUIREMENTS = {
                 {
                     "@type": "Site",
                     "or": [
-                        {"region": {"@type": "Term"}},
-                        {"country": {"@type": "Term"}}
+                        {"region": {"@type": "Term", "termType": "region"}},
+                        {"country": {"@type": "Term", "termType": "region"}}
                     ]
                 }
             ]

hestia_earth/models/geospatialDatabase/longFallowRatio.py

@@ -14,8 +14,8 @@ REQUIREMENTS = {
         "site": {
             "@type": "Site",
             "or": [
-                {"region": {"@type": "Term"}},
-                {"country": {"@type": "Term"}}
+                {"region": {"@type": "Term", "termType": "region"}},
+                {"country": {"@type": "Term", "termType": "region"}}
             ]
         },
         "optional": {
@@ -23,8 +23,8 @@ REQUIREMENTS = {
                 {
                     "@type": "Site",
                     "or": [
-                        {"region": {"@type": "Term"}},
-                        {"country": {"@type": "Term"}}
+                        {"region": {"@type": "Term", "termType": "region"}},
+                        {"country": {"@type": "Term", "termType": "region"}}
                     ]
                 }
             ]

hestia_earth/models/geospatialDatabase/region.py

@@ -1,8 +1,9 @@
-from hestia_earth.utils.api import download_hestia
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import linked_node
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
 from .utils import download, has_coordinates
+from hestia_earth.models.utils.term import download_term
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,7 +31,7 @@ def _download_region(site: dict):
         only_coordinates=True
     )
     try:
-        return None if gadm_id is None else linked_node(download_hestia(f"GADM-{gadm_id}"))
+        return None if gadm_id is None else linked_node(download_term(f"GADM-{gadm_id}", TermTermType.REGION))
     except Exception:
         return None
 

hestia_earth/models/geospatialDatabase/utils.py

@@ -1,10 +1,10 @@
 import os
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.log import debugValues, logErrorRun, logRequirements
 from hestia_earth.models.utils.site import cached_value, region_factor, region_level_1_id
+from hestia_earth.models.utils.term import download_term
 from . import MODEL
 
 MAX_AREA_SIZE = int(os.getenv('MAX_AREA_SIZE', '5000'))
@@ -97,7 +97,7 @@ def _get_boundary_area_size(boundary: dict):
 
 def _get_region_area_size(site: dict):
     term = site.get('region', site.get('country'))
-    return term.get('area', (download_hestia(term.get('@id')) or {}).get('area')) if term else None
+    return term.get('area', (download_term(term.get('@id'), TermTermType.REGION) or {}).get('area')) if term else None
 
 
 def get_area_size(site: dict):
@@ -153,9 +153,10 @@ def _get_cached_data(term: str, site: dict, data: dict):
     cache = _cached_value(site, term)
     cache_sub_key = _cache_sub_key(data)
     # data can be grouped by year when required
-    value = cache.get(cache_sub_key) if (
-        isinstance(cache, dict) and cache_sub_key in cache and cache is not None
-     ) else cache
+    value = cache.get(cache_sub_key) if all([
+        isinstance(cache, dict),
+        cache_sub_key
+    ]) else cache
     if value is not None:
         debugValues(site, model=MODEL, term=term, value_from_cache=value)
     return value

hestia_earth/models/haversineFormula/transport/distance.py

@@ -1,9 +1,10 @@
 from haversine import haversine
-from hestia_earth.utils.api import download_hestia
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.log import logRequirements, logShouldRun, debugValues
 from hestia_earth.models.utils.method import include_methodModel
+from hestia_earth.models.utils.term import download_term
 from .. import MODEL
 
 REQUIREMENTS = {
@@ -55,7 +56,7 @@ def _should_run_transport(cycle: dict, transport: dict):
 def _run_input(cycle: dict, site_country: dict):
     def exec(input: dict):
         term_id = input.get('term', {}).get('@id')
-        input_country = download_hestia(input.get('country', {}).get('@id'))
+        input_country = download_term(input.get('country', {}).get('@id'), TermTermType.REGION)
         distance_kms = haversine(
             (site_country.get('latitude'), site_country.get('longitude')),
             (input_country.get('latitude'), input_country.get('longitude'))
@@ -74,7 +75,7 @@ def _should_run_input(site_country_id: str):
     def exec(input: dict):
         input_country = input.get('country', {}) or {}
         input_country_id = input_country.get('@id')
-        input_country = download_hestia(input_country_id)
+        input_country = download_term(input_country_id, TermTermType.REGION)
         has_transports = len(input.get('transport', [])) > 0
         should_run = input_country and all([
             input_country.get('latitude'), input_country.get('latitude'),
@@ -89,7 +90,7 @@ def _should_run(cycle: dict):
     country_id = cycle.get('site', {}).get('country', {}).get('@id')
     inputs = list(filter(_should_run_input(country_id), cycle.get('inputs', [])))
     # download full term to get coordinates only if there is anything to run
-    country = download_hestia(country_id) if len(inputs) > 0 else {}
+    country = download_term(country_id, TermTermType.REGION) if len(inputs) > 0 else {}
 
     # can only run if the site country has centroid coordinates
     logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,

hestia_earth/models/hestia/landCover.py

@@ -40,7 +40,7 @@ REQUIREMENTS = {
             "permanent pasture",
             "other natural vegetation"
         ],
-        "country": "",
+        "country": {"@type": "Term", "termType": "region"},
         "management": [
             {
                 "@type": "Management",
@@ -56,11 +56,7 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Management": [{
-        "@type": "Management",
         "term.termType": "landCover",
-        "term.@id": [
-            "Forest", "Annual cropland", "Permanent cropland", "Permanent pasture", "Other natural vegetation"
-        ],
         "value": "",
         "endDate": "",
         "startDate": ""

hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py

@@ -2,7 +2,8 @@ from .resourceUse_utils import run_resource_use
 
 REQUIREMENTS = {
     "ImpactAssessment": {
-        "Site": {
+        "site": {
+            "@type": "Site",
             "management": [{"@type": "Management", "value": ">=0", "term.termType": "landCover", "endDate": ""}]
         },
         "emissionsResourceUse": [

hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py

@@ -2,7 +2,8 @@ from .resourceUse_utils import run_resource_use
 
 REQUIREMENTS = {
     "ImpactAssessment": {
-        "Site": {
+        "site": {
+            "@type": "Site",
             "management": [{"@type": "Management", "value": ">=0", "term.termType": "landCover", "endDate": ""}]
         },
         "emissionsResourceUse": [

hestia_earth/models/hestia/seed_emissions.py

@@ -27,7 +27,7 @@ REQUIREMENTS = {
             "term.termType": "seed",
             "value": "> 0",
             "none": {
-                "impactAssessment": "",
+                "impactAssessment": {"@type": "ImpactAssessment"},
                 "fromCycle": "True",
                 "producedInCycle": "True"
             }

hestia_earth/models/impact_assessment/emissions.py

@@ -8,7 +8,7 @@ from . import MODEL
 
 REQUIREMENTS = {
     "ImpactAssessment": {
-        "product": {"@type": "Product", "term": {"@type": "Term"}},
+        "product": {"@type": "Product"},
         "cycle": {
             "@type": "Cycle",
             "products": [{

hestia_earth/models/impact_assessment/product/economicValueShare.py

@@ -4,7 +4,7 @@ from .. import MODEL
 
 REQUIREMENTS = {
     "ImpactAssessment": {
-        "product": {"@type": "Product", "term": {"@type": "Term"}, "none": {"economicValueShare": ""}},
+        "product": {"@type": "Product", "none": {"economicValueShare": ""}},
         "cycle": {
             "@type": "Cycle",
             "products": [{"@type": "Product", "economicValueShare": ""}]

hestia_earth/models/impact_assessment/product/value.py

@@ -4,7 +4,7 @@ from .. import MODEL
 
 REQUIREMENTS = {
     "ImpactAssessment": {
-        "product": {"@type": "Product", "term": {"@type": "Term"}, "none": {"value": ""}},
+        "product": {"@type": "Product", "none": {"value": ""}},
         "cycle": {
             "@type": "Cycle",
             "products": [{"@type": "Product", "value": ""}]

hestia_earth/models/ipcc2019/animal/fatContent.py

@@ -9,10 +9,10 @@ REQUIREMENTS = {
         "animals": [{
             "@type": "Animal",
             "term.termType": "liveAnimal",
-            "practices": {
+            "practices": [{
                 "@type": "Practice",
                 "term.termType": "animalManagement"
-            }
+            }]
         }]
     }
 }

hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py

@@ -13,10 +13,10 @@ REQUIREMENTS = {
         "animals": [{
             "@type": "Animal",
             "term.termType": "liveAnimal",
-            "practices": {
+            "practices": [{
                 "@type": "Practice",
                 "term.termType": "animalManagement"
-            }
+            }]
         }]
     }
 }

hestia_earth/models/ipcc2019/animal/trueProteinContent.py

@@ -9,10 +9,10 @@ REQUIREMENTS = {
         "animals": [{
             "@type": "Animal",
             "term.termType": "liveAnimal",
-            "practices": {
+            "practices": [{
                 "@type": "Practice",
                 "term.termType": "animalManagement"
-            }
+            }]
         }]
     }
 }

hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -5,6 +5,7 @@ from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import debugMissingLookup, debugValues, logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.blank_node import get_total_value_converted_with_min_ratio
+from hestia_earth.models.utils.term import get_ionophore_terms
 from hestia_earth.models.utils.input import get_feed_inputs
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.liveAnimal import get_default_digestibility
@@ -48,7 +49,10 @@ REQUIREMENTS = {
                     }
                 }]
             }
-        ]
+        ],
+        "optional": {
+            "inputs": [{"@type": "Input", "term.@id": ["ionophores", "ionophoreAntibiotics"]}]
+        }
     }
 }
 LOOKUPS = {
@@ -192,7 +196,8 @@ def _get_DE_type(lookup, term_id: str, term_type: str):
 
 def _is_ionophore(cycle: dict, total_feed: float):
     inputs = cycle.get('inputs', [])
-    has_input = find_term_match(inputs, 'ionophores', None) is not None
+    ionophore_terms = get_ionophore_terms()
+    has_input = any([find_term_match(inputs, term_id, None) is not None for term_id in ionophore_terms])
     maize_input = find_term_match(inputs, 'maizeSteamFlaked')
     maize_feed = get_total_value_converted_with_min_ratio(MODEL, None, blank_nodes=[maize_input]) if maize_input else 0
     maize_feed_ratio = maize_feed / total_feed if all([maize_feed, total_feed]) else 0

hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py

@@ -11,6 +11,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "site": {
+            "@type": "Site",
             "measurements": [
                 {
                     "@type": "Measurement",

hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py

@@ -11,6 +11,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "site": {
+            "@type": "Site",
             "measurements": [
                 {
                     "@type": "Measurement",
@@ -38,7 +39,7 @@ RETURNS = {
         "statsDefinition": "simulated",
         "observations": "",
         "methodTier": "",
-        "depth": "30"
+        "depth": 30
     }]
 }
 TERM_ID = 'co2ToAirBelowGroundBiomassStockChangeLandUseChange,co2ToAirBelowGroundBiomassStockChangeManagementChange'

hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py

@@ -11,6 +11,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "site": {
+            "@type": "Site",
             "measurements": [
                 {
                     "@type": "Measurement",
@@ -38,7 +39,7 @@ RETURNS = {
         "statsDefinition": "simulated",
         "observations": "",
         "methodTier": "",
-        "depth": "30"
+        "depth": 30
     }]
 }
 TERM_ID = 'co2ToAirSoilOrganicCarbonStockChangeLandUseChange,co2ToAirSoilOrganicCarbonStockChangeManagementChange'