paradox-alarm-interface 3.4.0__tar.gz → 3.4.2.dev0__tar.gz

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paradox-alarm-interface
-Version: 3.4.0
+Version: 3.4.2.dev0
 Summary: Interface to Paradox Alarm Panels
 Home-page: https://github.com/ParadoxAlarmInterface/pai
 Author: Jevgeni Kiski, João Paulo Barraca
@@ -18,14 +18,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Requires-Python: <3.12,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: construct~=2.9.43
 Requires-Dist: argparse>=1.4.0
 Requires-Dist: python-slugify>=4.0.1
 Requires-Dist: pytz>=2021.3
-Requires-Dist: paho_mqtt>=1.5.0
+Requires-Dist: paho_mqtt<2,>=1.5.0
 Requires-Dist: requests>=2.20.0
 Requires-Dist: pyserial-asyncio>=0.4
 Provides-Extra: yaml
@@ -107,8 +107,8 @@ See [wiki](https://github.com/ParadoxAlarmInterface/pai/wiki/Installation)
 ## Tested Environment
 
 Tested in the following environment:
-* Python 3.6, 3.7, 3.8
-* Mosquitto MQTT Broker >v 1.4.8
+* Python 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
+* Mosquitto MQTT Broker > 1.4.8
 * OrangePi 2G-IOT, NanoPi NEO, and Raspberry Pi 3 through their built in Serial Port (with a level shifter!), or a USB RS232 TTL adapter (CP2102, PL2303, CH340, etc..)
 * Ubuntu Server 16.04.3 LTS
 * Paradox MG5050, SP7000 and EVO panels

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/README.md

@@ -65,8 +65,8 @@ See [wiki](https://github.com/ParadoxAlarmInterface/pai/wiki/Installation)
 ## Tested Environment
 
 Tested in the following environment:
-* Python 3.6, 3.7, 3.8
-* Mosquitto MQTT Broker >v 1.4.8
+* Python 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
+* Mosquitto MQTT Broker > 1.4.8
 * OrangePi 2G-IOT, NanoPi NEO, and Raspberry Pi 3 through their built in Serial Port (with a level shifter!), or a USB RS232 TTL adapter (CP2102, PL2303, CH340, etc..)
 * Ubuntu Server 16.04.3 LTS
 * Paradox MG5050, SP7000 and EVO panels

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/__init__.py

@@ -1,3 +1,3 @@
-VERSION = "3.4.0"
+VERSION = "3.4.2-dev"
 
 __version__ = VERSION

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/config.py

@@ -55,6 +55,7 @@ class Config:
         "IP_CONNECTION_BARE": False,  # IP endpoint connects directly to panel. Used for Serial Tunnels over TCP
         # Paradox
         "KEEP_ALIVE_INTERVAL": 10,  # Interval between status updates
+        "IO_TIMEOUT": 0.5,  # Timeout for IO operations
         "LIMITS": {},  # By default all zones will be monitored
         "LABEL_ENCODING": "paradox-en",  # Encoding to use when decoding labels. paradox-* or https://docs.python.org/3/library/codecs.html#standard-encodings
         "LABEL_REFRESH_INTERVAL": (

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/connections/ip/connection.py

@@ -1,17 +1,15 @@
-# -*- coding: utf-8 -*-
-
+from abc import ABC, abstractmethod
 import asyncio
 import logging
-from abc import ABC, abstractmethod
 
 from construct import Container
 
+from paradox.config import config as cfg
 from paradox.connections.connection import Connection
 from paradox.connections.handler import IPConnectionHandler
 from paradox.connections.ip.commands import IPModuleConnectCommand
 from paradox.connections.ip.stun_session import StunSession
-from paradox.connections.protocols import (IPConnectionProtocol,
-                                           SerialConnectionProtocol)
+from paradox.connections.protocols import IPConnectionProtocol, SerialConnectionProtocol
 from paradox.exceptions import PAICriticalException
 from paradox.lib.handlers import FutureHandler, HandlerRegistry
 
@@ -94,7 +92,7 @@ class IPConnectionWithEncryption(MultiAttemptConnection, IPConnectionHandler, AB
     def on_ip_message(self, container: Container):
         return self.loop.create_task(self.ip_handler_registry.handle(container))
 
-    async def wait_for_ip_message(self, timeout=2) -> Container:
+    async def wait_for_ip_message(self, timeout=cfg.IO_TIMEOUT) -> Container:
         future = FutureHandler()
         return await self.ip_handler_registry.wait_until_complete(future, timeout)
 
@@ -107,7 +105,10 @@ class IPConnectionWithEncryption(MultiAttemptConnection, IPConnectionHandler, AB
 
 class LocalIPConnection(IPConnectionWithEncryption):
     def __init__(
-        self, host, port, password,
+        self,
+        host,
+        port,
+        password,
     ):
         super().__init__(password)
         self.host = host

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/connections/protocols.py

@@ -1,12 +1,16 @@
+from abc import abstractmethod
 import asyncio
 import binascii
 import logging
-from abc import abstractmethod
 
 from paradox.config import config as cfg
 from paradox.connections.handler import ConnectionHandler, IPConnectionHandler
-from paradox.connections.ip.parsers import (IPMessageCommand, IPMessageRequest,
-                                            IPMessageResponse, IPMessageType)
+from paradox.connections.ip.parsers import (
+    IPMessageCommand,
+    IPMessageRequest,
+    IPMessageResponse,
+    IPMessageType,
+)
 
 logger = logging.getLogger("PAI").getChild(__name__)
 
@@ -52,11 +56,11 @@ class ConnectionProtocol(asyncio.Protocol):
         if self.transport:
             try:
                 self.transport.close()
-            except:
+            except Exception:
                 logger.exception("Connection transport close raised Exception")
             self.transport = None
 
-        await asyncio.wait_for(self._closed, timeout=1)
+        await asyncio.wait_for(self._closed, timeout=cfg.IO_TIMEOUT)
 
     @abstractmethod
     def send_message(self, message):
@@ -94,7 +98,7 @@ class ConnectionProtocol(asyncio.Protocol):
 class SerialConnectionProtocol(ConnectionProtocol):
     def send_message(self, message):
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug("PAI -> SER {}".format(binascii.hexlify(message)))
+            logger.debug(f"PAI -> SER {binascii.hexlify(message)}")
 
         self.check_active()
 
@@ -137,7 +141,7 @@ class SerialConnectionProtocol(ConnectionProtocol):
             if checksum(frame, min_length):
                 self.buffer = self.buffer[len(frame) :]  # Remove message
                 if cfg.LOGGING_DUMP_PACKETS:
-                    logger.debug("SER -> PAI {}".format(binascii.hexlify(frame)))
+                    logger.debug(f"SER -> PAI {binascii.hexlify(frame)}")
 
                 self.handler.on_message(frame)
             else:
@@ -146,14 +150,14 @@ class SerialConnectionProtocol(ConnectionProtocol):
 
 class IPConnectionProtocol(ConnectionProtocol):
     def __init__(self, handler: IPConnectionHandler, key):
-        super(IPConnectionProtocol, self).__init__(handler)
+        super().__init__(handler)
 
         self.handler = handler
         self.key = key
 
     def send_raw(self, raw):
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug("PAI -> IP (raw) {}".format(binascii.hexlify(raw)))
+            logger.debug(f"PAI -> IP (raw) {binascii.hexlify(raw)}")
 
         self.check_active()
 
@@ -161,7 +165,7 @@ class IPConnectionProtocol(ConnectionProtocol):
 
     def send_message(self, message):
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug("PAI -> IP (payload) {}".format(binascii.hexlify(message)))
+            logger.debug(f"PAI -> IP (payload) {binascii.hexlify(message)}")
 
         self.check_active()
 
@@ -180,7 +184,7 @@ class IPConnectionProtocol(ConnectionProtocol):
             password=self.key,
         )
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug("PAI -> IP (raw) {}".format(binascii.hexlify(msg)))
+            logger.debug(f"PAI -> IP (raw) {binascii.hexlify(msg)}")
 
         self.transport.write(msg)
 
@@ -188,9 +192,7 @@ class IPConnectionProtocol(ConnectionProtocol):
         message = IPMessageResponse.parse(data, password=self.key)
 
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug(
-                "IP -> PAI (payload) {}".format(binascii.hexlify(message.payload))
-            )
+            logger.debug(f"IP -> PAI (payload) {binascii.hexlify(message.payload)}")
 
         if message.header.message_type == IPMessageType.serial_passthrough_response:
             self.handler.on_message(message.payload)
@@ -218,7 +220,7 @@ class IPConnectionProtocol(ConnectionProtocol):
             return
 
         if cfg.LOGGING_DUMP_PACKETS:
-            logger.debug("IP -> PAI (raw) {}".format(binascii.hexlify(self.buffer)))
+            logger.debug(f"IP -> PAI (raw) {binascii.hexlify(self.buffer)}")
 
         self._process_message(self.buffer)
         self.buffer = b""

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/hardware/spectra_magellan/adapters.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
-
 import datetime
+from enum import Enum
 
 from construct import Adapter
-from enum import Enum
+
 
 class DateAdapter(Adapter):
     def _decode(self, obj, context, path):
@@ -35,7 +34,6 @@ class PartitionStateAdapter(Adapter):
     states = dict(arm=4, disarm=5, arm_sleep=3, arm_stay=1, none=0)
 
     def _decode(self, obj, context, path):
-
         for k, v in enumerate(self.states):
             if v == obj[0]:
                 return k
@@ -53,7 +51,6 @@ class ZoneStateAdapter(Adapter):
     states = dict(bypass=0x10)
 
     def _decode(self, obj, context, path):
-
         for k, v in enumerate(self.states):
             if v == obj[0]:
                 return k
@@ -227,16 +224,24 @@ class PGMDefinitionAdapter(Adapter):
         disabled = sum(obj) == 0
 
         if disabled:
-            return 'disabled'
+            return "disabled"
 
         try:
-            activation_event = PGMDefinitionAdapter.PGMEvent(obj[0]) if sum(obj[:3]) != 0 else 'disabled'
-        except:
-            activation_event = 'unknown'
+            activation_event = (
+                PGMDefinitionAdapter.PGMEvent(obj[0])
+                if sum(obj[:3]) != 0
+                else "disabled"
+            )
+        except Exception:
+            activation_event = "unknown"
 
         try:
-            deactivation_event = PGMDefinitionAdapter.PGMEvent(obj[3]) if sum(obj[3:]) != 0 else 'disabled'
-        except:
-            deactivation_event = 'unknown'
+            deactivation_event = (
+                PGMDefinitionAdapter.PGMEvent(obj[3])
+                if sum(obj[3:]) != 0
+                else "disabled"
+            )
+        except Exception:
+            deactivation_event = "unknown"
 
         return dict(activation=activation_event, deactivation=deactivation_event)

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/interfaces/mqtt/basic.py

@@ -461,7 +461,8 @@ class BasicMQTTInterface(AbstractMQTTInterface):
                     if i not in labels:
                         continue
 
-                    for attribute in definitions[i]:  # attribute
+                    definition = {**(definitions[i]), "id": i}
+                    for attribute in definition:  # attribute
                         if element_type == "user" and attribute == "code":
                             continue
                         self._publish(
@@ -469,7 +470,7 @@ class BasicMQTTInterface(AbstractMQTTInterface):
                             element_type,
                             labels[i]["key"],
                             attribute,
-                            definitions[i][attribute],
+                            definition[attribute],
                         )
 
         if (

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/lib/async_message_manager.py

@@ -4,8 +4,8 @@ from typing import Callable, Optional
 
 from construct import Container
 
-from paradox.lib.handlers import (FutureHandler, HandlerRegistry,
-                                  PersistentHandler)
+from paradox.config import config as cfg
+from paradox.lib.handlers import FutureHandler, HandlerRegistry, PersistentHandler
 
 logger = logging.getLogger("PAI").getChild(__name__)
 
@@ -27,7 +27,7 @@ class ErrorMessageHandler(PersistentHandler):
 
 class AsyncMessageManager:
     def __init__(self, loop=None):
-        super(AsyncMessageManager, self).__init__()
+        super().__init__()
 
         if not loop:
             loop = asyncio.get_event_loop()
@@ -37,7 +37,9 @@ class AsyncMessageManager:
         self.raw_handler_registry = HandlerRegistry()
 
     async def wait_for_message(
-        self, check_fn: Optional[Callable[[Container], bool]] = None, timeout=2
+        self,
+        check_fn: Optional[Callable[[Container], bool]] = None,
+        timeout=cfg.IO_TIMEOUT,
     ) -> Container:
         return await self.handler_registry.wait_until_complete(
             FutureHandler(check_fn), timeout

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/lib/handlers.py

@@ -1,8 +1,10 @@
+from abc import abstractmethod
 import asyncio
 import logging
-from abc import abstractmethod
 from typing import Any, Awaitable, Callable, List, Optional, Union
 
+from paradox.config import config as cfg
+
 logger = logging.getLogger("PAI").getChild(__name__)
 
 
@@ -30,7 +32,9 @@ class AlreadyHandledError(Exception):
 
 class FutureHandler(Handler, asyncio.Future):
     def __init__(
-        self, check_fn: Optional[Callable[[Any], bool]] = None, name=None,
+        self,
+        check_fn: Optional[Callable[[Any], bool]] = None,
+        name=None,
     ):
         super().__init__()
         self.name = name if name is not None else self.__class__.__name__
@@ -53,7 +57,7 @@ class PersistentHandler(Handler):
     def __init__(
         self, callback: Callable[[Any], Union[None, Awaitable[None]]], name=None
     ):
-        super(PersistentHandler, self).__init__(name)
+        super().__init__(name)
         self._handle = callback
         self.persistent = True
 
@@ -90,7 +94,7 @@ class HandlerRegistry:
         for handler in to_remove:
             self.remove(handler)
 
-    async def wait_until_complete(self, handler: Handler, timeout=2):
+    async def wait_until_complete(self, handler: Handler, timeout=cfg.IO_TIMEOUT):
         self.append(handler)
         try:
             return await asyncio.wait_for(handler, timeout=timeout)
@@ -112,7 +116,7 @@ class HandlerRegistry:
                     await handler(data)
             except AlreadyHandledError:
                 logger.error("Already handled")
-            except:
+            except Exception:
                 logger.exception("Exception caught during message handling")
                 raise
 

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/lib/help.py

@@ -33,7 +33,9 @@ MODULES = {
     "ws4py": dict(
         mandatory=False, desc="the Pushbullet interface", install_name="ws4py>=0.4.2"
     ),
-    "yaml": dict(mandatory=False, desc="the IP150 connection", install_name="pyyaml>=5.2.0"),
+    "yaml": dict(
+        mandatory=False, desc="the IP150 connection", install_name="pyyaml>=5.2.0"
+    ),
     "chump": dict(
         mandatory=False, desc="the Pushover interface", install_name="chump>=1.6.0"
     ),
@@ -44,9 +46,10 @@ MODULES = {
         mandatory=False, desc="the Signal interface", install_name="pygobject>=3.20.0"
     ),
     "gi": dict(mandatory=False, desc="the Signal interface", install_name="gi>=1.2"),
-    "pytz": dict(mandatory=False, desc="Panel time sync", install_name="pytz>=2023.3.post1"),
-    "mqtt": dict(mandatory=False, desc="MQTT", install_name="paho_mqtt>=1.5.0"),
-
+    "pytz": dict(
+        mandatory=False, desc="Panel time sync", install_name="pytz>=2023.3.post1"
+    ),
+    "mqtt": dict(mandatory=False, desc="MQTT", install_name="paho_mqtt>=1.5.0,<2"),
     "pre-commit": dict(mandatory=False, desc="Development", install_name="pre-commit"),
     "flake8": dict(mandatory=False, desc="Code checker", install_name="flake8"),
     "tox": dict(mandatory=False, desc="virtual env / testing", install_name="tox"),
@@ -54,7 +57,7 @@ MODULES = {
 
 
 def import_error_help(error):
-    logger.error("Could not import Python3 module '{}': {}\n".format(error.name, error))
+    logger.error(f"Could not import Python3 module '{error.name}': {error}\n")
 
     if error.name in MODULES:
         m = MODULES[error.name]

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox/paradox.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
-
 import asyncio
-import logging
-import time
-import pytz
 from binascii import hexlify
 from datetime import datetime
-from typing import Callable, Iterable, Optional, Sequence
+import logging
+import time
+from typing import Callable, Iterable, Optional
 
 from construct import Container
+import pytz
 
 from paradox.config import config as cfg, get_limits_for_type
 from paradox.connections.connection import Connection
@@ -16,13 +14,16 @@ from paradox.data.enums import RunState
 from paradox.data.memory_storage import MemoryStorage as Storage
 from paradox.data.model import DetectedPanel
 from paradox.event import Change, ChangeEvent, Event, LiveEvent
-from paradox.exceptions import (AuthenticationFailed, PanelNotDetected,
-                                StatusRequestException,
-                                async_loop_unhandled_exception_handler, CodeLockout)
+from paradox.exceptions import (
+    AuthenticationFailed,
+    CodeLockout,
+    PanelNotDetected,
+    StatusRequestException,
+    async_loop_unhandled_exception_handler,
+)
 from paradox.hardware import Panel, create_panel
 from paradox.lib import ps
-from paradox.lib.async_message_manager import (ErrorMessageHandler,
-                                               EventMessageHandler)
+from paradox.lib.async_message_manager import ErrorMessageHandler, EventMessageHandler
 from paradox.lib.handlers import PersistentHandler
 from paradox.lib.utils import deep_merge
 from paradox.parsers.status import convert_raw_status
@@ -35,7 +36,7 @@ class Paradox:
         self.panel: Panel = None
         self._connection: Connection = None
         self.retries = retries
-        self.work_loop = asyncio.get_event_loop()  # type: asyncio.AbstractEventLoop
+        self.work_loop = asyncio.get_event_loop()
         self.work_loop.set_exception_handler(async_loop_unhandled_exception_handler)
 
         self.storage = Storage()
@@ -70,7 +71,8 @@ class Paradox:
                 from paradox.connections.serial_connection import SerialCommunication
 
                 self._connection = SerialCommunication(
-                    port=cfg.SERIAL_PORT, baud=cfg.SERIAL_BAUD,
+                    port=cfg.SERIAL_PORT,
+                    baud=cfg.SERIAL_BAUD,
                 )
             elif cfg.CONNECTION_TYPE == "IP":
                 logger.info("Using IP Connection")
@@ -81,10 +83,7 @@ class Paradox:
                     self._connection = BareIPConnection(
                         host=cfg.IP_CONNECTION_HOST, port=cfg.IP_CONNECTION_PORT
                     )
-                elif (
-                    cfg.IP_CONNECTION_SITEID
-                    and cfg.IP_CONNECTION_EMAIL
-                ):
+                elif cfg.IP_CONNECTION_SITEID and cfg.IP_CONNECTION_EMAIL:
                     from paradox.connections.ip.connection import StunIPConnection
 
                     self._connection = StunIPConnection(
@@ -102,9 +101,7 @@ class Paradox:
                         password=cfg.IP_CONNECTION_PASSWORD,
                     )
             else:
-                raise AssertionError(
-                    "Invalid connection type: {}".format(cfg.CONNECTION_TYPE)
-                )
+                raise AssertionError(f"Invalid connection type: {cfg.CONNECTION_TYPE}")
 
             self._register_connection_handlers()
 
@@ -140,7 +137,7 @@ class Paradox:
             initiate_reply = await self.send_wait(
                 self.panel.get_message("InitiateCommunication"),
                 None,
-                reply_expected=0x7
+                reply_expected=0x7,
             )
 
             if initiate_reply:
@@ -156,9 +153,7 @@ class Paradox:
                     initiate_reply.fields.value.serial_number
                 ).decode()
 
-                logger.info(
-                    "Panel Identified {} version {}".format(model, firmware_version)
-                )
+                logger.info(f"Panel Identified {model} version {firmware_version}")
             else:
                 raise ConnectionError("Panel did not replied to InitiateCommunication")
 
@@ -251,7 +246,9 @@ class Paradox:
                 tzinfo = pytz.timezone(cfg.SYNC_TIME_TIMEZONE)
                 now = now.astimezone(tzinfo)
             except pytz.exceptions.UnknownTimeZoneError:
-                logger.debug(f"Panel Timezone Unknown ('{cfg.SYNC_TIME_TIMEZONE}'). Skipping sync")
+                logger.debug(
+                    f"Panel Timezone Unknown ('{cfg.SYNC_TIME_TIMEZONE}'). Skipping sync"
+                )
                 return
 
         if not self._is_time_sync_required(now.replace(tzinfo=None)):
@@ -297,13 +294,13 @@ class Paradox:
                         logger.error("Lost communication with panel")
                         await self.disconnect()
                         return
-                except:
+                except Exception:
                     logger.exception("Loop")
                 finally:
                     self.busy.release()
 
                 if replies_missing > 0:
-                    logger.debug("Loop: Replies missing: {}".format(replies_missing))
+                    logger.debug(f"Loop: Replies missing: {replies_missing}")
 
             # cfg.Listen for events
 
@@ -353,15 +350,14 @@ class Paradox:
             # No message
             if recv_message is None:
                 logger.debug(
-                    "Unknown message: %s"
-                    % (" ".join("{:02x} ".format(c) for c in message))
+                    "Unknown message: %s" % (" ".join(f"{c:02x} " for c in message))
                 )
                 return
 
             self.connection.schedule_message_handling(
                 recv_message
             )  # schedule handling in the loop
-        except:
+        except Exception:
             logger.exception("Error parsing message")
 
     async def send_wait(
@@ -370,10 +366,9 @@ class Paradox:
         args=None,
         message=None,
         retries=5,
-        timeout=0.5,
+        timeout=cfg.IO_TIMEOUT,
         reply_expected=None,
     ) -> Optional[Container]:
-
         # Connection closed
         if not self.connection.connected:
             raise ConnectionError("Not connected")
@@ -422,12 +417,12 @@ class Paradox:
                 except ConnectionError:
                     result = "connection error"
                     raise
-                except:
+                except Exception:
                     result = "exception"
                     logger.exception("Unexpected exception during send_wait")
                     raise
-                #finally:
-                    #logger.debug("send/receive %s in %.4f s", result, time.time() - t1)
+                finally:
+                    logger.debug("send/receive %s in %.4f s", result, time.time() - t1)
 
             attempt += 1
 
@@ -435,11 +430,9 @@ class Paradox:
 
     async def control_zone(self, zone: str, command: str) -> bool:
         command = command.lower()
-        logger.debug("Control Zone: {} - {}".format(zone, command))
+        logger.debug(f"Control Zone: {zone} - {command}")
 
-        zones_selected = self.storage.get_container("zone").select(
-            zone
-        )  # type: Sequence[int]
+        zones_selected = self.storage.get_container("zone").select(zone)
 
         # Not Found
         if len(zones_selected) == 0:
@@ -464,11 +457,9 @@ class Paradox:
 
     async def control_partition(self, partition: str, command: str) -> bool:
         command = command.lower()
-        logger.debug("Control Partition: {} - {}".format(partition, command))
+        logger.debug(f"Control Partition: {partition} - {command}")
 
-        partitions_selected = self.storage.get_container("partition").select(
-            partition
-        )  # type: Sequence[int]
+        partitions_selected = self.storage.get_container("partition").select(partition)
 
         # Not Found
         if len(partitions_selected) == 0:
@@ -493,7 +484,7 @@ class Paradox:
 
     async def control_output(self, output, command) -> bool:
         command = command.lower()
-        logger.debug("Control Output: {} - {}".format(output, command))
+        logger.debug(f"Control Output: {output} - {command}")
 
         outputs_selected = self.storage.get_container("pgm").select(output)
 
@@ -545,7 +536,7 @@ class Paradox:
 
     async def control_door(self, door, command) -> bool:
         command = command.lower()
-        logger.debug("Control Door: {} - {}".format(door, command))
+        logger.debug(f"Control Door: {door} - {command}")
 
         doors_selected = self.storage.get_container("door").select(door)
 
@@ -585,7 +576,7 @@ class Paradox:
                     event_map=self.panel.event_map,
                     label_provider=self.get_label,
                 )
-            except AssertionError as e:
+            except AssertionError:
                 logger.debug("Error creating event")
                 return
 
@@ -633,7 +624,7 @@ class Paradox:
 
             ps.sendEvent(evt)
 
-        except:
+        except Exception:
             logger.exception("Handle live event")
 
     def handle_error_message(self, message):
@@ -644,7 +635,7 @@ class Paradox:
             asyncio.get_event_loop().create_task(self.disconnect())
         else:
             message = self.panel.get_error_message(error_enum)
-            logger.error("Got ERROR Message: {}".format(message))
+            logger.error(f"Got ERROR Message: {message}")
             if message == "Invalid PC Password":
                 raise AuthenticationFailed()
             elif "code lockout" in message:
@@ -709,7 +700,13 @@ class Paradox:
             if element_type in ["troubles"]:  # troubles was already parsed
                 continue
             for element_item_key, element_item_status in element_items.items():
-                if isinstance(element_item_status, (dict, list,)):
+                if isinstance(
+                    element_item_status,
+                    (
+                        dict,
+                        list,
+                    ),
+                ):
                     self.storage.update_container_object(
                         element_type, element_item_key, element_item_status
                     )
@@ -746,13 +743,15 @@ class Paradox:
     def _is_time_sync_required(self, now) -> bool:
         assert now.tzinfo is None
         try:
-           drift = (now - self.storage.get_container("system")["date"]["time"]).total_seconds()
+            drift = (
+                now - self.storage.get_container("system")["date"]["time"]
+            ).total_seconds()
 
-           if abs(drift) > cfg.SYNC_TIME_MIN_DRIFT:
-              logger.info(f"Time drifted more than allowed: {drift} seconds")
-              return True
-           else:
-              logger.debug(f"Time drifted within allowed range: {drift} seconds")
+            if abs(drift) > cfg.SYNC_TIME_MIN_DRIFT:
+                logger.info(f"Time drifted more than allowed: {drift} seconds")
+                return True
+            else:
+                logger.debug(f"Time drifted within allowed range: {drift} seconds")
 
         except KeyError:
             pass
@@ -795,7 +794,7 @@ class Paradox:
 
     def _on_event(self, event: Event):
         if cfg.LOGGING_DUMP_EVENTS:
-            logger.debug("LiveEvent: {}".format(event))
+            logger.debug(f"LiveEvent: {event}")
 
         event.call_hook(storage=self.storage, alarm=self)
 
@@ -813,7 +812,7 @@ class Paradox:
                 label_provider=self.get_label,
             )
             if cfg.LOGGING_DUMP_EVENTS:
-                logger.debug("ChangeEvent: {}".format(event))
+                logger.debug(f"ChangeEvent: {event}")
             ps.sendEvent(event)
         except AssertionError:
             logger.debug("Could not create event from change")

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox_alarm_interface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paradox-alarm-interface
-Version: 3.4.0
+Version: 3.4.2.dev0
 Summary: Interface to Paradox Alarm Panels
 Home-page: https://github.com/ParadoxAlarmInterface/pai
 Author: Jevgeni Kiski, João Paulo Barraca
@@ -18,14 +18,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Requires-Python: <3.12,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: construct~=2.9.43
 Requires-Dist: argparse>=1.4.0
 Requires-Dist: python-slugify>=4.0.1
 Requires-Dist: pytz>=2021.3
-Requires-Dist: paho_mqtt>=1.5.0
+Requires-Dist: paho_mqtt<2,>=1.5.0
 Requires-Dist: requests>=2.20.0
 Requires-Dist: pyserial-asyncio>=0.4
 Provides-Extra: yaml
@@ -107,8 +107,8 @@ See [wiki](https://github.com/ParadoxAlarmInterface/pai/wiki/Installation)
 ## Tested Environment
 
 Tested in the following environment:
-* Python 3.6, 3.7, 3.8
-* Mosquitto MQTT Broker >v 1.4.8
+* Python 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
+* Mosquitto MQTT Broker > 1.4.8
 * OrangePi 2G-IOT, NanoPi NEO, and Raspberry Pi 3 through their built in Serial Port (with a level shifter!), or a USB RS232 TTL adapter (CP2102, PL2303, CH340, etc..)
 * Ubuntu Server 16.04.3 LTS
 * Paradox MG5050, SP7000 and EVO panels

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/paradox_alarm_interface.egg-info/requires.txt

@@ -2,7 +2,7 @@ construct~=2.9.43
 argparse>=1.4.0
 python-slugify>=4.0.1
 pytz>=2021.3
-paho_mqtt>=1.5.0
+paho_mqtt<2,>=1.5.0
 requests>=2.20.0
 pyserial-asyncio>=0.4
 

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/requirements.txt

@@ -2,7 +2,7 @@ argparse>=1.4.0
 chump>=1.6.0
 construct~=2.9.43
 flake8
-paho_mqtt>=1.5.0
+paho_mqtt>=1.5.0,<2
 
 pre-commit
 pushbullet.py>=0.11.0

{paradox-alarm-interface-3.4.0 → paradox_alarm_interface-3.4.2.dev0}/setup.cfg

@@ -26,13 +26,13 @@ license = EPL
 [options]
 zip_safe = True
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.8,<3.12
 install_requires = 
 	construct~=2.9.43
 	argparse>=1.4.0
 	python-slugify>=4.0.1
 	pytz>=2021.3
-	paho_mqtt>=1.5.0
+	paho_mqtt>=1.5.0,<2
 	requests>=2.20.0
 	pyserial-asyncio>=0.4