wizata-dsapi 2.2.0.dev13__tar.gz → 2.2.0.dev15__tar.gz

{wizata_dsapi-2.2.0.dev13 → wizata_dsapi-2.2.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev13
+Version: 2.2.0.dev15
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-2.2.0.dev13 → wizata_dsapi-2.2.0.dev15}/wizata_dsapi/__init__.py

@@ -58,7 +58,7 @@ from .streamlit_utils import (get_streamlit_token, get_streamlit_domain, get_str
 from .search import FilterOperator, SearchQuery, SortOption, GroupSearchQuery, GroupOption, GroupSummary, GroupSummaryType
 from .notification import NotificationScope, DeviceToken, AlertRule, AlertActive, MonitoredDatapoint, \
     MonitoredPipeline, NotificationPreference, RecipientList, Recipient, RecipientType
-from .edge_device import EdgeDevice, EdgeDeviceStatus, EdgeDeviceType
+from .edge_device import EdgeDevice, EdgeDeviceStatus, EdgeDeviceType, EdgeDeviceProvisioning
 from .edge_module import EdgeModule, EdgeModuleType, WIZATA_MODULES
 from .edge_config import EdgeConsumer, EdgeWriter, EdgeTrigger
 from .connection import Connection, ConnectionMapping, ConnectionDirection, TransformKind, \

{wizata_dsapi-2.2.0.dev13 → wizata_dsapi-2.2.0.dev15}/wizata_dsapi/edge_device.py

@@ -23,6 +23,14 @@ class EdgeDeviceType(Enum):
     CUSTOM = "Custom"
 
 
+class EdgeDeviceProvisioning(Enum):
+    """
+    How an edge device is installed (DEV-6015).
+    """
+    AZURE_IOT_EDGE = "azure-iot-edge"
+    MANUAL = "manual"
+
+
 class EdgeDevice(ApiDto):
     """
     Edge device registered on the platform.
@@ -35,6 +43,9 @@ class EdgeDevice(ApiDto):
     :ivar EdgeDeviceStatus status: current status of the device.
     :ivar int status_code: numeric status code.
     :ivar EdgeDeviceType device_type: type of the edge device.
+    :ivar EdgeDeviceProvisioning provisioning: how the device is installed.
+    :ivar int created_at: creation time, epoch ms (the PostgreSQL registry, DEV-6015).
+    :ivar int updated_at: last update time, epoch ms.
     :ivar str connection_state: IoT Hub connection state ('Connected' or 'Disconnected'), enriched from IoT Hub.
     :ivar str last_activity_time: last device activity timestamp from IoT Hub.
     """
@@ -59,7 +70,10 @@ class EdgeDevice(ApiDto):
                  status_code: int = None,
                  device_type: EdgeDeviceType = None,
                  connection_state: str = None,
-                 last_activity_time: str = None):
+                 last_activity_time: str = None,
+                 provisioning: EdgeDeviceProvisioning = None,
+                 created_at: int = None,
+                 updated_at: int = None):
         if edge_device_id is None:
             self.edge_device_id = uuid.uuid4()
         else:
@@ -73,6 +87,9 @@ class EdgeDevice(ApiDto):
         self.device_type = device_type
         self.connection_state = connection_state
         self.last_activity_time = last_activity_time
+        self.provisioning = provisioning
+        self.created_at = created_at
+        self.updated_at = updated_at
 
     def api_id(self) -> str:
         return str(self.edge_device_id).upper()
@@ -107,6 +124,12 @@ class EdgeDevice(ApiDto):
             self.connection_state = obj["connectionState"]
         if "lastActivityTime" in obj and obj["lastActivityTime"] is not None:
             self.last_activity_time = obj["lastActivityTime"]
+        if "provisioning" in obj and obj["provisioning"] is not None:
+            self.provisioning = EdgeDeviceProvisioning(obj["provisioning"])
+        if "createdAt" in obj and obj["createdAt"] is not None:
+            self.created_at = int(obj["createdAt"])
+        if "updatedAt" in obj and obj["updatedAt"] is not None:
+            self.updated_at = int(obj["updatedAt"])
 
     def to_json(self, target: str = None):
         obj = {
@@ -130,4 +153,10 @@ class EdgeDevice(ApiDto):
             obj["connectionState"] = self.connection_state
         if self.last_activity_time is not None:
             obj["lastActivityTime"] = self.last_activity_time
+        if self.provisioning is not None:
+            obj["provisioning"] = self.provisioning.value
+        if self.created_at is not None:
+            obj["createdAt"] = self.created_at
+        if self.updated_at is not None:
+            obj["updatedAt"] = self.updated_at
         return obj

wizata_dsapi-2.2.0.dev15/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0.dev15"

{wizata_dsapi-2.2.0.dev13 → wizata_dsapi-2.2.0.dev15}/wizata_dsapi/wizata_dsapi_client.py

@@ -56,6 +56,7 @@ import ast
 from .deployment import Deployment, DeploymentStatus
 from .product import ProductKind, Product, ProductComponent
 from .inventory import InventoryBalance, InventoryStorage, InventoryStock
+from .connection import EdgeDeviceKey
 from .api_config import _registry
 
 from .streamlit_utils import get_streamlit_token, get_streamlit_domain
@@ -2989,6 +2990,43 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         self._planner_request("DELETE", f"planner/inventory/balances/{self._balance_id(balance)}/",
                               expected=(204,))
 
+    # ------------------------------------------------------------ edge device keys
+
+    @staticmethod
+    def _edge_device_keys_route(edge_device_id) -> str:
+        if not edge_device_id:
+            raise ValueError("please provide the edge device id")
+        return f"edgedevices/{urllib.parse.quote(str(edge_device_id), safe='')}/keys"
+
+    def register_edge_device_key(self, edge_device_id: str, public_key: str) -> EdgeDeviceKey:
+        """
+        Register the public half of the key pair an edge generated for itself (DEV-6013).
+        Connection secrets are sealed for the edge's active key, and only that edge can
+        open them: the private half never leaves the device.
+
+        Registering the same key again is a no-op, so an edge can register on every start.
+        A different key retires the current one, and every secret sealed for that one must
+        be entered again.
+
+        :param edge_device_id: the device id the edge runs as, not its UUID.
+        :param public_key: PEM of the edge's X25519 public key.
+        :return: the edge's active key.
+        """
+        response = self._process_request(method="POST",
+                                         route=self._edge_device_keys_route(edge_device_id),
+                                         data=json.dumps({"publicKey": public_key}))
+        return EdgeDeviceKey.from_dict(response.json())
+
+    def get_edge_device_keys(self, edge_device_id: str) -> list:
+        """
+        :param edge_device_id: the device id the edge runs as, not its UUID.
+        :return: every EdgeDeviceKey the edge registered, newest first. With no active
+            one, the edge has not registered yet and no secret can be entered for it.
+        """
+        return self._process_request(method="GET",
+                                     route=self._edge_device_keys_route(edge_device_id),
+                                     dto_class=EdgeDeviceKey, result_type="list")
+
 
 def api() -> WizataDSAPIClient:
     """

{wizata_dsapi-2.2.0.dev13 → wizata_dsapi-2.2.0.dev15}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev13
+Version: 2.2.0.dev15
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-2.2.0.dev13/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.0.dev13"