pyControl4 1.5.0__tar.gz → 1.6.0__tar.gz

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyControl4
-Version: 1.5.0
+Version: 1.6.0
 Summary: Python 3 asyncio package for interacting with Control4 systems
 Home-page: https://github.com/lawtancool/pyControl4
 Author: lawtancool
@@ -8,7 +8,7 @@ Author-email: contact@lawrencetan.ca
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4/account.py

@@ -3,10 +3,9 @@ controller info, and retrieves a bearer token for connecting to a Control4 Direc
 """
 
 import aiohttp
-import async_timeout
+import asyncio
 import json
 import logging
-import datetime
 
 from .error_handling import checkResponseForError
 
@@ -64,14 +63,14 @@ class C4Account:
         }
         if self.session is None:
             async with aiohttp.ClientSession() as session:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with session.post(
                         AUTHENTICATION_ENDPOINT, json=dataDictionary
                     ) as resp:
                         await checkResponseForError(await resp.text())
                         return await resp.text()
         else:
-            with async_timeout.timeout(10):
+            async with asyncio.timeout(10):
                 async with self.session.post(
                     AUTHENTICATION_ENDPOINT, json=dataDictionary
                 ) as resp:
@@ -94,12 +93,12 @@ class C4Account:
             raise
         if self.session is None:
             async with aiohttp.ClientSession() as session:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with session.get(uri, headers=headers) as resp:
                         await checkResponseForError(await resp.text())
                         return await resp.text()
         else:
-            with async_timeout.timeout(10):
+            async with asyncio.timeout(10):
                 async with self.session.get(uri, headers=headers) as resp:
                     await checkResponseForError(await resp.text())
                     return await resp.text()
@@ -125,7 +124,7 @@ class C4Account:
         }
         if self.session is None:
             async with aiohttp.ClientSession() as session:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with session.post(
                         CONTROLLER_AUTHORIZATION_ENDPOINT,
                         headers=headers,
@@ -134,7 +133,7 @@ class C4Account:
                         await checkResponseForError(await resp.text())
                         return await resp.text()
         else:
-            with async_timeout.timeout(10):
+            async with asyncio.timeout(10):
                 async with self.session.post(
                     CONTROLLER_AUTHORIZATION_ENDPOINT,
                     headers=headers,

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4/alarm.py

@@ -141,30 +141,30 @@ class C4SecurityPanel(C4Entity):
         data = await self.director.getItemInfo(self.item_id)
         jsonDictionary = json.loads(data)
 
-        if jsonDictionary[0]["capabilities"]["has_fire"]:
+        capabilities = (
+            jsonDictionary[0].get("capabilities", {}) if jsonDictionary else {}
+        )
+        if capabilities.get("has_fire"):
             types_list.append("Fire")
-        if jsonDictionary[0]["capabilities"]["has_medical"]:
+        if capabilities.get("has_medical"):
             types_list.append("Medical")
-        if jsonDictionary[0]["capabilities"]["has_panic"]:
+        if capabilities.get("has_panic"):
             types_list.append("Panic")
-        if jsonDictionary[0]["capabilities"]["has_police"]:
+        if capabilities.get("has_police"):
             types_list.append("Police")
 
         return types_list
 
-    async def triggerEmergency(self, usercode, type):
+    async def triggerEmergency(self, type):
         """Triggers an emergency of the specified type.
 
         Parameters:
-            `usercode` - PIN/code for disarming the system.
-
             `type` - Type of emergency: "Fire", "Medical", "Panic", or "Police"
         """
-        usercode = str(usercode)
         await self.director.sendPostRequest(
             "/api/v1/items/{}/commands".format(self.item_id),
-            "PARTITION_DISARM",
-            {"UserCode": usercode},
+            "EXECUTE_EMERGENCY",
+            {"EmergencyType": type},
         )
 
     async def sendKeyPress(self, key):

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4/director.py

@@ -3,7 +3,7 @@ getting details about items on the Director.
 """
 
 import aiohttp
-import async_timeout
+import asyncio
 import json
 
 from .error_handling import checkResponseForError
@@ -50,14 +50,14 @@ class C4Director:
             async with aiohttp.ClientSession(
                 connector=aiohttp.TCPConnector(verify_ssl=False)
             ) as session:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with session.get(
                         self.base_url + uri, headers=self.headers
                     ) as resp:
                         await checkResponseForError(await resp.text())
                         return await resp.text()
         else:
