MouseTools 6.0.0rc2__tar.gz → 6.2.0__tar.gz

{mousetools-6.0.0rc2 → mousetools-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 6.0.0rc2
+Version: 6.2.0
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -11,15 +11,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Operating System :: OS Independent
+Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: more-itertools>=10.7.0
-Requires-Dist: pycryptodome>=3.22.0
+Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: niquests[http3,utls]>=3.20.0
 Requires-Dist: tzdata>=2025.2
+Requires-Dist: typing-extensions>=4.5; python_version < "3.13"
 Requires-Dist: websockets>=13.0
 Dynamic: license-file
 

{mousetools-6.0.0rc2 → mousetools-6.2.0}/mousetools/__init__.py

@@ -8,6 +8,7 @@ from mousetools.entities import (
     DISNEYLAND_RESORT,
     WALT_DISNEY_WORLD,
     Appearance,
+    ArrivalPrediction,
     Attraction,
     AudioTour,
     Avatar,
@@ -18,6 +19,7 @@ from mousetools.entities import (
     Coordinates,
     DailySchedule,
     Destination,
+    DestinationArrival,
     DiningEvent,
     DinnerShow,
     Entertainment,
@@ -35,12 +37,16 @@ from mousetools.entities import (
     MenuItem,
     MenuPrice,
     MerchandiseFacility,
+    NameParts,
     PartySizeStatus,
     PhotoPass,
     PointOfInterest,
     PriceRange,
     Recreation,
     RecreationActivity,
+    RelatedAncestor,
+    RelatedCoordinate,
+    RelatedLocation,
     Resort,
     ResortArea,
     Restaurant,
@@ -51,7 +57,9 @@ from mousetools.entities import (
     Spa,
     ThemePark,
     Tour,
+    TransportArrivals,
     Transportation,
+    TransportService,
     WaitTime,
     WalkUpAvailability,
     WaterPark,
@@ -59,15 +67,31 @@ from mousetools.entities import (
     load_many,
 )
 from mousetools.enums import ChannelSource, DestinationShort, EntityType, ScheduleSource
-from mousetools.stream import CalendarEvent, ChangeEvent, FacilityStatusEvent, ForecastEvent, RawChange
+from mousetools.stream import (
+    ArrivalsEvent,
+    ArrivalsFilter,
+    CalendarEvent,
+    ChangeEvent,
+    CharacterEvent,
+    DiningFacilityStatusFilter,
+    DocId,
+    FacilityStatusEvent,
+    ForecastEvent,
+    NonDiningFacilityStatusFilter,
+    RawChange,
+    SubscriptionFilter,
+)
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("mousetools")
 logger.addHandler(logging.NullHandler())
 
 __all__ = [
     "DISNEYLAND_RESORT",
     "WALT_DISNEY_WORLD",
     "Appearance",
+    "ArrivalPrediction",
+    "ArrivalsEvent",
+    "ArrivalsFilter",
     "Attraction",
     "AudioTour",
     "Avatar",
@@ -77,14 +101,18 @@ __all__ = [
     "ChangeEvent",
     "ChannelSource",
     "Character",
+    "CharacterEvent",
     "Client",
     "ContainerEntity",
     "Coordinates",
     "DailySchedule",
     "Destination",
+    "DestinationArrival",
     "DestinationShort",
     "DiningEvent",
+    "DiningFacilityStatusFilter",
     "DinnerShow",
+    "DocId",
     "Entertainment",
     "EntertainmentVenue",
     "Entity",
@@ -103,6 +131,8 @@ __all__ = [
     "MenuItem",
     "MenuPrice",
     "MerchandiseFacility",
+    "NameParts",
+    "NonDiningFacilityStatusFilter",
     "PartySizeStatus",
     "PhotoPass",
     "PointOfInterest",
@@ -110,6 +140,9 @@ __all__ = [
     "RawChange",
     "Recreation",
     "RecreationActivity",
+    "RelatedAncestor",
+    "RelatedCoordinate",
+    "RelatedLocation",
     "Resort",
     "ResortArea",
     "Restaurant",
@@ -119,8 +152,11 @@ __all__ = [
     "SearchResponse",
     "SearchResult",
     "Spa",
+    "SubscriptionFilter",
     "ThemePark",
     "Tour",
+    "TransportArrivals",
+    "TransportService",
     "Transportation",
     "WaitTime",
     "WalkUpAvailability",

{mousetools-6.0.0rc2 → mousetools-6.2.0}/mousetools/_internal/auth/public.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 from collections.abc import Callable
 
 from mousetools._internal.auth.base import LEEWAY_SECONDS, epoch_now
@@ -6,6 +7,8 @@ from mousetools._internal.config import load_config
 from mousetools._internal.transport import Transport
 from mousetools.errors import AuthError
 
+logger = logging.getLogger("mousetools.network.auth")
+
 
 class PublicAuth:
     """Zero-config guest-token auth (assertion/public grant). The Client binds the
@@ -62,6 +65,7 @@ class PublicAuth:
         if self._transport is None:
             raise AuthError("PublicAuth used before bind(transport)")
         if self._token is not None and self._now() < self._expires_at - LEEWAY_SECONDS:
+            logger.debug("reusing cached public token, %.0fs of life left", self._expires_at - self._now())
             return self._token
         async with self._grant_lock:
             # Re-check inside the lock: a concurrent caller may have granted while
@@ -77,8 +81,10 @@ class PublicAuth:
                 if resp.status_code is None or resp.status_code >= 400:
                     raise AuthError(f"public token grant failed: {resp.status_code} from {self._token_url}")
                 body = resp.json()
+                expires_in = int(body["expires_in"])
                 self._token = body["access_token"]
-                self._expires_at = self._now() + int(body["expires_in"])
+                self._expires_at = self._now() + expires_in
+                logger.info("public token refreshed, expires in %.0fs", expires_in)
             return self._token
 
     async def headers(self) -> dict[str, str]:

{mousetools-6.0.0rc2 → mousetools-6.2.0}/mousetools/_internal/config.py

@@ -17,7 +17,7 @@ from dataclasses import dataclass
 from functools import lru_cache
 from importlib.resources import files
 
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 
 # AES-GCM appends a 16-byte authentication tag to the ciphertext.
 _GCM_TAG_BYTES = 16

{mousetools-6.0.0rc2 → mousetools-6.2.0}/mousetools/_internal/loaders.py

@@ -1,11 +1,14 @@
 """Generic DataLoader: coalesce per-tick key loads into batched fetches."""
 
 import asyncio
+import logging
 from collections.abc import Awaitable, Callable
 from typing import Generic, TypeVar
 
 from mousetools.errors import NotFound
 
+logger = logging.getLogger("mousetools.network.loaders")
+
 T = TypeVar("T")
 
 
@@ -27,6 +30,7 @@ class DataLoader(Generic[T]):
         batch_fetch: Callable[[list[str]], Awaitable[dict[str, T]]],
         *,
         max_batch: int = 100,
+        name: str | None = None,
     ) -> None:
         """Create a loader around a batch-fetch callable.
 
@@ -36,9 +40,13 @@ class DataLoader(Generic[T]):
             max_batch: The largest chunk of keys passed to `batch_fetch` in
                 one call; a tick's coalesced keys are split into chunks of
                 this size.
+            name: Identifies this loader in its log records. Without it,
+                several loaders batching concurrently emit indistinguishable
+                lines; optional so any construction site still works.
         """
         self._batch_fetch = batch_fetch
         self._max_batch = max_batch
+        self._name = name or "unnamed"
         self._pending: dict[str, asyncio.Future[T]] = {}
         self._flush_scheduled = False
         self._tasks: set[asyncio.Task[None]] = set()
@@ -83,6 +91,8 @@ class DataLoader(Generic[T]):
         """
         try:
             keys = list(batch)
+            chunks = (len(keys) + self._max_batch - 1) // self._max_batch
+            logger.debug("batch[%s]: %d key(s) in %d chunk(s)", self._name, len(keys), chunks)
             await asyncio.gather(
                 *(
                     self._resolve_chunk(keys[start : start + self._max_batch], batch)
@@ -112,6 +122,12 @@ class DataLoader(Generic[T]):
             # settled with the error (its awaiters re-raise it) -- narrowing would
             # leave futures hung forever on an unexpected type. `Exception` (not
             # BaseException) deliberately lets CancelledError propagate.
+            logger.debug(
+                "batch[%s]: chunk fetch failed (%s); settling %d future(s) with it",
+                self._name,
+                type(exc).__name__,
+                len(chunk),
+            )
             for k in chunk:
                 if not batch[k].done():
                     batch[k].set_exception(exc)

{mousetools-6.0.0rc2 → mousetools-6.2.0}/mousetools/_internal/services/couchbase.py

@@ -15,7 +15,7 @@ from mousetools._internal.services.http import looks_like_bot_block
 from mousetools._internal.transport import Transport
 from mousetools.errors import AuthError, BotChallengeError, DisneyServerError, HTTPStatusError, RateLimited
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("mousetools.network.couchbase")
 
 _JSON_OBJECT = re.compile(r"\{.*\}", re.DOTALL)
 # Pull the boundary token out of a `multipart/related; boundary=...` Content-Type,
@@ -43,7 +43,7 @@ def _raise_for_status_code(code: int | None, url: str) -> None:
         HTTPStatusError: Any other status code of 400 or higher.
     """
     if code is None:
-        raise DisneyServerError(f"no response from {url}")
+        raise DisneyServerError(f"no response from {url}", url=url)
     if code < 400:
         return
     if code == 401:
@@ -54,7 +54,7 @@ def _raise_for_status_code(code: int | None, url: str) -> None:
     if code == 429:
         raise RateLimited(url)
     if code >= 500:
-        raise DisneyServerError(f"{code} from {url}")
+        raise DisneyServerError(f"{code} from {url}", status=code, url=url)
     raise HTTPStatusError(f"{code} from {url}", status=code, url=url)
 
 
@@ -278,6 +278,9 @@ async def bulk_get(
             (response-level or per-doc), including a per-doc error other than
             `"not_found"` (e.g. `"forbidden"`/`"unauthorized"`).
     """
+    # `base_url` is constant for the client's life, so it cannot tell two concurrent
+    # bulk_gets apart under HTTP/2 multiplexing -- name the ids instead, bounded.
+    logger.debug("bulk_get: requesting %d id(s): %s", len(channel_ids), channel_ids[:5])
     resp = await transport.request(
         "POST",
         f"{base_url}/_bulk_get",
@@ -305,10 +308,20 @@ async def bulk_get(
     unexplained = [cid for cid in channel_ids if cid not in out and cid not in reported_missing]
     if unexplained:
         logger.debug(
-            "_bulk_get: %d requested id(s) resolved to neither a doc nor a not_found: %s",
+            "bulk_get: %d requested id(s) resolved to neither a doc nor a not_found: %s",
             len(unexplained),
             unexplained[:5],
         )
+    absent = [cid for cid in channel_ids if cid not in out]
+    # Names the requested ids AND the absent ones: the former is what pairs this
+    # record with its opener under H2 multiplexing, the latter is the diagnosis.
+    logger.debug(
+        "bulk_get: %d of %d id(s) returned for %s; absent: %s",
+        len(out),
+        len(channel_ids),
+        channel_ids[:5],
+        absent[:5],
+    )
     return out