hestia-earth-models 0.74.5__py3-none-any.whl → 0.74.7__py3-none-any.whl

hestia_earth/models/resourceUseNotRelevant/__init__.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import IndicatorMethodTier, TermTermType
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.lookup import download_lookup, lookup_term_ids
 from hestia_earth.utils.lookup_utils import is_in_system_boundary
 
@@ -15,8 +15,7 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Indicator": [{
-        "value": "0",
-        "methodTier": "not relevant"
+        "value": "0"
     }]
 }
 LOOKUPS = {
@@ -27,13 +26,11 @@ LOOKUPS = {
     ]
 }
 MODEL = 'resourceUseNotRelevant'
-TIER = IndicatorMethodTier.NOT_RELEVANT.value
 
 
 def _indicator(term_id: str, land_cover_id: str):
     indicator = _new_indicator(term_id, MODEL, land_cover_id)
     indicator['value'] = 0
-    indicator['methodTier'] = TIER
     return indicator
 
 

hestia_earth/models/utils/indicator.py

@@ -10,9 +10,7 @@ def _new_indicator(
     land_cover_id: str = None, previous_land_cover_id: str = None, country_id: str = None, key_id: str = None
 ):
     node = {'@type': SchemaType.INDICATOR.value}
-    node['term'] = linked_node(term if isinstance(term, dict) else download_term(
-        term, TermTermType.CHARACTERISEDINDICATOR)
-    )
+    node['term'] = linked_node(term if isinstance(term, dict) else download_term(term))
     if land_cover_id:
         node['landCover'] = linked_node(download_term(land_cover_id, TermTermType.LANDCOVER))
     if previous_land_cover_id:

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.74.5'
+VERSION = '0.74.7'

