hestia-earth-models 0.62.5__py3-none-any.whl → 0.62.6__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/plantationLifespan.py

@@ -7,8 +7,7 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "products": [{"@type": "Product", "value": "", "term.termType": "crop"}],
-        "site": {"@type": "Site", "siteType": "cropland"}
+        "products": [{"@type": "Product", "value": "", "term.termType": "crop"}]
     }
 }
 LOOKUPS = {

hestia_earth/models/pooreNemecek2018/plantationProductiveLifespan.py

@@ -9,8 +9,7 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "products": [{"@type": "Product", "value": "", "term.termType": "crop"}],
-        "site": {"@type": "Site", "siteType": "cropland"}
+        "products": [{"@type": "Product", "value": "", "term.termType": "crop"}]
     }
 }
 LOOKUPS = {

hestia_earth/models/preload_requests.py

@@ -2,13 +2,14 @@
 Preload all search requests to avoid making the same searches many times while running models.
 """
 import json
+import os
 
 from .log import logger
 from .mocking.mock_search import create_search_results
 from .mocking import RESULTS_PATH, enable_mock as _mock
 
 
-def enable_preload(filepath: str = RESULTS_PATH, node: dict = None):
+def enable_preload(filepath: str = RESULTS_PATH, node: dict = None, overwrite_existing: bool = True):
     """
     Prefetch calls to HESTIA API in a local file.
 
@@ -18,15 +19,21 @@ def enable_preload(filepath: str = RESULTS_PATH, node: dict = None):
         The path of the file containing the search results. Defaults to current library folder.
     node : dict
         Optional - The node used to run calculations. This is especially useful when running calculations on a Site.
+    overwrite_existing : bool
+        Optional - If the file already exists, the file can be used instead of generating it again.
+        Will overwrite by default.
     """
-    logger.debug('Preloading search results and storing in %s', filepath)
+    should_generate = overwrite_existing or not os.path.exists(filepath)
 
-    # build the search results
-    data = create_search_results()
+    if should_generate:
+        logger.debug('Preloading search results and storing in %s', filepath)
 
-    # store in file
-    with open(filepath, 'w') as f:
-        f.write(json.dumps(data, indent=2, ensure_ascii=False))
+        # build the search results
+        data = create_search_results()
+
+        # store in file
+        with open(filepath, 'w') as f:
+            f.write(json.dumps(data, indent=2, ensure_ascii=False))
 
     # enable mock search results from file
     _mock(filepath=filepath, node=node)

hestia_earth/models/utils/__init__.py

@@ -122,15 +122,6 @@ def get_kg_term_units(term_id: str, units: str):
     }.get(units, lambda x: None)(term_id)
 
 
-def _get_by_key(x, y):
-    return x if x is None else (
-        x.get(y) if isinstance(x, dict) else list(map(lambda v: get_dict_key(v, y), x))
-    )
-
-
-def get_dict_key(value: dict, key: str): return reduce(lambda x, y: _get_by_key(x, y), key.split('.'), value)
-
-
 def first_day_of_month(year: int, month: int):
     return datetime.date(int(year), int(month), 1)
 

hestia_earth/models/utils/cycle.py

@@ -1,9 +1,9 @@
 from hestia_earth.schema import CycleFunctionalUnit, SiteSiteType, TermTermType, AnimalReferencePeriod
 from hestia_earth.utils.model import filter_list_term_type, find_term_match, find_primary_product
-from hestia_earth.utils.tools import list_sum, safe_parse_float, safe_parse_date
+from hestia_earth.utils.tools import list_sum, safe_parse_float, safe_parse_date, non_empty_list
 
 from ..log import logRequirements, debugValues
-from .lookup import factor_value
+from .lookup import factor_value, is_siteType_allowed
 from .term import get_lookup_value
 from .property import get_node_property
 from .completeness import _is_term_type_complete
@@ -464,3 +464,11 @@ def get_animals_by_period(cycle: dict, period: AnimalReferencePeriod = AnimalRef
             a.get('referencePeriod') == period.value
         ])
     ]
+
+
+def get_allowed_sites(model: str, term_id: str, termType: TermTermType, cycle: dict):
+    sites = non_empty_list([cycle.get('site', None)]) + cycle.get('otherSites', [])
+    allowed_sites = [s for s in sites if is_siteType_allowed(s, {'@id': term_id, 'termType': termType.value})]
+    debugValues(cycle, model=model, term=term_id,
+                allowed_sites=';'.join([s.get('@id', s.get('id')) for s in allowed_sites]))
+    return allowed_sites

hestia_earth/models/utils/product.py

@@ -1,9 +1,9 @@
 from hestia_earth.schema import SchemaType, TermTermType, UNIQUENESS_FIELDS
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import filter_list_term_type, find_term_match, linked_node
-from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
+from hestia_earth.utils.tools import flatten, list_sum, non_empty_list, get_dict_key
 
-from . import _term_id, _include_model, get_dict_key
+from . import _term_id, _include_model
 from .blank_node import get_total_value, get_total_value_converted
 from .constant import Units
 from .currency import DEFAULT_CURRENCY

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.62.5'
+VERSION = '0.62.6'

{hestia_earth_models-0.62.5.dist-info → hestia_earth_models-0.62.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.62.5
+Version: 0.62.6
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hestia-earth.schema==29.*
-Requires-Dist: hestia-earth.utils>=0.13.2
+Requires-Dist: hestia-earth.utils>=0.13.3
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0

{hestia_earth_models-0.62.5.dist-info → hestia_earth_models-0.62.6.dist-info}/RECORD

@@ -2,9 +2,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=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoWpUSoM,6065
 hestia_earth/models/log.py,sha256=DbfNcGzaC5hzkuMDxQqW6XYoNBI4Uxw4SIoOYoZA6og,3474
-hestia_earth/models/preload_requests.py,sha256=y_okcYzSbqODvmzkw-wOK2cOZEzkJq3pmRfxRsPsUw0,1012
+hestia_earth/models/preload_requests.py,sha256=Ibx-YOhR_1yuyFBxsLUbvJHVK7PLyMLoPu5l9jDN_Qk,1342
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=nhEXCAlUUnEUnxeP_S43AOWaQmufkzv4hRSHjCAeqR0,19
+hestia_earth/models/version.py,sha256=bq12SSfdPusguwOVPL82zbxOkhoEi6X6goWBn-b5HwE,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=tnGxBmJdPfPFfehLUQcefEqy1lHvzsSpx_s7O8nf3Zs,4412
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -39,6 +39,7 @@ hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tR
 hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=k0xg5SIfJGwEKteFr2Fh-lh8yDC_sqQw_lBnnfwl9zU,3069
 hestia_earth/models/cycle/concentrateFeed.py,sha256=wiq9KLRuipHz_2_CVfXDuUek0JN1ZPSyKSimtJntG9E,5636
 hestia_earth/models/cycle/cropResidueManagement.py,sha256=QTRCCFu9VvD_a3_8aAj216vsuhAJEhlAwTJH7ifMkDo,2237
+hestia_earth/models/cycle/croppingIntensity.py,sha256=44CgDqXg9CBRfTPYTyOleQT-M4_tsQgPba-0vjjk_C4,1770
 hestia_earth/models/cycle/cycleDuration.py,sha256=SuTFqCP3Zr3nOV9HuvvvIVcaHtOlTAdSaaswvRLSEwc,3242
 hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3Ca__F0KJ_wlwTxbPd7mUyehZW7AJPM,2212
 hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
@@ -47,6 +48,7 @@ hestia_earth/models/cycle/excretaKgVs.py,sha256=ed-DcQoQXZgWF8UZDs2N-G6EBIOPmpXu
 hestia_earth/models/cycle/inorganicFertiliser.py,sha256=Yt5NcP9FQEzWwlritrPGbhh2W9wR378OM3lDPBzDiL4,6967
 hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kpw0rMlRjCK25CExaW58DEvc9w,2125
 hestia_earth/models/cycle/liveAnimal.py,sha256=LWAMnNKRoLDdChrGApVIN-Ns7em0Lspz5UtLbf7PPLY,3988
+hestia_earth/models/cycle/longFallowRatio.py,sha256=RmUAUrTmSi8YG3A43R60N_7iy66vN_aY3d4uSJoJcDc,1661
 hestia_earth/models/cycle/milkYield.py,sha256=RhzePjkvEAGicTzRA4eatc0K_4NSGHhyEhYF0EbbGXw,5820
 hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
 hestia_earth/models/cycle/pastureSystem.py,sha256=uksVgl_3bp_t2niwZ5BvS3VT-Kndx26Se6GpzqG0bX8,2709
@@ -55,7 +57,8 @@ 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=XAxCA_51kQaWh4_0L_Y08cGn-qsMRUcyaPrn84rfafI,1058
+hestia_earth/models/cycle/siteDuration.py,sha256=793ez4IDOHxsbDIREZQ5rUgS6FQare2jL6SZ8qemxKs,2014
+hestia_earth/models/cycle/siteUnusedDuration.py,sha256=HvVyok1HPt0_WsTPZq2PklsFT9WKPF9frncS07nqzGA,2105
 hestia_earth/models/cycle/startDate.py,sha256=OnuMf4TkDb0WwCntjXNy3ipLS-b4drMWSkXWeXU142Q,1507
 hestia_earth/models/cycle/startDateDefinition.py,sha256=nCFeKjZjC3MoYNFH0N66WNW4HJUzKD_UkznvTMl_KfM,2244
 hestia_earth/models/cycle/transformation.py,sha256=06KTfVubh2I47dfnG9Iv6AbuUBbURM8BAVOkRu7XmHw,1255
@@ -143,14 +146,14 @@ hestia_earth/models/faostat2018/product/price.py,sha256=X7Zxa-rXthzYdgw2lzybbHc-
 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
-hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=V6ra1BvyXWXfHZHdJNfgbQU8D6piI0-rG6GxKHcy1pU,1975
+hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=4HVrl7Hayg6IpdCrz19Xq_clKdcS_0Sw9uiA4kjKJ40,2509
 hestia_earth/models/geospatialDatabase/drainageClass.py,sha256=CVagB2wxLnHgQQauDyYCJCfJw21OPB7Ry8BVyt2uPak,1883
 hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=hzK9Je_4NvbLtgAM48G7yf-6jrcMpsDzqSlLkVP3oYg,3625
 hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=awvHn0YEVu-YaW0ZDgBo_zbjSJU2EvydM_qAT_CL78A,1462
 hestia_earth/models/geospatialDatabase/erodibility.py,sha256=M62CetEcHuExeXl7P7DVKZWWbk9tenjaDFvjMsWbga4,1843
 hestia_earth/models/geospatialDatabase/heavyWinterPrecipitation.py,sha256=54pvHOfcfEUNNhTIWIPGRzqO_t59ACh-zhnLidO2xro,1956
 hestia_earth/models/geospatialDatabase/histosol.py,sha256=5zwKdF1t9aOjTzBoear62T0Kzpjco-IJXu4oRYrUFQ8,2387
-hestia_earth/models/geospatialDatabase/longFallowRatio.py,sha256=VnTW2Y7qpoxlEarOM85SzxhFb1kayNJAiecRXatrEpw,1872
+hestia_earth/models/geospatialDatabase/longFallowRatio.py,sha256=OXInoU4uYlgLwpAF3PetIDQ2ck4rOdf9_EyjXEtzD4Q,2505
 hestia_earth/models/geospatialDatabase/nutrientLossToAquaticEnvironment.py,sha256=uEsoYJ1mzgUo6fQhUrcJ-ATcFw1j9oEgqMXKbQuFRxQ,1973
 hestia_earth/models/geospatialDatabase/organicCarbonPerKgSoil.py,sha256=gt3-crrUN0HPtIKY7Hf9dUteCXkegSICVjO-jufDqas,2196
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py,sha256=UlCBvAD-6H-4sdryfPuX1YDlOsGPOI8T9y0q4O0Tau8,2544
@@ -369,8 +372,8 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=pdluhfRQuJK0EHq-L0s0TOf37tvOQYB-M-wZiuSbarw,1050
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
-hestia_earth/models/mocking/mock_search.py,sha256=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
-hestia_earth/models/mocking/search-results.json,sha256=1hltFd6NwJIu9ThIGHJHatLsd3EflzRDnpShgM9vm60,46412
+hestia_earth/models/mocking/mock_search.py,sha256=qgABw-sZK37XtsALKt8AHF2VJPUrZSnHv5Qj1Dn93oA,2405
+hestia_earth/models/mocking/search-results.json,sha256=Ej8oiIFaddQ5-eOjMO_X7TxO7yVdsd0IASgWWRPfvWg,46413
 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
@@ -379,7 +382,7 @@ hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kLWtv49c1sD3YrporqRcmw
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=nlnZSDx-bIvtukL79Syhon0cSQ8o4OC1YKtAG6haGhI,8500
 hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=HB_9q5eE6al2Te3v29hC5wqxsYe4P46ZAPwdWNzx3v0,3939
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=jE110XgPMgfnBMUXyKIL5SL9yZWYhdGr5NrfHcqn2h0,2785
-hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=yttZiWc1Tr3Tqe2C3-rWYoEyogIUDraoVWnDxwH3vYs,1566
+hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=jXm6SeoA0kW0rpcWLcGEDxWwiLsIJRllM4md6jSAqgc,1507
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=HJ7IstImGyasIKosK2lQZ-v6Lqt3_aEfZhoiC4CY0rM,2586
 hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py,sha256=SoZlogDd7_4kq5S9gc8KmVeIXacWWhaUkWlKTuho_OA,2431
 hestia_earth/models/pooreNemecek2018/nh3ToAirAquacultureSystems.py,sha256=4TDILoagYMVBSBbVXEecIOv-pzQ-W2Hg6rpL58t1-J4,4001
@@ -389,11 +392,11 @@ hestia_earth/models/pooreNemecek2018/no3ToGroundwaterInorganicFertiliser.py,sha2
 hestia_earth/models/pooreNemecek2018/no3ToGroundwaterOrganicFertiliser.py,sha256=ussLIjMsJT0_GmikEBpGqHzDZ5KqJYH8T-B2qN4LRzE,2298
 hestia_earth/models/pooreNemecek2018/no3ToGroundwaterSoilFlux.py,sha256=G0D_YBCP29Yl_hmQ7jpZP6i0I708PiiaaVRoNrI01MI,6058
 hestia_earth/models/pooreNemecek2018/noxToAirAquacultureSystems.py,sha256=NfuCdx-rt5mhUxGSsJSudSMp9YkiHRMAiWVyR6m8faM,2733
-hestia_earth/models/pooreNemecek2018/nurseryDensity.py,sha256=oVoMNWF64ps2SkazFhbdq4CPGqYiHYu0Tum75ACRICU,1010
-hestia_earth/models/pooreNemecek2018/nurseryDuration.py,sha256=QDKvYgx8JrleL1cjtsaYpguBxiu9Dlg0SVSo4b21VXs,1012
-hestia_earth/models/pooreNemecek2018/plantationDensity.py,sha256=p0Lu2lzDDmPRq4MPPGKO_gPP_2lTfC9E1pxPJwKW8Tg,1016
-hestia_earth/models/pooreNemecek2018/plantationLifespan.py,sha256=n1GhSkQ7qcQ6GE_KcMk7Iowi9H29SgS2-1Y5oRDv32w,1018
-hestia_earth/models/pooreNemecek2018/plantationProductiveLifespan.py,sha256=daDf6lxJdx6SWcK2mjCq65tePVQ7_6I4rllrAePmQuo,1799
+hestia_earth/models/pooreNemecek2018/nurseryDensity.py,sha256=ZY4w4q6uvKls-Tj4hz770MRIwJeHxA4DZ10JUJYeBss,951
+hestia_earth/models/pooreNemecek2018/nurseryDuration.py,sha256=_k8OCZxCiT5hrWGLx4HF0CHi21eYtbkFMxMNYKctzCc,953
+hestia_earth/models/pooreNemecek2018/plantationDensity.py,sha256=-y-zXHFPet0LdIgSG-o2hV_sdIOLeuWoRikW2DPi3kk,957
+hestia_earth/models/pooreNemecek2018/plantationLifespan.py,sha256=FudC-csC1IkiFOJ_uD0s6_rwsgqVrUN6Ej7A03JXDsM,959
+hestia_earth/models/pooreNemecek2018/plantationProductiveLifespan.py,sha256=Q54woX67eUab0qEEAuW2naFGhnVPJHrMas3bG92KNeg,1740
 hestia_earth/models/pooreNemecek2018/rotationDuration.py,sha256=F3zDjhEzxZJ_1y_9LG3_DRkyNuaGiJX5i4XqiXOoP_0,1509
 hestia_earth/models/pooreNemecek2018/saplings.py,sha256=LS0zepV51-LlVmPBAjj5nlfgaJFnQF6wo40sgoFCr3Y,2258
 hestia_earth/models/pooreNemecek2018/utils.py,sha256=to2vtONKCbuG1gVSDvsUcG7EnlahELfG_57gzIAHlv0,1710
@@ -527,7 +530,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
-hestia_earth/models/utils/__init__.py,sha256=s9kqI1lHCvY6XmssTe5s3CzgrOQ4MKzlCiGmtr3ueE4,5228
+hestia_earth/models/utils/__init__.py,sha256=xC04_nMK9YSVW8Eq8BOcvi2AFjKxlVG5uAwfdZ-_cak,4964
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
@@ -539,7 +542,7 @@ hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO
 hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
-hestia_earth/models/utils/cycle.py,sha256=Q6NE5LWvoHng0l980r1i8lpmHWOL0HyMW6uXWhAf_Pw,16219
+hestia_earth/models/utils/cycle.py,sha256=JeYxIJOwdgZltkVQqFmEdzyGIpjWLa4oBt_H65OaRxU,16706
 hestia_earth/models/utils/descriptive_stats.py,sha256=qOyG8_TpWYmaxZ0h99n9L71gDLLiVMrMf0ChtxnZLjw,8559
 hestia_earth/models/utils/ecoClimateZone.py,sha256=NHFt-A9EiWXC6tUNIxkgOWUZOjj4I4uwJIP9ddDZegw,1112
 hestia_earth/models/utils/emission.py,sha256=5Dz8Z4P6QXbYSvOzVcqJy3R_oZMrp77_Iwj5xZsxsKc,3769
@@ -557,7 +560,7 @@ hestia_earth/models/utils/measurement.py,sha256=rxrrOVdkDm-J0QVjCEapa4z4KY3hUw-b
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=6f8b-dFm3qr-eY049_eOvj_iDk4XBam61csozdDAvyA,2361
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
-hestia_earth/models/utils/product.py,sha256=H9UqJNzTqtMWXDQnbRkZlTpv_hg4s-Tya469fBk8InA,10143
+hestia_earth/models/utils/product.py,sha256=DhDgiReR8k9n9aaRM2xk3PIY3nfoE1ISKg9pKsBVzVQ,10143
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
 hestia_earth/models/utils/property.py,sha256=_9Wy0oZIBLsa-jOiGLokKehYLNdz-_7LfLaE4fb6SWM,5085
 hestia_earth/models/utils/site.py,sha256=zEj2PtIghk-L_vVJidlXM6_ed7HTc2-ogP0sQSh49vw,3874
@@ -606,6 +609,7 @@ tests/models/cycle/test_coldDressedCarcassWeightPerHead.py,sha256=DrdI1TUmggeeQv
 tests/models/cycle/test_completeness.py,sha256=Ku1ZSApGaACkXe3ae14yP01C4GssHMwlPG_UPrSytPo,1625
 tests/models/cycle/test_concentrateFeed.py,sha256=tgkThL4g293CexLvb89ftO9UqUbHhNOxiP6QMmsqCCo,2013
 tests/models/cycle/test_cropResidueManagement.py,sha256=vQWl7rDYLJjiKyBQlCiOA76LpzM4dI2t7JJ30uF8H9M,2020
+tests/models/cycle/test_croppingIntensity.py,sha256=o5nA5tGbnk1IFdOhlN_Dh9oKcSq_yzSwkbBJzYfmYMg,1565
 tests/models/cycle/test_cycleDuration.py,sha256=2KExiliuOa7_j88rJuPObJKZqq0xsRnFAb0ZEqc5KEM,846
 tests/models/cycle/test_energyContentLowerHeatingValue.py,sha256=ZvHigQrtneKrRc8qr7rN8aj6tuA0ds0V6Brh0UzN_T8,1204
 tests/models/cycle/test_excretaKgMass.py,sha256=xpuq0k5HKvnGmWdJy0GmIv6A4xYk2VDFB4BMb8J2Z0g,2925
@@ -615,6 +619,7 @@ tests/models/cycle/test_feedConversionRatio.py,sha256=V6zpZvUmBN0LciJW5YbHHaRQX6
 tests/models/cycle/test_inorganicFertiliser.py,sha256=c-JDYC0qDK4JWlYDaGX53AcKfetz_YifSfdhy-v-WMo,642
 tests/models/cycle/test_irrigatedTypeUnspecified.py,sha256=9YGwpDO_RHMaldvjJZ0xdrdfUzYDnLPt6nMJ2eRXSTI,2151
 tests/models/cycle/test_liveAnimal.py,sha256=7fRPgEnIwcir-tYwUNnr6gc2e5_vnZi-t8EuuiPioeM,2139
+tests/models/cycle/test_longFallowRatio.py,sha256=Aspp7l_L4gBVDmd9cj8doma6NX-509iWmzvkDpKhFf8,1502
 tests/models/cycle/test_milkYield.py,sha256=7e5JJzLkc47OnQf3xni1Nkyq7N4xi1RglnE8caE9TfY,1778
 tests/models/cycle/test_pastureGrass.py,sha256=hNRjBLYXGybzHPMfBOCgcRjGkDBmW0k_G6tn9TLrycY,1025
 tests/models/cycle/test_pastureSystem.py,sha256=VlPn4mlaNimiu3liV5EMELJueUCqSSJ1l82yMV0UK90,1590
@@ -625,7 +630,8 @@ tests/models/cycle/test_residueBurnt.py,sha256=eBAzGR1210cBYH_s6oI1yCG6tVKUj9gGs
 tests/models/cycle/test_residueIncorporated.py,sha256=esB_wnpf6W0PB24HW0YUgtfD9mxLDIY22eNVD4WAYFA,1719
 tests/models/cycle/test_residueLeftOnField.py,sha256=_8CoSp-7z3BBLGN5Hv067FRYz8yDFw5fi_Cu5n6Rl3g,1290
 tests/models/cycle/test_residueRemoved.py,sha256=R5v8lwGyz_4a9_X_LnugBEmgVgcisS5LTM5GFCtKIco,1278
-tests/models/cycle/test_siteDuration.py,sha256=3VS9oyEey_dkaIaKtXfnxfARkfSmZbbM-Px0_lvqxQM,881
+tests/models/cycle/test_siteDuration.py,sha256=43Hjb0f2lXCRGqj-UmfLVmk7OGJswawtcA2q5wlffXk,1712
+tests/models/cycle/test_siteUnusedDuration.py,sha256=5h9R3guw6ErU_sE5omoiK9Fpke74SmQWsJYWYURE9Fo,1532
 tests/models/cycle/test_startDate.py,sha256=cGhqeZWkJdp6PNxmT0rJ5ZVsTAKm_8CyZKivAzRwSeI,592
 tests/models/cycle/test_startDateDefinition.py,sha256=42BmsT1I7Jq_YMVN-VNU7a0fIZ2w3i5jgwy4H_r4dNM,920
 tests/models/cycle/test_transformations.py,sha256=Ws_8KhNqeHogGFXTQ4qZXQ5Ph2I3ZUaY0yO1itFUHLk,464
@@ -697,14 +703,14 @@ tests/models/faostat2018/product/test_price.py,sha256=vUTT-FZVbXnDrwQVOgq8PWTDuF
 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
-tests/models/geospatialDatabase/test_croppingIntensity.py,sha256=e2opH6R2BIAEg5_Qm80UGJfzpDle0vjN5wvVBNmXdDc,943
+tests/models/geospatialDatabase/test_croppingIntensity.py,sha256=p7OQZOKuxcEhokFqIE4jj6GU3YwR9GtQqNwlhOGy7uI,1006
 tests/models/geospatialDatabase/test_drainageClass.py,sha256=X75v6f8N5i40grULUNMvNOu_UC27VoahuW6BaQb19LY,1015
 tests/models/geospatialDatabase/test_ecoClimateZone.py,sha256=ad0BBOhjl6uMUP_-QhAHEG3kTo7x3EaXuEahbbnx10E,1119
 tests/models/geospatialDatabase/test_ecoregion.py,sha256=xPEXQKXpF4ghpVwuyZWC-4mmN9qywF-s_QKkmU40H70,868
 tests/models/geospatialDatabase/test_erodibility.py,sha256=UW6SZS1nY3rzr2TqRcFDoq6a5KJ6ox-8L0k-im23R0s,1013
 tests/models/geospatialDatabase/test_heavyWinterPrecipitation.py,sha256=1xv7L_b3ochbcu6y6TQrTUL0ZLr6aR44kAPsEN_1kAE,1026
 tests/models/geospatialDatabase/test_histosol.py,sha256=Jc4N7Qt2zx09L8lj9Kjmr1q36T96MBNlasxGB0jD4EQ,1102
-tests/models/geospatialDatabase/test_longFallowRatio.py,sha256=b1H2onTFO3NPHNG_e_kMnd_BMs1mGZnp2a9EsYpmI_c,941
+tests/models/geospatialDatabase/test_longFallowRatio.py,sha256=VoYURFuOnlC8ozxcMLTzv99MGlymlVXd596T5MKVvOU,1004
 tests/models/geospatialDatabase/test_nutrientLossToAquaticEnvironment.py,sha256=ZtoNdI_dB3Nk79Ts9JJrlda7z6HRE2cwCQHC2DiWCsY,1034
 tests/models/geospatialDatabase/test_organicCarbonPerKgSoil.py,sha256=WomlRdVl4f6ooJz2YctPf0YGiNs-9To6XFwTdtpm0SQ,1024
 tests/models/geospatialDatabase/test_potentialEvapotranspirationAnnual.py,sha256=6s4XDmKi__njKE_3tFMIAHr0a1w7X4t8uFRtihN_cm4,706
@@ -1094,8 +1100,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.62.5.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.62.5.dist-info/METADATA,sha256=OAujkDOEp9WGRnmAyJHbKMy1QeXRDfjmsedbSU3dwBo,3343
-hestia_earth_models-0.62.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.62.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.62.5.dist-info/RECORD,,
+hestia_earth_models-0.62.6.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.62.6.dist-info/METADATA,sha256=vTHt2mh8iCpLEmF569y6GKPZrhm2xg91Fjq3bnKFc1E,3343
+hestia_earth_models-0.62.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.62.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.62.6.dist-info/RECORD,,

tests/models/cycle/test_croppingIntensity.py

@@ -0,0 +1,53 @@
+from unittest.mock import patch
+import pytest
+import json
+from tests.utils import fixtures_path, fake_new_practice
+
+from hestia_earth.models.cycle.croppingIntensity import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@pytest.mark.parametrize(
+    'test_name,cycle,expected_should_run',
+    [
+        (
+            'no cycleDuration => no run',
+            {},
+            False
+        ),
+        (
+            'with cycleDuration and wrong startDateDefinition => no run',
+            {
+                'cycleDuration': 100,
+                'startDateDefinition': 'random definition'
+            },
+            False
+        ),
+        (
+            'with cycleDuration and correct startDateDefinition => run',
+            {
+                'cycleDuration': 100,
+                'startDateDefinition': 'harvest of previous crop'
+            },
+            True
+        )
+    ]
+)
+@patch(f"{class_path}.is_plantation", return_value=False)
+def test_should_run(mock_is_plantation, test_name, cycle, expected_should_run):
+    should_run = _should_run(cycle)
+    assert should_run == expected_should_run, test_name
+
+
+@patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/cycle/test_longFallowRatio.py

@@ -0,0 +1,49 @@
+from unittest.mock import patch
+import pytest
+import json
+from tests.utils import fixtures_path, fake_new_practice
+
+from hestia_earth.models.cycle.longFallowRatio import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@pytest.mark.parametrize(
+    'test_name,cycle,expected_should_run',
+    [
+        (
+            'no longFallowPeriod => no run',
+            {'practices': []},
+            False
+        ),
+        (
+            'with longFallowPeriod no rotationDuration => no run',
+            {'practices': [{'term': {'@id': 'longFallowPeriod'}, 'value': [10]}]},
+            False
+        ),
+        (
+            'with longFallowPeriod and rotationDuration => run',
+            {'practices': [
+                {'term': {'@id': 'longFallowPeriod'}, 'value': [10]},
+                {'term': {'@id': 'rotationDuration'}, 'value': [10]}
+            ]},
+            True
+        )
+    ]
+)
+def test_should_run(test_name, cycle, expected_should_run):
+    should_run, *args = _should_run(cycle)
+    assert should_run == expected_should_run, test_name
+
+
+@patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/cycle/test_siteDuration.py

@@ -1,4 +1,5 @@
 import json
+import pytest
 from tests.utils import fixtures_path
 
 from hestia_earth.models.cycle.siteDuration import MODEL, MODEL_KEY, _should_run, run
@@ -6,21 +7,47 @@ from hestia_earth.models.cycle.siteDuration import MODEL, MODEL_KEY, _should_run
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 
 
-def test_should_run():
-    # no cycleDuration => no run
-    cycle = {}
+@pytest.mark.parametrize(
+    'test_name,cycle,expected_should_run',
+    [
+        (
+            'no cycleDuration => no run',
+            {},
+            False
+        ),
+        (
+            'with otherSites => no run',
+            {'otherSites': []},
+            False
+        ),
+        (
+            'with cycleDuration => run',
+            {'cycleDuration': 100},
+            True
+        ),
+        (
+            'with a crop product and wrong startDateDefinition => no run',
+            {
+                'cycleDuration': 100,
+                'products': [{'term': {'termType': 'crop'}, 'primary': True}],
+                'startDateDefinition': 'random definition'
+            },
+            False
+        ),
+        (
+            'with a crop product and correct startDateDefinition => run',
+            {
+                'cycleDuration': 100,
+                'products': [{'term': {'termType': 'crop'}, 'primary': True}],
+                'startDateDefinition': 'harvest of previous crop'
+            },
+            True
+        )
+    ]
+)
+def test_should_run_animal(test_name, cycle, expected_should_run):
     should_run = _should_run(cycle)
-    assert not should_run
-
-    # with cycleDuration => run
-    cycle['cycleDuration'] = 100
-    should_run = _should_run(cycle)
-    assert should_run is True
-
-    # with otherSites => no run
-    cycle['otherSites'] = [{}]
-    should_run = _should_run(cycle)
-    assert not should_run
+    assert should_run == expected_should_run, test_name
 
 
 def test_run():

tests/models/cycle/test_siteUnusedDuration.py

@@ -0,0 +1,55 @@
+import json
+import pytest
+from tests.utils import fixtures_path
+
+from hestia_earth.models.cycle.siteUnusedDuration import MODEL, MODEL_KEY, _should_run, run
+
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+@pytest.mark.parametrize(
+    'test_name,cycle,expected_should_run',
+    [
+        (
+            'no siteDuration => no run',
+            {},
+            False
+        ),
+        (
+            'with siteDuration => no run',
+            {'siteDuration': 100},
+            False
+        ),
+        (
+            'with siteDuration and longFallowRatio => no run',
+            {
+                'siteDuration': 100,
+                'practices': [{'term': {'@id': 'longFallowRatio'}, 'value': [10]}]
+            },
+            False
+        ),
+        (
+            'with siteDuration and longFallowRatio and cropland => run',
+            {
+                'siteDuration': 100,
+                'practices': [{'term': {'@id': 'longFallowRatio'}, 'value': [10]}],
+                'site': {'siteType': 'cropland'}
+            },
+            True
+        )
+    ]
+)
+def test_should_run_animal(test_name, cycle, expected_should_run):
+    should_run, *args = _should_run(cycle)
+    assert should_run == expected_should_run, test_name
+
+
+def test_run():
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
+
+    with open(f"{fixtures_folder}/result.txt", encoding='utf-8') as f:
+        expected = f.read().strip()
+
+    value = run(data)
+    assert float(value) == float(expected)

tests/models/geospatialDatabase/test_croppingIntensity.py

@@ -9,14 +9,16 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 @patch(f"{class_path}.is_plantation")
-def test_should_run(mock_is_plantation):
+def test_should_run(mock_is_plantation, *args):
     cycle = {'@type': 'Cycle'}
 
     mock_is_plantation.return_value = False
-    assert _should_run(cycle) is True
+    should_run = _should_run(cycle)
+    assert should_run is True
 
     mock_is_plantation.return_value = True
-    assert not _should_run(cycle)
+    should_run = _should_run(cycle)
+    assert not should_run
 
 
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)

tests/models/geospatialDatabase/test_longFallowRatio.py

@@ -9,14 +9,16 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 @patch(f"{class_path}.is_plantation")
-def test_should_run(mock_is_plantation):
+def test_should_run(mock_is_plantation, *args):
     cycle = {'@type': 'Cycle'}
 
     mock_is_plantation.return_value = False
-    assert _should_run(cycle) is True
+    should_run = _should_run(cycle)
+    assert should_run is True
 
     mock_is_plantation.return_value = True
-    assert not _should_run(cycle)
+    should_run = _should_run(cycle)
+    assert not should_run
 
 
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)