plugp100 5.0.0.dev4__tar.gz → 5.0.0.dev5__tar.gz

{plugp100-5.0.0.dev4/plugp100.egg-info → plugp100-5.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugp100
-Version: 5.0.0.dev4
+Version: 5.0.0.dev5
 Summary: Controller for TP-Link Tapo P100 and other devices
 Home-page: https://github.com/petretiandrea/plugp100
 Download-URL: https://github.com/petretiandrea/plugp100

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/plugp100/__init__.py

@@ -16,4 +16,4 @@ from plugp100.api.requests import *
 from plugp100.api import *
 from plugp100.common import *
 
-__version__ = "5.0.0-dev.4"
+__version__ = "5.0.0-dev.5"

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/plugp100/discovery/__init__.py

@@ -1,4 +1,4 @@
-from .discovered_device import DiscoveredDevice, EncryptionScheme
+from .discovered_device import DiscoveredDevice, EncryptionSchema
 from .tapo_discovery import TapoDiscovery
 
-__all__ = ["TapoDiscovery", "DiscoveredDevice", "EncryptionScheme"]
+__all__ = ["TapoDiscovery", "DiscoveredDevice", "EncryptionSchema"]

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/plugp100/discovery/discovered_device.py

@@ -1,4 +1,5 @@
 import dataclasses
+import logging
 from typing import Optional, Any
 
 import aiohttp
@@ -14,7 +15,7 @@ class DiscoveredDevice:
     device_model: str
     ip: str
     mac: str
-    mgt_encrypt_schm: "EncryptionScheme"
+    mgt_encrypt_schm: Optional["EncryptionSchema"]
 
     device_id: Optional[str] = None
     owner: Optional[str] = None
@@ -25,6 +26,10 @@ class DiscoveredDevice:
 
     @staticmethod
     def from_dict(values: dict[str, Any]) -> "DiscoveredDevice":
+        if enc_schema_info := values.get("mgt_encrypt_schm", None):
+            encryption_schema = EncryptionSchema(**enc_schema_info)
+        else:
+            encryption_schema = None
         return DiscoveredDevice(
             device_type=values.get("device_type", values.get("device_type_text")),
             device_model=values.get("device_model", values.get("model")),
@@ -36,7 +41,7 @@ class DiscoveredDevice:
             is_support_iot_cloud=values.get("is_support_iot_cloud", None),
             obd_src=values.get("obd_src", None),
             factory_default=values.get("factory_default", None),
-            mgt_encrypt_schm=EncryptionScheme(**values.get("mgt_encrypt_schm")),
+            mgt_encrypt_schm=encryption_schema,
         )
 
     @property
@@ -56,25 +61,37 @@ class DiscoveredDevice:
                 "encrypt_type": self.mgt_encrypt_schm.encrypt_type,
                 "http_port": self.mgt_encrypt_schm.http_port,
                 "lv": self.mgt_encrypt_schm.lv,
-            },
+            }
+            if self.mgt_encrypt_schm is not None
+            else None,
         }
 
     async def get_tapo_device(
         self, credentials: AuthCredential, session: Optional[aiohttp.ClientSession] = None
     ) -> TapoDevice:
-        config = DeviceConnectConfiguration(
-            host=self.ip,
-            port=self.mgt_encrypt_schm.http_port,
-            credentials=credentials,
-            device_type=self.device_type,
-            encryption_type=self.mgt_encrypt_schm.encrypt_type,
-            encryption_version=self.mgt_encrypt_schm.lv,
-        )
+        if encrypt_schema := self.mgt_encrypt_schm:
+            config = DeviceConnectConfiguration(
+                host=self.ip,
+                port=encrypt_schema.http_port,
+                credentials=credentials,
+                device_type=self.device_type,
+                encryption_type=encrypt_schema.encrypt_type,
+                encryption_version=encrypt_schema.lv,
+            )
+        else:
+            logging.warning(
+                "No encryption schema found for discovered device {}, {}",
+                self.ip,
+                self.device_type,
+            )
+            config = DeviceConnectConfiguration(
+                host=self.ip, port=80, device_type=self.device_type
+            )
         return await connect(config, session)
 
 
 @dataclasses.dataclass
-class EncryptionScheme:
+class EncryptionSchema:
     """Base model for encryption scheme of discovery result."""
 
     is_support_https: Optional[bool] = None

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/plugp100/responses/child_device_list.py

@@ -52,7 +52,7 @@ class ChildDeviceList(object):
         )
 
     def get_next_index(self) -> int:
-        return self.start_index + len(self.child_device_list) + 1
+        return self.start_index + len(self.child_device_list)
 
     def has_next(self) -> bool:
         return self.get_next_index() < self.sum

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5/plugp100.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugp100
-Version: 5.0.0.dev4
+Version: 5.0.0.dev5
 Summary: Controller for TP-Link Tapo P100 and other devices
 Home-page: https://github.com/petretiandrea/plugp100
 Download-URL: https://github.com/petretiandrea/plugp100

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/tests/integration/test_power_strip.py

@@ -1,7 +1,7 @@
 import unittest
 
 from plugp100.new.device_factory import connect
-from plugp100.new.tapoplugstrip import TapoPlugStrip
+from plugp100.new.tapoplug import TapoPlug
 from tests.integration.tapo_test_helper import (
     _test_expose_device_info,
     get_test_config,
@@ -14,7 +14,7 @@ class PowerStripTest(unittest.IsolatedAsyncioTestCase):
 
     async def asyncSetUp(self) -> None:
         connect_config = await get_test_config(device_type="power_strip")
-        self._device: TapoPlugStrip = await connect(connect_config)
+        self._device: TapoPlug = await connect(connect_config)
         await self._device.update()
 
     async def asyncTearDown(self):

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/tests/integration/test_tapo_discovery.py

@@ -6,7 +6,7 @@ import unittest
 from cryptography.hazmat.primitives import serialization, hashes
 from cryptography.hazmat.primitives.asymmetric import padding
 
-from plugp100.discovery.discovered_device import DiscoveredDevice, EncryptionScheme
+from plugp100.discovery.discovered_device import DiscoveredDevice, EncryptionSchema
 from plugp100.discovery.tapo_discovery import (
     TapoDiscovery,
     _build_packet_for_payload_json,
@@ -88,7 +88,7 @@ class TapoDiscoveryTest(unittest.TestCase):
                     device_model="P105(IT)",
                     ip="192.168.1.3",
                     mac="9C-53-22-A7-C8-35",
-                    mgt_encrypt_schm=EncryptionScheme(
+                    mgt_encrypt_schm=EncryptionSchema(
                         is_support_https=False, encrypt_type="KLAP", http_port=80, lv=2
                     ),
                     device_id="26d9887af76f0d5facf8febeb20f6ec9",

{plugp100-5.0.0.dev4 → plugp100-5.0.0.dev5}/tests/unit/test_hub.py

@@ -1,6 +1,6 @@
 from plugp100.new.device_type import DeviceType
 from plugp100.new.tapohub import TapoHub
-from tests.conftest import hub
+from tests.conftest import hub, hub_lot_devices
 
 
 @hub
@@ -40,3 +40,8 @@ async def test_get_alarm_tones(device: TapoHub):
     if device.has_alarm:
         tones = (await device.get_supported_alarm_tones()).get_or_raise()
         assert len(tones.tones) > 0
+
+
+@hub_lot_devices
+async def test_should_get_all_children(device: TapoHub):
+    assert len(device.children) == 17