{hestia_earth_models-0.74.5.dist-info → hestia_earth_models-0.74.7.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK
 hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
 hestia_earth/models/preload_requests.py,sha256=-eb4TA4m-A4bLcdAwbKqr3TIsDteVSXhJGCp95mQCew,2504
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=Yw5gBLFlJzKrCW3z-N2u5t7ExCXhNqHDMYZHrXtwdx4,19
+hestia_earth/models/version.py,sha256=063ysqdwW7WLAcbJ9hTLDpvitQTP0eRqk7F3ZKIs7Hg,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -202,7 +202,7 @@ hestia_earth/models/hestia/concentrateFeed.py,sha256=HnuG3zAECtFVdPRbTATGz5ImO2V
 hestia_earth/models/hestia/cropResidueManagement.py,sha256=VlubB0q5MtvBM2dQSWdrENBMOYpvFbGu36TEwxoDl7A,2301
 hestia_earth/models/hestia/croppingIntensity.py,sha256=xev3GOE06nBJ8ZY3XtbnE0eR2YR_kqAFPnrTuKFtLrQ,1777
 hestia_earth/models/hestia/default_emissions.py,sha256=UaG__VXbsa2f3lU_wD7Pz0hYWhABSTmyx8wwT3MQG1w,3546
-hestia_earth/models/hestia/default_resourceUse.py,sha256=uV4yawZTDoDNyb_NojOEzRZgjy-tWzXCzaxgAT1BGTs,3880
+hestia_earth/models/hestia/default_resourceUse.py,sha256=ne1apNctXHNFW0_Xzbwyk6hfW8ittWQSeygfaCcJFcw,4341
 hestia_earth/models/hestia/energyContentLowerHeatingValue.py,sha256=2gR7Iu5nUUCGSXjFrkTnss6XBGtQz-yKwexCQoy8TJU,2214
 hestia_earth/models/hestia/excretaKgMass.py,sha256=pBhD3I2NPjJ-Dbnp_P508J7OCLI_fxOAyTi_wKtrkcg,4017
 hestia_earth/models/hestia/excretaKgN.py,sha256=J2TuRGzA8KHDgsRnZflF8LMcd8993YPguY-cdbQOJ8Y,2878
@@ -213,7 +213,7 @@ hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
 hestia_earth/models/hestia/landCover.py,sha256=bZdlubbri0yzYCdhAQx_6iXZWQjeijBLr8NLldZPWOs,40280
-hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=9FAjqFh-MFeABzW83Ge5Y5JOmakhG8hYv8dtKqdXms0,9582
+hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=xiVun-YIXwtQ917DG9K8-7qzllwIj_QiBjuk1e0CQJU,9574
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=Bd8rD4ioiXvlKCTtYva_Cj3yqIgi2ykeVmCDtjgeY4A,1202
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=yWbnkjvV87M8lUcSR5nxJGunX3Ne3wdVvBMR2b1K_Sc,1200
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
@@ -243,7 +243,7 @@ hestia_earth/models/hestia/residueLeftOnField.py,sha256=EZoPlDhh1aNJvPT52Bvro6xc
 hestia_earth/models/hestia/residueRemoved.py,sha256=2I4wTJJcORrhkWiRJOzjwxRMIn3Jjeggh1dhFC2CK4Y,4969
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=eEROdEYQc4hQsz57iAThV8hQi-FVb5aDZmDZWqzHF-M,6624
 hestia_earth/models/hestia/salineWater.py,sha256=rqiF3KfjvvNx3sxWFiXsP1_e5aB3ekA4QGC8vtcFHmo,1270
-hestia_earth/models/hestia/seed_emissions.py,sha256=1TxXfDjtIYS7yEZLDs70j6D3-x-68K9KZQGwHIBl7EE,12107
+hestia_earth/models/hestia/seed_emissions.py,sha256=JPvpkwA1lv2iBSgp9gl73Xnu_mhk3pDIaWeQo8HgZqA,12475
 hestia_earth/models/hestia/soilMeasurement.py,sha256=cP4nuz2DE-FLaFbP-0fG5wbIgU28s3n4-lo8-RTFpF0,7088
 hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py,sha256=WIRmBSTk70Dffm_KcbTqpAhtnrV4rzl_m0gKED5NIAo,1844
 hestia_earth/models/hestia/temperatureAnnual.py,sha256=IhMoO-SkSp1JBxgu9bSr1OCtr7QQlZsoCXqhsWeEprs,1963
@@ -467,7 +467,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=DM6ZUnw23KH0oMKS3jA5q
 hestia_earth/models/mocking/__init__.py,sha256=-mJ_zrVWZSGc3awWW2YJfXAK3Nku77sAUgmmFa99Xmo,733
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=uvklojTAbjDI7Jw43jGAUDcTHk1R3A3CWiYBJZI6rao,1493
-hestia_earth/models/mocking/search-results.json,sha256=jzk1kqMxajoL5SojazrZfsG3Tl2LqvxfBihTTMT0Dc0,103845
+hestia_earth/models/mocking/search-results.json,sha256=j-TFPJNkexB3Hf9ADBKg63yAkLM0hZkK8lsZxukCo4o,103843
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
@@ -551,7 +551,7 @@ hestia_earth/models/recipe2016Individualist/marineEutrophicationPotential.py,sha
 hestia_earth/models/recipe2016Individualist/ozoneDepletionPotential.py,sha256=cRpcfMsQnFFYV6lW5iy0yEqt9lqL0C7ALL-OdhdbV8A,1064
 hestia_earth/models/recipe2016Individualist/terrestrialAcidificationPotential.py,sha256=YvFqXh8SdYy1Na71mYGO9Dpi928fzzXESRA3x-JKG7Y,1069
 hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcbeq.py,sha256=Sf6_kPt1hHRwe_Cg6Fz7nnxBZgIhpUzi8xMLJSxoRN8,928
-hestia_earth/models/resourceUseNotRelevant/__init__.py,sha256=UWlMN3tYCyTDpnlyoKqsoAQADPgBwY5tZWN0FVXoPrQ,2236
+hestia_earth/models/resourceUseNotRelevant/__init__.py,sha256=U2QEwqwRhLpGpl0GWZf9XzivzHYPHKMMRiw6F5ZRaBw,2096
 hestia_earth/models/schererPfister2015/__init__.py,sha256=_6FJKfWeAbbS3jFzQ8gEVzoX1LZdPWUTLrow6Hz90U0,419
 hestia_earth/models/schererPfister2015/nErosionSoilFlux.py,sha256=rh1H-06upTXlv5x8RqhBt1RRrWnMznPbm3k3EBoAGY0,5450
 hestia_earth/models/schererPfister2015/pErosionSoilFlux.py,sha256=2LVjKHpKKsV6vEcUrDwtqrdFqAYeSXzTLqhkBPBBxno,5462
@@ -630,7 +630,7 @@ hestia_earth/models/utils/feedipedia.py,sha256=ETJx80zf_qGFWASE1u4kmpYncCz-7xSFl
 hestia_earth/models/utils/fertiliser.py,sha256=9Kv7czDEPDvZ5Bz6Rr_2vy2MsXrPDvBC3921cEJSks8,810
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
 hestia_earth/models/utils/impact_assessment.py,sha256=AfIZo_ykkkqWYY2AG-kLzGtd3fwzGIQXxnEKEzL_oGk,8516
-hestia_earth/models/utils/indicator.py,sha256=Vb5L2ziXKXiL558M0K5V5ihaDTuvX3BLJP1SCbQ_B5E,1009
+hestia_earth/models/utils/indicator.py,sha256=b3aRJ73p_y4VmL2_ZY9eXVDJxrQEP0WathuLKbSaluk,958
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
 hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
@@ -858,8 +858,8 @@ tests/models/hestia/test_coldDressedCarcassWeightPerHead.py,sha256=5UwhLh0DjPlOc
 tests/models/hestia/test_concentrateFeed.py,sha256=knFM7SlKZhvmRu9T6T5H1fitFAZBuEBdxiBQpnekn4M,2012
 tests/models/hestia/test_cropResidueManagement.py,sha256=zjHY0dlrJN7pqlRIs3rpssuwqOFJtjv4El3V39QpoFs,2021
 tests/models/hestia/test_croppingIntensity.py,sha256=YIBeAj3HSpLTKKjTNpQyy273w36xKSnv2lUbeO_-cb0,1566
-tests/models/hestia/test_default_emissions.py,sha256=d85cKeFJsT-p3ti4AliSPB7lUJmwNoogRU-sUGn52Zg,869
-tests/models/hestia/test_default_resourceUse.py,sha256=RZ0oV4lzl-LujGoih6OAxxZmeqi655KHQWQNG_senmg,917
+tests/models/hestia/test_default_emissions.py,sha256=56nVuEm0OMF_Z_JgdUffAmw6lAIVT4x_0mUUcLJDWvs,1053
+tests/models/hestia/test_default_resourceUse.py,sha256=GKfAIJSUvpNkDqrNVXPrATet91K8F-2nJtMqcxhs2PM,1066
 tests/models/hestia/test_energyContentLowerHeatingValue.py,sha256=sjFrRFNMGvZy8i5WWqfR3Z_92wd9lUTtdZv0YFXidR8,1222
 tests/models/hestia/test_excretaKgMass.py,sha256=tY4he1xRDHZi976slnFra-4lRqWwogx2fXkpXfJxpOY,2924
 tests/models/hestia/test_excretaKgN.py,sha256=7yuF9-nrwfkcmU_VsQtFBYSO92RqEDtUU9kdL0ERiUk,1091
@@ -1286,8 +1286,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.74.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.74.5.dist-info/METADATA,sha256=7JSVI3aieeaAATUOsKCFJUyxj9Suv4GkM8Cy0A88FaE,4037
-hestia_earth_models-0.74.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.74.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.74.5.dist-info/RECORD,,
+hestia_earth_models-0.74.7.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.74.7.dist-info/METADATA,sha256=8Znns2lsgYAaWBeVScidRuK_3NCf-xF__bW6sUBFyto,4037
+hestia_earth_models-0.74.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.74.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.7.dist-info/RECORD,,

tests/models/hestia/test_default_emissions.py

@@ -11,8 +11,14 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
+def fake_new_emission_extended(*args):
+    data = fake_new_emission(*args)
+    data['term']['termType'] = 'emission'
+    return data
+
+
 @pytest.mark.parametrize("subfolder", _folders)
-@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission_extended)
 def test_run(mock, subfolder: str):
     folder = f"{fixtures_folder}/{subfolder}"
     with open(f"{folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -22,4 +28,5 @@ def test_run(mock, subfolder: str):
         expected = json.load(f)
 
     result = run(cycle)
+    print(json.dumps(result, indent=2))
     assert result == expected

tests/models/hestia/test_default_resourceUse.py

@@ -11,8 +11,14 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
+def fake_new_indicator_extended(*args):
+    data = fake_new_indicator(*args)
+    data['term']['termType'] = 'resourceUse'
+    return data
+
+
 @pytest.mark.parametrize("subfolder", _folders)
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator_extended)
 def test_run(mock, subfolder: str):
     folder = f"{fixtures_folder}/{subfolder}"
     with open(f"{folder}/impact.jsonld", encoding='utf-8') as f: