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

hestia_earth/models/cycle/longFallowRatio.py

@@ -8,7 +8,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "practices": [
-            {"@type": "Practice", "value": "> 0", "term.@id": "longFallowPeriod"},
+            {"@type": "Practice", "value": "> 0", "term.@id": "longFallowDuration"},
             {"@type": "Practice", "value": "> 0", "term.@id": "rotationDuration"}
         ]
     }
@@ -27,26 +27,26 @@ def _practice(value: float):
     return practice
 
 
-def _run(longFallowPeriod: float, rotationDuration: float):
-    value = rotationDuration / (rotationDuration - longFallowPeriod)
+def _run(longFallowDuration: float, rotationDuration: float):
+    value = rotationDuration / (rotationDuration - longFallowDuration)
     return [_practice(value)]
 
 
 def _should_run(cycle: dict):
     practices = cycle.get('practices', [])
 
-    longFallowPeriod = list_sum(find_term_match(practices, 'longFallowPeriod', {}).get('value', 0), 0)
+    longFallowDuration = list_sum(find_term_match(practices, 'longFallowDuration', {}).get('value', 0), 0)
     rotationDuration = list_sum(find_term_match(practices, 'rotationDuration', {}).get('value', 0), 0)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    longFallowPeriod=longFallowPeriod,
+                    longFallowDuration=longFallowDuration,
                     rotationDuration=rotationDuration)
 
-    should_run = all([longFallowPeriod > 0, rotationDuration > 0])
+    should_run = all([longFallowDuration > 0, rotationDuration > 0])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)
-    return should_run, longFallowPeriod, rotationDuration
+    return should_run, longFallowDuration, rotationDuration
 
 
 def run(cycle: dict):
-    should_run, longFallowPeriod, rotationDuration = _should_run(cycle)
-    return _run(longFallowPeriod, rotationDuration) if should_run else []
+    should_run, longFallowDuration, rotationDuration = _should_run(cycle)
+    return _run(longFallowDuration, rotationDuration) if should_run else []

hestia_earth/models/mocking/search-results.json

@@ -1486,7 +1486,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 26.344206
+        "_score": 26.36456
       }
     ]
   },

hestia_earth/models/pooreNemecek2018/{longFallowPeriod.py → longFallowDuration.py}

@@ -11,14 +11,14 @@ REQUIREMENTS = {
     }
 }
 LOOKUPS = {
-    "crop": "Plantation_longFallowPeriod"
+    "crop": "Plantation_longFallowDuration"
 }
 RETURNS = {
     "Practice": [{
         "value": ""
     }]
 }
-TERM_ID = 'longFallowPeriod'
+TERM_ID = 'longFallowDuration'
 
 
 def _practice(value: float):

hestia_earth/models/pooreNemecek2018/rotationDuration.py

@@ -2,7 +2,7 @@ from hestia_earth.models.log import debugValues, log_as_table
 from hestia_earth.models.utils.practice import _new_practice
 from hestia_earth.models.utils import sum_values
 from .plantationLifespan import _get_value as get_plantationLifespan
-from .longFallowPeriod import _get_value as get_longFallowPeriod
+from .longFallowDuration import _get_value as get_longFallowDuration
 from .utils import run_products_average
 from . import MODEL
 
@@ -12,7 +12,7 @@ REQUIREMENTS = {
     }
 }
 LOOKUPS = {
-    "crop": ["Plantation_lifespan", "Plantation_longFallowPeriod"]
+    "crop": ["Plantation_lifespan", "Plantation_longFallowDuration"]
 }
 RETURNS = {
     "Practice": [{
@@ -31,15 +31,15 @@ def _practice(value: float):
 def _get_value(cycle: dict):
     def get(product: dict):
         plantationLifespan = get_plantationLifespan(product)
-        longFallowPeriod = get_longFallowPeriod(product)
+        longFallowDuration = get_longFallowDuration(product)
         product_id = product.get('term').get('@id')
         product_id_logs = log_as_table({
             'plantationLifespan': plantationLifespan,
-            'longFallowPeriod': longFallowPeriod
+            'longFallowDuration': longFallowDuration
         })
         debugValues(cycle, model=MODEL, term=TERM_ID,
                     **{product_id: product_id_logs})
-        return sum_values([plantationLifespan, longFallowPeriod])
+        return sum_values([plantationLifespan, longFallowDuration])
     return get
 
 

hestia_earth/models/utils/cycle.py

@@ -469,6 +469,6 @@ def get_animals_by_period(cycle: dict, period: AnimalReferencePeriod = AnimalRef
 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]))
+    allowed_site_ids = non_empty_list([s.get('@id', s.get('id')) for s in allowed_sites])
+    debugValues(cycle, model=model, term=term_id, site_ids=';'.join(allowed_site_ids))
     return allowed_sites

hestia_earth/models/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.62.6
+Version: 0.63.0
 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.62.6.dist-info → hestia_earth_models-0.63.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=DbfNcGzaC5hzkuMDxQqW6XYoNBI4Uxw4SIoOYoZA6og,3474
 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=bq12SSfdPusguwOVPL82zbxOkhoEi6X6goWBn-b5HwE,19
+hestia_earth/models/version.py,sha256=gA5_Bj5-CBV6LXgvlenTaXCJJNDsCnX2WFR-jHXi9F8,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
@@ -48,7 +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/longFallowRatio.py,sha256=_h0kub99sACO87IfjMeiu8IgdK2jaeBlgGA9A9-ViZA,1683
 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
@@ -373,7 +373,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 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=qgABw-sZK37XtsALKt8AHF2VJPUrZSnHv5Qj1Dn93oA,2405
-hestia_earth/models/mocking/search-results.json,sha256=Ej8oiIFaddQ5-eOjMO_X7TxO7yVdsd0IASgWWRPfvWg,46413
+hestia_earth/models/mocking/search-results.json,sha256=-BZt5OSwu_1B2DMyPuhUdQTWmv1iymSRUQsCKCh6-oQ,46412
 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
@@ -382,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=jXm6SeoA0kW0rpcWLcGEDxWwiLsIJRllM4md6jSAqgc,1507
+hestia_earth/models/pooreNemecek2018/longFallowDuration.py,sha256=Wdm6QyOttCFP9Y3OjbaYrvdMmivOmMIT-m5Eg9SM9rY,1511
 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
@@ -397,7 +397,7 @@ hestia_earth/models/pooreNemecek2018/nurseryDuration.py,sha256=_k8OCZxCiT5hrWGLx
 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/rotationDuration.py,sha256=j5hW_NEKYQbeMcdsqp2nQIDXCnUdZIKURzAmPCiegQk,1525
 hestia_earth/models/pooreNemecek2018/saplings.py,sha256=LS0zepV51-LlVmPBAjj5nlfgaJFnQF6wo40sgoFCr3Y,2258
 hestia_earth/models/pooreNemecek2018/utils.py,sha256=to2vtONKCbuG1gVSDvsUcG7EnlahELfG_57gzIAHlv0,1710
 hestia_earth/models/recipe2016Egalitarian/__init__.py,sha256=OvZoSgfaMe6DWIdqr-Sx3ouzXlp994oro7Mi0Xid18Q,422
@@ -542,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=JeYxIJOwdgZltkVQqFmEdzyGIpjWLa4oBt_H65OaRxU,16706
+hestia_earth/models/utils/cycle.py,sha256=W-VIReb1OVooV6EIj-P6gUlr-W17_6USdnnj4ihMTTc,16741
 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
@@ -619,7 +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_longFallowRatio.py,sha256=sztr1pysldwedTC78JWUHAVWl2oL0jTIQ13c6Nxzlso,1512
 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
@@ -933,7 +933,7 @@ tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=lKM-Q7TjQoxjvjY9tCcmJxoW
 tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=LIoLevR0tHrZwazuGprt6SCFtmDrj4NBq1s1SJEhQCA,3252
 tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=5QxDU6VzcwWup3Nuhn32kJoIlAkqcSggGr4CmoRqrFA,1623
 tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=XbsApbRIuzq4GeaN7PrzlMA7grU7y6j_HPesgQIf_Uw,1650
-tests/models/pooreNemecek2018/test_longFallowPeriod.py,sha256=zAa-zmCbHOjCUsOQdEvZRBw_r8gdmxYZXYurRGVLxfM,923
+tests/models/pooreNemecek2018/test_longFallowDuration.py,sha256=kelZajIbKyvVm1vX_grRZy0IUrtejGI5GPn03qbElnw,925
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=4YAoUhIwfEmRe2B5BvNg247VeB7UXHNeZqr2mRtJA7Y,2207
 tests/models/pooreNemecek2018/test_n2ToAirAquacultureSystems.py,sha256=YqwAvbYfLVamfkUJUwGTEWEnz8ts66jVF8831QcWNkg,2200
 tests/models/pooreNemecek2018/test_nh3ToAirAquacultureSystems.py,sha256=aTXdtjp3j3vZkRF3C8aHcFwnWZH-FkfTWVdIIZYBaK8,2945
@@ -1100,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.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,,
+hestia_earth_models-0.63.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.63.0.dist-info/METADATA,sha256=MK-JrrKU5oV4srRZkm6T31CFsmoyaAr1NpMWMJ6zb3M,3343
+hestia_earth_models-0.63.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.63.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.63.0.dist-info/RECORD,,

tests/models/cycle/test_longFallowRatio.py

@@ -13,19 +13,19 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
     'test_name,cycle,expected_should_run',
     [
         (
-            'no longFallowPeriod => no run',
+            'no longFallowDuration => no run',
             {'practices': []},
             False
         ),
         (
-            'with longFallowPeriod no rotationDuration => no run',
-            {'practices': [{'term': {'@id': 'longFallowPeriod'}, 'value': [10]}]},
+            'with longFallowDuration no rotationDuration => no run',
+            {'practices': [{'term': {'@id': 'longFallowDuration'}, 'value': [10]}]},
             False
         ),
         (
-            'with longFallowPeriod and rotationDuration => run',
+            'with longFallowDuration and rotationDuration => run',
             {'practices': [
-                {'term': {'@id': 'longFallowPeriod'}, 'value': [10]},
+                {'term': {'@id': 'longFallowDuration'}, 'value': [10]},
                 {'term': {'@id': 'rotationDuration'}, 'value': [10]}
             ]},
             True

tests/models/pooreNemecek2018/{test_longFallowPeriod.py → test_longFallowDuration.py}

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.pooreNemecek2018.longFallowPeriod import MODEL, TERM_ID, run
+from hestia_earth.models.pooreNemecek2018.longFallowDuration import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"