hestia-earth-models 0.54.0__tar.gz → 0.54.1__tar.gz

{hestia-earth-models-0.54.0/hestia_earth_models.egg-info → hestia-earth-models-0.54.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.54.0
+Version: 0.54.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

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1}/hestia_earth/models/cycle/input/ecoinventV3.py

@@ -52,7 +52,8 @@ LOOKUPS = {
     "material": "ecoinventMapping",
     "pesticideAI": "ecoinventMapping",
     "soilAmendment": "ecoinventMapping",
-    "transport": "ecoinventMapping"
+    "transport": "ecoinventMapping",
+    "veterinaryDrugs": "ecoinventMapping"
 }
 MODEL = 'ecoinventV3'
 MODEL_KEY = 'impactAssessment'  # keep to generate entry in "model-links.json"

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1}/hestia_earth/models/ipcc2019/pastureGrass.py

@@ -6,6 +6,7 @@ Source:
 [IPCC 2019, Vol.4, Chapter 10](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch10_Livestock.pdf).
 """
 from hestia_earth.schema import TermTermType, AnimalReferencePeriod
+from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
@@ -30,7 +31,7 @@ REQUIREMENTS = {
             "term.@id": "pastureGrass",
             "key": {
                 "@type": "Term",
-                "term.termType": ["crop", "forage"]
+                "term.termType": ["crop", "landCover"]
             }
         }],
         "animals": [{
@@ -93,7 +94,7 @@ LOOKUPS = {
     "crop-property": ["energyDigestibilityRuminants", "energyContentHigherHeatingValue"],
     "crop": "grazedPastureGrassInputId",
     "forage-property": ["energyDigestibilityRuminants", "energyContentHigherHeatingValue"],
-    "forage": "grazedPastureGrassInputId"
+    "landCover": "grazedPastureGrassInputId"
 }
 RETURNS = {
     "Input": [{
@@ -104,7 +105,7 @@ RETURNS = {
 MODEL_KEY = 'pastureGrass'
 KEY_TERM_TYPES = [
     TermTermType.CROP.value,
-    TermTermType.FORAGE.value
+    TermTermType.LANDCOVER.value
 ]
 
 
@@ -382,7 +383,7 @@ def _calculate_NEwool(cycle: dict):
 
 def _pastureGrass_key_property_value(practice: dict, column: dict):
     term_id = _practice_input_id(practice)
-    term = practice.get('key', {})
+    term = download_hestia(term_id)
     term_type = term.get('termType')
     value = list_sum(practice.get('value', [0]))
     lookup_value = _node_property_value(MODEL, {'@id': term_id, 'termType': term_type}, column)

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1}/hestia_earth/models/mocking/search-results.json

@@ -877,27 +877,27 @@
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueBurnt"
+        "@id": "discardedCropRemoved"
       },
       {
         "@type": "Term",
-        "@id": "belowGroundCropResidue"
+        "@id": "aboveGroundCropResidueTotal"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueLeftOnField"
+        "@id": "aboveGroundCropResidueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropRemoved"
+        "@id": "aboveGroundCropResidueBurnt"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueTotal"
+        "@id": "belowGroundCropResidue"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueIncorporated"
+        "@id": "aboveGroundCropResidueLeftOnField"
       }
     ]
   },
@@ -930,23 +930,23 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "digestibleEnergyRuminants"
+        "@id": "digestibleEnergyRabbits"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPigs"
+        "@id": "digestibleEnergyRuminants"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergySalmonids"
+        "@id": "digestibleEnergyPoultry"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyRabbits"
+        "@id": "digestibleEnergyPigs"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPoultry"
+        "@id": "digestibleEnergySalmonids"
       },
       {
         "@type": "Term",
@@ -987,23 +987,23 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPoultry"
+        "@id": "energyDigestibilitySalmonids"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityRabbits"
+        "@id": "energyDigestibilityRuminants"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPigs"
+        "@id": "energyDigestibilityPoultry"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilitySalmonids"
+        "@id": "energyDigestibilityRabbits"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityRuminants"
+        "@id": "energyDigestibilityPigs"
       },
       {
         "@type": "Term",
@@ -1060,47 +1060,47 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
+        "@id": "excretaBuffaloKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBuffaloKgN"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDairyCattleKgN"
+        "@id": "excretaTurkeysKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSheepKgN"
+        "@id": "processedExcretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgN"
+        "@id": "excretaLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgN"
+        "@id": "excretaMixturesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgN"
+        "@id": "excretaDairyCattleKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgN"
+        "@id": "excretaSheepKgN"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgN"
+        "@id": "excretaHorsesMulesAndAssesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgN"
+        "@id": "excretaCamelsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaMixturesKgN"
+        "@id": "excretaPigsKgN"
       }
     ]
   },
@@ -1121,47 +1121,47 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
+        "@id": "excretaBuffaloKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDairyCattleKgVs"
+        "@id": "excretaHorsesMulesAndAssesKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgVs"
+        "@id": "processedExcretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgVs"
+        "@id": "excretaTurkeysKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBuffaloKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgVs"
+        "@id": "excretaDairyCattleKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaGeeseKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
@@ -1204,7 +1204,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 23.278303
+        "_score": 23.378887
       }
     ]
   },
@@ -1364,15 +1364,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "milkYieldPerCowRaw"
+        "@id": "milkYieldPerSheepRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepRaw"
+        "@id": "milkYieldPerGoatRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerGoatRaw"
+        "@id": "milkYieldPerCowRaw"
       },
       {
         "@type": "Term",
@@ -1380,19 +1380,19 @@
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepFpcm"
+        "@id": "milkYieldPerCamelRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerCowFpcm"
+        "@id": "milkYieldPerBuffaloRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerCamelRaw"
+        "@id": "milkYieldPerCowFpcm"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerBuffaloRaw"
+        "@id": "milkYieldPerSheepFpcm"
       }
     ]
   },
@@ -1452,23 +1452,23 @@
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "deepTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "stripTillage"
       },
       {
         "@type": "Term",
-        "@id": "deepTillage"
+        "@id": "mulchTillage"
       },
       {
         "@type": "Term",
-        "@id": "stripTillage"
+        "@id": "minimumTillage"
       },
       {
         "@type": "Term",
-        "@id": "mulchTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1}/hestia_earth/models/utils/lookup.py

@@ -76,7 +76,7 @@ _ALLOW_ALL = 'all'
 def _model_lookup_values(model: str, term: dict, restriction: str):
     lookup = download_lookup(f"{term.get('termType')}-model-{restriction}.csv")
     values = get_table_value(lookup, 'termid', term.get('@id'), column_name(model))
-    return (values or _ALLOW_ALL).split(';')
+    return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
 
 
 def is_model_siteType_allowed(model: str, term: dict, data: dict):
@@ -89,7 +89,7 @@ def is_model_siteType_allowed(model: str, term: dict, data: dict):
 def _lookup_values(term: dict, column: str):
     lookup = download_lookup(f"{term.get('termType')}.csv")
     values = get_table_value(lookup, 'termid', term.get('@id'), column_name(column))
-    return (values or _ALLOW_ALL).split(';')
+    return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
 
 
 def is_siteType_allowed(data: dict, term: dict):

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

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

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.54.0
+Version: 0.54.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

{hestia-earth-models-0.54.0 → hestia-earth-models-0.54.1}/tests/models/ipcc2019/test_pastureGrass.py

@@ -10,6 +10,10 @@ MILK_YIELD_TERMS = ['milkYieldPerCowRaw', 'milkYieldPerSheepRaw']
 WOOL_TERMS = ['woolSheepGreasy']
 
 
+def fake_download_hestia(term_id: str, *args): return {'@id': term_id, 'termType': 'forage'}
+
+
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -24,6 +28,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -38,6 +43,7 @@ def test_run_with_feed(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)

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

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