-            with async_timeout.timeout(10):
+            async with asyncio.timeout(10):
                 async with self.session.get(
                     self.base_url + uri, headers=self.headers
                 ) as resp:
@@ -86,14 +86,14 @@ class C4Director:
             async with aiohttp.ClientSession(
                 connector=aiohttp.TCPConnector(verify_ssl=False)
             ) as session:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with session.post(
                         self.base_url + uri, headers=self.headers, json=dataDictionary
                     ) as resp:
                         await checkResponseForError(await resp.text())
                         return await resp.text()
         else:
-            with async_timeout.timeout(10):
+            async with asyncio.timeout(10):
                 async with self.session.post(
                     self.base_url + uri, headers=self.headers, json=dataDictionary
                 ) as resp:
@@ -162,12 +162,8 @@ class C4Director:
             "/api/v1/items/{}/variables?varnames={}".format(item_id, var_name)
         )
         if data == "[]":
-            raise ValueError(
-                "Empty response recieved from Director! The variable {} \
-                    doesn't seem to exist for item {}.".format(
-                    var_name, item_id
-                )
-            )
+            raise ValueError("Empty response recieved from Director! The variable {} \
+                    doesn't seem to exist for item {}.".format(var_name, item_id))
         jsonDictionary = json.loads(data)
         return jsonDictionary[0]["value"]
 
@@ -185,12 +181,8 @@ class C4Director:
             "/api/v1/items/variables?varnames={}".format(var_name)
         )
         if data == "[]":
-            raise ValueError(
-                "Empty response recieved from Director! The variable {} \
-                    doesn't seem to exist for any items.".format(
-                    var_name
-                )
-            )
+            raise ValueError("Empty response recieved from Director! The variable {} \
+                    doesn't seem to exist for any items.".format(var_name))
         jsonDictionary = json.loads(data)
         return jsonDictionary
 

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4/light.py

@@ -43,3 +43,33 @@ class C4Light(C4Entity):
             "RAMP_TO_LEVEL",
             {"LEVEL": level, "TIME": time},
         )
+
+    async def setColorXY(self, x: float, y: float, *, rate: int | None = None):
+        """Sends SET_COLOR_TARGET with xy"""
+        params = {
+            "LIGHT_COLOR_TARGET_X": float(x),
+            "LIGHT_COLOR_TARGET_Y": float(y),
+            "LIGHT_COLOR_TARGET_MODE": 0,
+        }
+        if rate is not None:
+            params["RATE"] = int(rate)
+
+        await self.director.sendPostRequest(
+            f"/api/v1/items/{self.item_id}/commands",
+            "SET_COLOR_TARGET",
+            params,
+        )
+
+    async def setColorTemperature(self, kelvin: int, *, rate: int | None = None):
+        params = {
+            "LIGHT_COLOR_TARGET_COLOR_CORRELATED_TEMPERATURE": int(kelvin),
+            "LIGHT_COLOR_TARGET_MODE": 1,
+        }
+        if rate is not None:
+            params["RATE"] = int(rate)
+
+        await self.director.sendPostRequest(
+            f"/api/v1/items/{self.item_id}/commands",
+            "SET_COLOR_TARGET",
+            params,
+        )

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4/websocket.py

@@ -1,7 +1,7 @@
 """Handles Websocket connections to a Control4 Director, allowing for real-time updates using callbacks."""
 
 import aiohttp
-import async_timeout
+import asyncio
 import socketio_v4 as socketio
 import logging
 
@@ -60,7 +60,7 @@ class _C4DirectorNamespace(socketio.AsyncClientNamespace):
                 async with aiohttp.ClientSession(
                     connector=aiohttp.TCPConnector(verify_ssl=False)
                 ) as session:
