MouseTools 4.0.1__tar.gz → 4.0.3__tar.gz

{mousetools-4.0.1 → mousetools-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.0.1
+Version: 4.0.3
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -19,7 +19,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx>=0.27.2
 Requires-Dist: pycryptodome>=3.22.0
-Requires-Dist: tzdata>=2024.1
+Requires-Dist: python-dateutil>=2.9.0.post0
+Requires-Dist: tzdata>=2025.2
 Dynamic: license-file
 
 # MouseTools

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools/channels/__init__.py

@@ -35,6 +35,7 @@ class CouchbaseChannel(CouchbaseMixin):
         """Pulls initial data if none exists or if it is older than the refresh interval"""
         if self._cb_data is None or datetime.now(tz=self._tz.value) - self.last_update > self._refresh_interval:
             self._cb_data = self.get_channel_changes(self.channel_id)
+            self.last_update = datetime.now(tz=self._tz.value)
 
     def get_children_channel_ids(self) -> list[str]:
         """Returns a list of child channel ids for the channel."""
@@ -43,4 +44,9 @@ class CouchbaseChannel(CouchbaseMixin):
         return [i["id"] for i in self._cb_data["results"]]
 
     def __repr__(self):
-        return f"{self.__class__.__name__}({self.channel_id})"
+        return f"{self.__class__.__name__}(channel_id='{self.channel_id}')"
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, CouchbaseChannel):
+            return self.channel_id == other.channel_id
+        return False

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools/channels/enums.py

@@ -13,6 +13,7 @@ class CouchbaseChannels(str, Enum):
     CALENDAR = "calendar"
     FORECASTED_WAIT_TIME = "forecastedwaittimes"
     TODAY = "today"
