hestia-earth-models 0.59.6__py3-none-any.whl → 0.59.7__py3-none-any.whl

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/cycle/siteDuration.py

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

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/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/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/ipcc2019/co2ToAirLimeHydrolysis.py

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

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/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/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/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/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/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/version.py

@@ -1 +1 @@
-VERSION = '0.59.6'
+VERSION = '0.59.7'

{hestia_earth_models-0.59.6.dist-info → hestia_earth_models-0.59.7.dist-info}/METADATA

@@ -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.dist-info → hestia_earth_models-0.59.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
-hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
+hestia_earth/models/cache_sites.py,sha256=tPuUiSVSwKfTueuinDsiVRAbxIdDmpJ8V0AOdMOX_yE,4783
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=E52IwrZP7kg3p_BwGu8Byk8OXacNFackbjqastcHIG8,19
+hestia_earth/models/version.py,sha256=YdTI02fIcHtygnhw1S3ojSKc9kpReMFy_DlUYJO0yXY,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -55,7 +55,7 @@ hestia_earth/models/cycle/residueBurnt.py,sha256=HwU1D9ibiIul-FlXDUcEMDEc_KxpB8u
 hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7RiFFMeK0bDJ65CW4qlE,2763
 hestia_earth/models/cycle/residueLeftOnField.py,sha256=qYxKGAdUORN7Vjqj7AZC2VGV_rM3MN0-padDGhgjiNU,2175
 hestia_earth/models/cycle/residueRemoved.py,sha256=jxDu_Jfcyd-rm-qo8ZuRIf-GGxtFBMpmGy1zHOavwy0,2135
-hestia_earth/models/cycle/siteDuration.py,sha256=Hox20n3Y-tJ4ydmkrOreWOXAENxOnd827B7qH7_66T0,1058
+hestia_earth/models/cycle/siteDuration.py,sha256=XAxCA_51kQaWh4_0L_Y08cGn-qsMRUcyaPrn84rfafI,1058
 hestia_earth/models/cycle/startDate.py,sha256=RTpA7NX5afktdQH0Z6c2SB7LCSi5R28aPcqq7Xn5lkw,1181
 hestia_earth/models/cycle/transformation.py,sha256=06KTfVubh2I47dfnG9Iv6AbuUBbURM8BAVOkRu7XmHw,1255
 hestia_earth/models/cycle/utils.py,sha256=ZcVwvRwVNK48jZfnhrHl2ai4a96YzcmRgO-eQXwQNjo,1408
@@ -110,7 +110,7 @@ hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_T
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=DfoGlB5HjA1gafO0OutJjfsA6yPP_PsAd-p16evwCiQ,1609
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=R3lRF5-Md4Jd7irvTe8WJZJPc9-wa1pD6UWVk7lnGtQ,1616
 hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=lWo1AaorIk4HtTCQAND3RFbCHO-em1DbA5ZOxv0Ldn8,3750
-hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=AGQwJX3GwI2PbV8fqW-do8EyaW8pgrQ7iVmzXNceJTg,6377
+hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=w9Cti3pBKVRsTbFJJorFy1-vREB0iIi9UkZKwRezOE4,6469
 hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=y49RvO5OkrZ4iK7o2Kmx5xW52y8SS9xEKAmlXlTQtWc,1609
 hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=bo_0mFcwicpOkPsvZRAnL2tDBDRBAQqsPD_Wc5e20K4,1609
 hestia_earth/models/emepEea2019/utils.py,sha256=ikoZn3JPe9wz-_voVlIqVwh4jBgmnfKi2oyLhi7_7E4,1398
