hestia-earth-aggregation 0.21.17__py3-none-any.whl → 0.21.18__py3-none-any.whl

hestia_earth/aggregation/utils/management.py

@@ -1,6 +1,7 @@
 from hestia_earth.schema import ManagementJSONLD
 from hestia_earth.utils.model import linked_node
-from hestia_earth.utils.tools import safe_parse_date
+from hestia_earth.utils.tools import safe_parse_date, flatten
+from hestia_earth.utils.date import gapfill_datestr
 
 from . import match_dates, _set_dict_single
 from .queries import TIME_PERIOD, _get_time_ranges, _current_date
@@ -45,6 +46,34 @@ def aggregated_dates(blank_node: dict):
     )
 
 
+def split_by_dates(blank_nodes: list, start_year: int):
+    # if the blank_node overlaps with the start period of the aggregation, we need to split it in 2 parts
+    def split_data(blank_node: dict):
+        start_date = safe_parse_date(blank_node.get("startDate"), default=None)
+        end_date = safe_parse_date(blank_node.get("endDate"), default=None)
+        is_overlapping = all([start_date is not None, end_date is not None]) and all(
+            [start_date.year < start_year, start_year < end_date.year]
+        )
+        return (
+            [
+                blank_node
+                | {
+                    "startDate": blank_node.get("startDate"),
+                    "endDate": gapfill_datestr(start_year - 1, "end"),
+                },
+                blank_node
+                | {
+                    "startDate": gapfill_datestr(start_year, "start"),
+                    "endDate": blank_node.get("endDate"),
+                },
+            ]
+            if is_overlapping
+            else blank_node
+        )
+
+    return flatten(map(split_data, blank_nodes))
+
+
 def filter_management(blank_nodes: list, start_year: int = None, end_year: int = None):
     def update_dates(blank_node: dict):
         start_date = safe_parse_date(blank_node.get("startDate"), default=None)
