petsafe-api 3.0.1__tar.gz → 3.0.4__tar.gz

{petsafe_api-3.0.1 → petsafe_api-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petsafe-api
-Version: 3.0.1
+Version: 3.0.4
 Summary: Provides ability to connect and control a PetSafe Smart Feed, Scoopfree, and Smart Door devices using the PetSafe API.
 Home-page: https://github.com/ThomasHFWright/petsafe-api
 Author: Jordan Stremming & Dominick Meglio & Thomas Wright

petsafe_api-3.0.4/petsafe/__main__.py

@@ -0,0 +1,46 @@
+import sys
+import argparse
+import asyncio
+
+from petsafe import PetSafeClient
+
+# create parser for arguments
+parser = argparse.ArgumentParser(
+    usage="python -m petsafe email [-t email_code]"
+)
+parser.add_argument("email", help="account email address")
+
+# if no arguments specified, show help
+if len(sys.argv) < 2:
+    parser.print_help()
+    sys.exit(1)
+
+# parse for arguments
+args = parser.parse_args()
+
+async def main() -> None:
+    client = PetSafeClient(email=args.email)
+    await client.request_code()
+    print("Code requested, please check your email.")
+    print("")
+
+    try:
+        code = input("Enter email code: ")
+    except EOFError:
+        print("\nNo code entered (EOF). Exiting.")
+        return
+
+    await client.request_tokens_from_code(code)
+
+    print("")
+    print("IdToken:")
+    print(client.id_token)
+    print("")
+    print("AccessToken:")
+    print(client.access_token)
+    print("")
+    print("RefreshToken:")
+    print(client.refresh_token)
+
+
+asyncio.run(main())

{petsafe_api-3.0.1 → petsafe_api-3.0.4}/petsafe/devices.py

@@ -83,10 +83,13 @@ class DeviceSmartFeed:
 
         """
         messages = await self.get_messages_since()
-        for message in messages:
-            if message["message_type"] == "FEED_DONE":
-                return message
-        return None
+        feed_done = [
+            message for message in messages
+            if message.get("message_type") == "FEED_DONE"
+            and isinstance(message.get("payload"), dict)
+            and isinstance(message["payload"].get("time"), int)
+        ]
+        return max(feed_done, key=lambda message: message["payload"]["time"], default=None)
 
     async def feed(
         self, amount: int = 1, slow_feed: bool = None, update_data: bool = True

{petsafe_api-3.0.1 → petsafe_api-3.0.4}/petsafe_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petsafe-api
-Version: 3.0.1
+Version: 3.0.4
 Summary: Provides ability to connect and control a PetSafe Smart Feed, Scoopfree, and Smart Door devices using the PetSafe API.
 Home-page: https://github.com/ThomasHFWright/petsafe-api
 Author: Jordan Stremming & Dominick Meglio & Thomas Wright

{petsafe_api-3.0.1 → petsafe_api-3.0.4}/petsafe_api.egg-info/SOURCES.txt

@@ -13,4 +13,5 @@ petsafe_api.egg-info/SOURCES.txt
 petsafe_api.egg-info/dependency_links.txt
 petsafe_api.egg-info/requires.txt
 petsafe_api.egg-info/top_level.txt
-tests/test_smartdoor_modes.py
+tests/test_smartdoor_modes.py
+tests/test_smartfeed_last_feeding.py

{petsafe_api-3.0.1 → petsafe_api-3.0.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="petsafe-api",
-    version="3.0.1",
+    version="3.0.4",
     author="Jordan Stremming & Dominick Meglio & Thomas Wright",
     license="MIT",
     author_email="thomas.h.f.wright@gmail.com",

petsafe_api-3.0.4/tests/test_smartfeed_last_feeding.py

@@ -0,0 +1,34 @@
+"""Regression check for unordered SmartFeed messages."""
+
+import asyncio
+from itertools import permutations
+from unittest.mock import AsyncMock
+
+from petsafe.devices import DeviceSmartFeed
+
+
+def test_last_feeding_uses_latest_valid_timestamp():
+    async def check():
+        feeder = DeviceSmartFeed(None, {})
+        oldest = {"message_type": "FEED_DONE", "payload": {"time": 100, "amount": 1}}
+        middle = {"message_type": "FEED_DONE", "payload": {"time": 200, "amount": 2}}
+        newest = {"message_type": "FEED_DONE", "payload": {"time": 300, "amount": 3}}
+        invalid = [
+            {},
+            {"message_type": "FEED_START", "payload": {"time": 400}},
+            {"message_type": "FEED_DONE"},
+            {"message_type": "FEED_DONE", "payload": None},
+            {"message_type": "FEED_DONE", "payload": []},
+            {"message_type": "FEED_DONE", "payload": {}},
+            {"message_type": "FEED_DONE", "payload": {"time": "400"}},
+        ]
+        for order in permutations((oldest, middle, newest)):
+            messages = invalid + list(order)
+            feeder.get_messages_since = AsyncMock(return_value=messages)
+            assert await feeder.get_last_feeding() is newest
+            assert messages == invalid + list(order)
+        for messages, expected in (([], None), (invalid, None), ([oldest], oldest)):
+            feeder.get_messages_since = AsyncMock(return_value=messages)
+            assert await feeder.get_last_feeding() is expected
+
+    asyncio.run(check())

petsafe_api-3.0.1/petsafe/__main__.py

@@ -1,36 +0,0 @@
-import sys
-import argparse
-
-from petsafe import PetSafeClient
-
-# create parser for arguments
-parser = argparse.ArgumentParser(
-    usage="python -m petsafe email [-t email_code]"
-)
-parser.add_argument("email", help="account email address")
-
-# if no arguments specified, show help
-if len(sys.argv) < 2:
-    parser.print_help()
-    sys.exit(1)
-
-# parse for arguments
-args = parser.parse_args()
-
-client = PetSafeClient(email=args.email)
-client.request_code()
-print("Code requested, please check your email.")
-print("")
-
-code = input("Enter email code: ")
-client.request_tokens_from_code(code)
-
-print("")
-print("IdToken:")
-print(client.id_token)
-print("")
-print("AccessToken:")
-print(client.access_token)
-print("")
-print("RefreshToken:")
-print(client.refresh_token)