hestia-earth-models 0.57.2__py3-none-any.whl → 0.59.0__py3-none-any.whl

hestia_earth/models/mocking/search-results.json

@@ -839,11 +839,11 @@
       },
       {
         "@type": "Term",
-        "@id": "longFallowCrop"
+        "@id": "shortFallowCrop"
       },
       {
         "@type": "Term",
-        "@id": "shortFallowCrop"
+        "@id": "longFallowCrop"
       }
     ]
   },
@@ -914,23 +914,19 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
-      },
-      {
-        "@type": "Term",
-        "@id": "residueIncorporated"
+        "@id": "residueRemoved"
       },
       {
         "@type": "Term",
-        "@id": "residueRemoved"
+        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
+        "@id": "residueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "residueBurntBeforeAllowingForCombustionFactor"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
@@ -958,43 +954,43 @@
       },
       {
         "@type": "Term",
-        "@id": "discardedCropLeftOnField"
+        "@id": "discardedCropIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropTotal"
+        "@id": "aboveGroundCropResidueRemoved"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropIncorporated"
+        "@id": "discardedCropLeftOnField"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueRemoved"
+        "@id": "discardedCropTotal"
       },
       {
         "@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"
       }
     ]
   },
@@ -1032,11 +1028,11 @@
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergySalmonids"
+        "@id": "digestibleEnergyPigs"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPigs"
+        "@id": "digestibleEnergySalmonids"
       },
       {
         "@type": "Term",
@@ -1090,11 +1086,11 @@
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilitySalmonids"
+        "@id": "energyDigestibilityRuminants"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityRuminants"
+        "@id": "energyDigestibilitySalmonids"
       },
       {
         "@type": "Term",
@@ -1115,67 +1111,67 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "excretaBuffaloKgN"
+        "@id": "excretaInsectsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaGeeseKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaInsectsKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgN"
+        "@id": "excretaTurkeysKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgN"
+        "@id": "excretaMixturesKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgN"
+        "@id": "excretaLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaMixturesKgN"
+        "@id": "processedExcretaKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgN"
+        "@id": "excretaBuffaloKgN"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgN"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
@@ -1216,47 +1212,47 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaLiquidFishCrustaceansKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDairyCattleKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgVs"
+        "@id": "processedExcretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaHorsesMulesAndAssesKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaBuffaloKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaTurkeysKgVs"
       },
       {
         "@type": "Term",
-        "@id": "processedExcretaKgVs"
+        "@id": "excretaLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaHorsesMulesAndAssesKgVs"
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBuffaloKgVs"
+        "@id": "excretaDairyCattleKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaTurkeysKgVs"
+        "@id": "excretaGeeseKgVs"
       },
       {
         "@type": "Term",
@@ -1303,7 +1299,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.66477
+        "_score": 24.857483
       }
     ]
   },
@@ -1353,43 +1349,43 @@
       },
       {
         "@type": "Term",
-        "@id": "irrigated"
+        "@id": "irrigatedContinuouslyFlooded"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedManualIrrigation"
+        "@id": "irrigatedSurfaceIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedSprinklerIrrigation"
+        "@id": "irrigated"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedDripIrrigation"
+        "@id": "irrigatedManualIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedLateralMoveIrrigation"
+        "@id": "irrigatedLocalizedIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedSubIrrigation"
+        "@id": "irrigatedFurrowIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedLocalizedIrrigation"
+        "@id": "irrigatedSubIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedFurrowIrrigation"
+        "@id": "irrigatedDripIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedContinuouslyFlooded"
+        "@id": "irrigatedSprinklerIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedSurfaceIrrigation"
+        "@id": "irrigatedLateralMoveIrrigation"
       },
       {
         "@type": "Term",
@@ -1496,7 +1492,7 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "diesel1D"
+        "@id": "marineDieselOil"
       },
       {
         "@type": "Term",
@@ -1504,11 +1500,7 @@
       },
       {
         "@type": "Term",
-        "@id": "marineDieselOil"
-      },
-      {
-        "@type": "Term",
-        "@id": "diesel"
+        "@id": "diesel1D"
       },
       {
         "@type": "Term",
@@ -1520,23 +1512,66 @@
       },
       {
         "@type": "Term",
-        "@id": "petrol"
+        "@id": "diesel"
       },
       {
         "@type": "Term",
         "@id": "petrolBurntIn4StrokeEngine"
       },
