hestia-earth-models 0.59.0__tar.gz → 0.59.1__tar.gz

{hestia-earth-models-0.59.0/hestia_earth_models.egg-info → hestia-earth-models-0.59.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.0
+Version: 0.59.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.59.0 → hestia-earth-models-0.59.1}/hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -3650,19 +3650,19 @@ def _log_inventory(inventory: dict) -> str:
                 group.get(_InventoryKey.CI_CATEGORY).value if group.get(_InventoryKey.CI_CATEGORY) else None
             ),
             "temperature-monthly": (
-                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.TEMP_MONTHLY))
+                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.TEMP_MONTHLY, []))
                 if group.get(_InventoryKey.TEMP_MONTHLY) else None
             ),
             "precipitation-monthly": (
-                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.PRECIP_MONTHLY))
+                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.PRECIP_MONTHLY, []))
                 if group.get(_InventoryKey.PRECIP_MONTHLY) else None
             ),
             "pet-monthly": (
-                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.PET_MONTHLY))
+                " ".join(f"{val:.1f}" for val in group.get(_InventoryKey.PET_MONTHLY, []))
                 if group.get(_InventoryKey.PET_MONTHLY) else None
             ),
             "irrigated-monthly": (
-                " ".join(str(val) for val in group.get(_InventoryKey.IRRIGATED_MONTHLY))
+                " ".join(str(val) for val in group.get(_InventoryKey.IRRIGATED_MONTHLY, []))
                 if group.get(_InventoryKey.PET_MONTHLY) else None
             ),
             "sand-content": group.get(_InventoryKey.SAND_CONTENT, None),

{hestia-earth-models-0.59.0 → hestia-earth-models-0.59.1}/hestia_earth/models/mocking/search-results.json

@@ -918,11 +918,11 @@
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
+        "@id": "residueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporated"
+        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
@@ -1028,11 +1028,11 @@
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPigs"
+        "@id": "digestibleEnergySalmonids"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergySalmonids"
+        "@id": "digestibleEnergyPigs"
       },
       {
         "@type": "Term",
@@ -1111,43 +1111,43 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "excretaInsectsKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGeeseKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaInsectsKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaBeefCattleFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaGeeseKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaKgN"
       },
       {
         "@type": "Term",
@@ -1299,7 +1299,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 24.857483
+        "_score": 23.9092
       }
     ]
   },
@@ -1337,31 +1337,19 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "deepWater"
+        "@id": "rainfedDeepWater"
       },
       {
         "@type": "Term",
-        "@id": "deepWaterWaterDepth50100Cm"
+        "@id": "rainfedDeepWaterWaterDepth50100Cm"
       },
       {
         "@type": "Term",
-        "@id": "deepWaterWaterDepth100Cm"
+        "@id": "rainfedDeepWaterWaterDepth100Cm"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedContinuouslyFlooded"
-      },
-      {
-        "@type": "Term",
-        "@id": "irrigatedSurfaceIrrigation"
-      },
-      {
-        "@type": "Term",
-        "@id": "irrigated"
-      },
-      {
-        "@type": "Term",
-        "@id": "irrigatedManualIrrigation"
+        "@id": "irrigatedTypeUnspecified"
       },
       {
         "@type": "Term",
@@ -1375,6 +1363,10 @@
         "@type": "Term",
         "@id": "irrigatedSubIrrigation"
       },
+      {
+        "@type": "Term",
+        "@id": "irrigatedSurfaceIrrigationDrainageRegimeUnspecified"
+      },
       {
         "@type": "Term",
         "@id": "irrigatedDripIrrigation"
@@ -1389,15 +1381,19 @@
       },
       {
         "@type": "Term",
-        "@id": "irrigatedSingleDrainagePeriod"
+        "@id": "irrigatedCenterPivotIrrigation"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedCenterPivotIrrigation"
+        "@id": "irrigatedSurfaceIrrigationContinuouslyFlooded"
       },
       {
         "@type": "Term",
-        "@id": "irrigatedMultipleDrainagePeriods"
+        "@id": "irrigatedSurfaceIrrigationMultipleDrainagePeriods"
+      },
+      {
+        "@type": "Term",
+        "@id": "irrigatedSurfaceIrrigationSingleDrainagePeriod"
       }
     ]
   },
@@ -1736,23 +1732,23 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "ridgeTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "noTillage"
       },
       {
         "@type": "Term",
-        "@id": "ridgeTillage"
+        "@id": "fullInversionTillage"
       },
       {
         "@type": "Term",
-        "@id": "noTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullInversionTillage"
+        "@id": "minimumTillage"
       },
       {
         "@type": "Term",

{hestia-earth-models-0.59.0 → hestia-earth-models-0.59.1}/hestia_earth/models/utils/site.py

@@ -61,7 +61,7 @@ def related_cycles(site_id: str):
         The related `Cycle`s as `dict`.
     """
     nodes = find_related(SchemaType.SITE, site_id, SchemaType.CYCLE)
-    return list(map(lambda node: download_hestia(node.get('@id'), SchemaType.CYCLE), nodes or []))
+    return non_empty_list(map(lambda node: download_hestia(node.get('@id'), SchemaType.CYCLE), nodes or []))
 
 
 def _cycle_end_year(cycle: dict):

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

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

{hestia-earth-models-0.59.0 → hestia-earth-models-0.59.1/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.0
+Version: 0.59.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.59.0/hestia_earth/models/version.py

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