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

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/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/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/version.py

@@ -1 +1 @@
-VERSION = '0.59.0'
+VERSION = '0.59.1'

{hestia_earth_models-0.59.0.dist-info → hestia_earth_models-0.59.1.dist-info}/METADATA

@@ -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.dist-info → hestia_earth_models-0.59.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
 hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=xjXiXMg7lFhjsIJz6jJ7IE-CaCrZz77IQTZ8sCC-pnY,19
+hestia_earth/models/version.py,sha256=LsmLTJIb3gRkCkowNKNONE3gjzMidoU3T3ZdHLRP_xc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -238,7 +238,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=mJUXLGtg9EOZq9LH0KFOKvzER1ypCUucs0ZMaNYMShc,2991
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=wTvMBthqmiKMn4nLbL4VD6_8_gGI2WGR3OYz3KK8sXs,3105
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=zOhp6NhYUuUNU_LMMwhZBP78YC2XRWRlGnajBUX2AN8,3095
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=VQgYbFYoTkj-qnidHfIdb-2hcl29NMQ_xh0CIGkhYNI,141126
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=7FXRYTrgFFdU1Fjo4HegfipiWPbY5ChcBi3qRfc7aXE,141142
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=CpDEtdnbKd_8eaDLcflJ-dGik3t879HIoEIzuaHNmC0,23168
 hestia_earth/models/ipcc2019/utils.py,sha256=1DfHJxVktu7vZMqj-yVjGb_59sHi7lu91GDnB5-qR4o,6504
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
@@ -341,7 +341,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=GZb-7uylALKNabUQaPjwekZHqBBeVCuL3wG2OzHeEo8,4565
 hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
 hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
-hestia_earth/models/mocking/search-results.json,sha256=VNWU4RlhEqEhL5vubdeCCre1_fQzz-_MczF5VjNsQXA,39752
+hestia_earth/models/mocking/search-results.json,sha256=lqiVVybBoRY40119-ykY8FND8RfzK0WLCcBKlQzHE-8,39777
 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
@@ -519,7 +519,7 @@ hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam
 hestia_earth/models/utils/product.py,sha256=XwxrRwdREWc4N5cE0oLJbLdEucKFRKgKNDj-Kd8mZEQ,9837
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
 hestia_earth/models/utils/property.py,sha256=7UV9pxSX49RnUsbEqOeohzxyXXShao1XAnEYCCVKS0k,4923
-hestia_earth/models/utils/site.py,sha256=3mV7lwKFdTGcb4Po1fRKHjsc3gtF680tX06M8UA7qvQ,3145
+hestia_earth/models/utils/site.py,sha256=4i6rjvFIzOEcsNcF1B9I8OFdVR_iFDODcWgq2_XFXfc,3155
 hestia_earth/models/utils/source.py,sha256=HhZkvQoFdy6j6FC2cwP5EbHXHFM4pif9gpnuzeDwEh4,1746
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
 hestia_earth/models/utils/term.py,sha256=_DahtnHIS5wtyEXew3gpV52QjnsAWQZmyxnz4fu6mrI,17780
@@ -1017,8 +1017,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=JJmzyHnhVGeQ7tG-T6DjE7CoIJPH0guH-y2kjGeZiJY,3756
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.59.0.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.59.0.dist-info/METADATA,sha256=PhYlKE9july6EQWJYvuzLIIB6syEag5c3G9KEIk3k0U,3134
-hestia_earth_models-0.59.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.59.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.59.0.dist-info/RECORD,,
+hestia_earth_models-0.59.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.59.1.dist-info/METADATA,sha256=OmSflUlcdw-cSbja7uMHn26Do72YujIz0dol2DND0Ek,3134
+hestia_earth_models-0.59.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.59.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.59.1.dist-info/RECORD,,