hestia-earth-models 0.65.9__py3-none-any.whl → 0.65.10__py3-none-any.whl

hestia_earth/models/site/defaultMethodClassification.py

@@ -0,0 +1,35 @@
+"""
+Default Method Classification.
+
+When gap-filling `management` node on Site, the
+`defaultMethodClassification` and `defaultMethodClassificationDescription` fields become required.
+This model will use the first value in the `management` node.
+"""
+from hestia_earth.models.log import logRequirements, logShouldRun
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "management": [{"@type": "Management", "methodClassification": ""}]
+    }
+}
+RETURNS = {
+    "The methodClassification as a `string`": ""
+}
+MODEL_KEY = 'defaultMethodClassification'
+
+
+def _should_run(site: dict):
+    methodClassification = next((n.get('methodClassification') for n in site.get('management', [])), None)
+
+    logRequirements(site, model=MODEL, model_key=MODEL_KEY,
+                    methodClassification=methodClassification)
+
+    should_run = all([methodClassification])
+    logShouldRun(site, MODEL, None, should_run, model_key=MODEL_KEY)
+    return should_run, methodClassification
+
+
+def run(site: dict):
+    should_run, value = _should_run(site)
+    return value

hestia_earth/models/site/defaultMethodClassificationDescription.py

@@ -0,0 +1,39 @@
+"""
+Default Method Classification Description.
+
+When gap-filling `management` node on Site, the
+`defaultMethodClassification` and `defaultMethodClassificationDescription` fields become required.
+This model will use the first value in the `management` node.
+"""
+from hestia_earth.models.log import logRequirements, logShouldRun
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "management": [{"@type": "Management", "methodClassification": "", "methodClassificationDescription": ""}]
+    }
+}
+RETURNS = {
+    "The methodClassification as a `string`": ""
+}
+MODEL_KEY = 'defaultMethodClassificationDescription'
+
+
+def _should_run(site: dict):
+    methodClassificationDescription = next((
+        n.get('methodClassificationDescription')
+        for n in site.get('management', [])
+        if n.get('methodClassification')
+    ), None)
+
+    logRequirements(site, model=MODEL, model_key=MODEL_KEY,
+                    methodClassificationDescription=methodClassificationDescription)
+
+    should_run = all([methodClassificationDescription])
+    logShouldRun(site, MODEL, None, should_run, model_key=MODEL_KEY)
+    return should_run, methodClassificationDescription
+
+
+def run(site: dict):
+    should_run, value = _should_run(site)
+    return value

hestia_earth/models/site/management.py

@@ -165,15 +165,28 @@ def _gap_filled_date_obj(date_str: str, mode: str = DatestrGapfillMode.END) -> d
     )
 
 
-def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> datetime:
+def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> dict:
     """If possible, gap-fill the startDate based on the endDate - maximumCycleDuration"""
     maximum_cycle_duration = _get_maximum_cycle_duration(land_cover_id)
-    return max(
-        _gap_filled_date_obj(end_date) - timedelta(days=maximum_cycle_duration)
-        if maximum_cycle_duration else datetime.fromtimestamp(0),
-        _gap_filled_date_obj(cycle.get("startDate"), mode=DatestrGapfillMode.START)
-        if cycle.get("startDate") else datetime.fromtimestamp(0)
-    ) if any([maximum_cycle_duration, cycle.get("startDate")]) else None
+    return {
+        "startDate": max(
+            _gap_filled_date_obj(end_date) - timedelta(days=maximum_cycle_duration)
+            if maximum_cycle_duration else datetime.fromtimestamp(0),
+            _gap_filled_date_obj(cycle.get("startDate"), mode=DatestrGapfillMode.START)
+            if cycle.get("startDate") else datetime.fromtimestamp(0)
+        )
+    } if any([maximum_cycle_duration, cycle.get("startDate")]) else {}
+
+
+def _include_with_date_gap_fill(value: dict, keys: list) -> dict:
+    return {
+        k: (
+            _gap_filled_date_only_str(v) if k == "endDate" else
+            _gap_filled_date_only_str(v, mode=DatestrGapfillMode.START) if k == "startDate" else
+            v
+        )
+        for k, v in value.items() if k in keys
+    }
 
 
 def _should_gap_fill(term: dict):
