vortexasdk 0.72.2__tar.gz → 0.72.4__tar.gz

{vortexasdk-0.72.2 → vortexasdk-0.72.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexasdk
-Version: 0.72.2
+Version: 0.72.4
 Summary: Vortexa SDK
 Home-page: https://github.com/vortechsa/python-sdk
 Author: Vortexa Developers

{vortexasdk-0.72.2 → vortexasdk-0.72.4}/vortexasdk/endpoints/timeseries_result.py

@@ -19,13 +19,18 @@ DEFAULT_COLUMNS = ["key", "value", "count"]
 def sort_breakdown(item: dict, full_header_column: list):
     if "breakdown" not in item:
         return item
-    for b_item in full_header_column:
-        label = b_item["label"]
-        if next((x for x in item["breakdown"] if x["label"] == label), None):
-            continue
 
+    breakdown_labels = [x["label"] for x in item["breakdown"]]
+    header_items = {b_item["label"]: b_item for b_item in full_header_column}
+    labels_to_append = set(header_items.keys()) - set(breakdown_labels)
+    for label in labels_to_append:
         item["breakdown"].append(
-            {"label": label, "id": b_item["id"], "value": "", "count": ""}
+            {
+                "label": label,
+                "id": header_items[label]["id"],
+                "value": "",
+                "count": "",
+            }
         )
 
     item["breakdown"].sort(
@@ -64,27 +69,33 @@ class TimeSeriesResult(Result):
         Notes:
         - The 'breakdown' column in the DataFrame provides aggregated data and can contain multiple entries. To access additional breakdown information, modify the column names in the 'columns' parameter (e.g., 'breakdown.1.label', 'breakdown.2.label').
         """
+        items = super().to_list()
+        full_header_column: list = []
+        # there is a world where we can just get items[-1], as it seems reasonable to thing the most recent one would have the most regions
+        for item in items:
+            if "breakdown" not in item:
+                continue
+            if len(item["breakdown"]) > len(full_header_column):
+                full_header_column = item["breakdown"][:]
+        sorted_list = map(
+            lambda item: sort_breakdown(item, full_header_column), items
+        )
+
         flatten = functools.partial(convert_to_flat_dict, columns=columns)
-        with Pool(os.cpu_count()) as pool:
-            items = super().to_list()
-
-            full_header_column: list = []
-            # there is a world where we can just get items[-1], as it seems reasonable to thing the most recent one would have the most regions
-            for item in items:
-                if "breakdown" not in item:
-                    continue
-                if len(item["breakdown"]) > len(full_header_column):
-                    full_header_column = item["breakdown"][:]
-            sorted_list = map(
-                lambda item: sort_breakdown(item, full_header_column), items
-            )
-            records = pool.map(flatten, sorted_list)
+        cpu_count = os.cpu_count()
+        if cpu_count is None or cpu_count > 1:
+            with Pool(os.cpu_count()) as pool:
+                records = pool.map(flatten, sorted_list)
+        else:
+            records = [flatten(v) for v in sorted_list]
 
         df = create_dataframe(
             columns=columns,
             data=records,
             logger_description="TimeSeries",
         )
-        df["key"] = pd.to_datetime(df["key"])
+
+        if "key" in df.columns:
+            df["key"] = pd.to_datetime(df["key"])
 
         return df

vortexasdk-0.72.4/vortexasdk/version.py

@@ -0,0 +1 @@
+__version__ = "0.72.4"

{vortexasdk-0.72.2 → vortexasdk-0.72.4}/vortexasdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexasdk
-Version: 0.72.2
+Version: 0.72.4
 Summary: Vortexa SDK
 Home-page: https://github.com/vortechsa/python-sdk
 Author: Vortexa Developers

vortexasdk-0.72.2/vortexasdk/version.py

@@ -1 +0,0 @@
-__version__ = "0.72.2"