hestia-earth-models 0.64.0__py3-none-any.whl → 0.64.1__py3-none-any.whl

hestia_earth/models/cycle/endDate.py

@@ -0,0 +1,47 @@
+"""
+End Date
+
+This model sets the [Cycle endDate](https://hestia.earth/schema/Cycle#endDate) based on:
+* if no `cycleDuration` is provided, and the `endDate` is set to month precision (e.g., `2000-01`),
+assumed it ended on the 14th of the month.
+"""
+from hestia_earth.utils.date import is_in_months
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "endDate": "month precision",
+        "none": {
+            "cycleDuration": ""
+        }
+    }
+}
+RETURNS = {
+    "The endDate as a string": ""
+}
+MODEL_KEY = 'endDate'
+
+
+def _run(cycle: dict):
+    endDate = cycle.get('endDate')
+    return f"{endDate}-14"
+
+
+def _should_run(cycle: dict):
+    has_endDate = cycle.get('endDate') is not None
+    has_month_precision = has_endDate and is_in_months(cycle.get('endDate'))
+    no_cycleDuration = cycle.get('cycleDuration') is None
+
+    logRequirements(cycle, model=MODEL, key=MODEL_KEY, by='endDate',
+                    has_endDate=has_endDate,
+                    has_month_precision=has_month_precision,
+                    no_cycleDuration=no_cycleDuration)
+
+    should_run = all([has_endDate, has_month_precision, no_cycleDuration])
+    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY, by='endDate')
+    return should_run
+
+
+def run(cycle: dict): return _run(cycle) if _should_run(cycle) else None

hestia_earth/models/cycle/otherSitesUnusedDuration.py

@@ -0,0 +1,91 @@
+"""
+Other Sites Unused Duration
+
+This model sets the [Cycle otherSitesUnusedDuration](https://hestia.earth/schema/Cycle#otherSitesUnusedDuration)
+based on the `otherSites`, `otherSitesDuration`, and the `longFallowRatio` practice associated with each.
+"""
+from hestia_earth.schema import SiteSiteType
+from hestia_earth.utils.tools import list_sum
+
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.site import valid_site_type
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "otherSites": [{
+            "@type": "Site",
+            "siteType": ["cropland", "glass and high accessible cover"]
+        }],
+        "otherSitesDuration": "",
+        "practices": [{
+            "@type": "Practice",
+            "value": "> 0",
+            "term.@id": "longFallowRatio",
+            "site": {"@type": "Site"}
+        }]
+    }
+}
+RETURNS = {
+    "The otherSitesUnusedDuration as an array of number": ""
+}
+MODEL_KEY = 'otherSitesUnusedDuration'
+VALID_SITE_TYPES = [
+    SiteSiteType.CROPLAND.value,
+    SiteSiteType.GLASS_OR_HIGH_ACCESSIBLE_COVER.value
+]
+_PRACTICE_TERM_ID = 'longFallowRatio'
+
+
+def _run(siteDuration: float, longFallowRatio: float):
+    return siteDuration * (longFallowRatio - 1)
+
+
+def _find_site_practice(practices: list, site_id: str):
+    return list_sum(next(
+        (p for p in practices if all([
+            p.get('term', {}).get('@id') == _PRACTICE_TERM_ID,
+            p.get('site') is None or p.get('site', {}).get('@id', p.get('site', {}).get('id')) == site_id
+        ])),
+        {}
+    ).get('value'), None)
+
+
+def _should_run(cycle: dict):
+    otherSitesDuration = cycle.get('otherSitesDuration', [])
+    practices = cycle.get('practices', [])
+
+    site_data = [
+        {
+            'site-id': site.get('@id', site.get('id')),
+            'siteType': site.get('siteType'),
+            'valid-site': valid_site_type(site, site_types=VALID_SITE_TYPES),
+            'site-duration': otherSitesDuration[index] if len(otherSitesDuration) > index else None,
+            _PRACTICE_TERM_ID: _find_site_practice(practices, site.get('@id'))
+        }
+        for index, site in enumerate(cycle.get('otherSites', []))
+    ]
+
+    has_valid_sites = any([
+        all([
+            data.get('valid-site'),
+            data.get(_PRACTICE_TERM_ID) is not None,
+            (data.get('site-duration') or 0) >= 0
+        ]) for data in site_data
+    ])
+
+    logRequirements(cycle, model=MODEL, key=MODEL_KEY,
+                    has_valid_sites=has_valid_sites,
+                    site_data=log_as_table(site_data))
+
+    should_run = all([has_valid_sites])
+    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY)
+    return should_run, site_data
+
+
+def run(cycle: dict):
+    should_run, site_data = _should_run(cycle)
+    return [
+        _run(data.get('site-duration'), data.get(_PRACTICE_TERM_ID)) if data.get('valid-site') else None
+        for data in site_data
+    ] if should_run else []

