hestia-earth-models 0.62.6__tar.gz → 0.63.0__tar.gz

{hestia-earth-models-0.62.6/hestia_earth_models.egg-info → hestia-earth-models-0.63.0}/PKG-INFO

@@ -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 → hestia-earth-models-0.63.0}/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-0.62.6 → hestia-earth-models-0.63.0}/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-0.62.6/hestia_earth/models/pooreNemecek2018/longFallowPeriod.py → hestia-earth-models-0.63.0/hestia_earth/models/pooreNemecek2018/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-0.62.6 → hestia-earth-models-0.63.0}/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-0.62.6 → hestia-earth-models-0.63.0}/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-0.63.0/hestia_earth/models/version.py

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

{hestia-earth-models-0.62.6 → hestia-earth-models-0.63.0/hestia_earth_models.egg-info}/PKG-INFO

@@ -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 → hestia-earth-models-0.63.0}/hestia_earth_models.egg-info/SOURCES.txt

@@ -386,7 +386,7 @@ hestia_earth/models/pooreNemecek2018/excretaKgN.py
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py
 hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py
-hestia_earth/models/pooreNemecek2018/longFallowPeriod.py
+hestia_earth/models/pooreNemecek2018/longFallowDuration.py
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py
 hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py
 hestia_earth/models/pooreNemecek2018/nh3ToAirAquacultureSystems.py
@@ -942,7 +942,7 @@ tests/models/pooreNemecek2018/test_excretaKgN.py
 tests/models/pooreNemecek2018/test_excretaKgVs.py
 tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py
 tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py
-tests/models/pooreNemecek2018/test_longFallowPeriod.py
+tests/models/pooreNemecek2018/test_longFallowDuration.py
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py
 tests/models/pooreNemecek2018/test_n2ToAirAquacultureSystems.py
 tests/models/pooreNemecek2018/test_nh3ToAirAquacultureSystems.py

{hestia-earth-models-0.62.6 → hestia-earth-models-0.63.0}/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

hestia-earth-models-0.62.6/tests/models/pooreNemecek2018/test_longFallowPeriod.py → hestia-earth-models-0.63.0/tests/models/pooreNemecek2018/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}"

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

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