@@ -129,7 +129,7 @@ hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=b1_GZQ3oFl88w
 hestia_earth/models/faostat2018/seed.py,sha256=ts9PKs9UnZnJ9nPFlL7etL1Qb9uIWIES8Mz8W7FWbOw,2917
 hestia_earth/models/faostat2018/utils.py,sha256=r69UWDdMOLTYkI8_oQeEnUCOAZCnmwj_NwyrypAOb_A,3734
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/faostat2018/product/price.py,sha256=v7DmFB0Xdsm9OxIGJ6YQUwA6erI6yie69ZLGzjn6deI,7098
+hestia_earth/models/faostat2018/product/price.py,sha256=J0G-Si0AnlER69FFbC8Lkwpn_05CtA8wV46KoFAYPm0,7757
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
 hestia_earth/models/geospatialDatabase/aware.py,sha256=cbxFnShXW8QUCIjU4uuO1DdK9KhYiLf41ZVjS9hSppI,1358
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=HWaswqkf1FZXcRHw8DrMvvpH2Uo3nbjX4C0D1tqyTBw,2710
@@ -160,7 +160,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=j
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=hJjbnTgefBtRwL5IJHaaPFtRvzTDv7l5nDI8vdadMCg,3353
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=kjP3ue-tlzMQNx2hBM56_CBBRa8Pcosmd2BPgyiNVW4,2081
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=5oasLMYgfnPwSse0D8EEe_pV57AMusac853BgVSUh5E,2070
-hestia_earth/models/geospatialDatabase/utils.py,sha256=hKzR6wlVtkSyvCGcUKjI1YdvRk9mrNfvdmae4yHGLrM,6229
+hestia_earth/models/geospatialDatabase/utils.py,sha256=tjc9Z1wkDzlZ0v82oy5fHwixak3YDq4QCZprNjnm5_M,6208
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=pajS-6UWxqIqnzW0IjkgNm-2Vl3bMor2UZOQtQQERuc,4096
@@ -228,9 +228,9 @@ hestia_earth/models/ipcc2019/carbonContent.py,sha256=I76bJaO1OYSrIjwDKxhwY-DZGZJ
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=khX90NjkmlvosyRZ77QxgwTKwg42Z_ftOWTTAanHViw,11420
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=IzYHdnzT8Z-WQGoZIt9-O98VqriA5rKr38He_TbYadk,6723
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=f3orp6tDZ7f8bE9-lLZC0H_SgCKsDASAlphVRAHKJ0I,6885
-hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=VBNNt9q8Mku4jOog0MjT1wGbfHqtEjtYXqhqaIITwkU,2455
+hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
 hestia_earth/models/ipcc2019/co2ToAirSoilCarbonStockChangeManagementChange.py,sha256=lW3OZcIO3QEifrs_g_K_aytSXvpPFN51vYVuZRGIdDc,25367
-hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=ICE3r8GMoHj6WfMUxQdqdejRpOLa3cxDMyF3GvSTW0U,3700
+hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=071H3ykjzJFW2K5PKvbAaeIj0aL8LTzMiG_pIeYEpEc,3520
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=_jlFrTNDOARH2_g8s4dzuaCoLHSX2BHzSQd3uuQN32Y,3173
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=wp5EbCthCDAKyvPBfZULS9-uKEY58TQQ8ey1pf-juv8,7267
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
@@ -250,7 +250,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=wTvMB
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=zOhp6NhYUuUNU_LMMwhZBP78YC2XRWRlGnajBUX2AN8,3095
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=D-UyzY55mOiIcXRzEtvPY-r1bDFgb9YqA08SmHsQeNA,4226
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=SVgVNp76bIv9oUjrZZuI6xYLo4Gw2DRU5tbp14gydOE,3911
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=wOCMlw2Jjwctg9_iNASAvkIDI0prWgkV8xzDaWN3ZXE,141395
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=omxrtnAZ58qHQYIhi38R7VFn7SRzf8Kk89KgP0VELFQ,141507
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=ntgDsXYIJA3xN5Cn2VzlZ2zDItTb6jXwONOW4VSfFqA,23177
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
@@ -353,7 +353,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=d19wzr4GnWXpMWRhchqwp3S8txrUkpIWrGPwnWdXhjI,6236
 hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
 hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
-hestia_earth/models/mocking/search-results.json,sha256=qu6-xbdy9Vj6-2QJPJsSMwLbmP7a1WRr_lJv16eD8M8,39322
+hestia_earth/models/mocking/search-results.json,sha256=4jtf6WHW7XorahPkYbGLFzjW19pM4iSgBmjcPa-v18A,39322
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -473,7 +473,7 @@ hestia_earth/models/site/measurement/value.py,sha256=7IhUbIj7n5vB7yXoNxXsWbliEJj
 hestia_earth/models/site/post_checks/__init__.py,sha256=CkExxesk1GuG8NjrbKfix1iDuVUgU-9i1ccM_X7MZn4,284
 hestia_earth/models/site/post_checks/cache.py,sha256=_MZsNsclecUdHDT2MsYx4cEsVUXydIasddgZNA6SU4k,284
 hestia_earth/models/site/pre_checks/__init__.py,sha256=fjv6nU5fiL-CLyaa-cBpiLB-xujgPzeK7i7ZJuTOjCI,394
-hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=XmAJAohSQQwbjqx-xTqB6LuU4lyz5lcG8njVuWFDGsU,4820
+hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=K-6EvJvcBijo_gVeIlOtYsYwdM9iBVTBy0jOSmr4OL4,4831
 hestia_earth/models/site/pre_checks/cache_sources.py,sha256=RzvSgHJTpVkAB3mEvRju_irDQmdJRK7GUdU6PhS2Gaw,904
 hestia_earth/models/site/pre_checks/cache_years.py,sha256=qGwTaHlWxnVT7iVxXVcpJ-oG6M-VH4ZpCDTdTixUHR4,883
 hestia_earth/models/stehfestBouwman2006/__init__.py,sha256=EhvD4NK6oEPevusLb1WdYV3GT_fCtQx4gvdMhK_dEIQ,420
@@ -534,8 +534,8 @@ hestia_earth/models/utils/pesticideAI.py,sha256=oAQTUlgXnSJrBGvIphlmVcjx2gbCHH6k
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
 hestia_earth/models/utils/product.py,sha256=H9UqJNzTqtMWXDQnbRkZlTpv_hg4s-Tya469fBk8InA,10143
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
-hestia_earth/models/utils/property.py,sha256=7UV9pxSX49RnUsbEqOeohzxyXXShao1XAnEYCCVKS0k,4923
-hestia_earth/models/utils/site.py,sha256=OhSpyDqVwnIglBtoa3iUImzVr0Xj254oYR1wMiAiOHs,3176
+hestia_earth/models/utils/property.py,sha256=XSSPRUJm6fcc4kJWjZ8A_ZCie7h3QsjwlUg2wDWytdQ,5002
+hestia_earth/models/utils/site.py,sha256=oLuai82WdN_qAAG09XmLEbhf7-jr7AT7BGxRBUs1Bno,3292
 hestia_earth/models/utils/source.py,sha256=HhZkvQoFdy6j6FC2cwP5EbHXHFM4pif9gpnuzeDwEh4,1746
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
 hestia_earth/models/utils/term.py,sha256=XH3-xTkv8WNB0obOjo6Y5YLT8B3zcON6Z-JeskCsCXY,17112
@@ -662,7 +662,7 @@ tests/models/faostat2018/test_liveweightPerHead.py,sha256=1gnezEdoWvb8Hu-W6YCD3f
 tests/models/faostat2018/test_readyToCookWeightPerHead.py,sha256=pMDcONs0WUvANcJ6_OPF7TBwMF45JGMxFRPNPtHLqVI,1570
 tests/models/faostat2018/test_seed.py,sha256=tUXoNVveX0m0ed9UXB4zXxIZsPxktXyUXlbWuUKG0sQ,1705
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/faostat2018/product/test_price.py,sha256=_3K_xIdbaA_KuYO6tq3ES6bBwYA29fZPTwtBZ475F2o,3079
+tests/models/faostat2018/product/test_price.py,sha256=vUTT-FZVbXnDrwQVOgq8PWTDuFK_gAT6aqJ9ZK6Qcsc,3493
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_aware.py,sha256=tbBBvXrOqdO0cMPJTa02UfhlwfosH8iNoJLzZNFs1NU,857
 tests/models/geospatialDatabase/test_clayContent.py,sha256=KdkmsJMB1FsJXZCggcGWh3LlDKDDlwvcmSLEhZpdM_g,1177
@@ -782,7 +782,7 @@ tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
 tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
 tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
-tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=7il6ebAceMIjW8pQHJiQrpOpakaZd-9P8Nw-aHhlr8w,20803
+tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=TO3ubi8z8-iYEAdf295Z30ft5W1652GPkmaiQCb7QN4,23197
 tests/models/ipcc2019/test_pastureGrass.py,sha256=pE4PWdR541v4xWDYihP7Dou8V1iqg5GwD5_rjGRzrds,2292
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=JRklKMSg-OXopb9ZufGgl94deuMuJSsfNXRZDBtOZrE,1119
@@ -1049,8 +1049,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.59.6.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.59.6.dist-info/METADATA,sha256=gkSZP2r_UbFoNZzpSMHRYKWLt0jHC2mM9EVCSmL-TOE,3134
-hestia_earth_models-0.59.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.59.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.59.6.dist-info/RECORD,,
+hestia_earth_models-0.59.7.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.59.7.dist-info/METADATA,sha256=ZIvcMUOqXgRxksT65t2aFMM4hzvl0Wox15BJuffBBGo,3134
+hestia_earth_models-0.59.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.59.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.59.7.dist-info/RECORD,,

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)

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 ---