hestia_earth/models/cycle/siteUnusedDuration.py

@@ -37,6 +37,7 @@ def _run(cycle: dict, longFallowRatio: float):
 
 
 def _should_run(cycle: dict):
+    site_id = cycle.get('site', {}).get('@id', cycle.get('site', {}).get('id'))
     site_type_valid = valid_site_type(cycle.get('site'), site_types=VALID_SITE_TYPES)
 
     siteDuration = cycle.get('siteDuration', 0)
@@ -45,7 +46,7 @@ def _should_run(cycle: dict):
     longFallowRatio = list_sum(next((
         p for p in practices if all([
             p.get('term', {}).get('@id') == 'longFallowRatio',
-            p.get('site') is None or p.get('site', {}).get('@id') == cycle.get('site', {}).get('@id')
+            p.get('site') is None or p.get('site', {}).get('@id', p.get('site', {}).get('id')) == site_id
         ])
     ), {}).get('value'), None)
 

hestia_earth/models/cycle/startDate.py

@@ -1,11 +1,13 @@
 """
 Start Date
 
-This model sets the [Cycle startDate](https://hestia.earth/schema/Cycle#startDate) based on the `endDate` and the
-`cycleDuration`. This only works when the `endDate` has been provided to a day precision (`2000-01-01`).
+This model sets the [Cycle startDate](https://hestia.earth/schema/Cycle#startDate) based on:
+* the `cycleDuration` and the `endDate` if it has been provided to a day precision (e.g., `2000-01-01`);
+* if no `cycleDuration` is provided, and the `startDate` is set to month precision (e.g., `2000-01`),
+assumed it started on the 15th of the month.
 """
 from datetime import timedelta
-from hestia_earth.utils.date import is_in_days
+from hestia_earth.utils.date import is_in_days, is_in_months
 from hestia_earth.utils.tools import safe_parse_date
 
 from hestia_earth.models.log import logRequirements, logShouldRun
@@ -13,8 +15,11 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
-        "endDate": "to day precision",
-        "cycleDuration": ""
+        "optional": {
+            "startDate": "month precision",
+            "endDate": "day precision",
+            "cycleDuration": ""
+        }
     }
 }
 RETURNS = {
@@ -23,25 +28,48 @@ RETURNS = {
 MODEL_KEY = 'startDate'
 
 
-def _run(cycle: dict):
+def _run_by_cycleDuration(cycle: dict):
     endDate = safe_parse_date(cycle.get('endDate'))
     cycleDuration = cycle.get('cycleDuration')
     return (endDate - timedelta(days=cycleDuration)).strftime('%Y-%m-%d')
 
 
-def _should_run(cycle: dict):
+def _should_run_by_cycleDuration(cycle: dict):
     has_endDate = cycle.get('endDate') is not None
     has_day_precision = has_endDate and is_in_days(cycle.get('endDate'))
     has_cycleDuration = cycle.get('cycleDuration') is not None
 
-    logRequirements(cycle, model=MODEL, key=MODEL_KEY,
+    logRequirements(cycle, model=MODEL, key=MODEL_KEY, by='cycleDuration',
                     has_endDate=has_endDate,
                     has_day_precision=has_day_precision,
                     has_cycleDuration=has_cycleDuration)
 
     should_run = all([has_endDate, has_day_precision, has_cycleDuration])
-    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY)
+    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY, by='cycleDuration')
     return should_run
 
 
-def run(cycle: dict): return _run(cycle) if _should_run(cycle) else None
+def _run_by_startDate(cycle: dict):
+    startDate = cycle.get('startDate')
+    return f"{startDate}-15"
+
+
+def _should_run_by_startDate(cycle: dict):
+    has_startDate = cycle.get('startDate') is not None
+    has_month_precision = has_startDate and is_in_months(cycle.get('startDate'))
+    no_cycleDuration = cycle.get('cycleDuration') is None
+
+    logRequirements(cycle, model=MODEL, key=MODEL_KEY, by='startDate',
+                    has_startDate=has_startDate,
+                    has_month_precision=has_month_precision,
+                    no_cycleDuration=no_cycleDuration)
+
+    should_run = all([has_startDate, has_month_precision, no_cycleDuration])
+    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY, by='startDate')
+    return should_run
+
+
+def run(cycle: dict):
+    return _run_by_cycleDuration(cycle) if _should_run_by_cycleDuration(cycle) else (
+        _run_by_startDate(cycle) if _should_run_by_startDate(cycle) else None
+    )

