hestia-earth-utils 0.16.16__tar.gz → 0.16.18__tar.gz

{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.16
+Version: 0.16.18
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team

{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.18}/hestia_earth/utils/pipeline.py

@@ -1,3 +1,4 @@
+import os
 from os.path import join
 import json
 import numpy as np
@@ -375,3 +376,29 @@ def get_related_nodes_data(
         }
         for node in related_nodes
     ]
+
+
+def start_instances(multiple_instances: bool = False):
+    import boto3
+
+    client = boto3.client("ec2")
+    instance_ids = os.getenv("START_INSTANCE_ID").split(",")
+    ids = instance_ids if multiple_instances else [instance_ids[0]]
+    try:
+        for instance_id in ids:
+            response = client.describe_instances(InstanceIds=[instance_id])
+            state = response["Reservations"][0]["Instances"][0]["State"]["Name"]
+            print(f"Checking {instance_id}: Current state is '{state}'")
+
+            if state in ["pending", "running"]:
+                print(f" -> Instance {instance_id} is already active. Skipping.")
+                continue
+
+            elif state == "stopped":
+                print(f" -> Instance {instance_id} is stopped. Starting it now...")
+                client.start_instances(InstanceIds=[instance_id])
+                break
+    except client.exceptions.ClientError as e:
+        print(f"Error starting instances: {str(e)}")
+
+    print("Could not start any instance")

{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.18}/hestia_earth/utils/pivot/pivot_json.py

@@ -51,6 +51,13 @@ def _combine_node_ids(nodes: list):
     return {"@id": ";".join([node.get("@id", node.get("id")) for node in nodes])}
 
 
+_COMPACT_JSON_KEYS = ["boundary", "distribution", "covarianceMatrix"]
+
+
+def _combine_json_compact(key: str, value: dict):
+    return json.dumps(value).replace(" ", "") if key in _COMPACT_JSON_KEYS else value
+
+
 def _base_pivoted_value(key: str, value, is_top_level: bool):
     # handle list of Nodes
     return (
@@ -58,13 +65,13 @@ def _base_pivoted_value(key: str, value, is_top_level: bool):
             _combine_node_ids(value)
             if isinstance(value[0], dict) and value[0].get("@type") in NODE_TYPES
             else (
-                json.dumps(value, separators=(",", ":"))
-                if any([is_top_level, key in ["distribution"]])
+                _combine_json_compact(key, value)
+                if any([is_top_level, key in _COMPACT_JSON_KEYS])
                 else value
             )
         )
         if isinstance(value, list)
-        else value
+        else _combine_json_compact(key, value)
     )
 
 

hestia_earth_utils-0.16.18/hestia_earth/utils/version.py

@@ -0,0 +1 @@
+VERSION = "0.16.18"

{hestia_earth_utils-0.16.16 → hestia_earth_utils-0.16.18}/hestia_earth_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.16
+Version: 0.16.18
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team

hestia_earth_utils-0.16.16/hestia_earth/utils/version.py

@@ -1 +0,0 @@
-VERSION = "0.16.16"