Merge pull request #33 from rlippmann/1.1.2

1.1.2

Author: rlippmann

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.2 (2023-10-06)
+
+* change default poll interval to 2 seconds
+* update pyproject.toml
+* change source location to github/rlippmann from github/rsnodgrass
+* fix gateway attributes not updating
+* remove dependency on python_dateutils
+* add timestamp to example-client logging
+
 ## 1.1.1 (2023-10-02)
 
 * pylint fixes

example-client.py

@@ -60,7 +60,7 @@ def setup_logger(level: int):
     handler = logging.StreamHandler(sys.stdout)
     handler.setLevel(level)
 
-    formatter = logging.Formatter("%(name)s - %(levelname)s - %(message)s")
+    formatter = logging.Formatter("%(asctime)s %(name)s - %(levelname)s - %(message)s")
     handler.setFormatter(formatter)
     logger.addHandler(handler)
 

pyadtpulse/__init__.py

@@ -414,7 +414,7 @@ async def _keepalive_task(self) -> None:
                 response = await self._pulse_connection.async_query(
                     ADT_TIMEOUT_URI, "POST"
                 )
-                if handle_response(
+                if not handle_response(
                     response, logging.INFO, "Failed resetting ADT Pulse cloud timeout"
                 ):
                     retry_after = self._check_retry_after(response, "Keepalive task")

pyadtpulse/const.py

@@ -1,5 +1,5 @@
 """Constants for pyadtpulse."""
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 DEFAULT_API_HOST = "https://portal.adtpulse.com"
 API_HOST_CA = "https://portal-ca.adtpulse.com"  # Canada
 
@@ -25,7 +25,7 @@
 
 # ADT sets their keepalive to 1 second, so poll a little more often
 # than that
-ADT_DEFAULT_POLL_INTERVAL = 0.75
+ADT_DEFAULT_POLL_INTERVAL = 2.0
 ADT_GATEWAY_OFFLINE_POLL_INTERVAL = 90.0
 ADT_DEFAULT_HTTP_HEADERS = {
     "User-Agent": (

pyadtpulse/util.py

@@ -11,7 +11,6 @@
 
 from aiohttp import ClientResponse
 from bs4 import BeautifulSoup
-from dateutil import relativedelta
 
 LOG = logging.getLogger(__name__)
 
@@ -234,14 +233,13 @@ def parse_pulse_datetime(datestring: str) -> datetime:
     t = datetime.today()
     if split_string[0].lstrip() == "Today":
         last_update = t
+    elif split_string[0].lstrip() == "Yesterday":
+        last_update = t - timedelta(days=1)
     else:
-        if split_string[0].lstrip() == "Yesterday":
-            last_update = t - timedelta(days=1)
-        else:
-            tempdate = ("/".join((split_string[0], str(t.year)))).lstrip()
-            last_update = datetime.strptime(tempdate, "%m/%d/%Y")
-            if last_update > t:
-                last_update = last_update - relativedelta.relativedelta(years=1)
+        tempdate = f"{split_string[0]}/{t.year}"
+        last_update = datetime.strptime(tempdate, "%m/%d/%Y")
+    if last_update > t:
+        last_update = last_update.replace(year=t.year)
     update_time = datetime.time(
         datetime.strptime(split_string[1] + split_string[2], "%I:%M%p")
     )

pyproject.toml

@@ -1,3 +1,31 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pyadtpulse"
+dynamic = ["version"]
+description="Python interface for ADT Pulse security systems"
+readme = "README.md"
+authors = [{name = "Ryan Snodgrass"}]
+maintainers = [{name = "Robert Lippmann"}]
+license = {file = "LICENSE.md"}
+dependencies = ["aiohttp>=3.8.1", "uvloop>=0.17.0", "beautifulsoup4>=4.11.1"]
+keywords = ["security system", "adt", "home automation", "security alarm"]
+classifiers = [
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+    ]
+
+[project.urls]
+"Changelog" = "https://github.com/rlippmann/pyadtpulse/blob/master/CHANGELOG.md"
+"Source" = "https://github.com/rlippmann/pyadtpulse"
+"Issues" = "https://github.com/rlippmann/pyadtpulse/issues"
+
+[tool.setuptools.dynamic]
+version = {attr = "pyadtpulse.const.__version__"}
+
 [tool.isort]
 profile = "black"
 force_to_top = [ "logging" ]

requirements.txt

@@ -1,4 +1,3 @@
 beautifulsoup4>=4.11.1
 aiohttp>=3.8.1
-python_dateutil>=2.8.2
 uvloop>=0.17.0

setup.py

@@ -1,19 +1,17 @@
 #!/usr/bin/env python
 
-import os
 import sys
+from os import path, system
 from pathlib import Path
 
 import setuptools
 
 from pyadtpulse.const import __version__
 
 if sys.argv[-1] == "publish":
-    os.system("python setup.py sdist upload")
+    system("python setup.py sdist upload")
     sys.exit()
 
-# read the contents of your README file
-from os import path
 
 this_directory = path.abspath(path.dirname(__file__))
 long_description = Path(
@@ -27,11 +25,11 @@
     description="Python interface for ADT Pulse security systems",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/rsnodgrass/pyadtpulse",
+    url="https://github.com/rlippmann/pyadtpulse",
     author="",
     author_email="",
     license="Apache Software License",
-    install_requires=["aiohttp>=3.8.1", "uvloop>=0.17.0"],
+    install_requires=["aiohttp>=3.8.1", "uvloop>=0.17.0", "beautifulsoup4>=4.11.1"],
     keywords=["security system", "adt", "home automation", "security alarm"],
     zip_safe=True,
     classifiers=[