hestia_earth/models/cycle/startDateDefinition.py

@@ -14,11 +14,11 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "cycleDuration": "",
-        "products": {
+        "products": [{
             "@type": "Product",
             "primary": "True",
             "term.termType": "crop"
-        },
+        }],
         "optional": {
             "endDate": ""
         }

hestia_earth/models/edip2003/__init__.py

@@ -0,0 +1,13 @@
+from os.path import dirname, abspath
+import sys
+from importlib import import_module
+
+from hestia_earth.models.utils.blank_node import run_if_required
+
+CURRENT_DIR = dirname(abspath(__file__)) + '/'
+sys.path.append(CURRENT_DIR)
+MODEL = 'edip2003'
+PKG = '.'.join(['hestia_earth', 'models', MODEL])
+
+
+def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/edip2003/ozoneDepletionPotential.py

@@ -0,0 +1,34 @@
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.indicator import _new_indicator
+from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "emissionsResourceUse": [{"@type": "Indicator", "value": "", "term.termType": "emission"}]
+    }
+}
+LOOKUPS = {
+    "emission": "ozoneDepletionPotential"
+}
+RETURNS = {
+    "Indicator": [{
+        "value": ""
+    }]
+}
+
+TERM_ID = 'ozoneDepletionPotential'
+
+
+def _indicator(value: float):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    return indicator
+
+
+def run(impact_assessment: dict):
+    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    value=value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
+    return _indicator(value)

hestia_earth/models/mocking/search-results.json

@@ -1058,15 +1058,15 @@
       },
       {
         "@type": "Term",
-        "@id": "residueRemoved"
+        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueRemoved"
       },
       {
         "@type": "Term",
@@ -1094,19 +1094,19 @@
       },
       {
         "@type": "Term",
-        "@id": "discardedCropIncorporated"
+        "@id": "discardedCropLeftOnField"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueRemoved"
+        "@id": "discardedCropTotal"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropLeftOnField"
+        "@id": "discardedCropIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropTotal"
+        "@id": "aboveGroundCropResidueRemoved"
       },
       {
         "@type": "Term",
@@ -1505,11 +1505,11 @@
       },
       {
         "@type": "Term",
-        "@id": "nonFloodedPreSeasonMoreThan180Days"
+        "@id": "nonFloodedPreSeasonLessThan180Days"
       },
       {
         "@type": "Term",
-        "@id": "nonFloodedPreSeasonLessThan180Days"
+        "@id": "nonFloodedPreSeasonMoreThan180Days"
       },
       {
         "@type": "Term",
@@ -1528,7 +1528,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 26.448057
+        "_score": 25.47927
       }
     ]
   },
@@ -1764,61 +1764,61 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 59.747684
+        "_score": 58.564175
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 51.048874
+        "_score": 50.11611
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 41.325626
+        "_score": 40.03552
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 31.698704
+        "_score": 30.704037
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 28.502478
+        "_score": 27.611277
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 27.39837
+        "_score": 26.687897
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 25.22627
+        "_score": 24.424568
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 24.007807
+        "_score": 23.257332
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 20.544846
+        "_score": 19.83205
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 20.397137
+        "_score": 19.576632
       }
     ]
   },
@@ -2066,15 +2066,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "verticalTillage"
+        "@id": "noTillage"
       },
       {
         "@type": "Term",
-        "@id": "noTillage"
+        "@id": "ridgeTillage"
       },
       {
         "@type": "Term",
-        "@id": "ridgeTillage"
+        "@id": "verticalTillage"
       },
       {
         "@type": "Term",

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -28,6 +28,14 @@ REQUIREMENTS = {
     "Cycle": {
         "completeness.animalFeed": "",
         "completeness.product": "",
+        "products": [{
+            "@type": "Product",
+            "value": "",
+            "term.termType": ["liveAnimal", "animalProduct", "liveAquaticSpecies"],
+            "optional": {
+                "properties": [{"@type": "Property", "value": "", "term.@id": "nitrogenContent"}]
+            }
+        }],
         "or": [
             {
                 "animals": [{
@@ -55,15 +63,7 @@ REQUIREMENTS = {
                     ]
                 }]
             }
-        ],
-        "products": [{
-            "@type": "Product",
-            "value": "",
-            "term.termType": ["liveAnimal", "animalProduct", "liveAquaticSpecies"],
-            "optional": {
-                "properties": [{"@type": "Property", "value": "", "term.@id": "nitrogenContent"}]
-            }
-        }]
+        ]
     }
 }
 RETURNS = {

hestia_earth/models/pooreNemecek2018/excretaKgVs.py

@@ -26,6 +26,12 @@ from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
+        "products": [{
+            "@type": "Product",
+            "primary": "True",
+            "value": "",
+            "term.termType": ["animalProduct", "liveAnimal", "liveAquaticSpecies"]
+        }],
         "or": [
             {
                 "completeness.animalFeed": "",
@@ -72,14 +78,6 @@ REQUIREMENTS = {
                     "@type": "Site",
                     "measurements": [{"@type": "Measurement", "value": "", "term.@id": "netPrimaryProduction"}]
                 }
-            },
-            {
-                "products": [{
-                    "@type": "Product",
-                    "primary": "True",
-                    "value": "",
-                    "term.termType": ["animalProduct", "liveAnimal", "liveAquaticSpecies"]
-                }]
             }
         ]
     }

