MouseTools 4.2.0__tar.gz → 4.3.1__tar.gz

{mousetools-4.2.0 → mousetools-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.2.0
+Version: 4.3.1
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/api/menu.py

@@ -1,3 +1,4 @@
+import logging
 import typing
 from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
@@ -8,7 +9,7 @@ from mousetools.auth import auth_obj
 from mousetools.decorators import disney_property, json_property
 from mousetools.mixins.disney import DisneyAPIMixin
 
-# menus -> menu -> menugroups -> menuitems
+logger = logging.getLogger(__name__)
 
 
 class MenuItem:
@@ -351,7 +352,17 @@ class Menus(DisneyAPIMixin):
 
     def refresh(self) -> None:
         """Pulls initial data if none exists or if it is older than the refresh interval"""
-        if self._disney_data is None or datetime.now(tz=self._tz) - self.last_refresh > self._refresh_interval:
+        no_data_check = self._disney_data is None
+        time_since_pull = datetime.now(tz=self._tz) - self._disney_data_pull_time
+        old_data_check = time_since_pull > self._refresh_interval
+        logger.debug(
+            "No data check: %s, Time since last update: %s, Old data check: %s",
+            no_data_check,
+            time_since_pull,
+            old_data_check,
+        )
+        if no_data_check or old_data_check:
+            logger.info("Refreshing menu data %s", self.entity_id)
             self._disney_data = self.get_disney_data(self._menu_service_url)
             self._disney_data_pull_time = datetime.now(tz=self._tz)
 
@@ -396,19 +407,14 @@ class Menus(DisneyAPIMixin):
         """
         return self._disney_data["ancestorLocationLandArea"]
 
-    @property
-    def last_refresh(self) -> datetime:
+    @disney_property()
+    def last_refresh(self) -> typing.Optional[datetime]:
         """
         The last time the menus were refreshed.
 
         Returns:
-            (datetime): The last time the menus were refreshed.
+            (typing.Optional[datetime]): The last time the menus were refreshed.
         """
-        if self._disney_data is None:
-            self._disney_data = self.get_disney_data(self.entity_id)
-        try:
-            refresh_time = isoparse(self._disney_data["lastRefresh"])
-            refresh_time = refresh_time.replace(tzinfo=self._tz)
-            return refresh_time
-        except (KeyError, TypeError, ValueError):
-            return self._disney_data_pull_time
+        refresh_time = isoparse(self._disney_data["lastRefresh"])
+        refresh_time = refresh_time.replace(tzinfo=self._tz)
+        return refresh_time

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/auth.py

@@ -1,5 +1,6 @@
 import base64
 import json
+import logging
 import typing
 from datetime import datetime, timedelta
 from importlib.resources import as_file, files
@@ -7,6 +8,8 @@ from importlib.resources import as_file, files
 import httpx
 from Crypto.Cipher import AES
 
+logger = logging.getLogger(__name__)
+
 
 class Authentication:
     def __init__(self):
@@ -38,6 +41,7 @@ class Authentication:
             "client_id": self._environments["authzClientId"],
         }
 
+        logger.debug("Sending request for authentication token")
         response = httpx.post(
             f"{self._environments['authzServiceUrl']}/token",
             headers=headers,
@@ -57,6 +61,7 @@ class Authentication:
         """
 
         if self.time_of_expire is None or (datetime.now() > self.time_of_expire):
+            logger.info("Requesting new authentication token")
             access_token, expires_in = self.authenticate()
             self.time_of_expire = datetime.now() + timedelta(seconds=(expires_in - 10))
             self.access_token = access_token

mousetools-4.3.1/mousetools/channels/__init__.py

@@ -0,0 +1,125 @@
+import logging
+import typing
+from datetime import datetime, timedelta
+from enum import Enum
+
+from dateutil.parser import isoparse
+
+from mousetools.channels.enums import DestinationTimezones, DLRCouchbaseChannels, WDWCouchbaseChannels
+from mousetools.decorators import disney_property
+from mousetools.enums import DestinationShort, EntityType
+from mousetools.mixins.couchbase import CouchbaseMixin
+
+logger = logging.getLogger(__name__)
+
+
+class CouchbaseChildChannel(CouchbaseMixin):
+    def __init__(self, channel_id: str, lazy_load: bool = True):
+        if isinstance(channel_id, Enum):
+            channel_id = channel_id.value
+
+        self.channel_id: str = channel_id
+        self.entity_id: str = channel_id.rsplit(".", 1)[-1]
+
+        self._destination_short: DestinationShort = self.channel_id.split(".")[0]
+        self._tz: DestinationTimezones = (
+            DestinationTimezones.WALT_DISNEY_WORLD
+            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
+            else DestinationTimezones.DISNEYLAND_RESORT
+        )
+        self._refresh_interval: timedelta = timedelta(hours=12)
+        self._cb_data: typing.Optional[dict] = None
+        self._cb_data_pull_time: datetime = datetime.now(tz=self._tz.value)
+        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"""
+
+        no_data_check = self._cb_data is None
+        time_since_pull = datetime.now(tz=self._tz.value) - self._cb_data_pull_time
+        old_data_check = time_since_pull > self._refresh_interval
+        logger.debug(
+            "No data check: %s, Time since pull: %s, Old data check: %s", no_data_check, time_since_pull, old_data_check
+        )
+        if no_data_check or old_data_check:
+            logger.info("Refreshing %s", self.channel_id)
+            self._cb_data = self.get_channel_data(self.channel_id)
+            self._cb_data_pull_time = datetime.now(tz=self._tz.value)
+
+    @disney_property()
+    def last_update(self) -> typing.Optional[datetime]:
+        """
+        The last time disney updated the data.
+
+        Returns:
+            (typing.Optional[datetime]): The last time the entity's data was updated, or None if no such data exists.
+        """
+        dt = isoparse(self._cb_data["lastUpdate"])
+        dt = dt.replace(tzinfo=self._tz.value)
+        return dt
+
+
+class CouchbaseChannel(CouchbaseMixin):
+    def __init__(self, channel_id: typing.Union[WDWCouchbaseChannels, DLRCouchbaseChannels], lazy_load: bool = True):
+        """
+        Args:
+            channel_id (typing.Union[WDWCouchbaseChannels, DLRCouchbaseChannels]): Channel ID from the enum
+            lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
+        """
+        if isinstance(channel_id, Enum):
+            channel_id = channel_id.value
+        self.channel_id = channel_id
+
+        self._destination_short: DestinationShort = channel_id.split(".")[0]
+        self._tz: DestinationTimezones = (
+            DestinationTimezones.WALT_DISNEY_WORLD
+            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
+            else DestinationTimezones.DISNEYLAND_RESORT
+        )
+
+        self._cb_data = None
+        self._refresh_interval = timedelta(minutes=10)
+        self._cb_data_pull_time = datetime.now(tz=self._tz.value)
+
+        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"""
+        no_data_check = self._cb_data is None
+        time_since_pull = datetime.now(tz=self._tz.value) - self._cb_data_pull_time
+        old_data_check = time_since_pull > self._refresh_interval
+        logger.debug(
+            "No data check: %s, Time since last update: %s, Old data check: %s",
+            no_data_check,
+            time_since_pull,
+            old_data_check,
+        )
+        if no_data_check or old_data_check:
+            logger.info("Refreshing %s", self.channel_id)
+            self._cb_data = self.get_channel_changes(self.channel_id)
+            self._cb_data_pull_time = datetime.now(tz=self._tz.value)
+
+    def get_children_channel_ids(self) -> list[str]:
+        """Returns a list of child channel ids for the channel."""
+        self.refresh()
+
+        return [i["id"] for i in self._cb_data["results"]]
+
+    def _get_children_objects_helper(self, class_obj, entity_type: EntityType) -> list:
+        self.refresh()
+        channels = []
+        check_for = f"entitytype={entity_type.value}".lower()
+        for i in self._cb_data["results"]:
+            if check_for == i["id"].rsplit(";")[-1].lower():
+                channels.append(class_obj(i["id"]))
+        return channels
+
+    def __repr__(self):
+        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.2.0 → mousetools-4.3.1}/mousetools/channels/calendar/__init__.py

