hestia-earth-models 0.61.8__py3-none-any.whl → 0.62.0__py3-none-any.whl

hestia_earth/models/utils/blank_node.py

@@ -995,33 +995,6 @@ def _validate_time_fraction_dict(
     ])
 
 
-def _build_update_dict(node: dict, years: list, target_year: int) -> dict:
-    """
-    Build an update dictionary containing values and dates from a node that fall within a given year.
-
-    This is only required if when `group_nodes_by_year` `mode = GroupNodesByYearMode.DATES`
-
-    Parameters
-    ----------
-    node : dict
-        The node containing values and dates.
-    year : int
-        The year to be matched.
-
-    Returns
-    -------
-    dict
-        An update dictionary containing "value" and "dates" keys.
-    """
-    valid_indices = {
-        i for i, y in enumerate(years) if y == target_year
-    }
-    return {
-        "value": [node.get("value")[i] for i in valid_indices],
-        "dates": [node.get("dates")[i] for i in valid_indices]
-    }
-
-
 def group_nodes_by_year(
     nodes: list[dict],
     default_node_duration: int = 1,
@@ -1057,7 +1030,7 @@ def group_nodes_by_year(
     should_run_node = GROUP_NODES_BY_YEAR_MODE_TO_SHOULD_RUN_NODE_FUNCTION[mode]
     get_node_datetime_range = GROUP_NODES_BY_YEAR_MODE_TO_GET_DATETIME_RANGE_FUNCTION[mode]
 
-    valid_nodes = [node for node in nodes if should_run_node(node)]
+    valid_nodes = non_empty_list(flatten(split_node_by_dates(node) for node in nodes if should_run_node(node)))
 
     def group_node(groups: dict, index: int):
         node = valid_nodes[index]
@@ -1066,12 +1039,6 @@ def group_nodes_by_year(
             node, default_node_duration=default_node_duration
         )
 
-        # pre-parse the "dates" field so it doesn't get re-calculated in each iteration of the for-loop
-        years = (
-            [safe_parse_date(datestr).year for datestr in node.get("dates", [])]
-            if mode == GroupNodesByYearMode.DATES else []
-        )
-
         range_start = node_datetime_range.start.year if node_datetime_range else 0
         range_end = node_datetime_range.end.year + 1 if node_datetime_range else 0
 
@@ -1085,7 +1052,6 @@ def group_nodes_by_year(
             is_final_year = _datetime_within_range(node_datetime_range.end, group_datetime_range)
 
             time_fraction_dict = _build_time_fraction_dict(group_datetime_range, node_datetime_range)
-            update_dict = _build_update_dict(node, years, year) if mode == GroupNodesByYearMode.DATES else {}
 
             should_run = (
                 mode == GroupNodesByYearMode.DATES
@@ -1096,7 +1062,7 @@ def group_nodes_by_year(
             )
 
             should_run and groups[year].append(
-                node | time_fraction_dict | update_dict
+                node | time_fraction_dict
             )
 
         return groups
@@ -1111,6 +1077,57 @@ def group_nodes_by_year(
     return dict(sorted(iterated.items())) if sort_result else iterated
 
 
+def split_node_by_dates(node: dict) -> list[dict]:
+    """
+    Split a node with an array-like `value` and `dates` with multiple elements into a list of nodes with a single
+    `value` and `dates`. All other array-like node fields (`sd`, `min`, `max`,  and `observations`) will be also be
+    split. Any other fields will be copied with no modifications.
+
+    All split fields will still be array-like, but will only contain one element. Any array-like fields with a
+    different number of elements to `value` will not be split.
+
+    This function should only run on nodes with array-like `value` and `dates` (e.g., nodes with `@type` == `Emission`,
+    `Input`,`Measurement`, `Practice` or `Product`).
+
+    Parameters
+    ----------
+    node : dict
+        A HESTIA blank node with array-like `value` and `dates` (and optional array-like fields `sd`, `min`, `max`, and
+        `observations`).
+
+    Returns
+    -------
+    list[dict]
+        A list of nodes with single `value` and `dates`.
+    """
+    REQUIRED_KEYS = ["value", "dates"]
+    OPTIONAL_KEYS = ["sd", "min", "max", "observations"]
+
+    value = node.get("value", [])
+    target_len = len(value) if isinstance(value, list) else -1
+
+    def should_run_key(key: str) -> bool:
+        item = node.get(key, [])
+        return isinstance(item, list) and len(item) == target_len
+
+    should_run = all([
+        target_len > 0,
+        all(should_run_key(key) for key in REQUIRED_KEYS)
+    ])
+
+    valid_keys = REQUIRED_KEYS + [key for key in OPTIONAL_KEYS if should_run_key(key)]
+
+    def split(result: list[dict], index: int) -> list[dict]:
+        update = {key: [node[key][index]] for key in valid_keys}
+        result.append(node | update)
+        return result
+
+    return (
+        sorted(reduce(split, range(len(value)), list()), key=lambda node: node.get("dates", []))
+        if should_run else [node]
+    )
+
+
 def group_nodes_by_year_and_month(
     nodes: list[dict],
     default_node_duration: int = 1,

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.61.8'
+VERSION = '0.62.0'

{hestia_earth_models-0.61.8.dist-info → hestia_earth_models-0.62.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.61.8
+Version: 0.62.0
 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
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hestia-earth.schema ==28.*
+Requires-Dist: hestia-earth.schema ==29.*
 Requires-Dist: hestia-earth.utils >=0.13.0
 Requires-Dist: python-dateutil >=2.8.1
 Requires-Dist: CurrencyConverter ==0.16.8

{hestia_earth_models-0.61.8.dist-info → hestia_earth_models-0.62.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/preload_requests.py,sha256=elhYQTxBVuFlZROWvZ3yErDzzMLdMUIjBhmpdaTUSi8,1012
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=Gmx1Mzumxee0MDRwhnW69WRndkZUHweMwKOy4mZhmno,19
+hestia_earth/models/version.py,sha256=20rNPRrr5iRqYOjgaG8FGBREz_Bc791OcD-8QH-p7UY,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
@@ -69,7 +69,7 @@ hestia_earth/models/cycle/animal/input/properties.py,sha256=2bKyyclrt0O7zvtD1Ij7
 hestia_earth/models/cycle/completeness/__init__.py,sha256=rkwGtxIay_AleJCT7al_ngnix_xRqySVie7qvHXMQI0,1517
 hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-LVxSyOdD8mDCOZMvjuj5W2uo,1012
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=zSiu9h0NxEBDUWlaKBh1QcX4jDIklrs0BC2NWMCQQ80,2549
-hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=fmBll9hQCUSVI5anQGHu3dcIauUseu4ZZQRYx6Cpu4w,1757
+hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=FWG8EuOPubTLDc3jMJv6NdFCgG0wOVgxv-5P9wA7Nys,2044
 hestia_earth/models/cycle/completeness/excreta.py,sha256=2yVxcuWjAh4hoEukaMJ90VZpkCL7SfpwIgzigbjVaF4,996
 hestia_earth/models/cycle/completeness/material.py,sha256=UQH2oRnUY-Q-_MVuOlTAYqQxc7wWDM5mi_iFmp9PlIQ,1362
 hestia_earth/models/cycle/completeness/seed.py,sha256=g4GOzRx249pEfr2beU9n5tzBiWA3hhxnqyiGri7QbEI,1662
@@ -94,7 +94,7 @@ hestia_earth/models/cycle/pre_checks/cache_sources.py,sha256=jCynHYIqOVizBSPKWKi
 hestia_earth/models/cycle/pre_checks/site.py,sha256=n26QBpRTvUIZ-_SyD8D2_0Ny_JsFG1977ZKUaZAIFb0,870
 hestia_earth/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/product/currency.py,sha256=lB1pCD1747Ke3oFoqjAKEHbIdHPfrHKNaJSni69iMUQ,2150
-hestia_earth/models/cycle/product/economicValueShare.py,sha256=bbEyasn6SoVRkQFfDq7tSfM0_xnfhen3MmjbDGLZN5o,7601
+hestia_earth/models/cycle/product/economicValueShare.py,sha256=jSuwTa94OKnI4vn8B_DVkVyjRHSqDGoF6rAwl4NK1zk,8540
 hestia_earth/models/cycle/product/price.py,sha256=E5Q0TkfbbsJHZZD3cBGZvvHj0f2sJrgLGulRCyILTbY,1449
 hestia_earth/models/cycle/product/primary.py,sha256=FYyl-Mv8AmEml1nhDJwU01N4LrszJm6E31eztQDHzdg,1853
 hestia_earth/models/cycle/product/properties.py,sha256=PiwCod4dlMScTm_MQhY35QpeLRuHvdsc_nijv_7TqNM,1377
@@ -242,15 +242,15 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=eyPfy
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-uaus2cftXzlsYCUAxLuon6BnDXmaFI9xhQrgU,3347
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=3TPl6RvUlNHbc7TZiHWoqK-o2fCgAvlcLh2C__MNj8A,8728
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=8rQifRZYQdoBz9HpoSbmrKiGP7ayQUZT78KEErgqtwc,8658
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=YrjsBTmFbOw2DlGgcxf1B0d_NeNhE1Fl_OG4DrCPhLU,82293
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=W3G0LbrfQp5lnYQj7CvznLtjH_7WVPk7-zBiujgD0yE,57867
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=xIp0Xu4Ke3lksR5fDyYT7f5qmjevV9oCtLvdNnvqvgA,57974
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=CrQWsDhW--wNQ2HEc_zxdFKuIdBHEwOQnVJGA3HgPpQ,10856
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Q3uX7IcTk0PmzxqEhU3JAcHb5LnUymZbmdRFP9xXsfo,8713
-hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nUJYYkovzF7QD4LeUqhV5mBYFKdrhxeG4gyPRv0Xpuk,16002
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=FCp39CiMUwzvsAsX0-stLlDAjFy6g5brmr9-XD8TuN0,9318
+hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=J7Du1woOvEbqyAMX9cNQ2NYDYpiVAbYWMEn_w2oBVbM,15394
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=xPtuTiKeAvBhv9d7B6Upw_cbP6YxKykVJ3_p0S_EtZg,10689
+hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=hOPTRzwugjoPWhVMvi9JfWdROH0V2EE9n2jAksyFqL0,10936
 hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=5smSAmKVCIlELCD6S_3I16YuSWNFhcClGDOdvrIuYsE,3657
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
@@ -364,7 +364,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=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
 hestia_earth/models/mocking/mock_search.py,sha256=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
-hestia_earth/models/mocking/search-results.json,sha256=b2D9kIA18EpfCUl36Fi0L4JL8EuTrm4-VzZoaYw9dOw,43543
+hestia_earth/models/mocking/search-results.json,sha256=bXKQ-rzwrMA_DWaLa5FFHkRBmnmHaTwHZylVcEIULMw,43626
 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
@@ -526,7 +526,7 @@ hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmm
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=0_Ik0gKoh1QBijyb-55odh8_dIs-CWQ3lgUN1Hnc4Y8,18749
-hestia_earth/models/utils/blank_node.py,sha256=PTrjipqY35g0AjlFU_pn9AdZ6I26VBizW7Elr7sF-OY,41908
+hestia_earth/models/utils/blank_node.py,sha256=y6Gyp6p-CWvMd5mgN-sZFtGy1Q22YLo-vYsL_bO7CaM,42672
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=5H7odhRwU_LmUhYwf8c1LsdqXSYbLWkuknvtRDqUBTQ,3194
 hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO5ADg,2246
@@ -651,7 +651,7 @@ tests/models/cycle/pre_checks/test_cache_sources.py,sha256=tvk7E1LlJSq2Sb2MKBRlx
 tests/models/cycle/pre_checks/test_site.py,sha256=2JTrsOXVGfNn7FlLiX7DPNs6AHdeZuVvjNZP6SCjEII,694
 tests/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/cycle/product/test_currency.py,sha256=r7TA0FDDS9U50-FolEMXESi4pvSmwXnQxAHrQh0lRjA,1222
-tests/models/cycle/product/test_economicValueShare.py,sha256=58EsOw5nZWGTsKK_LFblIz3YwmCXROT-GffHojmd674,4417
+tests/models/cycle/product/test_economicValueShare.py,sha256=sFS-gKt6oglqeKuDqHsPfZ90cEROOIdydFsOu4E85eo,4624
 tests/models/cycle/product/test_price.py,sha256=zmWNdF2P4k2QTje_62NJDklCIwmk2vF8xuOoVzL9qf0,1193
 tests/models/cycle/product/test_primary.py,sha256=UfLOOxUkDyeSOmDv4NyN6v5Yf0RO9etZNT797fbCbpA,1862
 tests/models/cycle/product/test_properties.py,sha256=7pcBH_Ny8JeQ2dWXBU-ZSmY5iYl0f_qFejp8Vk5e1H8,1142
@@ -770,7 +770,7 @@ tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py,sha256=3Hv86L4X_Va2mZL
 tests/models/ipcc2019/test_ch4ToAirExcreta.py,sha256=e58NXmBW2SNVLUqQO9A66Xq6jiGTyhdFZDZk51JApF8,2902
 tests/models/ipcc2019/test_ch4ToAirFloodedRice.py,sha256=FAp5b45WdX5Ih4yGUOZ4CmVD8smW1Lw1tnulx9AKVBI,1980
 tests/models/ipcc2019/test_co2ToAirLimeHydrolysis.py,sha256=e5iuZ-kQNEVih0ZRgRPWqaUtXcLpfkoU7sQypbqA9_Y,1345
-tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChangeManagementChange.py,sha256=cvgUMp3pIyPvyeCuL9-TIDJajIw4FoljN88JKc5GsMI,4166
+tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChangeManagementChange.py,sha256=KCZfRKdkVgZ8u_mFsE99-yZ-A53SKOzyG1edYtI26P0,4242
 tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=MmtEME0xjsa3KojFk_fxOLK6RZM_6p5HIpY2DOFHVu4,1530
 tests/models/ipcc2019/test_croppingDuration.py,sha256=gLRXeR6Tqa7ciD9KTRfsIflSeIIWT2iOpZMdcxAQla4,1871
 tests/models/ipcc2019/test_ligninContent.py,sha256=eIKEN__ab-0R52EhlhPSBiHnmTl6xOf1XbI33O-W9A4,4146
@@ -791,13 +791,13 @@ tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
 tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
 tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
-tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=CtgRy-7qXBTF7ZnWV6l6hOV_d8b6um0T3grHXUOc9OM,13891
+tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=q75Bq29hjmjPjbwFCNzTmTVOMr54izyXaeOlPPKQ5z8,13901
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_1_utils.py,sha256=e5RpK4GlH9tNxbwEyPQkO2lMwYBtGNp8ha8j4bZF9eg,20699
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=gHAi0qr9vE2_TtyJOqOc5Wc8ZRIflQz8vKBOcvKTzCE,7020
 tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
-tests/models/ipcc2019/test_pastureGrass.py,sha256=hn6tw-ifMTn00_WmYPIjRdm56SMF1w-eqETngVE29ns,3373
+tests/models/ipcc2019/test_pastureGrass.py,sha256=xcFXpszkqgeJImWOp-JlJxpcSHQKC-Pi0zdaKfai4a4,2660
 tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/ipcc2019/animal/test_pastureGrass.py,sha256=2ZbeIxxEZ9xaDkfCY2pLripmtOG89iHMTrPqa2-UuQg,1983
+tests/models/ipcc2019/animal/test_pastureGrass.py,sha256=IifdYacwC_cXn5wHeLqq2e0fJeIe8WLWOumYKY36MrE,1979
 tests/models/ipcc2019/animal/test_weightAtMaturity.py,sha256=Tss9bTVz66yXVEBZT31KMm6gd45B9E1DJLqwYArPuYY,665
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=JRklKMSg-OXopb9ZufGgl94deuMuJSsfNXRZDBtOZrE,1119
@@ -1061,7 +1061,7 @@ tests/models/usetoxV2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 tests/models/usetoxV2/test_freshwaterEcotoxicityPotentialCtue.py,sha256=eq7Gcmfya9g0eOKKkuBhz8vq7xi_CmZ_LTSxueBwZt4,835
 tests/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/utils/test_array_builders.py,sha256=1zTc5r6Y9fcQ3x67S9Am0G3ip4Kp9_MmiSqIvY-M6yc,6470
-tests/models/utils/test_blank_node.py,sha256=hgom8mJPWqylnf4AfLgVlbYgAHAEcH8DngOdFidFMcw,34343
+tests/models/utils/test_blank_node.py,sha256=zOZvZ0OPrLQSKwkuYhf9KBOEUa-pMn1zK0jxqhI3HaE,38039
 tests/models/utils/test_crop.py,sha256=ve_BqT2XuLTWAH-8YOnVY4nzMUSXYYXPB8S-5RtGlf4,463
 tests/models/utils/test_cropResidueManagement.py,sha256=RQt8lexeJzCyxZceIutgDpw7BpcqmjsUB0C0yZC2QpY,930
 tests/models/utils/test_currency.py,sha256=BPsojPsY9QW2aj8vgbjkPQXU8GU6wDwwtPZ3HdC4KTU,277
@@ -1082,8 +1082,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.8.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.61.8.dist-info/METADATA,sha256=IWeDTAdOnEFZ1vddHFUvLfz428gHnUaA3OSm-n0-NG8,3350
-hestia_earth_models-0.61.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.61.8.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.61.8.dist-info/RECORD,,
+hestia_earth_models-0.62.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.62.0.dist-info/METADATA,sha256=I4RMMfkN95mAgg48dBTcssIccEoKZqc1MLsXltrYgus,3350
+hestia_earth_models-0.62.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.62.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.62.0.dist-info/RECORD,,

tests/models/cycle/product/test_economicValueShare.py

@@ -148,3 +148,11 @@ def test_run_complete_above_80_percent():
 
     value = run(cycle)
     assert value == expected
+
+
+def test_run_complete_2_products():
+    with open(f"{fixtures_folder}/complete-2-products/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    value = run(cycle)
+    assert value == []

tests/models/ipcc2019/animal/test_pastureGrass.py

@@ -5,9 +5,9 @@ from tests.utils import fixtures_path, fake_new_input
 from tests.models.ipcc2019.test_pastureGrass import MILK_YIELD_TERMS, WOOL_TERMS, TERMS_BY_ID
 from hestia_earth.models.ipcc2019.animal.pastureGrass import MODEL, MODEL_KEY, run
 
-class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY.replace('/', '.')}"
+class_path = f"hestia_earth.models.{MODEL}.animal.{MODEL_KEY}"
 class_path_utils = f"hestia_earth.models.{MODEL}.pastureGrass_utils"
-fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/animal/{MODEL_KEY}"
 
 
 def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChangeManagementChange.py

@@ -22,6 +22,7 @@ RUN_SCENARIOS = [
     ("complex-overlapping-cycles", 5),
     ("missing-measurement-dates", 3),
     ("no-organic-carbon-measurements", 1),  # Closes issue #700
+    ("non-consecutive-organic-carbon-measurements", 1),  # Closes issue 827
     ("multiple-method-classifications", 5)  # Closes issue #764
 ]
 """List of (subfolder: str, num_cycles: int)."""

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -84,7 +84,7 @@ DEFAULT_PROPERTIES = {
 
 
 def fake_calc_descriptive_stats(arr: NDArray, *_args, **_kwargs):
-    return {"value": [row[0] for row in arr]}
+    return {"value": [round(row[0], 6) for row in arr]}
 
 
 def fake_find_term_property(term: dict, property: str, *_):

tests/models/ipcc2019/test_pastureGrass.py

@@ -50,22 +50,6 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
-@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
-@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
-@patch(f"{class_path}._new_input", side_effect=fake_new_input)
-def test_run_with_feed(*args):
-    with open(f"{fixtures_folder}/with-feed/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/with-feed/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    value = run(cycle)
-    assert value == expected
-
-
 @patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
 @patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)

tests/models/utils/test_blank_node.py

@@ -21,7 +21,8 @@ from hestia_earth.models.utils.blank_node import (
     get_node_value,
     group_nodes_by_year,
     group_nodes_by_year_and_month,
-    GroupNodesByYearMode
+    GroupNodesByYearMode,
+    split_node_by_dates
 )
 
 
@@ -1017,33 +1018,67 @@ def test_group_nodes_by_year_multiple_values_and_dates(mock_parse, system_dateti
             "2001-02",
             "2002-03",
             "2003-01"
+        ],
+        "sd": [
+            0.8, 0.9, 1.0, 0.9, 0.8
+        ],
+        "observations": [
+            100, 100, 100, 100, 100
         ]
     }]
 
     EXPECTED = {
-        2000: [{
-            "dates": ["2000-01", "2000-06"],
-            "fraction_of_node_duration": 0.32475598935226263,
-            "fraction_of_group_duration": 1.0,
-            "value": [1, 2]
-        }],
+        2000: [
+            {
+                "dates": ["2000-01"],
+                "fraction_of_node_duration": 1.0,
+                "fraction_of_group_duration": 0.08469945355191257,
+                "value": [1],
+                "sd": [0.8],
+                "observations": [
+                    100
+                ]
+            },
+            {
+                "dates": ["2000-06"],
+                "fraction_of_node_duration": 1.0,
+                "fraction_of_group_duration": 0.08196721311475409,
+                "value": [2],
+                "sd": [0.9],
+                "observations": [
+                    100
+                ]
+            }
+        ],
         2001: [{
             "dates": ["2001-02"],
-            "fraction_of_node_duration": 0.323868677905945,
-            "fraction_of_group_duration": 1.0,
-            "value": [3]
+            "fraction_of_node_duration": 1.0,
+            "fraction_of_group_duration": 0.07671232876712329,
+            "value": [3],
+            "sd": [1.0],
+            "observations": [
+                100
+            ]
         }],
         2002: [{
             "dates": ["2002-03"],
-            "fraction_of_node_duration": 0.323868677905945,
-            "fraction_of_group_duration": 1.0,
-            "value": [4]
+            "fraction_of_node_duration": 1.0,
+            "fraction_of_group_duration": 0.08493150684931507,
+            "value": [4],
+            "sd": [0.9],
+            "observations": [
+                100
+            ]
         }],
         2003: [{
             "dates": ["2003-01"],
-            "fraction_of_node_duration": 0.027506654835847383,
+            "fraction_of_node_duration": 1.0,
             "fraction_of_group_duration": 0.08493150684931507,
-            "value": [5]
+            "value": [5],
+            "sd": [0.8],
+            "observations": [
+                100
+            ]
         }]
     }
 
@@ -1134,3 +1169,107 @@ def test_group_nodes_by_year_and_month(mock_parse, system_datetime):
 
     result = group_nodes_by_year_and_month(MANAGEMENT)
     assert result == EXPECTED
+
+
+# node, expected
+PARAMS_SPLIT_NODE = [
+    (
+        {},
+        [{}]
+    ),
+    (
+        {"value": [1, 2, 3], "dates": ["2000"]},
+        [{"value": [1, 2, 3], "dates": ["2000"]}]
+    ),
+    (
+        {"value": [1, 2, 3], "startDate": "2000", "endDate": "2001"},
+        [{"value": [1, 2, 3], "startDate": "2000", "endDate": "2001"}]
+    ),
+    (
+        {"value": 1, "startDate": "2000", "endDate": "2001"},
+        [{"value": 1, "startDate": "2000", "endDate": "2001"}]
+    ),
+    (
+        {"value": None},
+        [{"value": None}]
+    ),
+    (
+        {"value": [1, 2, 3], "dates": ["2000", "2001", "2002"]},
+        [
+            {"value": [1], "dates": ["2000"]},
+            {"value": [2], "dates": ["2001"]},
+            {"value": [3], "dates": ["2002"]}
+        ]
+    ),
+    (
+        {
+            "value": [1, 2],
+            "dates": ["2000", "2001"],
+            "sd": [0.816496, 0.816496],
+            "min": [0, 1],
+            "max": [2, 3],
+            "observations": [3, 3]
+        },
+        [
+            {
+                "value": [1],
+                "dates": ["2000"],
+                "sd": [0.816496],
+                "min": [0],
+                "max": [2],
+                "observations": [3]
+            },
+            {
+                "value": [2],
+                "dates": ["2001"],
+                "sd": [0.816496],
+                "min": [1],
+                "max": [3],
+                "observations": [3]
+            }
+        ]
+    ),
+    (
+        {
+            "value": [1, 2],
+            "dates": ["2000", "2001"],
+            "sd": [0.816496, 0.816496],
+            "min": [0, 1],
+            "max": [2, 3],
+            "observations": [3]
+        },
+        [
+            {
+                "value": [1],
+                "dates": ["2000"],
+                "sd": [0.816496],
+                "min": [0],
+                "max": [2],
+                "observations": [3]
+            },
+            {
+                "value": [2],
+                "dates": ["2001"],
+                "sd": [0.816496],
+                "min": [1],
+                "max": [3],
+                "observations": [3]
+            }
+        ]
+    )
+]
+IDS_SPLIT_NODE = [
+    "no split -> empty node",
+    "no split -> not enough dates",  # len(value) and len(dates) MUST match
+    "no split -> startDate & endDate",
+    "no split -> non-iterable value",  # i.e., on a Management or Animal node.
+    "no split -> null value",  # i.e., on a Animal node where value is not required.
+    "value & dates",
+    "descriptive statistics",
+    "descriptive statistics w/ bad key"  # if descriptive statistic keys have wrong length, don't split them
+]
+
+
+@mark.parametrize("node, expected", PARAMS_SPLIT_NODE, ids=IDS_SPLIT_NODE)
+def test_split_node_by_dates(node, expected):
+    assert split_node_by_dates(node) == expected