+      {
+        "@type": "Term",
+        "@id": "petrol"
+      },
       {
         "@type": "Term",
         "@id": "en590Diesel"
       },
+      {
+        "@type": "Term",
+        "@id": "diesel2D"
+      },
       {
         "@type": "Term",
         "@id": "diesel4D"
+      }
+    ]
+  },
+  {
+    "name": "get_long_fallow_land_cover_terms",
+    "query": {
+      "bool": {
+        "must": [
+          {
+            "match": {
+              "@type": "Term"
+            }
+          },
+          {
+            "match": {
+              "termType.keyword": "landCover"
+            }
+          },
+          {
+            "match_phrase_prefix": {
+              "name": "long"
+            }
+          },
+          {
+            "match": {
+              "name": "fallow"
+            }
+          }
+        ]
+      }
+    },
+    "results": [
+      {
+        "@type": "Term",
+        "@id": "longFallow"
       },
       {
         "@type": "Term",
-        "@id": "diesel2D"
+        "@id": "longBareFallow"
       }
     ]
   },
@@ -1566,15 +1601,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "milkYieldPerBuffaloFpcm"
+        "@id": "milkYieldPerSheepRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerSheepRaw"
+        "@id": "milkYieldPerGoatRaw"
       },
       {
         "@type": "Term",
-        "@id": "milkYieldPerGoatRaw"
+        "@id": "milkYieldPerBuffaloFpcm"
       },
       {
         "@type": "Term",
@@ -1654,10 +1689,6 @@
       {
         "@type": "Term",
         "@id": "residueBurnt"
-      },
-      {
-        "@type": "Term",
-        "@id": "residueBurntBeforeAllowingForCombustionFactor"
       }
     ]
   },
@@ -1696,41 +1727,6 @@
       }
     ]
   },
-  {
-    "name": "get_rice_plant_upland_terms",
-    "query": {
-      "bool": {
-        "must": [
-          {
-            "match": {
-              "@type": "Term"
-            }
-          },
-          {
-            "match": {
-              "termType.keyword": "landCover"
-            }
-          },
-          {
-            "match_phrase": {
-              "name": "rice plant"
-            }
-          },
-          {
-            "match": {
-              "name": "upland"
-            }
-          }
-        ]
-      }
-    },
-    "results": [
-      {
-        "@type": "Term",
-        "@id": "ricePlantUpland"
-      }
-    ]
-  },
   {
     "name": "get_tillage_terms",
     "query": {
@@ -1772,6 +1768,76 @@
       }
     ]
   },