@@ -1,21 +1,17 @@
 import logging
 import typing
-from datetime import datetime, timedelta
-from enum import Enum
 from zoneinfo import ZoneInfo
 
 from dateutil.parser import isoparse
 
-from mousetools.channels import CouchbaseChannel
-from mousetools.channels.enums import CouchbaseChannels, DestinationTimezones
+from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
+from mousetools.channels.enums import CouchbaseChannels
 from mousetools.decorators import disney_property
-from mousetools.enums import DestinationShort
-from mousetools.mixins.couchbase import CouchbaseMixin
 
 logger = logging.getLogger(__name__)
 
 
-class CalendarChildChannel(CouchbaseMixin):
+class CalendarChildChannel(CouchbaseChildChannel):
     def __init__(
         self,
         channel_id: str,
@@ -26,34 +22,11 @@ class CalendarChildChannel(CouchbaseMixin):
             channel_id (str): Calendar Channel ID
             lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
         """
-        if isinstance(channel_id, Enum):
-            channel_id = channel_id.value
-
-        self.channel_id: str = channel_id
-        self.entity_id: str = channel_id.rsplit(".", 1)[-1]
-
-        self._destination_short: DestinationShort = self.channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-        self._refresh_interval: timedelta = timedelta(minutes=30)
-
-        self._cb_data: typing.Optional[dict] = None
-        self._cb_data_pull_time: datetime = datetime.now(tz=self._tz.value)
-        if not lazy_load:
-            self.refresh()
+        super().__init__(channel_id, lazy_load=lazy_load)
 
     def __repr__(self):
         return f"{self.__class__.__name__}(channel_id='{self.channel_id}')"
 
-    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)
-
     @disney_property()
     def calendar_id(self) -> typing.Optional[str]:
         """The ID of the calendar
@@ -63,24 +36,6 @@ class CalendarChildChannel(CouchbaseMixin):
         """
         return self._cb_data["id"]
 
-    @property
-    def last_update(self) -> datetime:
-        """The last time the data was updated.
-
-        Returns:
-            (datetime): The last time the entity's data was updated, or None if no such data exists.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-
-        try:
-            dt = isoparse(self._cb_data["lastUpdate"])
-            dt = dt.replace(tzinfo=self._tz.value)
-            return dt
-        except (KeyError, ValueError, TypeError):
-            logger.debug("No last updated found for %s", self.channel_id)
-            return self._cb_data_pull_time
-
     @disney_property()
     def all_closed(self) -> typing.Optional[list[dict]]:
         """The list of closed facilities.

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/channels/characters/__init__.py

@@ -1,20 +1,16 @@
 import logging
-from datetime import datetime, timedelta
-from enum import Enum
 from typing import Optional
 
 from dateutil.parser import isoparse
 
-from mousetools.channels import CouchbaseChannel
-from mousetools.channels.enums import CouchbaseChannels, DestinationTimezones
+from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
+from mousetools.channels.enums import CouchbaseChannels
 from mousetools.decorators import disney_property
-from mousetools.enums import DestinationShort
-from mousetools.mixins.couchbase import CouchbaseMixin
 
 logger = logging.getLogger(__name__)
 
 
-class CharactersChildChannel(CouchbaseMixin):
+class CharactersChildChannel(CouchbaseChildChannel):
     def __init__(
         self,
         channel_id: str,
@@ -25,52 +21,11 @@ class CharactersChildChannel(CouchbaseMixin):
             channel_id (str): Forecasted Wait Times Channel ID
             lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
         """
-        if isinstance(channel_id, Enum):
-            channel_id = channel_id.value
-
-        self.channel_id: str = channel_id
-        self.entity_id: str = channel_id.rsplit(".", 1)[-1]
-
-        self._destination_short: DestinationShort = self.channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-        self._refresh_interval: timedelta = timedelta(minutes=30)
-
-        self._cb_data: Optional[dict] = None
-        self._cb_data_pull_time: Optional[datetime] = datetime.now(tz=self._tz.value)
-        if not lazy_load:
-            self.refresh()
+        super().__init__(channel_id, lazy_load=lazy_load)
 
     def __repr__(self):
         return f"{self.__class__.__name__}(channel_id='{self.channel_id}')"
 
-    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)
-
-    @property
-    def last_update(self) -> datetime:
-        """The last time the data was updated.
-
-        Returns:
-            (datetime): The last time the entity's data was updated, or None if no such data exists.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-
-        try:
-            dt = isoparse(self._cb_data["lastUpdate"])
-            dt = dt.replace(tzinfo=self._tz.value)
-            return dt
-        except (KeyError, TypeError, ValueError):
-            logger.debug("No last updated found for %s", self.channel_id)
-            return self._cb_data_pull_time
-
     @disney_property()
     def name(self) -> Optional[str]:
         """The name of the entity.

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/channels/facilities/__init__.py