hestia_earth/models/poschEtAl2008/__init__.py

@@ -0,0 +1,13 @@
+from os.path import dirname, abspath
+import sys
+from importlib import import_module
+
+from hestia_earth.models.utils.blank_node import run_if_required
+
+CURRENT_DIR = dirname(abspath(__file__)) + '/'
+sys.path.append(CURRENT_DIR)
+MODEL = 'poschEtAl2008'
+PKG = '.'.join(['hestia_earth', 'models', MODEL])
+
+
+def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -0,0 +1,40 @@
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.impact_assessment import impact_country_value
+from hestia_earth.models.utils.indicator import _new_indicator
+from . import MODEL
+
+REQUIREMENTS = {
+    "ImpactAssessment": {
+        "or": {
+            "country": {"@type": "Term", "termType": "region"},
+            "site": {
+                "@type": "Site",
+                "region": {"@type": "Term", "termType": "region"}
+            }
+        },
+        "emissionsResourceUse": [{"@type": "Indicator", "value": "", "term.termType": "emission"}]
+    }
+}
+RETURNS = {
+    "Indicator": {
+        "value": ""
+    }
+}
+LOOKUPS = {
+    "region-emission-terrestrialAcidificationPotentialAccumulatedExceedance": ""
+}
+TERM_ID = 'terrestrialAcidificationPotentialAccumulatedExceedance'
+
+
+def _indicator(value: float):
+    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator['value'] = value
+    return indicator
+
+
+def run(impact_assessment: dict):
+    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
+    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
+                    value=value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
+    return _indicator(value)

hestia_earth/models/site/waterDepth.py

@@ -14,9 +14,6 @@ RETURNS = {
         "methodClassification": "modelled using other measurements"
     }]
 }