+    CHARACTERS = "characters"
 
 
 def get_complete_channel_id(
@@ -41,6 +42,8 @@ class WDWCouchbaseChannels(str, Enum):
     """Walt Disney World Forecasted Wait Time Channel"""
     TODAY = get_complete_channel_id(DestinationShort.WALT_DISNEY_WORLD, CouchbaseChannels.TODAY, "1_0", False)
     """Walt Disney World Today Channel"""
+    CHARACTERS = get_complete_channel_id(DestinationShort.WALT_DISNEY_WORLD, CouchbaseChannels.CHARACTERS, "1_0", False)
+    """Walt Disney World Characters Channel"""
 
 
 class DLRCouchbaseChannels(str, Enum):
@@ -58,6 +61,8 @@ class DLRCouchbaseChannels(str, Enum):
     """Disneyland Resort Forecasted Wait Time Channel"""
     TODAY = get_complete_channel_id(DestinationShort.DISNEYLAND_RESORT, CouchbaseChannels.TODAY, "1_0", False)
     """Disneyland Resort Today Channel"""
+    CHARACTERS = get_complete_channel_id(DestinationShort.DISNEYLAND_RESORT, CouchbaseChannels.CHARACTERS, "1_0", False)
+    """Disneyland Resort Characters Channel"""
 
 
 class DestinationTimezones(Enum):

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools/channels/facilities/__init__.py

@@ -5,6 +5,8 @@ from datetime import datetime, time, timedelta
 from enum import Enum
 from zoneinfo import ZoneInfo
 
+from dateutil.parser import isoparse
+
 from mousetools.api.menu import Menus
 from mousetools.channels import CouchbaseChannel
 from mousetools.channels.enums import (
@@ -62,6 +64,7 @@ class FacilityChildChannel(CouchbaseMixin):
         self._refresh_interval: timedelta = timedelta(minutes=10)
 
         self._cb_data: typing.Optional[dict] = None
+        self._cb_data_pull_time: typing.Optional[datetime] = datetime.now(tz=self._tz.value)
         if not lazy_load:
             self.refresh()
 
@@ -69,6 +72,7 @@ class FacilityChildChannel(CouchbaseMixin):
         """Pulls initial data if none exists or if it is older than the refresh interval"""
         if self._cb_data is None or datetime.now(tz=self._tz.value) - self.last_update > self._refresh_interval:
             self._cb_data = self.get_channel_data(self.channel_id)
+            self._cb_data_pull_time = datetime.now(tz=self._tz.value)
 
     @property
     def name(self) -> typing.Optional[str]:
@@ -418,12 +422,12 @@ class FacilityChildChannel(CouchbaseMixin):
                 if "wdw" in self.channel_id
                 else DestinationTimezones.DISNEYLAND_RESORT
             )
-            dt = datetime.fromisoformat(self._cb_data["lastUpdate"])
+            dt = isoparse(self._cb_data["lastUpdate"])
             dt = dt.replace(tzinfo=tz.value)
             return dt
         except KeyError:
             logger.debug("No last updated found for %s", self.channel_id)
-            return None
+            return self._cb_data_pull_time
 
     @property
     def sponsor_name(self) -> typing.Optional[str]:
@@ -440,6 +444,32 @@ class FacilityChildChannel(CouchbaseMixin):
             logger.debug("No sponsor name found for %s", self.channel_id)
             return None
 
+    @property
+    def meal_periods(self) -> typing.Optional[list[str]]:
+        """
+        The meal periods offered by the restaurant.
+
+        Returns:
+            (typing.Optional[list[str]]): The meal periods offered by the restaurant.
+        """
+        if self._cb_data is None:
+            self._cb_data = self.get_channel_data(self.channel_id)
+        try:
+            return self._cb_data["mealPeriods"]
+        except KeyError:
+            logger.debug("No meal periods found for %s", self.channel_id)
+            return None
+
+    @property
+    def menu(self) -> Menus:
+        """
+        The menu of the restaurant.
+
+        Returns:
+            (typing.Optional[Menus]): The menu of the restaurant.
+        """
+        return Menus(self.channel_id)
+
     def __str__(self) -> str:
         return f"{self.entity_type}: {self.name} ({self.channel_id})"
 
@@ -482,39 +512,7 @@ ThemeParkFacilityChild = FacilityChildChannel.get_subclass("ThemeParkFacilityChi
 TourFacilityChild = FacilityChildChannel.get_subclass("TourFacilityChild")
 TransportationFacilityChild = FacilityChildChannel.get_subclass("TransportationFacilityChild")
 WaterParkFacilityChild = FacilityChildChannel.get_subclass("WaterParkFacilityChild")
-
-
-class RestaurantFacilityChild(FacilityChildChannel):
-    """Class for RestaurantFacilityChild Entities."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    @property
-    def meal_periods(self) -> typing.Optional[list[str]]:
-        """
-        The meal periods offered by the restaurant.
-
-        Returns:
-            (typing.Optional[list[str]]): The meal periods offered by the restaurant.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-        try:
-            return self._cb_data["mealPeriods"]
-        except KeyError:
-            logger.debug("No meal periods found for %s", self.channel_id)
-            return None
-
-    @property
-    def menu(self) -> Menus:
-        """
-        The menu of the restaurant.
-
-        Returns:
-            (typing.Optional[Menus]): The menu of the restaurant.
-        """
-        return Menus(self.channel_id)
+RestaurantFacilityChild = FacilityChildChannel.get_subclass("RestaurantFacilityChild")
 
 
 class FacilityChannel(CouchbaseChannel):

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools/channels/facilitystatus/__init__.py

@@ -3,6 +3,8 @@ import typing
 from collections.abc import Generator
 from datetime import datetime, timedelta
 
+from dateutil.parser import isoparse
+
 from mousetools.channels import CouchbaseChannel
 from mousetools.channels.enums import CouchbaseChannels, DestinationShort, DestinationTimezones
 from mousetools.mixins.couchbase import CouchbaseMixin
@@ -28,16 +30,17 @@ class FacilityStatusChildChannel(CouchbaseMixin):
             else DestinationTimezones.DISNEYLAND_RESORT
         )
         self._refresh_interval: timedelta = timedelta(minutes=10)
+        self._cb_data: typing.Optional[dict] = None
+        self._cb_data_pull_time: typing.Optional[datetime] = datetime.now(tz=self._tz.value)
 
-        if lazy_load:
-            self._cb_data: typing.Optional[dict] = None
-        else:
-            self._cb_data = self.get_channel_data(self.channel_id)
+        if not lazy_load:
+            self.refresh()
 
     def refresh(self) -> None:
         """Pulls initial data if none exists or if it is older than the refresh interval"""
         if self._cb_data is None or datetime.now(tz=self._tz.value) - self.last_update > self._refresh_interval:
             self._cb_data = self.get_channel_data(self.channel_id)
+            self._cb_data_pull_time = datetime.now(tz=self._tz.value)
 
     def get_status(self) -> typing.Optional[str]:
         """Get the operating status of the facility
@@ -78,12 +81,12 @@ class FacilityStatusChildChannel(CouchbaseMixin):
             self._cb_data = self.get_channel_data(self.channel_id)
 
         try:
-            dt = datetime.fromisoformat(self._cb_data["lastUpdate"])
+            dt = isoparse(self._cb_data["lastUpdate"])
             dt = dt.replace(tzinfo=self._tz.value)
             return dt
         except KeyError:
             logger.debug("No last updated found for %s", self.channel_id)
-            return None
+            return self._cb_data_pull_time
 
     @property
     def fast_pass_available(self) -> typing.Optional[bool]:
@@ -99,7 +102,7 @@ class FacilityStatusChildChannel(CouchbaseMixin):
         self.refresh()
 
         try:
-            dt = datetime.fromisoformat(self._cb_data["fastPassEndTime"])
+            dt = isoparse(self._cb_data["fastPassEndTime"])
             dt = dt.replace(tzinfo=self._tz.value)
             return dt
         except (KeyError, ValueError):
@@ -110,7 +113,7 @@ class FacilityStatusChildChannel(CouchbaseMixin):
         self.refresh()
 
         try:
-            dt = datetime.fromisoformat(self._cb_data["fastPassStartTime"])
+            dt = isoparse(self._cb_data["fastPassStartTime"])
             dt = dt.replace(tzinfo=self._tz.value)
             return dt
         except (KeyError, ValueError):

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools/mixins/disney.py

@@ -1,3 +1,4 @@
+import json
 import logging
 
 import httpx
@@ -29,7 +30,7 @@ class DisneyAPIMixin:
         try:
             response.raise_for_status()
             data = response.json()
-        except httpx.HTTPError as err:
+        except (httpx.HTTPError, json.decoder.JSONDecodeError) as err:
             logger.warning("Request failed. Error: %s", err)
             return None
 

{mousetools-4.0.1 → mousetools-4.0.3}/mousetools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.0.1
+Version: 4.0.3
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -19,7 +19,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx>=0.27.2
 Requires-Dist: pycryptodome>=3.22.0
-Requires-Dist: tzdata>=2024.1
+Requires-Dist: python-dateutil>=2.9.0.post0
+Requires-Dist: tzdata>=2025.2
 Dynamic: license-file
 
 # MouseTools

mousetools-4.0.3/mousetools.egg-info/requires.txt

@@ -0,0 +1,4 @@
+httpx>=0.27.2
+pycryptodome>=3.22.0
+python-dateutil>=2.9.0.post0
+tzdata>=2025.2

{mousetools-4.0.1 → mousetools-4.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mousetools"
-version = "4.0.1"
+version = "4.0.3"
 authors = [{name = "Scott Caratozzolo"}]
 description = "An unofficial Python wrapper for Disney's API"
 readme = "README.md"
@@ -10,7 +10,8 @@ requires-python = ">=3.9, <4.0"
 dependencies = [
     "httpx>=0.27.2",
     "pycryptodome>=3.22.0",
-    "tzdata>=2024.1",
+    "python-dateutil>=2.9.0.post0",
+    "tzdata>=2025.2",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -40,6 +41,7 @@ dev-dependencies = [
     "commitizen>=4.7.0",
     "go-task-bin>=3.43.3",
     "icecream>=2.1.4",
+    "pytest-mock>=3.14.0",
 ]
 
 [build-system]

{mousetools-4.0.1 → mousetools-4.0.3}/tests/test_mixins.py

@@ -13,6 +13,15 @@ def test_couchbase_mixin():
     assert channel_changes
     assert len(channel_changes["results"]) > 0
 
+    channel_data = cb.get_channel_data("wdw.notreal.1_0")
+    assert channel_data.get("error", "") == "not_found"
+
+    cb._couchbase_url = "http://notreal.com"
+    channel_data = cb.get_channel_data("wdw.facilities.1_0.en_us.attraction.80010177;entityType=Attraction")
+    channel_changes = cb.get_channel_changes("wdw.facilities.1_0.en_us", since=3900000)
+    assert channel_data is None
+    assert channel_changes is None
+
 
 def test_disney_mixin():
     disney = DisneyAPIMixin()
@@ -22,3 +31,7 @@ def test_disney_mixin():
 
     assert data
     assert "menus" in data
+
+    data = disney.get_disney_data("http://notreal.com")
+
+    assert data is None

mousetools-4.0.1/mousetools.egg-info/requires.txt

@@ -1,3 +0,0 @@
-httpx>=0.27.2
-pycryptodome>=3.22.0
-tzdata>=2024.1