python-aidot 0.3.54b3__tar.gz → 0.3.54b4__tar.gz

{python_aidot-0.3.54b3/python_aidot.egg-info → python_aidot-0.3.54b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.54b3
+Version: 0.3.54b4
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.54b3 → python_aidot-0.3.54b4}/aidot/discover.py

@@ -35,7 +35,7 @@ class BroadcastProtocol:
         try:
             request = DiscoverRequest.from_params(userId=self.user_id)
             message = request.to_dict()
-            _LOGGER.info(f"send_broadcast {message}")
+            _LOGGER.warning(f"send_broadcast {message}")
             send_data = aes_encrypt(json.dumps(message).encode(), self.aes_key)
             self.transport.sendto(send_data, ("255.255.255.255", 6666))
         except Exception as error:
@@ -46,7 +46,7 @@ class BroadcastProtocol:
             data_str = aes_decrypt(data, self.aes_key)
             data_json = json.loads(data_str)
             response = DiscoverResponse.from_json(data=data_json)
-            _LOGGER.info(f"datagram_received {data_json}")
+            _LOGGER.warning(f"datagram_received {data_json}")
             if response.payload and response.payload.devId and self._discover_cb:
                 self._discover_cb(response.payload.devId, {CONF_IPADDRESS: addr[0]})
         except Exception as error:

python_aidot-0.3.54b4/aidot/models/__init__.py

@@ -0,0 +1,37 @@
+"""Models for AiDot."""
+
+from .device_client_model import (
+    DeviceAck,
+    DeviceAttr,
+    DeviceAttrPayload,
+    DeviceResponse,
+    DeviceActionPayload,
+    DeviceActionRequest,
+    LoginPayload,
+    LoginRequest,
+    PingRequest,
+    PingResponse,
+)
+from .device_model import (
+    DeviceFading,
+    DeviceProperties,
+    DeviceProduct,
+    DeviceInformation,
+)
+
+__all__ = [
+    "DeviceAck",
+    "DeviceAttr",
+    "DeviceAttrPayload",
+    "DeviceResponse",
+    "DeviceActionPayload",
+    "DeviceActionRequest",
+    "LoginPayload",
+    "LoginRequest",
+    "PingRequest",
+    "PingResponse",
+    "DeviceFading",
+    "DeviceProperties",
+    "DeviceProduct",
+    "DeviceInformation",
+]

python_aidot-0.3.54b4/aidot/models/device_client_model.py