@@ -2,18 +2,15 @@ import logging
 import os
 import typing
 from datetime import datetime, time, timedelta
-from enum import Enum
 from zoneinfo import ZoneInfo
 
 import httpx
-from dateutil.parser import isoparse
 
 from mousetools.api.menu import Menus
-from mousetools.channels import CouchbaseChannel
+from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
 from mousetools.channels.calendar import CalendarChildChannel
 from mousetools.channels.enums import (
     CouchbaseChannels,
-    DestinationTimezones,
     DLRCouchbaseChannels,
     WDWCouchbaseChannels,
 )
@@ -21,12 +18,11 @@ from mousetools.channels.facilitystatus import FacilityStatusChildChannel
 from mousetools.channels.forecastedwaittimes import ForecastedWaitTimesChildChannel
 from mousetools.decorators import disney_property
 from mousetools.enums import DestinationShort, EntityType
-from mousetools.mixins.couchbase import CouchbaseMixin
 
 logger = logging.getLogger(__name__)
 
 
-class FacilityChildChannel(CouchbaseMixin):
+class FacilityChildChannel(CouchbaseChildChannel):
     """Base class for all Facility Child Channels. Subclasses like Attraction, Restaurant, Entertainment, etc. extend this class.
 
     Example:
@@ -51,35 +47,12 @@ class FacilityChildChannel(CouchbaseMixin):
             channel_id (str): Facility Channel ID
             lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
         """