+  {
+    "name": "get_upland_rice_crop_terms",
+    "query": {
+      "bool": {
+        "must": [
+          {
+            "match": {
+              "@type": "Term"
+            }
+          },
+          {
+            "match": {
+              "termType.keyword": "crop"
+            }
+          },
+          {
+            "match_phrase": {
+              "name": "rice"
+            }
+          },
+          {
+            "match": {
+              "name": "upland"
+            }
+          }
+        ]
+      }
+    },
+    "results": [
+      {
+        "@type": "Term",
+        "@id": "riceGrainInHuskUpland"
+      }
+    ]
+  },
+  {
+    "name": "get_upland_rice_land_cover_terms",
+    "query": {
+      "bool": {
+        "must": [
+          {
+            "match": {
+              "@type": "Term"
+            }
+          },
+          {
+            "match": {
+              "termType.keyword": "landCover"
+            }
+          },
+          {
+            "match_phrase": {
+              "name": "rice plant"
+            }
+          },
+          {
+            "match": {
+              "name": "upland"
+            }
+          }
+        ]
+      }
+    },
+    "results": [
+      {
+        "@type": "Term",
+        "@id": "ricePlantUpland"
+      }
+    ]
+  },
   {
     "name": "get_urea_terms",
     "query": {
@@ -1785,11 +1851,11 @@
       },
       {
         "@type": "Term",
-        "@id": "ureaFormaldehydeKgN"
+        "@id": "ureaAmmoniumSulphateKgN"
       },
       {
         "@type": "Term",
-        "@id": "sulphurCoatedUreaKgN"
+        "@id": "ureaFormaldehydeKgN"
       },
       {
         "@type": "Term",
@@ -1797,11 +1863,11 @@
       },
       {
         "@type": "Term",
-        "@id": "ureaCalciumNitrateKgN"
+        "@id": "sulphurCoatedUreaKgN"
       },
       {
         "@type": "Term",
-        "@id": "ureaAmmoniumSulphateKgN"
+        "@id": "ureaCalciumNitrateKgN"
       }
     ]
   },
@@ -1841,11 +1907,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "woodPellets"
+        "@id": "woodFuel"
       },
       {
         "@type": "Term",
-        "@id": "woodFuel"
+        "@id": "woodPellets"
       },
       {
         "@type": "Term",

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -78,7 +78,6 @@ LOOKUPS = {
     "liveAquaticSpecies": ["excretaKgNTermId", "allowedExcretaKgNTermIds"]
 }
 MODEL_KEY = 'excretaKgN'
-MODEL_LOG = '/'.join([MODEL, MODEL_KEY])
 
 
 def _product(excreta_product: str, value: float):
@@ -109,9 +108,9 @@ def _should_run(cycle: dict):
     is_product_complete = dc.get('product', False)
 
     inputs_feed = get_feed_inputs(cycle)
-    inputs_n = convert_to_nitrogen(cycle, MODEL_LOG, excreta_term_id, inputs_feed)
+    inputs_n = convert_to_nitrogen(cycle, MODEL, excreta_term_id, inputs_feed, model_key=MODEL_KEY)
 
-    products_n = get_animal_produced_nitrogen(MODEL_LOG, cycle.get('products', []))
+    products_n = get_animal_produced_nitrogen(MODEL, cycle.get('products', []))
 
     # we can still run the model for `liveAquaticSpecies`
     is_liveAquaticSpecies = primary_prod.get('term', {}).get('termType') == TermTermType.LIVEAQUATICSPECIES.value
@@ -119,13 +118,13 @@ def _should_run(cycle: dict):
     nitrogen_content = _get_nitrogen_content(primary_prod)
 
     if is_liveAquaticSpecies:
-        logRequirements(cycle, model=MODEL_LOG, term=excreta_term_id,
+        logRequirements(cycle, model=MODEL, term=excreta_term_id, model_key=MODEL_KEY,
                         is_liveAquaticSpecies=is_liveAquaticSpecies,
                         product_value=product_value,
                         nitrogen_content=nitrogen_content)
 
     else:
-        logRequirements(cycle, model=MODEL_LOG, term=excreta_term_id,
+        logRequirements(cycle, model=MODEL, term=excreta_term_id, model_key=MODEL_KEY,
                         is_animalFeed_complete=is_animalFeed_complete,
                         is_product_complete=is_product_complete,
                         inputs_n=inputs_n,
@@ -144,8 +143,8 @@ def _should_run(cycle: dict):
     ])
     # only log if the excreta term does not exist to avoid showing failure when it already exists
     if should_add_product:
-        logShouldRun(cycle, MODEL_LOG, excreta_term_id, should_run)
-    logShouldRun(cycle, MODEL_LOG, None, should_run)
+        logShouldRun(cycle, MODEL, excreta_term_id, should_run, model_key=MODEL_KEY)
+    logShouldRun(cycle, MODEL, None, should_run)
     return should_run, excreta_product, mass_balance_items, alternate_items