@@ -0,0 +1,210 @@
+"""Models for AiDot device client."""
+
+from dataclasses import dataclass, asdict, field
+from typing import Any, Optional
+
+from dacite import Config, from_dict
+
+
+@dataclass
+class PingRequest:
+    """Ping request (heartbeat)."""
+
+    service: str = "test"
+    method: str = "pingreq"
+    seq: str = "123456"
+    srcAddr: str = "123456"
+    payload: dict[str, Any] = field(default_factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+
+@dataclass
+class PingResponse:
+    """Ping response."""
+
+    service: str = None
+    method: str = None
+    seq: str = None
+    srcAddr: str = None
+    payload: dict[str, Any] = None
+
+    @staticmethod
+    def from_json(data: dict[str, Any]) -> "PingResponse":
+        """Create PingResponse from JSON dict."""
+        return from_dict(
+            data_class=PingResponse, data=data, config=Config(check_types=False)
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+
+@dataclass
+class LoginPayload:
+    """Login request payload."""
+
+    userId: str = None
+    password: str = None
+    timestamp: str = field(default=None)
+    ascNumber: int = 1
+
+    def __post_init__(self):
+        """Auto-generate timestamp if not provided."""
+        if self.timestamp is None:
+            from datetime import datetime
+            self.timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")
+
+
+@dataclass
+class LoginRequest:
+    """Login request."""
+
+    service: str = "device"
+    method: str = "loginReq"
+    seq: str = None
+    srcAddr: str = None
+    deviceId: str = None
+    payload: LoginPayload = None
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+@dataclass
+class DeviceAck:
+    """Device response ack."""
+
+    code: int = 0
+    tst: str = ""
+
+
+@dataclass
+class DeviceAttr:
+    """Device attribute."""
+
+    OnOff: int = None
+    Dimming: int = None
+    RGBW: int = None
+    CCT: int = None
+
+
+@dataclass
+class DeviceAttrPayload:
+    """Device payload."""
+
+    devId: str = ""
+    parentId: str = ""
+    userId: str = ""
+    password: str = ""
+    timestamp: str = ""
+    channel: str = ""
+    ascNumber: int = 0
+    attr: Optional[DeviceAttr] = None
+
+
+@dataclass
+class DeviceResponse:
+    """Generic device response."""
+
+    service: str = ""
+    method: str = ""
+    seq: str = ""
+    srcAddr: str = ""
+    deviceId: str = ""
+    clientId: str = ""
+    payload: DeviceAttrPayload = field(default_factory=DeviceAttrPayload)
+    ack: DeviceAck = field(default_factory=DeviceAck)
+    tst: int = 0
+
+    @staticmethod
+    def from_json(data: dict[str, Any]) -> "DeviceResponse":
+        """Create DeviceResponse from JSON dict."""
+        return from_dict(
+            data_class=DeviceResponse, data=data, config=Config(check_types=False)
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+
+@dataclass
+class DeviceActionPayload:
+    """Device action payload."""
+
+    devId: str = ""
+    parentId: str = ""
+    userId: str = ""
+    password: str = ""
+    attr: dict[str, Any] = field(default_factory=dict)
+    channel: str = "tcp"
+    ascNumber: int = 0
+
+
+@dataclass
+class DeviceActionRequest:
+    """Device action request."""
+
+    method: str = ""
+    service: str = "device"
+    clientId: str = ""
+    srcAddr: str = ""
+    seq: str = ""
+    payload: DeviceActionPayload = field(default_factory=DeviceActionPayload)
+    tst: int = 0
+    deviceId: str = ""
+
+    def __post_init__(self):
+        """Auto-generate timestamp if not provided."""
+        if self.tst == 0:
+            import time
+            self.tst = int(time.time() * 1000)
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+    @staticmethod
+    def from_params(
+        method: str,
+        user_id: str,
+        device_id: str,
+        password: str,
+        ascNumber: int,
+        attr: dict[str, Any],
+        seq: str,
+        simpleVersion: str = None,
+    ) -> "DeviceActionRequest":
+        """Create DeviceActionRequest from params."""
+        if simpleVersion is not None:
+            return DeviceActionRequest(
+                method=method,
+                clientId="ha-" + user_id,
+                srcAddr="0." + user_id,
+                seq=seq,
+                payload=DeviceActionPayload(
+                    devId=device_id,
+                    parentId=device_id,
+                    userId=user_id,
+                    password=password,
+                    attr=attr,
+                    ascNumber=ascNumber,
+                ),
+                deviceId=device_id,
+            )
+        else:
+            return DeviceActionRequest(
+                method=method,
+                srcAddr="0." + user_id,
+                seq=seq,
+                payload=DeviceActionPayload(
+                    attr=attr,
+                    ascNumber=ascNumber,
+                ),
+                deviceId=device_id,
+            )
+        

python_aidot-0.3.54b4/aidot/models/device_model.py

@@ -0,0 +1,83 @@
+"""Models for AiDot device."""
+
+from dataclasses import dataclass, asdict, field
+from typing import Any, Optional, List
+
+from dacite import Config, from_dict
+
+
+@dataclass
+class DeviceFading:
+    """Device fading config."""
+
+    in_value: Optional[int] = field(default=None, metadata={"alias": "in"})
+    out: Optional[int] = None
+
+
+@dataclass
+class DeviceProperties:
+    """Device properties."""
+
+    ssidName: str = None
+    ipAddress: str = None
+    macAddress: str = None
+    networkRssi: str = None
+    networkSecurity: str = None
+    wifiChannel: str = None
+    OnOff: str = None
+    Dimming: str = None
+    CCT: str = None
+    RGBW: str = None
+    EffectMode: str = None
+    Area: str = None
+    city: str = None
+    CityTimezone: str = None
+    lastNotifyCctRgbw: str = None
+
+
+@dataclass
+class DeviceProduct:
+    """Device product info."""
+
+    id: str = None
+    name: str = None
+    type: str = None
+    modelId: str = None
+    picture: str = None
+    icon: str = None
+    isDirectDevice: int = None
+
+
+@dataclass
+class DeviceInformation:
+    """Device information."""
+
+    id: str = None
+    name: str = None
+    mac: str = None
+    type: str = None
+    modelId: str = None
+    productId: str = None
+    houseId: str = None
+    roomId: str = None
+    online: bool = None
+    firmwareVersion: str = None
+    hardwareVersion: str = None
+    protocolVersion: str = None
+    picture: str = None
+    aesKey: List[str] = field(default_factory=list)
+    password: str = None
+    fading: Optional[DeviceFading] = None
+    properties: Optional[DeviceProperties] = None
+    product: Optional[DeviceProduct] = None
+
+    @staticmethod
+    def from_json(data: dict[str, Any]) -> "DeviceInformation":
+        """Create DeviceInformation from JSON dict."""
+        return from_dict(
+            data_class=DeviceInformation, data=data, config=Config(check_types=False)
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)

python_aidot-0.3.54b4/aidot/models/discover_model.py

@@ -0,0 +1,102 @@
+"""Models for AiDot discover."""
+import time
+from dataclasses import dataclass, asdict, field
+from typing import Any, Optional
+
+from dacite import Config, from_dict
+
+
+@dataclass
+class DiscoverAck:
+    """Discover response ack."""
+
+    code: int = None
+    tst: str = None
+
+
+@dataclass
+class DiscoverExtends:
+    """Discover payload extends."""
+
+    srvHost: str = None
+
+
+@dataclass
+class DiscoverPayload:
+    """Discover response payload."""
+
+    ip: str = None
+    mac: str = None
+    devId: str = None
+    productModel: str = None
+    bindFlag: int = None
+    conMode: int = None
+    lanMode: int = None
+    wifiMode: int = None
+    wifiBand: int = None
+    version: int = None
+    extends: Optional[DiscoverExtends] = None
+
+
+@dataclass
+class DiscoverResponse:
+    """Discover device response."""
+
+    srcAddr: str = None
+    seq: str = None
+    service: str = None
+    method: str = None
+    ack: DiscoverAck = None
+    protocolVer: str = None
+    payload: DiscoverPayload = None
+
+    @staticmethod
+    def from_json(data: dict[str, Any]) -> "DiscoverResponse":
+        """Create DiscoverResponse from JSON dict."""
+        return from_dict(
+            data_class=DiscoverResponse, data=data, config=Config(check_types=False)
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)
+
+
+@dataclass
+class DiscoverRequestPayload:
+    """Discover request payload."""
+
+    extends: dict[str, Any] = field(default_factory=dict)
+    localCtrFlag: int = 1
+    timestamp: str = None
+
+
+@dataclass
+class DiscoverRequest:
+    """Discover device request."""
+
+    protocolVer: str = "2.0.0"
+    service: str = "device"
+    method: str = "devDiscoveryReq"
+    seq: str = None
+    srcAddr: str = None
+    tst: int = None
+    payload: DiscoverRequestPayload = field(default_factory=DiscoverRequestPayload)
+
+    @staticmethod
+    def from_params(userId: str) -> "DiscoverResponse":
+        """Create DiscoverResponse from JSON dict."""
+        current_timestamp_milliseconds = int(time.time() * 1000)
+        seq = str(current_timestamp_milliseconds + 1)[-9:]
+        return DiscoverRequest(
+            seq=seq,
+            srcAddr=f"0.{userId}",
+            tst=current_timestamp_milliseconds,
+            payload=DiscoverRequestPayload(
+                timestamp=str(current_timestamp_milliseconds)
+            )
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to dictionary."""
+        return asdict(self)

{python_aidot-0.3.54b3 → python_aidot-0.3.54b4/python_aidot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.54b3
+Version: 0.3.54b4
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.54b3 → python_aidot-0.3.54b4}/python_aidot.egg-info/SOURCES.txt

@@ -10,6 +10,10 @@ aidot/device_client.py
 aidot/discover.py
 aidot/exceptions.py
 aidot/login_const.py
+aidot/models/__init__.py
+aidot/models/device_client_model.py
+aidot/models/device_model.py
+aidot/models/discover_model.py
 python_aidot.egg-info/PKG-INFO
 python_aidot.egg-info/SOURCES.txt
 python_aidot.egg-info/dependency_links.txt

{python_aidot-0.3.54b3 → python_aidot-0.3.54b4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="python-aidot",
-    version="0.3.54b3",
+    version="0.3.54b4",
     author="aidotdev2024",
     url='https://github.com/Aidot-Development-Team/python-aidot',
     description="aidot control wifi lights",