@@ -210,15 +223,13 @@ def _get_relevant_items(cycle: dict, item_name: str, relevant_terms: list):
     Also adds dates from Cycle.
     """
     items = [
-        _include(cycle, ["startDate", "endDate"]) |
+        _include_with_date_gap_fill(cycle, ["startDate", "endDate"]) |
         _include(
-            {
-                "startDate": _gap_filled_start_date(
-                    land_cover_id=get_landCover_term_id(item.get('term', {})),
-                    end_date=item.get("endDate") if "endDate" in item else cycle.get("endDate", ""),
-                    cycle=cycle
-                )
-            } if "startDate" not in item else {},
+            _gap_filled_start_date(
+                land_cover_id=get_landCover_term_id(item.get('term', {})),
+                end_date=item.get("endDate") if "endDate" in item else cycle.get("endDate", ""),
+                cycle=cycle
+            ) if "startDate" not in item else {},
             "startDate"
         ) |
         item
@@ -266,7 +277,7 @@ def _run_from_siteType(site: dict, cycle: dict):
 
 
 def _run_products(cycle: dict, products: list, total_products: int = None, use_cycle_dates: bool = False):
-    default_dates = _include(cycle, ["startDate", "endDate"])
+    default_dates = _include_with_date_gap_fill(cycle, ["startDate", "endDate"])
     return [
         _map_to_value(default_dates | _copy_item_if_exists(
             source=product,
@@ -289,7 +300,7 @@ def _run_from_landCover(cycle: dict, crop_forage_products: list):
     """
     land_cover_products = [
         _map_to_value(_extract_node_value(
-            _include(
+            _include_with_date_gap_fill(
                 value=product,
                 keys=["term", "value", "startDate", "endDate", "properties"]
             )
@@ -354,7 +365,7 @@ def _should_run_practice(practice: dict):
 def _run_from_practices(cycle: dict):
     practices = [
         _extract_node_value(
-            _include(
+            _include_with_date_gap_fill(
                 value=practice,
                 keys=["term", "value", "startDate", "endDate"]
             )

hestia_earth/models/utils/impact_assessment.py

@@ -119,7 +119,8 @@ def impact_emission_lookup_value(
         lookup_name='emission.csv',
         lookup_col=lookup_col,
         blank_nodes=filter_list_term_type(impact.get('emissionsResourceUse', []), TermTermType.EMISSION),
-        grouped_key=grouped_key
+        grouped_key=grouped_key,
+        default_no_values=None
     )
 
 
@@ -170,7 +171,7 @@ def impact_country_value(
 
     # fail if some factors are missing
     return None if not all_with_factors else (
-        list_sum(values) if len(values) > 0 else 0
+        list_sum(values) if len(values) > 0 else None
     )
 
 
@@ -236,7 +237,8 @@ def impact_endpoint_value(model: str, term_id: str, impact: dict, lookup_col: st
         node=impact,
         lookup_name='characterisedIndicator.csv',
         lookup_col=lookup_col,
-        blank_nodes=nodes
+        blank_nodes=nodes,
+        default_no_values=None
     )
 
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.65.9'
+VERSION = '0.65.10'

{hestia_earth_models-0.65.9.dist-info → hestia_earth_models-0.65.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.65.9
+Version: 0.65.10
 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.16
+Requires-Dist: hestia-earth-utils>=0.13.19
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0

{hestia_earth_models-0.65.9.dist-info → hestia_earth_models-0.65.10.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=Llo2SH1Lp-R8x1JRxJ2Ta-vw5RbdUj2FHXUP-c
 hestia_earth/models/log.py,sha256=_zAfyOkL_VknEnMFvcpvenSMghadlDfZhiSx28545Gk,3558
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=kCzRyuygd47dgg8pZkkwCs6b_7Lb4-nPncYEsjaT4jc,19
+hestia_earth/models/version.py,sha256=kGCwazFyJPTHO9Kny5rZmqHxPuatjOBEax2liicBscw,20
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -27,17 +27,17 @@ hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransfo
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=11H8j9i2h2zChea92CdzPodWZfdegkAnQx6qYC6Ym9A,2623
 hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=Z0IrvVv-dKsRt09LmT7sc6e1bWnhjZ-WBrO-namIngo,1539
 hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
-hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=nRAwh5UljL7Tg0BGlYsA6nrIGzIlizVPeangtjHOIQE,7869
-hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=4p9Ui78F69yhZkXCwcM6lwbpaNLdpO9p_uJDnLqYhRM,5919
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=K3IfNziLDGvfmHsWBUXCwAl1k2Z6p-02Vi7HG3jZRhI,7708
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=yXie6UW0_I4VQcADn7Uvk4n1RmrFAauJ7ZVh7OgBUyA,5952
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
 hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=N8neIISqeTAS7VGTNWbbbozOtfCb816qwwHCnv7Nnpw,1113
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=HcwStlwnBEjuZwoK6gCFdCfvX5RphSPhDGDj0LQ32Fg,56086
+hestia_earth/models/config/Cycle.json,sha256=b_TTZGQ5QbD6BZ2tYezFlsxBKVwZONRVfA0cXAt1PBQ,56069
 hestia_earth/models/config/ImpactAssessment.json,sha256=EB8O8_GZ182upCP-Rpko7I48Tdf30ScK-ZZ3rf4DQQI,57585
-hestia_earth/models/config/Site.json,sha256=FfuME8DLLyoHYJ2uBgnueTIK9E7m9aV7iPT8TBoqlzk,12565
-hestia_earth/models/config/__init__.py,sha256=UZZdwfnxTqnZLG4hNecu6sfKvMLvctjdWFraE_9H438,2130
+hestia_earth/models/config/Site.json,sha256=SyajKMEg03v9_NdiQlfcyF7B60lrBlXZF6tlahnpfZA,13071
+hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
 hestia_earth/models/config/trigger-calculations.json,sha256=3dmn2bRuj6QEtSTOLdIy31ho7thgUXyDsnqZzPV9rAQ,623
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
@@ -57,8 +57,8 @@ hestia_earth/models/cycle/inorganicFertiliser.py,sha256=Yt5NcP9FQEzWwlritrPGbhh2
 hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kpw0rMlRjCK25CExaW58DEvc9w,2125
 hestia_earth/models/cycle/liveAnimal.py,sha256=5dlvuVAu24hLLOVXsozcVzWyDVzddzoungUBwrBDS-g,3986
 hestia_earth/models/cycle/longFallowRatio.py,sha256=_h0kub99sACO87IfjMeiu8IgdK2jaeBlgGA9A9-ViZA,1683
-hestia_earth/models/cycle/materialAndSubstrate.py,sha256=PaTnS3QVxGEMLMn4nuWHYp8npiZjDaDijRJHoUoRV40,5184
-hestia_earth/models/cycle/milkYield.py,sha256=JUwKK9gwXZiir7YK7_tOuV3B4Aml0LnJszfCA3Ygh3o,5816
+hestia_earth/models/cycle/materialAndSubstrate.py,sha256=euvY_qKmLlwixCoUnagQRZ5oHtTB7VSPjgmEq8fN3Qg,5186
+hestia_earth/models/cycle/milkYield.py,sha256=ghJXXxVQVYC3xtPgyp6FvbIuheJfeh2zwRBf9IkQi2E,5902
 hestia_earth/models/cycle/otherSitesArea.py,sha256=Xhi6C1K1v4VXv1Mhkg-b9JCAG-DfTQoEi9ICs71418w,1650
 hestia_earth/models/cycle/otherSitesUnusedDuration.py,sha256=ZqQaI9FvNVpONmsIiRo1BqSJJKC5Mgi-W6lt18sxTiA,2985
 hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
@@ -114,11 +114,11 @@ hestia_earth/models/cycle/pre_checks/otherSites.py,sha256=MQpf_v4lTIR60zF7slp3LB
 hestia_earth/models/cycle/pre_checks/site.py,sha256=OkrEOxwbo5rzAWQaPt2p9uZ9g7Vc58QweGW5-Pt0jPY,882
 hestia_earth/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/product/currency.py,sha256=lB1pCD1747Ke3oFoqjAKEHbIdHPfrHKNaJSni69iMUQ,2150
-hestia_earth/models/cycle/product/economicValueShare.py,sha256=Ow0M1vN3TYvdB4NpTQo3IGqx8i3qZvRkjj7Z3Pg20ig,8576
+hestia_earth/models/cycle/product/economicValueShare.py,sha256=HAIg9R-j9CdPdU6Wz1qYmVJDG08DPPVNQMq6pWpXSWg,8815
 hestia_earth/models/cycle/product/price.py,sha256=BUkY9V2Frg442HEGG7PLmXZFTrBPbBFDTk5LbS40Ajs,1588
 hestia_earth/models/cycle/product/primary.py,sha256=FYyl-Mv8AmEml1nhDJwU01N4LrszJm6E31eztQDHzdg,1853
 hestia_earth/models/cycle/product/properties.py,sha256=7iKIAYLi2_11HsizwAdNbEmx-C7CH_tTrgBFEePTcWs,1547
-hestia_earth/models/cycle/product/revenue.py,sha256=-PmQWbdOLyoemo2afzYPbI5Te7-BslGK7er1HxDL-t0,2438
+hestia_earth/models/cycle/product/revenue.py,sha256=JirczlbiuEWMuR-baAU90FE7k3cxz5bb8GoX_wrXfvg,2433
 hestia_earth/models/cycle/product/utils.py,sha256=nCQIFgwfI4meSRftV9v4vuxKAy3uUtShpN1pr2mywCw,359
 hestia_earth/models/cycle/product/value.py,sha256=8f_6Ornn06lbNR2U70qmxn-iwh_TIEFGjB3_8TzCFxs,1596
 hestia_earth/models/dammgen2009/__init__.py,sha256=dZ8tIXl6e3ZEixYrWiW7rzoqRJVFOoxi4RPvM3N0L1E,412
@@ -165,7 +165,7 @@ hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=b1_GZQ3oFl88w
 hestia_earth/models/faostat2018/seed.py,sha256=ts9PKs9UnZnJ9nPFlL7etL1Qb9uIWIES8Mz8W7FWbOw,2917
 hestia_earth/models/faostat2018/utils.py,sha256=vJxDILARNxE6DM_lTtoLIh5PvdDneSb9S41YAuD1HvY,7527
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/faostat2018/product/price.py,sha256=X7Zxa-rXthzYdgw2lzybbHc-oKGE5nyXpBn-BfZC_7w,7753
+hestia_earth/models/faostat2018/product/price.py,sha256=xAfHfMt2YhBOo0eQSaEnWfqeINoKHhk9hRDEj7GT0g4,7755
 hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
 hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=czZx8DgnDuLOdK0CfiriPbj1BwoiWn4d1nkQOiwkcPA,4472
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
@@ -198,7 +198,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=y
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=BLzWaFw4PXkjAK3MC1kVMT1kai4Cv9tEak_CuANTo5k,3354
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=DrjiPyakM1SJ1XO-arhvjLDj2qb3M-i58gJ1kFFM6kI,2821
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=5oasLMYgfnPwSse0D8EEe_pV57AMusac853BgVSUh5E,2070
-hestia_earth/models/geospatialDatabase/utils.py,sha256=RAmdiv2WTKzdiCF1c2KjNoE5v7EjOdO-ZEJdJfi8rB0,6419
+hestia_earth/models/geospatialDatabase/utils.py,sha256=VJ6P37C0Aw51ksN64e_et6aI9zAlk_wCmzlbWcrcau4,6618
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=pajS-6UWxqIqnzW0IjkgNm-2Vl3bMor2UZOQtQQERuc,4096
@@ -406,7 +406,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=K2swFvB_pADeINR3vBoKMdLcMf8aXTqfTvKaPy6tsFw,102055
+hestia_earth/models/mocking/search-results.json,sha256=_8AfPAX_YcwIYlJpyaHp5sxw4jpNX2Mub58HqO3Szuo,102054
 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
@@ -506,9 +506,11 @@ hestia_earth/models/schmidt2007/utils.py,sha256=tbTFg5TXAyS12JCa-OXQg37M1YymHxKW
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
 hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZXn0oJvfDZdMs4,1278
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
+hestia_earth/models/site/defaultMethodClassification.py,sha256=mqy3P3DLf7cr4-TU_kH7nXr8bz_kCrG_i33AuzwYMyo,1059
+hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=5rm9LUINmHF579HaqWfHZpFTjwZSgglE6TgAwBPs1uc,1250
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=51gpDKNGghiKnt7cbDJGyW62e1Bh7IoXUmgCThaU7Ms,14626
+hestia_earth/models/site/management.py,sha256=38_os7XxhwBrNQKO-1lKhzAg-HR89Fy0jAV5LdC_Ueg,15016
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -587,7 +589,7 @@ hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk
 hestia_earth/models/utils/feedipedia.py,sha256=wzzrMbYlda1XCpWiObLz4bFLXbAZejHcxsXJFr4U_AM,3953
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
-hestia_earth/models/utils/impact_assessment.py,sha256=WRG_VaEWrI3cLkbjupdFb_mOJ-77qdNRKRpJ9Lt-tbk,8070
+hestia_earth/models/utils/impact_assessment.py,sha256=VoJVgSVJkXFvlIukCBm054KGMCBeot17k3DRwo_3_QI,8137
 hestia_earth/models/utils/indicator.py,sha256=UuuraMUdKLqjcm_zEoF8BaMb76qW23djIA_2DeaoiEw,700
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF2uwc2PB4JPrHFSksMEQ,1900
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
@@ -630,7 +632,7 @@ hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87Xpb
 hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj5cgFClxGvepZYqtYsjWVE,217
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_sites.py,sha256=vuEVZh_mkuI2cPotX2GB88lURJm2giOQ3yu2Cn4iLoI,2997
-tests/models/test_config.py,sha256=WFz1OGhJE6kpcYe3kTPBpv4Jn59yeOCAvz1hqnbI_7o,3113
+tests/models/test_config.py,sha256=JhO7T3bNh2Dl61pKAyM4iEPKybfue02qdneHcJTO2Ck,3368
 tests/models/test_ecoinventV3.py,sha256=_BqfWiYFaw-Y7A-EeabHEnja3d7yb4Ed7gGGvu3Srpw,1936
 tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_EOxdrdavXP6L5_LtvaVbXb_-56UJXSaiPhpGntmwVc,801
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
@@ -655,8 +657,8 @@ tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandOccupatio
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandTransformation.py,sha256=lcyMTaNMbIjzZrbPxejujfYyAEj2XOH5Ei9pmAQAi7k,1912
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=NTc3PZZRc9ZqGpaARdbuzLWR5bB0HCPw5AMdGmwVsRg,704
 tests/models/cml2001Baseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=-913Bo7_IC8vz3Fi1tYqN0mSx6HzwWmHcQs-jpuRm80,8801
-tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=xBoSGZaNCSpfDdNFIbyJhJslDJD5A_eTywz01GDqFNM,4513
+tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=lR2PX0mmppnSMWj9-vAD1XUBXQab5w-xS5CbWbNl1Uk,8369
+tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=y-E5t5x2VcgPsy3cPFBWyULd6vieaGjDY_J2GVJMtUo,4081
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
 tests/models/cml2001Baseline/test_terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=t3WBdg_aTYSLfaqeXUDyvQJ8ZqbvKwv9RKaZyRzj61k,925
 tests/models/cml2001NonBaseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -743,7 +745,7 @@ tests/models/dammgen2009/test_noxToAirExcreta.py,sha256=RWd9QvzmJtN9M6UC6KDHkXwt
 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=4g6fvYNASaW662i9Y3FeDTDIPb6ZGcpSKBob0MzVbBU,1119
+tests/models/edip2003/test_ozoneDepletionPotential.py,sha256=z0kimdTxzSr8_K5eScbkxq2SB9nbBp41IHqVNR4Nh4Y,688
 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
@@ -906,7 +908,7 @@ tests/models/ipcc2019/animal/test_pregnancyRateTotal.py,sha256=3M4cpH0rM0fLR86bw
 tests/models/ipcc2019/animal/test_trueProteinContent.py,sha256=3O2w_PsVEki_piIHO-Wa6m28f5SAHWHsSk27nYDQDuM,783
 tests/models/ipcc2019/animal/test_weightAtMaturity.py,sha256=-lP4Sx1s11Wyo4Vm1it3SdIpNP43TZWmwOWttrAd_N8,705
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/ipcc2021/test_gwp100.py,sha256=wFc2QxF3ZIofwYAYl_RmdwhvRBGTn9bN9umjLrLPsg8,1137
+tests/models/ipcc2021/test_gwp100.py,sha256=r3pDw_TUcOrNlNRWtFAN3CBWfG5FCkHExypVqg0sZVk,857
 tests/models/jarvisAndPain1994/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/jarvisAndPain1994/test_n2ToAirExcreta.py,sha256=aMCuR9fmGDmum7VqLb1oBOsTCjBz5O9XQn2DWtP8HVM,1057
 tests/models/koble2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1034,8 +1036,8 @@ tests/models/pooreNemecek2018/test_rotationDuration.py,sha256=tD2E91beAXdyT-xf5Q
 tests/models/pooreNemecek2018/test_saplingsDepreciatedAmountPerCycle.py,sha256=seT7-ip5lSjglaM2Wbaf4qsNrc2W_RYnafef4mQlc8U,1668
 tests/models/pooreNemecek2018/test_utils.py,sha256=oqKCNVw6LOAa4jJFadQCL8ysUbUiVCnm0XBOdqa2BVA,742
 tests/models/poschEtAl2008/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=AlDvYqNq8TFPDNtgdSr1dNP-_Rqzbvoxq8ribh8AeEc,1876
-tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=0-hn3Ssu5cfJor_Mq5DYzLlgXiw9ulARlBa_ovJGMbg,1875
+tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=aCfUMusw9TH0DZ781RlltoNZeoKs1C8HbffehCYf5Dc,1441
+tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=8B63VI4rR6Ad9Z3TMO9jtAX79JpTTY6Na7PSZsr13jk,1440
 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
@@ -1105,6 +1107,8 @@ tests/models/schmidt2007/test_utils.py,sha256=rmtOV3xiFynjgx8lQNGsJqquG8HDxz3LDm
 tests/models/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/site/test_brackishWater.py,sha256=YGCp4glaWudKklYBSp-50KbfvIRtp3F4Qrj5T81ECTk,986
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
+tests/models/site/test_defaultMethodClassification.py,sha256=2Ek2TkSsWh_kNGBwzzarPt2LR710frziXxTdWq7pX30,532
+tests/models/site/test_defaultMethodClassificationDescription.py,sha256=ZqI5dmXxzz-op_czHFwTjHUPhBL1Q_gEU2UZTCkS50I,543
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
 tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
 tests/models/site/test_management.py,sha256=-QgZc4jBkhHrvvssn3Xtd3kYGIuV2dDoMJxoejkEhmM,1762
@@ -1204,8 +1208,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=lGqeebvgAwGathB8NLZ14Js5JV_-KyHueaD6I8IH8mU,3615
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.65.9.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.65.9.dist-info/METADATA,sha256=yf4UsyfGEEeJHUC7KgsGyf6YODOANQkvdOPgErfvMeI,4046
-hestia_earth_models-0.65.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.65.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.65.9.dist-info/RECORD,,
+hestia_earth_models-0.65.10.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.65.10.dist-info/METADATA,sha256=1B8T70nCeba3dfHkL6iNd8l0VARIGLSxUYTfw5LFcXA,4047
+hestia_earth_models-0.65.10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.65.10.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.65.10.dist-info/RECORD,,

tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py

@@ -120,8 +120,8 @@ bad_fuel_indicator_no_property_lookup = {
 @mark.parametrize(
     "resources, expected, num_inputs",
     [
-        ([], True, 0),
-        ([wrong_indicator], True, 0),
+        ([], False, 0),
+        ([wrong_indicator], False, 0),
         ([indicator_no_inputs], False, 0),
         ([indicator_2_inputs], False, 2),
         ([indicator_no_unit], False, 0),
@@ -167,20 +167,6 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_no_emissions(*args):
-    """
-    Impact assessment with no emissions should return a indicator of 0
-    """
-    with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
-        impactassessment = json.load(f)
-
-    del impactassessment['emissionsResourceUse']
-
-    value = run(impactassessment)
-    assert value['value'] == 0
-
-
 def test_download_all_non_renewable_terms(*args):
     """
     make sure download_all_non_renewable_terms() only returns terms we want

tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py

@@ -71,8 +71,8 @@ indicator_tellurium = {
 @mark.parametrize(
     "resources, expected, num_inputs",
     [
-        ([], True, 0),
-        ([wrong_indicator], True, 0),
+        ([], False, 0),
+        ([wrong_indicator], False, 0),
         ([indicator_no_inputs], False, 0),
         ([indicator_2_inputs], False, 0),
         ([indicator_no_unit], False, 0),
@@ -108,17 +108,3 @@ def test_run(*args):
 
     value = run(impactassessment)
     assert value == expected
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_no_emissions(*args):
-    """
-    Impact assessment with no emissions should return a indicator of 0
-    """
-    with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
-        impactassessment = json.load(f)
-
-    del impactassessment['emissionsResourceUse']
-
-    value = run(impactassessment)
-    assert value['value'] == 0

tests/models/edip2003/test_ozoneDepletionPotential.py

@@ -19,16 +19,3 @@ def test_run(*args):
 
     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'] == 0

tests/models/ipcc2021/test_gwp100.py

@@ -8,15 +8,6 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-def test_run_no_emissions():
-    with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    impact['emissionsResourceUse'] = []
-    indicator = run(impact)
-    assert indicator.get('value') == 0
-
-
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -42,17 +42,3 @@ def test_lookup_to_bad_country(*args):
 
     value = run(impactassessment)
     assert value == expected
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_no_emissions(*args):
-    """
-    Impact assessment with no emissions should return a indicator of 0
-    """
-    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
-        impactassessment = json.load(f)
-
-    del impactassessment['emissionsResourceUse']
-
-    value = run(impactassessment)
-    assert value['value'] == 0

tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py

@@ -42,17 +42,3 @@ def test_lookup_to_bad_country(*args):
 
     value = run(impactassessment)
     assert value == expected
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_no_emissions(*args):
-    """
-    Impact assessment with no emissions should return a indicator of 0
-    """
-    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
-        impactassessment = json.load(f)
-
-    del impactassessment['emissionsResourceUse']
-
-    value = run(impactassessment)
-    assert value['value'] == 0

tests/models/site/test_defaultMethodClassification.py

@@ -0,0 +1,18 @@
+import json
+from tests.utils import fixtures_path
+
+from hestia_earth.models.site.defaultMethodClassification import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+def test_run():
+    with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{fixtures_folder}/result.txt", encoding='utf-8') as f:
+        expected = f.read().strip()
+
+    result = run(site)
+    assert result == expected

tests/models/site/test_defaultMethodClassificationDescription.py

@@ -0,0 +1,18 @@
+import json
+from tests.utils import fixtures_path
+
+from hestia_earth.models.site.defaultMethodClassificationDescription import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+def test_run():
+    with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{fixtures_folder}/result.txt", encoding='utf-8') as f:
+        expected = f.read().strip()
+
+    result = run(site)
+    assert result == expected

tests/models/test_config.py

@@ -3,7 +3,8 @@ import importlib
 from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.config import (
-    load_config, config_max_stage, _is_aggregated_model, _remove_aggregated, load_run_config, load_trigger_config
+    load_config, config_max_stage, _is_aggregated_model, _remove_aggregated, load_run_config, load_trigger_config,
+    get_max_stage
 )
 
 
@@ -107,9 +108,17 @@ def _get_models_paths(node_type: str):
     'node_type',
     ['Cycle', 'Site', 'ImpactAssessment']
 )
-def test_load_config_cycle(node_type):
+def test_load_config_cycle(node_type: str):
     paths = _get_models_paths(node_type)
 
     for path in paths:
         run = importlib.import_module(path).run
         assert run is not None, path
+
+
+@pytest.mark.parametrize(
+    'node_type, max_stage',
+    [('Cycle', 2), ('Site', 2), ('ImpactAssessment', 1)]
+)
+def test_get_max_stage(node_type: str, max_stage: int):
+    assert get_max_stage(node_type) == max_stage, node_type