-LOOKUPS = {
-    "crop": "Non_bearing_duration"
-}
 TERM_ID = 'waterDepth'
 BIBLIO_TITLE = 'Reducing food’s environmental impacts through producers and consumers'
 SITE_TYPE_TO_DEPTH = {

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.0'
+VERSION = '0.64.1'

{hestia_earth_models-0.64.0.dist-info → hestia_earth_models-0.64.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.0
+Version: 0.64.1
 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==30.*
-Requires-Dist: hestia-earth.utils>=0.13.3
+Requires-Dist: hestia-earth.utils>=0.13.4
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0

{hestia_earth_models-0.64.0.dist-info → hestia_earth_models-0.64.1.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=IlwP1zg2m0DBprtBStQbPB5MvpS31n9yBC5AOs4qSfo,19
+hestia_earth/models/version.py,sha256=ynV6q1Uuf9gDmUxe-eyYGdhh8GzowZGw5X9OY5kt03Y,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
@@ -41,6 +41,7 @@ hestia_earth/models/cycle/concentrateFeed.py,sha256=wiq9KLRuipHz_2_CVfXDuUek0JN1
 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/endDate.py,sha256=xxTa3Pmu7udJwGYiTn7tcp9_Pl_SM7de9ezbR7sYvUk,1382
 hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3Ca__F0KJ_wlwTxbPd7mUyehZW7AJPM,2212
 hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
 hestia_earth/models/cycle/excretaKgN.py,sha256=mgJTneQIYJ9Su-rTK5ppb_k3YhICFNWsfPZtGR98RI0,2968
@@ -50,6 +51,7 @@ hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kp
 hestia_earth/models/cycle/liveAnimal.py,sha256=LWAMnNKRoLDdChrGApVIN-Ns7em0Lspz5UtLbf7PPLY,3988
 hestia_earth/models/cycle/longFallowRatio.py,sha256=_h0kub99sACO87IfjMeiu8IgdK2jaeBlgGA9A9-ViZA,1683
 hestia_earth/models/cycle/milkYield.py,sha256=RhzePjkvEAGicTzRA4eatc0K_4NSGHhyEhYF0EbbGXw,5820
+hestia_earth/models/cycle/otherSitesUnusedDuration.py,sha256=HkjCfllhtodAQ3LBjoEXCiii1t2LJxM9HZNyYWaAqas,2984
 hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
 hestia_earth/models/cycle/pastureSystem.py,sha256=uksVgl_3bp_t2niwZ5BvS3VT-Kndx26Se6GpzqG0bX8,2709
 hestia_earth/models/cycle/readyToCookWeightPerHead.py,sha256=R1Rt3WsTzwnI2Bqljx03RpdG0A1-bGV4M7EqmcP7Dzg,2955
@@ -58,9 +60,9 @@ hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7
 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=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/siteUnusedDuration.py,sha256=orYGlbzGMpjuDAtZe7KkCOLWrwUYR1H4A0ccAbutW3s,2189
+hestia_earth/models/cycle/startDate.py,sha256=pbBi55b6uJezPE8EOovOCSwQVrbwpmxwmravOCIh2zg,2683
+hestia_earth/models/cycle/startDateDefinition.py,sha256=--U3YLZjJ3WIHl8dxAOewGfMcYtOZS-M2KanJKG1cJw,2246
 hestia_earth/models/cycle/transformation.py,sha256=06KTfVubh2I47dfnG9Iv6AbuUBbURM8BAVOkRu7XmHw,1255
 hestia_earth/models/cycle/unknownPreSeasonWaterRegime.py,sha256=9EP8FMXO5fHqmhVNSqR_Dfe38KxwyPOCF6kMewiI_VE,1478
 hestia_earth/models/cycle/utils.py,sha256=ZcVwvRwVNK48jZfnhrHl2ai4a96YzcmRgO-eQXwQNjo,1408
@@ -117,6 +119,8 @@ hestia_earth/models/ecoinventV3/__init__.py,sha256=FctfsXFgEz23KbKNig1bY-fhoTN2Q
 hestia_earth/models/ecoinventV3/utils.py,sha256=HqtD8MzK9C_RCJ-ME-5G4J1KoCn5FqmAx4l0kjsCDbM,1577
 hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=XYFDUNpQpzbjPgLus0YlM3UdiXX7LLwn-XJqjrH9ywM,5801
 hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=INWB7gyhzk49GQ0KAcBS-Kzwdoyd5MQJcsCtuT6XxZA,1352
+hestia_earth/models/edip2003/__init__.py,sha256=nyB0CI2gNmRAXj-203aJHQMmETYhcY-dHbMABOhJ7YI,409
+hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=GdaAgDIUPcWccbbjB-CbxqelSW2vUGdIfJUbQBi4-sA,971
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ib_xzEbIg-iQwvW2L4BosD9lV6EYOXAiIs8gYhSD9GE,1431
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=H4dgGqDuvYN4S7TRxYsX3hms1xMWr8clR2gkyyO8T18,1438
@@ -375,13 +379,13 @@ 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=lyNM5NhYqniHhPP31dnp8G3rQlXIq-pLhSmhe_4txlU,47245
+hestia_earth/models/mocking/search-results.json,sha256=Hq-CDpm39QU5BB1x3ncyXYj5_4aIUzywOmYsjTHpDLA,47243
 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
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=CxjhFinScTebBGNVheEdbdw36DdHwoPszAnbxtd6_9s,6590
-hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kLWtv49c1sD3YrporqRcmwr36Q_fJc-hIrvi8LS-864,6418
-hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=nlnZSDx-bIvtukL79Syhon0cSQ8o4OC1YKtAG6haGhI,8500
+hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kB4C1mSA9h8uUJXXaf-39ZwhzAmmvapkfA7v0nUN_Qg,6418
+hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=5rK3wfI8JO2feaFRv23-s9bH09DIl4LLLcjHS3cf-Ow,8424
 hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=HB_9q5eE6al2Te3v29hC5wqxsYe4P46ZAPwdWNzx3v0,3939
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=jE110XgPMgfnBMUXyKIL5SL9yZWYhdGr5NrfHcqn2h0,2785
 hestia_earth/models/pooreNemecek2018/longFallowDuration.py,sha256=Wdm6QyOttCFP9Y3OjbaYrvdMmivOmMIT-m5Eg9SM9rY,1511
@@ -402,6 +406,8 @@ hestia_earth/models/pooreNemecek2018/plantationProductiveLifespan.py,sha256=Q54w
 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/poschEtAl2008/__init__.py,sha256=nvyyGglxCTV4PpxcOjY7jJb0v8Bjzj435Zt1j6VcryM,414
+hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=gbD8fgvdHANXsuPPWRx4Flcqhk3fPD5ROrrb2LMgmS8,1279
 hestia_earth/models/recipe2016Egalitarian/__init__.py,sha256=OvZoSgfaMe6DWIdqr-Sx3ouzXlp994oro7Mi0Xid18Q,422
 hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py,sha256=b1UZAsy3yGlHYxH2YhBhhSnjm5zzQl8Z32DcQBjgWNE,1123
 hestia_earth/models/recipe2016Egalitarian/damageToHumanHealth.py,sha256=dJ8WinGe52wFQCMKtT_B7c1MFM_GbBo8aqfw0n2pw94,1087
@@ -493,7 +499,7 @@ hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXH
 hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
 hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=8ERrTZpN_yCRUyFg_EYaX4abE9jLcyX3lx3MO4Bi6CE,1938
 hestia_earth/models/site/utils.py,sha256=b5y6jNmTclC1Vs8FzwW22u3sVyFsvs5if3NJzvLZQLs,3176
-hestia_earth/models/site/waterDepth.py,sha256=uasApPdOzibZMiOyKNKr_ajAkzwUEEPm1j0FNEy49TY,1293
+hestia_earth/models/site/waterDepth.py,sha256=jlphpSAHp-xBlTQsl_j_3xEH50HD7YrvvB7HHuSww-M,1244
 hestia_earth/models/site/measurement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/site/measurement/value.py,sha256=7IhUbIj7n5vB7yXoNxXsWbliEJjg1Ww3T5g_P2IyNCU,1661
 hestia_earth/models/site/post_checks/__init__.py,sha256=CkExxesk1GuG8NjrbKfix1iDuVUgU-9i1ccM_X7MZn4,284
@@ -613,6 +619,7 @@ tests/models/cycle/test_concentrateFeed.py,sha256=tgkThL4g293CexLvb89ftO9UqUbHhN
 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_endDate.py,sha256=4OKaPAkIQmsEZHhuC6o1ZnC1RkVPbhrZ7DIrn4286JM,537
 tests/models/cycle/test_energyContentLowerHeatingValue.py,sha256=ZvHigQrtneKrRc8qr7rN8aj6tuA0ds0V6Brh0UzN_T8,1204
 tests/models/cycle/test_excretaKgMass.py,sha256=xpuq0k5HKvnGmWdJy0GmIv6A4xYk2VDFB4BMb8J2Z0g,2925
 tests/models/cycle/test_excretaKgN.py,sha256=xoe0PF-DwhVkihN-1BonUa7u_QNM9lr7CmGXsOozQ0Y,1090
@@ -623,6 +630,7 @@ tests/models/cycle/test_irrigatedTypeUnspecified.py,sha256=9YGwpDO_RHMaldvjJZ0xd
 tests/models/cycle/test_liveAnimal.py,sha256=7fRPgEnIwcir-tYwUNnr6gc2e5_vnZi-t8EuuiPioeM,2139
 tests/models/cycle/test_longFallowRatio.py,sha256=sztr1pysldwedTC78JWUHAVWl2oL0jTIQ13c6Nxzlso,1512
 tests/models/cycle/test_milkYield.py,sha256=7e5JJzLkc47OnQf3xni1Nkyq7N4xi1RglnE8caE9TfY,1778
+tests/models/cycle/test_otherSitesUnusedDuration.py,sha256=zQejrYNwq14Pwe3d0zmfhxjdif5s_udbdVCiZcTuC8w,1635
 tests/models/cycle/test_pastureGrass.py,sha256=hNRjBLYXGybzHPMfBOCgcRjGkDBmW0k_G6tn9TLrycY,1025
 tests/models/cycle/test_pastureSystem.py,sha256=VlPn4mlaNimiu3liV5EMELJueUCqSSJ1l82yMV0UK90,1590
 tests/models/cycle/test_post_checks.py,sha256=yeUm-uZ4Om8poct2TgpFQEy-Hg72LNacyQcQ2Qh4Yyw,286
@@ -634,7 +642,7 @@ tests/models/cycle/test_residueLeftOnField.py,sha256=_8CoSp-7z3BBLGN5Hv067FRYz8y
 tests/models/cycle/test_residueRemoved.py,sha256=R5v8lwGyz_4a9_X_LnugBEmgVgcisS5LTM5GFCtKIco,1278
 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_startDate.py,sha256=-U1_XIx8v5zxK3oK5fCIIsS7GFKymNh3m0SgJ0J2iZ8,1223
 tests/models/cycle/test_startDateDefinition.py,sha256=42BmsT1I7Jq_YMVN-VNU7a0fIZ2w3i5jgwy4H_r4dNM,920
 tests/models/cycle/test_transformations.py,sha256=Ws_8KhNqeHogGFXTQ4qZXQ5Ph2I3ZUaY0yO1itFUHLk,464
 tests/models/cycle/test_unknownPreSeasonWaterRegime.py,sha256=4JSSpDvBQEQrDoytNVzuIcm9UVio4TzZpZm52iMWBVA,1220
@@ -678,6 +686,8 @@ tests/models/dammgen2009/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 tests/models/dammgen2009/test_noxToAirExcreta.py,sha256=RWd9QvzmJtN9M6UC6KDHkXwtKvwv0aAfMuI9HtsJLvk,1213
 tests/models/deRuijterEtAl2010/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/deRuijterEtAl2010/test_nh3ToAirCropResidueDecomposition.py,sha256=kS1nUBVohOSCb386g6Wq7iVclmx0haekUDYo7VQ4NCA,2030
+tests/models/edip2003/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/edip2003/test_ozoneDepletionPotential.py,sha256=dZAAwlhEtkhvLzJMksOIIW9YZiS7eXnwffWyY4TTU_g,1575
 tests/models/emepEea2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=z1H17R_Erox2dMg8xylGB0qt9BMZSwfLAoEMVv9z878,1518
 tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=4uemriZAyJBSn-xMttRpxqVHOFNBXlboVODHQYl65zQ,1524
@@ -954,6 +964,8 @@ tests/models/pooreNemecek2018/test_plantationLifespan.py,sha256=Pcbnhbt_HVfEet12
 tests/models/pooreNemecek2018/test_plantationProductiveLifespan.py,sha256=ifvjTXJxmbS3GH4a7S9T2mgPseajX8WL4KQ5lT_2Rus,935
 tests/models/pooreNemecek2018/test_rotationDuration.py,sha256=tD2E91beAXdyT-xf5QSqc7kp5UPDDEaCE-FgsoSGorg,923
 tests/models/pooreNemecek2018/test_saplings.py,sha256=uJyUWUocvrcPndv-YFLs0WfxGEAG1kM8HEWZwutRhvs,1621
+tests/models/poschEtAl2008/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=NJ_W-ypWwjBuGiaXUeJvaQ9ZufoqlSWk1NYE9tt94ZA,1612
 tests/models/recipe2016Egalitarian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/recipe2016Egalitarian/test_damageToFreshwaterEcosystemsSpeciesYear.py,sha256=OC8WjzPuyz5fd_E-LxFbOg3sasVc6LMJ9UK-jAKO7LU,697
 tests/models/recipe2016Egalitarian/test_damageToHumanHealth.py,sha256=fWjzC9r6itihyW6AdmDkotbhML_0KavXernOpnK1SmY,677
@@ -1104,8 +1116,8 @@ tests/models/utils/test_source.py,sha256=_Ol-OrJs2Tt9iZAZ_RY2qRuSbnE4yz5OuEGkDSb
 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.64.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.0.dist-info/METADATA,sha256=tyTyf2TquQ4gi_WG81o9Up-3us02Yz1Nc5ILz_UwI-g,3343
-hestia_earth_models-0.64.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.64.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.0.dist-info/RECORD,,
+hestia_earth_models-0.64.1.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.1.dist-info/METADATA,sha256=2I5vnl3mTZYWnqfJFd_A_KY0KomvUj2GMXm7GLaEPGo,3343
+hestia_earth_models-0.64.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.64.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.1.dist-info/RECORD,,

tests/models/cycle/test_endDate.py

@@ -0,0 +1,22 @@
+from hestia_earth.models.cycle.endDate import _should_run, run
+
+
+def test_should_run():
+    # no endDate => no run
+    cycle = {}
+    should_run = _should_run(cycle)
+    assert not should_run
+
+    # with endDate with days => no run
+    cycle['endDate'] = '2020-01-01'
+    should_run = _should_run(cycle)
+    assert not should_run
+
+    # with endDate no days => run
+    cycle['endDate'] = '2020-01'
+    should_run = _should_run(cycle)
+    assert should_run is True
+
+
+def test_run():
+    assert run({'endDate': '2020-01'}) == '2020-01-14'

tests/models/cycle/test_otherSitesUnusedDuration.py

@@ -0,0 +1,54 @@
+import json
+import pytest
+from tests.utils import fixtures_path
+
+from hestia_earth.models.cycle.otherSitesUnusedDuration 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 otherSites => no run',
+            {},
+            False
+        ),
+        (
+            'with otherSites => no run',
+            {
+                'otherSites': [{'siteType': 'cropland'}, {'siteType': 'permanent pasture'}]
+            },
+            False
+        ),
+        (
+            'with otherSites and otherSitesDuration => no run',
+            {
+                'otherSites': [{'siteType': 'cropland'}, {'siteType': 'permanent pasture'}],
+                'otherSitesDuration': [200, 300]
+            },
+            False
+        ),
+        (
+            'with siteDuration and otherSitesDuration and longFallowRatio => run',
+            {
+                'otherSites': [{'@id': '1', 'siteType': 'cropland'}, {'@id': '2', 'siteType': 'permanent pasture'}],
+                'otherSitesDuration': [200, 300],
+                'practices': [{'term': {'@id': 'longFallowRatio'}, 'value': [10], 'site': {'@id': '1'}}]
+            },
+            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)
+
+    value = run(data)
+    assert value == [50, None]

tests/models/cycle/test_startDate.py

@@ -1,22 +1,40 @@
-from hestia_earth.models.cycle.startDate import _should_run, run
+from hestia_earth.models.cycle.startDate import _should_run_by_cycleDuration, _should_run_by_startDate, run
 
 
-def test_should_run():
+def test_should_run_by_cycleDuration():
     # no endDate => no run
     cycle = {'cycleDuration': 365}
-    should_run = _should_run(cycle)
+    should_run = _should_run_by_cycleDuration(cycle)
     assert not should_run
 
     # with startDate missing days => not run
     cycle['endDate'] = '2020-01'
-    should_run = _should_run(cycle)
+    should_run = _should_run_by_cycleDuration(cycle)
     assert not should_run
 
     # with endDate full date => run
     cycle['endDate'] = '2020-01-01'
-    should_run = _should_run(cycle)
+    should_run = _should_run_by_cycleDuration(cycle)
+    assert should_run is True
+
+
+def test_should_run_by_startDate():
+    # no startDate => no run
+    cycle = {}
+    should_run = _should_run_by_startDate(cycle)
+    assert not should_run
+
+    # with startDate with days => no run
+    cycle['startDate'] = '2020-01-01'
+    should_run = _should_run_by_startDate(cycle)
+    assert not should_run
+
+    # with startDate no days => run
+    cycle['startDate'] = '2020-01'
+    should_run = _should_run_by_startDate(cycle)
     assert should_run is True
 
 
 def test_run():
     assert run({'endDate': '2020-01-01', 'cycleDuration': 365}) == '2019-01-01'
+    assert run({'startDate': '2020-01'}) == '2020-01-15'

tests/models/edip2003/test_ozoneDepletionPotential.py

@@ -0,0 +1,46 @@
+from unittest.mock import patch
+import json
+
+from hestia_earth.models.utils.lookup import factor_value
+from tests.utils import fixtures_path, fake_new_indicator
+
+from hestia_earth.models.edip2003.ozoneDepletionPotential import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
+        impactassessment = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impactassessment)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run_empty_input(*args):
+    """
+    Test with impact-assessment.jsonld that does NOT contain any "emissionsResourceUse".
+    """
+
+    with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:
+        impactassessment = json.load(f)
+
+    result = run(impactassessment)
+    assert result['value'] is None
+
+
+def test_known_ozone_depletion_lookup_value(*args):
+    lookup_result = factor_value(
+        'edip2003', 'ozoneDepletionPotential', 'emission.csv', 'ozoneDepletionPotential')(
+        data={
+            '@type': 'Emission',
+            'term': {'@type': 'Term', '@id': '112TrichlorotrifluoroethaneToAirInputsProduction'},
+            'value': [1],
+        })
+    assert lookup_result == 0.81

tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -0,0 +1,45 @@
+import json
+from unittest.mock import patch
+
+from hestia_earth.models.poschEtAl2008.terrestrialAcidificationPotentialAccumulatedExceedance import MODEL, TERM_ID, run
+from tests.utils import fixtures_path, fake_new_indicator
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(f"{fixtures_folder}/impact-assessment.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)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_lookup_to_bad_country(*args):
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+    cycle['country']['@id'] = "example-land-not-real"
+
+    value = run(cycle)
+    assert value['value'] is None
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_lookup_no_term_type(*args):
+    """
+    We currently do not filter out bad termTypes so this is expected behavior.
+    """
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+    del cycle['emissionsResourceUse'][0]['term']['termType']
+    del cycle['emissionsResourceUse'][1]['term']['termType']
+    cycle['emissionsResourceUse'][2]['term']['termType'] = "wrong-type"
+
+    value = run(cycle)
+    assert value['value'] == 0.085