hestia-earth-models 0.61.0__py3-none-any.whl → 0.61.1__py3-none-any.whl

hestia_earth/models/mocking/search-results.json

@@ -1868,11 +1868,11 @@
       },
       {
         "@type": "Term",
-        "@id": "ureaAmmoniumSulphateKgN"
+        "@id": "ureaCalciumNitrateKgN"
       },
       {
         "@type": "Term",
-        "@id": "ureaCalciumNitrateKgN"
+        "@id": "ureaAmmoniumSulphateKgN"
       }
     ]
   },

hestia_earth/models/utils/__init__.py

@@ -31,9 +31,9 @@ def _include_model(node: dict, term_id: str):
     return {**node, **({} if term.get('@id') is None else {'model': linked_node(term)})}
 
 
-def _include_method(node: dict, term_id: Union[str, dict]):
+def _include_method(node: dict, term_id: Union[None, str, dict]):
     term = (download_hestia(term_id) or {}) if isinstance(term_id, str) else term_id
-    return {**node, **({} if term.get('@id') is None else {'method': linked_node(term)})}
+    return node | ({} if term is None or term.get('@id') is None else {'method': linked_node(term)})
 
 
 def _include_methodModel(node: dict, term_id: str):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.61.0'
+VERSION = '0.61.1'

{hestia_earth_models-0.61.0.dist-info → hestia_earth_models-0.61.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.61.0
+Version: 0.61.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.61.0.dist-info → hestia_earth_models-0.61.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
 hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoWpUSoM,6065
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=FT08Vhb7Lb3VBMJTpz6SG6r9-iYbaTSa6dMvziz62nw,19
+hestia_earth/models/version.py,sha256=DawXHQzDIFA4jqWG3Ll44HT9IK7VVuH1ufis27BrDfE,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
@@ -356,7 +356,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 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=YBVHukDRbVuDQc17wZ-Jax2KbKLCEP9pa-wBr-q2P7Q,40203
+hestia_earth/models/mocking/search-results.json,sha256=jLKoR2nmYGXg5zicRlzRL1BSQks7tJtkM3_Vrfvt5eE,40203
 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
@@ -513,7 +513,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
-hestia_earth/models/utils/__init__.py,sha256=OrqV4x67N7bzHldAPGQyrvV1GobzBWfrCVzQrnxFdyQ,4442
+hestia_earth/models/utils/__init__.py,sha256=ULNgkb5S7UXoHnqmFSbqm6fVkit03FKV3WL924XGr0I,4459
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=3uSTSMDNNPa26NTJGZCYwByv3QZVyxj6bh2aFCoBzHk,126
@@ -1062,8 +1062,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.61.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.61.0.dist-info/METADATA,sha256=e46k2VJnTo3hg8p6ZeFBkWgRDzQFjk-xnnLMER1Cj2c,3134
-hestia_earth_models-0.61.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.61.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.61.0.dist-info/RECORD,,
+hestia_earth_models-0.61.1.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.61.1.dist-info/METADATA,sha256=Agkt0rgmCQ9lu5aVl2F1Dsg-FBO08o2dGEUyS755zHo,3134
+hestia_earth_models-0.61.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.61.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.61.1.dist-info/RECORD,,