-        if isinstance(channel_id, Enum):
-            channel_id = channel_id.value
+        super().__init__(channel_id, lazy_load=lazy_load)
 
-        self.channel_id: str = channel_id
-        self.entity_id: str = channel_id.rsplit(".", 1)[-1]
-
-        self._destination_short: DestinationShort = self.channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-        self._refresh_interval: timedelta = timedelta(
-            hours=12
-        )  # properties are rarely updated, no need to spam the API
-
-        self._cb_data: typing.Optional[dict] = None
-        self._cb_data_pull_time: datetime = datetime.now(tz=self._tz.value)
-        if not lazy_load:
-            self.refresh()
+        self._refresh_interval = timedelta(weeks=1)  # properties are rarely updated
 
         self._today_calendar: typing.Optional[CalendarChildChannel] = None
 
-    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 pull_today_calendar(self) -> None:
         """Pulls today's calendar.
 
@@ -392,30 +365,6 @@ class FacilityChildChannel(CouchbaseMixin):
 
         return FacilityStatusChildChannel(facility_status_channel_id)
 
-    @property
-    def last_update(self) -> datetime:
-        """
-        The last time the data was updated.
-
-        Returns:
-            (datetime): The last time the entity's data was updated, or None if no such data exists.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-
-        try:
-            tz = (
-                DestinationTimezones.WALT_DISNEY_WORLD
-                if "wdw" in self.channel_id
-                else DestinationTimezones.DISNEYLAND_RESORT
-            )
-            dt = isoparse(self._cb_data["lastUpdate"])
-            dt = dt.replace(tzinfo=tz.value)
-            return dt
-        except (KeyError, TypeError, ValueError):
-            logger.debug("No last updated found for %s", self.channel_id)
-            return self._cb_data_pull_time
-
     @disney_property()
     def sponsor_name(self) -> typing.Optional[str]:
         """The sponsor name of the entity.

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/channels/facilitystatus/__init__.py

@@ -4,42 +4,24 @@ from datetime import datetime, timedelta
 
 from dateutil.parser import isoparse
 
-from mousetools.channels import CouchbaseChannel
-from mousetools.channels.enums import CouchbaseChannels, DestinationTimezones
+from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
+from mousetools.channels.enums import CouchbaseChannels
 from mousetools.decorators import disney_property
-from mousetools.enums import DestinationShort, EntityType
-from mousetools.mixins.couchbase import CouchbaseMixin
+from mousetools.enums import EntityType
 
 logger = logging.getLogger(__name__)
 
 
-class FacilityStatusChildChannel(CouchbaseMixin):
+class FacilityStatusChildChannel(CouchbaseChildChannel):
     def __init__(self, channel_id: str, lazy_load: bool = True):
         """
         Args:
             channel_id (typing.Union[WDWCouchbaseChannels, DLRCouchbaseChannels]): Channel ID from the enum
             lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
         """
-        self.channel_id = channel_id
-
-        self._destination_short: DestinationShort = channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-        self._refresh_interval: timedelta = timedelta(minutes=10)
-        self._cb_data: typing.Optional[dict] = None
-        self._cb_data_pull_time: datetime = datetime.now(tz=self._tz.value)
-
-        if not lazy_load:
-            self.refresh()
+        super().__init__(channel_id, lazy_load=lazy_load)
 
-    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)
+        self._refresh_interval: timedelta = timedelta(minutes=10)
 
     def get_status(self) -> typing.Optional[str]:
         """Get the operating status of the facility
