wizata-dsapi 2.0.0.dev17__tar.gz → 2.0.0.dev18__tar.gz

{wizata_dsapi-2.0.0.dev17/wizata_dsapi.egg-info → wizata_dsapi-2.0.0.dev18}/PKG-INFO

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

{wizata_dsapi-2.0.0.dev17 → wizata_dsapi-2.0.0.dev18}/wizata_dsapi/notification.py

@@ -38,19 +38,13 @@ class DeviceToken:
 
     Primary key is ``(token, tenant_id)`` — one row per device per tenant.
 
-    Subscription model:
-    - ``scopes``: which event types to receive.
-                  Defaults to ``[PIPELINE_USER]``.
-    - ``twins``:  hardware IDs of twins to filter on.
-                  Empty list means all twins.
+    Pure token registration — scopes and twins are on NotificationPreference.
     """
 
     def __init__(self):
         self.token: Optional[str] = None
         self.tenant_id: Optional[str] = None
         self.user_id: Optional[str] = None
-        self.scopes: list = [NotificationScope.PIPELINE_USER]
-        self.twins: list = []
         self.platform: Optional[str] = None
         self.created_at: Optional[datetime] = None
 
@@ -66,8 +60,6 @@ class DeviceToken:
             obj["tenantId"] = self.tenant_id
         if self.user_id is not None:
             obj["userId"] = self.user_id
-        obj["scopes"] = [s.value if isinstance(s, NotificationScope) else s for s in self.scopes]
-        obj["twins"] = list(self.twins)
         if self.platform is not None:
             obj["platform"] = self.platform
         if self.created_at is not None:
@@ -80,14 +72,6 @@ class DeviceToken:
         obj.token = data.get("token")
         obj.tenant_id = data.get("tenantId") or data.get("tenant_id")
         obj.user_id = data.get("userId") or data.get("user_id")
-
-        raw_scopes = data.get("scopes")
-        if raw_scopes is not None:
-            obj.scopes = [NotificationScope(s.lower()) for s in raw_scopes]
-        else:
-            obj.scopes = [NotificationScope.PIPELINE_USER]
-
-        obj.twins = data.get("twins") or []
         obj.platform = data.get("platform")
 
         created_raw = data.get("createdAt") or data.get("created_at")
@@ -108,7 +92,7 @@ class DeviceToken:
     def __repr__(self) -> str:
         return (
             f"DeviceToken(tenant={self.tenant_id!r}, user={self.user_id!r}, "
-            f"scopes={self.scopes}, twins={self.twins!r})"
+            f"platform={self.platform!r})"
         )
 
 
@@ -370,6 +354,8 @@ class NotificationPreference:
         self.email_enabled: bool = False
         self.sms_enabled: bool = False
         self.whatsapp_enabled: bool = False
+        self.scopes: list = [NotificationScope.PIPELINE_USER]
+        self.twins: list = []
         self.created_at: Optional[datetime] = None
         self.updated_at: Optional[datetime] = None
 
@@ -400,6 +386,8 @@ class NotificationPreference:
         obj["emailEnabled"] = self.email_enabled
         obj["smsEnabled"] = self.sms_enabled
         obj["whatsappEnabled"] = self.whatsapp_enabled
+        obj["scopes"] = [s.value if isinstance(s, NotificationScope) else s for s in self.scopes]
+        obj["twins"] = list(self.twins)
         if self.created_at is not None:
             obj["createdAt"] = self.created_at.isoformat()
         if self.updated_at is not None:
@@ -415,6 +403,13 @@ class NotificationPreference:
         obj.sms_enabled = data.get("smsEnabled", data.get("sms_enabled", False))
         obj.whatsapp_enabled = data.get("whatsappEnabled", data.get("whatsapp_enabled", False))
 
+        raw_scopes = data.get("scopes")
+        if raw_scopes is not None:
+            obj.scopes = [NotificationScope(s.lower()) for s in raw_scopes]
+        else:
+            obj.scopes = [NotificationScope.PIPELINE_USER]
+        obj.twins = data.get("twins") or []
+
         for key in ("createdAt", "created_at"):
             raw = data.get(key)
             if raw is not None:
@@ -452,7 +447,10 @@ class NotificationPreference:
             channels.append("sms")
         if self.whatsapp_enabled:
             channels.append("whatsapp")
-        return f"NotificationPreference(user={self.user_id!r}, channels={channels})"
+        return (
+            f"NotificationPreference(user={self.user_id!r}, channels={channels}, "
+            f"scopes={[s.value for s in self.scopes]}, twins={self.twins!r})"
+        )
 
 
 class RecipientType(str, Enum):

wizata_dsapi-2.0.0.dev18/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.0.0.dev18"

{wizata_dsapi-2.0.0.dev17 → wizata_dsapi-2.0.0.dev18/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-2.0.0.dev17/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.0.0.dev17"