@@ -72,7 +101,9 @@ def filter_management(blank_nodes: list, start_year: int = None, end_year: int =
     """
     return [
         update_dates(v)
-        for v in blank_nodes
+        for v in (
+            split_by_dates(blank_nodes, start_year) if start_year else blank_nodes
+        )
         if not start_year
         or not end_year
         or match_dates(v, start_year - TIME_PERIOD, end_year)

hestia_earth/aggregation/utils/queries.py

@@ -15,7 +15,7 @@ from hestia_earth.aggregation.log import logger
 from . import HestiaError, _save_json, pick
 from .term import DEFAULT_COUNTRY_NAME, _fetch_countries, is_global as is_global_country
 
-SEARCH_LIMIT = 10000
+SEARCH_LIMIT = int(os.getenv("SEARCH_LIMIT", "10000"))
 _MATCH_AGGREGATED_QUERY = {"match": {"aggregated": "true"}}
 _MATCH_AGGREGATED_VALIDATED_QUERY = {"match": {"aggregatedDataValidated": "true"}}
 # enable matching any product

hestia_earth/aggregation/version.py

@@ -1 +1 @@
-VERSION = "0.21.17"
+VERSION = "0.21.18"

{hestia_earth_aggregation-0.21.17.dist-info → hestia_earth_aggregation-0.21.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_aggregation
-Version: 0.21.17
+Version: 0.21.18
 Summary: HESTIA's aggregation engine.
 Home-page: https://gitlab.com/hestia-earth/hestia-aggregation-engine
 Author: HESTIA Team

{hestia_earth_aggregation-0.21.17.dist-info → hestia_earth_aggregation-0.21.18.dist-info}/RECORD

@@ -2,7 +2,7 @@ hestia_earth/aggregation/__init__.py,sha256=kSK6RYcK0YnRGx6TknaukhuhbnxRHofLI_8P
 hestia_earth/aggregation/aggregate_cycles.py,sha256=MR-SseQRMGFUOKiBJcLVysjdjw5J-QfJ258VxGhasFw,7868
 hestia_earth/aggregation/log.py,sha256=0CibXDtKqFfE-R86qziM2uH7ATUZ6I9p_bVpRSn_e_o,2351
 hestia_earth/aggregation/recalculate_cycles.py,sha256=igMxKd7_K0MFlAt3Q_OynvHxDo3ldTixWbXjaC4M71c,510
-hestia_earth/aggregation/version.py,sha256=hcVLcttb0pemu91UT65kphAN_tKjRCwH4PaeO6euVl8,20
+hestia_earth/aggregation/version.py,sha256=l0WM7ge0CXaUMWDGZjVN-Bv5P4kpSeFzwkayyG9kADw,20
 hestia_earth/aggregation/config/Cycle/crop.json,sha256=OBYXxleifxg9EJfZsqR1dgCxlEe2lIrCBqMe_Jo5XE4,1387
 hestia_earth/aggregation/config/Cycle/processedFood.json,sha256=OBYXxleifxg9EJfZsqR1dgCxlEe2lIrCBqMe_Jo5XE4,1387
 hestia_earth/aggregation/utils/__init__.py,sha256=nVVLgVFZ4415CgQAqgv4jDamA7gDmzOWk5SY4vshAQs,6583
@@ -18,19 +18,19 @@ hestia_earth/aggregation/utils/emission.py,sha256=fmzi2GHhG1E5Ioi00D1vVIPZwqaDB7
 hestia_earth/aggregation/utils/group.py,sha256=qU9sAuJu0RG80yLs90nsyoOcU57Pb6M1WKwT1TlJEkM,4765
 hestia_earth/aggregation/utils/input.py,sha256=pZ1bcdHR3y4S-3b0JZllbEUWdEyVZbltxv-07j7SucI,1092
 hestia_earth/aggregation/utils/lookup.py,sha256=osJiXTRns5KeBMz3mRsanmFQTATrwcMVBzB07xrb71M,2046
-hestia_earth/aggregation/utils/management.py,sha256=wrgNHhWuDTWmpRdKNi9BKg7GQRL8CJVAjcW1aeRaiyM,2891
+hestia_earth/aggregation/utils/management.py,sha256=tr46zD8HrmRjEQnhMJ5s9eYapd8CKs4Gr99aZGLo1kY,4117
 hestia_earth/aggregation/utils/measurement.py,sha256=tdQwjo1hPb3iAaboBQiua832q27xZb_a9KqIp3iQkuE,1463
 hestia_earth/aggregation/utils/practice.py,sha256=MXZsQoeSXxe2vmdjvyS58HZN9jejPZNbVnczTc3HxxU,2252
 hestia_earth/aggregation/utils/product.py,sha256=dEUCy0eakyKyD2vu1RRnF4bdAI-jpS-qePNF8ZGhHFE,886
 hestia_earth/aggregation/utils/property.py,sha256=n_aHZ4qASv_wcDJ_HrA1T2kFX8R2zUEo91LCPL5xWkw,917
 hestia_earth/aggregation/utils/quality_score.py,sha256=PPNRW1wEkVqP7QExyu5dcr8R_Z_DWkmT3zmQG9u470Y,8914
-hestia_earth/aggregation/utils/queries.py,sha256=kzob6CHL1a60CRJdGICiWS98LKJRyq3uaToyuQyl9RI,17564
+hestia_earth/aggregation/utils/queries.py,sha256=S9JZ3km_7EkbPDV0piQxfXMDF0qa2eXKdN0mz7oIkf8,17598
 hestia_earth/aggregation/utils/site.py,sha256=nc1N4IRiTki69IbCX4G6lagQ5U7IpsOsqiPuHwbl1HM,5455
 hestia_earth/aggregation/utils/source.py,sha256=SOiE-jB5WNtbRxreUWQ8c04ywzrwICy1aGyRL3-L0RY,686
 hestia_earth/aggregation/utils/term.py,sha256=uVAfBYnxNkcTNfzuwwHur6JGBahNrPwR2pN-__sj9zk,2758
 hestia_earth/aggregation/utils/weights.py,sha256=Qk5hCr_K24DzkeE4Sa241pGb6m00iaWHIXFQAJ-cDGc,7518
-hestia_earth_aggregation-0.21.17.dist-info/licenses/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_aggregation-0.21.17.dist-info/METADATA,sha256=fgZq8hdf22iumAqR_xOGtVJcOoKfSKnaexEakj6H7YA,2481
-hestia_earth_aggregation-0.21.17.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-hestia_earth_aggregation-0.21.17.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
-hestia_earth_aggregation-0.21.17.dist-info/RECORD,,
+hestia_earth_aggregation-0.21.18.dist-info/licenses/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_aggregation-0.21.18.dist-info/METADATA,sha256=1WmgTNGYc4EQFS6ltVH_UQkThgZAm1gM2z84cuCiDLk,2481
+hestia_earth_aggregation-0.21.18.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+hestia_earth_aggregation-0.21.18.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
+hestia_earth_aggregation-0.21.18.dist-info/RECORD,,