@@ -69,24 +51,6 @@ class FacilityStatusChildChannel(CouchbaseMixin):
             logger.debug("No wait time found for %s", self.channel_id)
             return None
 
-    @property
-    def last_update(self) -> datetime:
-        """The last time the data was updated.
-
-        Returns:
-            (datetime): The last time the entity's data was updated, or None if no such data exists.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-
-        try:
-            dt = isoparse(self._cb_data["lastUpdate"])
-            dt = dt.replace(tzinfo=self._tz.value)
-            return dt
-        except (KeyError, TypeError, ValueError):
-            logger.debug("No last updated found for %s", self.channel_id)
-            return self._cb_data_pull_time
-
     @disney_property()
     def fast_pass_available(self) -> typing.Optional[bool]:
         return self._cb_data["fastPassAvailable"]
@@ -157,6 +121,25 @@ class FacilityStatusChannel(CouchbaseChannel):
                 channels.append(FacilityStatusChildChannel(i["id"]))
         return channels
 
+    def get_all_statuses(self) -> dict[str, dict[str, typing.Any]]:
+        """Get all statuses for the channel
+
+        Returns:
+            (dict[str, dict[str, typing.Any]]): A dictionary of all statuses for the channel
+        """
+        logger.info("Getting all children statuses for %s", self.channel_id)
+        children = self.get_children_channels()
+        logger.debug("Got %d children for %s", len(children), self.channel_id)
+
+        statuses = {}
+        for child in children:
+            tmp = {}
+            tmp["status"] = child.get_status()
+            tmp["wait_time"] = child.get_wait_time()
+            statuses[child.entity_id] = tmp
+
+        return statuses
+
     def get_children_attractions(self) -> list[AttractionFacilityStatusChild]:  # type: ignore
         """Get AttractionFacilityStatusChild Children of a Facility
 

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/channels/forecastedwaittimes/__init__.py

@@ -1,19 +1,14 @@
 import logging
-import typing
-from datetime import datetime, timedelta
-from enum import Enum
 
 from dateutil.parser import isoparse
 
-from mousetools.channels import CouchbaseChannel
-from mousetools.channels.enums import CouchbaseChannels, DestinationTimezones
-from mousetools.enums import DestinationShort
-from mousetools.mixins.couchbase import CouchbaseMixin
+from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
+from mousetools.channels.enums import CouchbaseChannels
 
 logger = logging.getLogger(__name__)
 
 
-class ForecastedWaitTimesChildChannel(CouchbaseMixin):
+class ForecastedWaitTimesChildChannel(CouchbaseChildChannel):
     def __init__(
         self,
         channel_id: str,
@@ -24,52 +19,11 @@ class ForecastedWaitTimesChildChannel(CouchbaseMixin):
             channel_id (str): Forecasted Wait Times Channel ID
             lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
         """
-        if isinstance(channel_id, Enum):
-            channel_id = channel_id.value
-
-        self.channel_id: str = channel_id
-        self.entity_id: str = channel_id.rsplit(".", 1)[-1]
-
-        self._destination_short: DestinationShort = self.channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-        self._refresh_interval: timedelta = timedelta(minutes=30)
-
-        self._cb_data: typing.Optional[dict] = None
-        self._cb_data_pull_time: datetime = datetime.now(tz=self._tz.value)
-        if not lazy_load:
-            self.refresh()
+        super().__init__(channel_id, lazy_load=lazy_load)
 
     def __repr__(self):
         return f"{self.__class__.__name__}(channel_id='{self.channel_id}')"
 
-    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)
-
-    @property
-    def last_update(self) -> datetime:
-        """The last time the data was updated.
-
-        Returns:
-            (datetime): The last time the entity's data was updated, or None if no such data exists.
-        """
-        if self._cb_data is None:
-            self._cb_data = self.get_channel_data(self.channel_id)
-
-        try:
-            dt = isoparse(self._cb_data["lastUpdate"])
-            dt = dt.replace(tzinfo=self._tz.value)
-            return dt
-        except (KeyError, TypeError, ValueError):
-            logger.debug("No last updated found for %s", self.channel_id)
-            return self._cb_data_pull_time
-
     def get_forecast(self) -> list[dict]:
         """Returns a list of forecasted wait times sorted by timestamp
 

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/decorators.py

@@ -18,6 +18,7 @@ def disney_property(
             try:
                 return func(self)
             except (KeyError, TypeError, ValueError):
+                logger.debug("No data found for disney property %s, returning default value", func.__name__)
                 return default_value
 
         wrapper.__annotations__ = func.__annotations__
@@ -34,6 +35,7 @@ def json_property(func: Callable) -> property:
         try:
             return func(self)
         except (KeyError, TypeError, ValueError):
+            logger.debug("No data found for json property %s", func.__name__)
             return None
 
     return wrapper

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/mixins/couchbase.py

@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 
 class CouchbaseMixin:
-    _couchbase_url = "https://" + auth_obj._environments["syncGatewayUrl"].split("//")[1]
+    _couchbase_url = "https://" + auth_obj._environments["syncGatewayUrl"].split("//")[1].rstrip("/")
     _headers: dict = auth_obj.get_couchbase_headers()
 
     def get_channel_data(self, channel_name: str) -> typing.Union[dict, None]:
@@ -35,8 +35,9 @@ class CouchbaseMixin:
             "json": True,
         }
 
+        logger.info("Sending request for channel data: %s", channel_name)
         response = httpx.post(self._couchbase_url + "/_bulk_get", json=payload, headers=self._headers)
-        logger.debug("Response status: %s", response.status_code)
+        logger.debug("Response status for %s: %s", channel_name, response.status_code)
         data = None
         try:
             response.raise_for_status()
@@ -71,7 +72,9 @@ class CouchbaseMixin:
             if since:
                 payload["since"] = since
 
+            logger.info("Sending request for channel changes: %s", channel_name)
             response = httpx.post(self._couchbase_url + "/_changes", json=payload, headers=self._headers)
+            logger.debug("Response status for %s: %s", channel_name, response.status_code)
             data = response.raise_for_status().json()
         except httpx.HTTPError as err:
             logger.error("Request failed: %s", err)

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools/mixins/disney.py

@@ -31,7 +31,7 @@ class DisneyAPIMixin:
             response.raise_for_status()
             data = response.json()
         except (httpx.HTTPError, json.decoder.JSONDecodeError) as err:
-            logger.warning("Request failed. Error: %s", err)
+            logger.error("Request failed. Error: %s", err)
             return None
 
         return data

{mousetools-4.2.0 → mousetools-4.3.1}/mousetools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.2.0
+Version: 4.3.1
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT

{mousetools-4.2.0 → mousetools-4.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mousetools"
-version = "4.2.0"
+version = "4.3.1"
 authors = [{name = "Scott Caratozzolo"}]
 description = "An unofficial Python wrapper for Disney's API"
 readme = "README.md"

mousetools-4.2.0/mousetools/channels/__init__.py

@@ -1,62 +0,0 @@
-import typing
-from datetime import datetime, timedelta
-from enum import Enum
-
-from mousetools.channels.enums import DestinationTimezones, DLRCouchbaseChannels, WDWCouchbaseChannels
-from mousetools.enums import DestinationShort, EntityType
-from mousetools.mixins.couchbase import CouchbaseMixin
-
-
-class CouchbaseChannel(CouchbaseMixin):
-    def __init__(self, channel_id: typing.Union[WDWCouchbaseChannels, DLRCouchbaseChannels], lazy_load: bool = True):
-        """
-        Args:
-            channel_id (typing.Union[WDWCouchbaseChannels, DLRCouchbaseChannels]): Channel ID from the enum
-            lazy_load (bool, optional): If True, will not pull data until a method or property is called. Defaults to True.
-        """
-        if isinstance(channel_id, Enum):
-            channel_id = channel_id.value
-        self.channel_id = channel_id
-
-        self._destination_short: DestinationShort = channel_id.split(".")[0]
-        self._tz: DestinationTimezones = (
-            DestinationTimezones.WALT_DISNEY_WORLD
-            if self._destination_short == DestinationShort.WALT_DISNEY_WORLD
-            else DestinationTimezones.DISNEYLAND_RESORT
-        )
-
-        self._cb_data = None
-        self._refresh_interval = timedelta(minutes=10)
-        self.last_update = datetime.now(tz=self._tz.value)
-
-        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_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."""
-        self.refresh()
-
-        return [i["id"] for i in self._cb_data["results"]]
-
-    def _get_children_objects_helper(self, class_obj, entity_type: EntityType) -> list:
-        self.refresh()
-        channels = []
-        check_for = f"entitytype={entity_type.value}".lower()
-        for i in self._cb_data["results"]:
-            if check_for == i["id"].rsplit(";")[-1].lower():
-                channels.append(class_obj(i["id"]))
-        return channels
-
-    def __repr__(self):
-        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