-                    with async_timeout.timeout(10):
+                    async with asyncio.timeout(10):
                         async with session.get(
                             self.url + self.uri,
                             params={"JWT": self.token, "SubscriptionClient": clientId},
@@ -71,7 +71,7 @@ class _C4DirectorNamespace(socketio.AsyncClientNamespace):
                             self.subscriptionId = data["subscriptionId"]
                             await self.emit("startSubscription", self.subscriptionId)
             else:
-                with async_timeout.timeout(10):
+                async with asyncio.timeout(10):
                     async with self.session.get(
                         self.url + self.uri,
                         params={"JWT": self.token, "SubscriptionClient": clientId},
@@ -116,40 +116,54 @@ class C4Websocket:
         self.connect_callback = connect_callback
         self.disconnect_callback = disconnect_callback
 
-        # Keep track of the callbacks registered for each item id
         self._item_callbacks = dict()
         # Initialize self._sio to None
         self._sio = None
 
     @property
     def item_callbacks(self):
-        """Returns a dictionary of registered item ids (key) and their callbacks (value).
-
-        item_callbacks cannot be modified directly. Use add_item_callback() and remove_item_callback() instead.
-        """
-        return self._item_callbacks
+        """Returns a dictionary of registered item ids (key) and their callbacks (value)."""
+        return {
+            item_id: callbacks[0] if callbacks else None
+            for item_id, callbacks in self._item_callbacks.items()
+        }
 
     def add_item_callback(self, item_id, callback):
         """Register a callback to receive updates about an item.
-        If a callback is already registered for the item, it will be overwritten with the provided callback.
-
         Parameters:
             `item_id` - The Control4 item ID.
-
             `callback` - The callback to be called when an update is received for the provided item id.
         """
-
         _LOGGER.debug("Subscribing to updates for item id: %s", item_id)
 
-        self._item_callbacks[item_id] = callback
+        if item_id not in self._item_callbacks:
+            self._item_callbacks[item_id] = []
 
-    def remove_item_callback(self, item_id):
-        """Unregister callback for an item.
+        # Avoid duplicates
+        if callback not in self._item_callbacks[item_id]:
+            self._item_callbacks[item_id].append(callback)
 
+    def remove_item_callback(self, item_id, callback=None):
+        """Unregister callback(s) for an item.
         Parameters:
             `item_id` - The Control4 item ID.
+            `callback` - (Optional) Specific callback to remove. If None, removes all callbacks for this item_id.
         """
-        self._item_callbacks.pop(item_id)
+        if item_id not in self._item_callbacks:
+            return
+
+        if callback is None:
+            # Remove all callbacks for this item_id
+            del self._item_callbacks[item_id]
+        else:
+            # Remove a specific callback
+            try:
+                self._item_callbacks[item_id].remove(callback)
+                # If no more callbacks, remove the entry
+                if not self._item_callbacks[item_id]:
+                    del self._item_callbacks[item_id]
+            except ValueError:
+                pass
 
     async def sio_connect(self, director_bearer_token):
         """Start WebSockets connection and listen, using the provided director_bearer_token to authenticate with the Control4 Director.
@@ -199,19 +213,25 @@ class C4Websocket:
         """Process an incoming event message."""
         _LOGGER.debug(message)
         try:
-            c = self._item_callbacks[message["iddevice"]]
+            callbacks = self._item_callbacks[message["iddevice"]]
         except KeyError:
             _LOGGER.debug("No Callback for device id {}".format(message["iddevice"]))
             return True
 
-        if isinstance(message, list):
-            for m in message:
-                await c(message["iddevice"], m)
-        else:
-            await c(message["iddevice"], message)
+        for callback in callbacks[:]:
+            try:
+                if isinstance(message, list):
+                    for m in message:
+                        await callback(message["iddevice"], m)
+                else:
+                    await callback(message["iddevice"], message)
+            except Exception as exc:
+                _LOGGER.warning(
+                    "Captured exception during callback: {}".format(str(exc))
+                )
 
     async def _execute_callback(self, callback, *args, **kwargs):
-        """Callback with some data capturing any excpetions."""
+        """Callback with some data capturing any exceptions."""
         try:
             self.sio.emit("ping")
             await callback(*args, **kwargs)

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/pyControl4.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyControl4
-Version: 1.5.0
+Version: 1.6.0
 Summary: Python 3 asyncio package for interacting with Control4 systems
 Home-page: https://github.com/lawtancool/pyControl4
 Author: lawtancool
@@ -8,7 +8,7 @@ Author-email: contact@lawrencetan.ca
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp

{pycontrol4-1.5.0 → pycontrol4-1.6.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pyControl4",  # Replace with your own username
-    version="1.5.0",
+    version="1.6.0",
     author="lawtancool",
     author_email="contact@lawrencetan.ca",
     description="Python 3 asyncio package for interacting with Control4 systems",
@@ -18,7 +18,7 @@ setuptools.setup(
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.11",
     install_requires=[
         "aiohttp",
         "xmltodict",