hestia-earth-models 0.59.6__tar.gz → 0.59.7__tar.gz

{hestia-earth-models-0.59.6/hestia_earth_models.egg-info → hestia-earth-models-0.59.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.6
+Version: 0.59.7
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/cache_sites.py

@@ -34,7 +34,7 @@ def _cache_results(results: list, collections: list, index: int):
     return cache_site_results(results[start:end], collections)
 
 
-def _run_values(sites: list, param_type: ParamType, rasters: list = [], vectors: list = [], years: list = []):
+def _run_values(sites: list, param_type: ParamType, rasters: list = [], vectors: list = [], years: list = None):
     param_values = list(map(_VALUE_AS_PARAM.get(param_type), sites))
     # unique list
     param_values = list(set(param_values)) if param_type == ParamType.GADM_IDS else list({
@@ -66,11 +66,9 @@ def _run_values(sites: list, param_type: ParamType, rasters: list = [], vectors:
         } | ({CACHE_AREA_SIZE: area_size} if area_size is not None else {})
         return {
             **site,
-            CACHE_KEY: {
-                **cached_value(site),
-                CACHE_YEARS_KEY: years,
-                CACHE_GEOSPATIAL_KEY: cached_data
-            }
+            CACHE_KEY: (
+                cached_value(site) | {CACHE_GEOSPATIAL_KEY: cached_data}
+            ) | ({CACHE_YEARS_KEY: years} if years else {})
         }
 
     return reduce(lambda prev, curr: prev + [_process_site(curr)], sites, [])
@@ -114,7 +112,7 @@ def _group_sites(sites: dict):
     }
 
 
-def run(sites: list, years: list, include_region: bool = False):
+def run(sites: list, years: list = None, include_region: bool = False):
     """
     Run all queries at once for the list of provided Sites.
     Note: Earth Engine needs to be initiliased with `init_gee()` before running this function.
@@ -129,7 +127,7 @@ def run(sites: list, years: list, include_region: bool = False):
         Prefecth region IDs.
         This will cache region-level data and will make the request slower. Only use if needed.
     """
-    rasters, vectors = list_collections(years, include_region=include_region)
+    rasters, vectors = list_collections(years, include_region)
 
     filtered_data = _group_sites(sites)
 

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/cycle/siteDuration.py

@@ -9,7 +9,7 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "cycleDuration": "365",
+        "cycleDuration": "> 0",
         "none": {
             "otherSites": ""
         }

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py

@@ -17,14 +17,17 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "or": {
-            "inputs": [{
+        "completeness.fertiliser": "True",
+        "inputs": [
+            {
                 "@type": "Input",
                 "value": "",
-                "term.termType": ["inorganicFertiliser", "inorganicNitrogenFertiliserUnspecifiedKgN"]
-            }],
-            "completeness.fertiliser": "True"
-        },
+                "term.termType": "inorganicFertiliser",
+                "optional": {
+                    "properties": [{"@type": "Property", "value": "", "term.@id": "nitrogenContent"}]
+                }
+            }
+        ],
         "site": {
             "@type": "Site",
             "country": {"@type": "Term", "termType": "region"},

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/faostat2018/product/price.py

@@ -41,7 +41,8 @@ LOOKUPS = {
     "liveAnimal": ["primaryMeatProductFaoPriceTermId"],
     "animalProduct": ["animalProductGroupingFAOEquivalent", "animalProductGroupingFAO"],
     "region-animalProduct-animalProductGroupingFAO-price": "use value from above",
-    "region-animalProduct-animalProductGroupingFAO-averageColdCarcassWeight": "use value from above"
+    "region-animalProduct-animalProductGroupingFAO-averageColdCarcassWeight": "use value from above",
+    "region-animalProduct-animalProductGroupingFAO-weightPerItem": "use value from above"
 }
 MODEL_KEY = 'price'
 LOOKUP_NAME = {
@@ -52,6 +53,9 @@ LOOKUP_GROUPING = {
     TermTermType.CROP.value: get_crop_grouping_faostat_production,
     TermTermType.ANIMALPRODUCT.value: get_animalProduct_grouping_fao
 }
+LOOKUP_UNITS_NUMBER = {
+    TermTermType.ANIMALPRODUCT.value: f"region-{TermTermType.ANIMALPRODUCT.value}-{FAO_LOOKUP_COLUMN}-weightPerItem.csv"
+}
 
 
 def _term_grouping(term: dict): return LOOKUP_GROUPING.get(term.get('termType'), lambda *_: None)(MODEL, term)
@@ -123,6 +127,7 @@ def _run_by_country(cycle: dict, product: dict, country_id: str, year: int = Non
     product_term = product.get('term', {})
     term_id = product_term.get('@id')
     term_type = product_term.get('termType')
+    term_units = product_term.get('units')
 
     has_yield = len(product.get('value', [])) > 0
     not_already_set = MODEL_KEY not in product.keys()
@@ -133,17 +138,23 @@ def _run_by_country(cycle: dict, product: dict, country_id: str, year: int = Non
     should_run = all([not_already_set, has_yield, grouping])
     value = _lookup_data(term_id, grouping, country_id, year, term_type=term_type) if should_run else None
 
+    # if units is number instead of kg, need to convert to number first
+    conversion_to_number = safe_parse_float(get_table_value(
+        download_lookup(LOOKUP_UNITS_NUMBER.get(term_type)), 'termid', country_id, column_name(grouping)
+    ), 1) if term_units == Units.NUMBER.value else 1
+
     logRequirements(cycle, model=MODEL, term=term_id, key=MODEL_KEY, by='country',
                     has_yield=has_yield,
                     not_already_set=not_already_set,
                     year=year,
                     price_per_ton=value,
-                    groupingFAO=f"'{grouping}'")
+                    groupingFAO=f"'{grouping}'",
+                    conversion_to_number=conversion_to_number)
 
     logShouldRun(cycle, MODEL, term_id, should_run, key=MODEL_KEY, by='country')
 
     # divide by 1000 to convert price per tonne to kg
-    return _product(product, value / 1000) if value is not None else None
+    return _product(product, value / 1000 * conversion_to_number) if value is not None else None
 
 
 def _should_run_product(product: dict):

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/geospatialDatabase/utils.py

@@ -175,7 +175,6 @@ def download(term: str, site: dict, data: dict, only_coordinates=False) -> dict:
                 }
             ]
         }
-        print(query)
         value = _parse_run_query(term, query)
 
     if value is None:

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py

@@ -11,7 +11,7 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.soilAmendments": "",
+        "completeness.soilAmendment": "",
         "inputs": [{
             "@type": "Input",
             "value": "",

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py

@@ -11,13 +11,8 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "or": {
-            "completeness.fertiliser": "",
-            "inputs": [{"@type": "Input", "value": "", "term.termType": "inorganicFertiliser"}]
-        },
-        "optional": {
-            "inputs": [{"@type": "Input", "value": "", "term.@id": "inorganicNitrogenFertiliserUnspecifiedKgN"}]
-        }
+        "completeness.fertiliser": "",
+        "inputs": [{"@type": "Input", "value": "", "term.termType": "inorganicFertiliser"}]
     }
 }
 RETURNS = {

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -259,6 +259,11 @@ The number of years required for soil organic carbon to reach equilibrium after
 a change in land use, management regime or carbon input regime.
 """
 
+EXCLUDED_ECO_CLIMATE_ZONES_TIER_1 = {
+    5,  # Polar Moist
+    6  # Polar Dry
+}
+
 VALID_SITE_TYPES_TIER_1 = [
     SiteSiteType.CROPLAND.value,
     SiteSiteType.FOREST.value,
@@ -287,7 +292,7 @@ def _measurement(year: int, value: float, method_classification: str) -> dict:
     dict
         A valid Hestia `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
     """
-    measurement = _new_measurement(TERM_ID, MODEL)
+    measurement = _new_measurement(TERM_ID)
     measurement["value"] = [value]
     measurement["dates"] = [f"{year}-12-31"]
     measurement["depthUpper"] = DEPTH_UPPER
@@ -3578,7 +3583,7 @@ def _should_run_tier_1(
     Determines whether there is sufficient data in the inventory and keyword args to run the tier 1 model.
     """
     return all([
-        eco_climate_zone and eco_climate_zone > 0,
+        eco_climate_zone and eco_climate_zone not in EXCLUDED_ECO_CLIMATE_ZONES_TIER_1,
         soc_ref and soc_ref > 0,
         any(year for year, group in inventory.items() if group.get(_InventoryKey.SHOULD_RUN_TIER_1))
     ])

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/mocking/search-results.json

@@ -1311,7 +1311,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 23.471432
+        "_score": 23.467773
       }
     ]
   },

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py

@@ -77,7 +77,7 @@ def _extend_collections(values: list, years: list = []):
     ])
 
 
-def list_collections(years: list, include_region: bool = False):
+def list_collections(years: list = [], include_region: bool = False):
     ee_params = list_ee_params()
     # only cache `raster` results as can be combined in a single query
     rasters = [value for value in ee_params if value.get('params').get('ee_type') == 'raster']
@@ -89,7 +89,7 @@ def list_collections(years: list, include_region: bool = False):
         ])
     ]
 
-    return (_extend_collections(rasters, years), _extend_collections(vectors))
+    return (_extend_collections(rasters, years or []), _extend_collections(vectors))
 
 
 def _cache_results(site: dict, area_size: float):

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/utils/property.py

@@ -93,7 +93,8 @@ def node_property_lookup_value(model: str, term: dict, prop_id: str, default=Non
         lookup_name = f"{term.get('termType')}-property.csv"
         lookup = download_lookup(lookup_name)
         term_id = term.get('@id')
-        value = extract_grouped_data(get_table_value(lookup, 'termid', term_id, column_name(prop_id)), 'Avg')
+        lookup_value = get_table_value(lookup, 'termid', term_id, column_name(prop_id))
+        value = extract_grouped_data(lookup_value, 'Avg') if 'Avg' in lookup_value else lookup_value
         debugMissingLookup(lookup_name, 'termid', term_id, prop_id, value, model=model, term=term_id, **log_args)
         return safe_parse_float(value, default=None)
     except Exception:

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/hestia_earth/models/utils/site.py

@@ -1,7 +1,7 @@
 from hestia_earth.schema import SchemaType, SiteSiteType, TermTermType
 from hestia_earth.utils.api import find_related
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
-from hestia_earth.utils.tools import non_empty_list, safe_parse_date
+from hestia_earth.utils.tools import non_empty_list, safe_parse_date, flatten
 
 from hestia_earth.models.log import debugMissingLookup
 from . import cached_value, _load_calculated_node
@@ -63,14 +63,17 @@ def related_cycles(site_id: str):
     return non_empty_list(map(lambda node: _load_calculated_node(node, SchemaType.CYCLE), nodes or []))
 
 
-def _cycle_end_year(cycle: dict):
-    date = safe_parse_date(cycle.get('endDate'))
+def _cycle_year(cycle: dict, key: str):
+    date = safe_parse_date(cycle.get(key))
     return date.year if date else None
 
 
 def related_years(site: dict):
     return cached_value(site, CACHE_YEARS_KEY) or (
-        non_empty_list(set(map(_cycle_end_year, related_cycles(site.get('@id')))))
+        sorted(non_empty_list(set(flatten([
+            _cycle_year(cycle, 'startDate'),
+            _cycle_year(cycle, 'endDate')
+        ] for cycle in related_cycles(site.get('@id'))))))
     )
 
 

hestia-earth-models-0.59.7/hestia_earth/models/version.py

@@ -0,0 +1 @@
+VERSION = '0.59.7'

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.6
+Version: 0.59.7
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/tests/models/faostat2018/product/test_price.py

@@ -27,11 +27,23 @@ def test_run_crop(*args):
 
 
 @patch(f"{class_path}.download_hestia", return_value={})
-def test_run_animalProduct(*args):
-    with open(f"{fixtures_folder}/animalProduct/cycle.jsonld", encoding='utf-8') as f:
+def test_run_animalProduct_kg(*args):
+    with open(f"{fixtures_folder}/animalProduct/kg/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/animalProduct/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/animalProduct/kg/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}.download_hestia", return_value={})
+def test_run_animalProduct_number(*args):
+    with open(f"{fixtures_folder}/animalProduct/number/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/animalProduct/number/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)

{hestia-earth-models-0.59.6 → hestia-earth-models-0.59.7}/tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -20,6 +20,7 @@ from hestia_earth.models.ipcc2019.organicCarbonPerHa import (
     _check_cropland_medium_category,
     _get_carbon_input_kwargs,
     _iterate_soc_equilibriums,
+    _should_run,
     IpccCarbonInputCategory,
     IpccLandUseCategory,
     IpccManagementCategory,
@@ -103,37 +104,38 @@ def find_term_property_side_effect(term: dict, property: str, *_):
 # --- TIER 1 & TIER 2 TESTS ---
 
 
-# subfolder, load_cycles
-RUN_SUBFOLDERS = [
-    ("tier-1-and-2/cropland", True),
-    ("tier-1-and-2/with-zero-carbon-input", True),  # Closes issue 777
-    ("tier-2/with-generalised-monthly-measurements", True),  # Closes issue 600
-    ("tier-2/with-incomplete-climate-data", True),  # Closes issue 599
-    ("tier-2/with-initial-soc", True),
-    ("tier-2/with-multi-year-cycles", True),
-    ("tier-2/with-multi-year-cycles-and-missing-properties", True),  # Closes issue 734
-    ("tier-2/without-any-measurements", True),  # Closes issue 594
-    ("tier-2/without-initial-soc", True),
-    ("tier-2/with-irrigation", True),
-    ("tier-2/with-irrigation-dates", True),
-    ("tier-2/with-paddy-rice", True),
-    ("tier-2/with-sand-without-date", True),  # Closes issue 739
-    ("tier-2/with-irrigated-upland-rice", True),
-    ("tier-1/cropland-depth-as-float", False),
-    ("tier-1/cropland-with-measured-soc", False),
-    ("tier-1/cropland-without-measured-soc", False),
-    ("tier-1/permanent-pasture", False),
-    ("tier-1/should-not-run", False),
-    ("tier-1/without-management-with-measured-soc", False),
-    ("tier-1/land-use-change", False),  # Closes issue 755
-    ("tier-1/run-with-site-type", False)  # Closes issue 755
+# subfolder, load_cycles, should_run
+SHOULD_RUN_SUBFOLDERS = [
+    ("tier-1-and-2/cropland", True, True),
+    ("tier-1-and-2/with-zero-carbon-input", True, True),  # Closes issue 777
+    ("tier-2/with-generalised-monthly-measurements", True, False),  # Closes issue 600
+    ("tier-2/with-incomplete-climate-data", True, False),  # Closes issue 599
+    ("tier-2/with-initial-soc", True, True),
+    ("tier-2/with-multi-year-cycles", True, True),
+    ("tier-2/with-multi-year-cycles-and-missing-properties", True, True),  # Closes issue 734
+    ("tier-2/without-any-measurements", True, False),  # Closes issue 594
+    ("tier-2/without-initial-soc", True, True),
+    ("tier-2/with-irrigation", True, True),
+    ("tier-2/with-irrigation-dates", True, True),
+    ("tier-2/with-paddy-rice", True, False),
+    ("tier-2/with-sand-without-date", True, True),  # Closes issue 739
+    ("tier-2/with-irrigated-upland-rice", True, False),
+    ("tier-1/cropland-depth-as-float", False, True),
+    ("tier-1/cropland-with-measured-soc", False, True),
+    ("tier-1/cropland-without-measured-soc", False, True),
+    ("tier-1/permanent-pasture", False, True),
+    ("tier-1/should-not-run", False, False),
+    ("tier-1/without-management-with-measured-soc", False, False),
+    ("tier-1/land-use-change", False, True),  # Closes issue 755
+    ("tier-1/run-with-site-type", False, True),  # Closes issue 755
+    ("tier-1/cropland-polar", False, False)  # Closes issue 794
 ]
 
 
 @mark.parametrize(
-    "subfolder, load_cycles",
-    RUN_SUBFOLDERS,
-    ids=[params[0] for params in RUN_SUBFOLDERS]
+    "subfolder, load_cycles, should_run",
+    SHOULD_RUN_SUBFOLDERS,
+    ids=[params[0] for params in SHOULD_RUN_SUBFOLDERS]
 )
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 @patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
@@ -143,8 +145,8 @@ RUN_SUBFOLDERS = [
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{class_path}.related_cycles")
-@patch("hestia_earth.models.utils.property.find_term_property")
-def test_run(
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_should_run(
     mock_find_term_property,
     mock_related_cycles,
     _mock_get_upland_rice_crop_terms,
@@ -155,7 +157,8 @@ def test_run(
     _mock_get_cover_crop_property_terms,
     _mock_new_measurement,
     subfolder,
-    load_cycles
+    load_cycles,
+    should_run
 ):
     folder = f"{fixtures_folder}/{subfolder}"
 
@@ -163,20 +166,17 @@ def test_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_find_term_property.side_effect = find_term_property_side_effect
     mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
+    should_run_tier_1, should_run_tier_2, *_ = _should_run(site)
+    should_run_ = should_run_tier_1 or should_run_tier_2
 
-    result = run(site)
-    assert result == expected
+    assert should_run_ == should_run
 
 
-@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 @patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
 @patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
@@ -184,11 +184,66 @@ def test_run(
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{class_path}.related_cycles", return_value=[])
-def test_run_no_data(*args):
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_should_run_no_data(*args):
     SITE = {}
-    EXPECTED = []
-    result = run(SITE)
-    assert result == EXPECTED
+    EXPECTED = False
+
+    should_run_tier_1, should_run_tier_2, *_ = _should_run(SITE)
+    should_run = should_run_tier_1 or should_run_tier_2
+
+    assert should_run == EXPECTED
+
+
+RUN_SUBFOLDERS = [
+    (subfolder, load_cycles) for subfolder, load_cycles, should_run in SHOULD_RUN_SUBFOLDERS
+    if should_run
+]
+
+
+@mark.parametrize(
+    "subfolder, load_cycles",
+    RUN_SUBFOLDERS,
+    ids=[params[0] for params in RUN_SUBFOLDERS]
+)
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
+@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{class_path}.related_cycles")
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_run(
+    mock_find_term_property,
+    mock_related_cycles,
+    _mock_get_upland_rice_crop_terms,
+    _mock_get_upland_rice_land_cover_terms,
+    _mock_get_residue_removed_or_burnt_terms,
+    _mock_get_irrigated_terms,
+    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
+    _mock_get_cover_crop_property_terms,
+    _mock_new_measurement,
+    subfolder,
+    load_cycles
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    def load_cycles_from_file():
+        with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
+            return json.load(f)
+
+    mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
+
+    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(site)
+    assert result == expected
 
 
 # --- TIER 2 TESTS: SUB-MODELS ---

hestia-earth-models-0.59.6/hestia_earth/models/version.py

@@ -1 +0,0 @@
-VERSION = '0.59.6'