MouseTools 3.1.0.dev1__py3-none-any.whl → 3.1.0.dev2__py3-none-any.whl

{MouseTools-3.1.0.dev1.dist-info → MouseTools-3.1.0.dev2.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: MouseTools
-Version: 3.1.0.dev1
+Version: 3.1.0.dev2
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 Project-URL: repository, https://gitlab.com/caratozzoloxyz/public/MouseTools
+Project-URL: documentation, https://caratozzoloxyz.gitlab.io/public/MouseTools/
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{MouseTools-3.1.0.dev1.dist-info → MouseTools-3.1.0.dev2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-mousetools/__init__.py,sha256=_2d-7eIVKOj36JQQygsloKaR6h4TBn17Ujt1gMV0ivM,199
+mousetools/__init__.py,sha256=8TH8dO7pAgFB4pSi1mfpEtIEAtOoLj0thRwkh-BWc7U,199
 mousetools/auth.py,sha256=ogbssFgG4Fmjuce2ppH96nlh3BJNXjOTWuSVbVM4XGQ,2372
 mousetools/exceptions.py,sha256=0omdWcFu99r1XgVWQpn2jemgR34-lkfOeXvWFyCFILM,536
 mousetools/ids.py,sha256=Gsnb9tkQ7uyDacbGJHGdYVv-4-FyfEI3BplMrYW67PY,4248
 mousetools/urls.py,sha256=2WQMnUo080QxwFXOs5t9X5893QofQ5z3by_vkQsCDpo,233
-mousetools/entities/__init__.py,sha256=hn2vBG7h9sxvRVhEptgh6aZ-Pzg8O9gkt2vMRiwQ8N8,1493
+mousetools/entities/__init__.py,sha256=HuNje5r9AuMPbP1h3S06XBPzoanhub8tWcApNyE4mIc,1493
 mousetools/entities/attraction.py,sha256=ACKNG_5xMM2kXws_76SmcfqaqErxRRzEER2XGsMtUpA,366
-mousetools/entities/base.py,sha256=aHR7aLO5nfjO4JlzoCWo7EinsARYhiDNTKjC6PjtRQg,16554
+mousetools/entities/base.py,sha256=Eeye28DhNk1_YXf-VPtwI2U0uum-wPfVW1Q57CRofg0,16579
 mousetools/entities/character.py,sha256=ifdzEZC9r3W_ZBoYzjgsKMWbT3TmmDo98wg7letqaoU,363
 mousetools/entities/destination.py,sha256=MsQ713DRoWlBoEHSKqtt4qctArHXUqk1ukYU_tnNh5o,520
 mousetools/entities/dining_event.py,sha256=9aa7MF5FPQdLcwHDgm77KT6kmba3IVBx_KyhEPXu9XU,370
@@ -15,18 +15,18 @@ mousetools/entities/entertainment_venue.py,sha256=53WzFLnjoKZYaz3GV-B9km2UNiMYKX
 mousetools/entities/event.py,sha256=_u_IYJM55FwPpf_RVlqYK2ryaWq-5gznhBqRlSwnepg,351
 mousetools/entities/guest_services.py,sha256=p1NP1vnkEXOv1OMKRiWPhQ77Cikok3jXAOu3PJQXV_o,376
 mousetools/entities/land.py,sha256=oT8wSBuLyBe34kRhl2O-DJyA1np1O-X-YsJoRnqVhFI,348
-mousetools/entities/menu.py,sha256=FvNfuk4DDWZBlcY7xwXm03TlTsCaq3LHMZplUxCOQYw,6145
+mousetools/entities/menu.py,sha256=ymXEBbxIlbThII_oxvgk9cXWt2_JSARWrk0uR4-xaw0,6167
 mousetools/entities/merchandise_facility.py,sha256=xtU_yuhGi4seS7e2ClMtsaqmw-SBIs5N_7gFz1FxgcA,395
 mousetools/entities/park.py,sha256=ZtXo4hyyJFIRQ7l-GMmBj9rMH14KUQ84f5RVZ0VLBcI,1221
 mousetools/entities/point_of_interest.py,sha256=h-CroI3QwuLGvGmGHRS3yQO8OQB-5lplLmQHlvLHDNo,385
 mousetools/entities/resort.py,sha256=aKNrLVa_KRTHPLbY2IHMp7sgSesBT2gR0u6XJBaEt14,354
 mousetools/entities/resort_area.py,sha256=COiwcB8aXOFWmjw_RYOYgJ35SHb8z_QaBKyTHA2OGZQ,368
-mousetools/entities/restaurant.py,sha256=j0Lk_F01A4jOTkUSyHm98gccbn1d52VK70KctU0ErpU,1654
+mousetools/entities/restaurant.py,sha256=9Ci3N2QohPeuPUwBS19rsFsXMjFC89IgSU8pYjJTKlo,1655
 mousetools/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mousetools/mixins/disney.py,sha256=9EW_TPl3LQy9EHyivxVSOKJ1TWjfPHHdwnDQJK4c-b0,1854
+mousetools/mixins/disney.py,sha256=1l2ck-1cIZph_fnIApqGRqLGKgVpTn91wnZ5abmxmfs,1862
 mousetools/mixins/themeparksapi.py,sha256=gxep2vBXMSSVh1c3Yjt7oaIyCjhQfGtbSHXysbhazbs,4321
-MouseTools-3.1.0.dev1.dist-info/LICENSE,sha256=xX4HoDU-zdafl3yEfIaspkvqHPaaXhuDwkJ6qhDMUIo,1074
-MouseTools-3.1.0.dev1.dist-info/METADATA,sha256=NKozUIYipaOkFtM9MT0sQF0b4yjUqWpQlwKi9QSeCac,2496
-MouseTools-3.1.0.dev1.dist-info/WHEEL,sha256=ixB2d4u7mugx_bCBycvM9OzZ5yD7NmPXFRtKlORZS2Y,91
-MouseTools-3.1.0.dev1.dist-info/top_level.txt,sha256=7nanLN103J_xJn6HK6yuyqqlDgltCsQY2-ArRXx1Ukk,11
-MouseTools-3.1.0.dev1.dist-info/RECORD,,
+MouseTools-3.1.0.dev2.dist-info/LICENSE,sha256=xX4HoDU-zdafl3yEfIaspkvqHPaaXhuDwkJ6qhDMUIo,1074
+MouseTools-3.1.0.dev2.dist-info/METADATA,sha256=JHql1m7EDD0kAOK5-mZ2b3Tr4q49dlYrHV1a-CIFJt4,2576
+MouseTools-3.1.0.dev2.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+MouseTools-3.1.0.dev2.dist-info/top_level.txt,sha256=7nanLN103J_xJn6HK6yuyqqlDgltCsQY2-ArRXx1Ukk,11
+MouseTools-3.1.0.dev2.dist-info/RECORD,,

{MouseTools-3.1.0.dev1.dist-info → MouseTools-3.1.0.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mousetools/__init__.py

@@ -3,5 +3,5 @@ import logging
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-__version__ = "3.1.0-dev.1"  # will be set at runtime
+__version__ = "3.1.0-dev.2"  # will be set at runtime
 logger.info(f"MouseTools version: {__version__}")

mousetools/entities/__init__.py

@@ -8,13 +8,13 @@ from mousetools.entities.entertainment_venue import EntertainmentVenue
 from mousetools.entities.event import Event
 from mousetools.entities.guest_services import GuestServices
 from mousetools.entities.land import Land
+from mousetools.entities.menu import Menus
 from mousetools.entities.merchandise_facility import MerchandiseFacility
 from mousetools.entities.park import ThemePark, WaterPark
 from mousetools.entities.point_of_interest import PointOfInterest
 from mousetools.entities.resort import Resort
 from mousetools.entities.resort_area import ResortArea
 from mousetools.entities.restaurant import Restaurant
-from mousetools.entities.menu import Menus
 from mousetools.ids import DestinationIds
 
 WALT_DISNEY_WORLD_DESTINATION = Destination(DestinationIds.WALT_DISNEY_WORLD)

mousetools/entities/base.py

@@ -106,16 +106,17 @@ class EntityBase(DisneyAPIMixin, ThemeParkAPIMixin):
             return {
                 "lat": float(
                     self.disney_data["coordinates"]["Guest Entrance"]["gps"][
-                        "lattitude"
+                        "latitude"
                     ]
                 ),
                 "lng": float(
-                    self.disney_data["coordinates"]["Guest entrance"]["gps"][
+                    self.disney_data["coordinates"]["Guest Entrance"]["gps"][
                         "longitude"
                     ]
                 ),
             }
-        except KeyError:
+        except KeyError as e:
+            print(e)
             logger.debug("No coordinates found for %s", self.entity_id)
             return None
 

mousetools/entities/menu.py

@@ -1,4 +1,5 @@
 import typing
+
 from mousetools.entities.base import EntityBase
 from mousetools.ids import FacilityServiceEntityTypes
 
@@ -74,6 +75,8 @@ class MenuItem:
         except KeyError:
             return None
 
+        return None
+
 
 class Menu:
     def __init__(self, raw_menu_data: dict):

mousetools/entities/restaurant.py

@@ -1,7 +1,8 @@
+import logging
 import typing
+
 from mousetools.entities.base import EntityBase
 from mousetools.ids import FacilityServiceEntityTypes
-import logging
 
 logger = logging.getLogger(__name__)
 

mousetools/mixins/disney.py

@@ -30,8 +30,6 @@ class DisneyAPIMixin:
         logger.info("Sending request to %s", url)
         response = httpx.get(url, headers=auth_obj.get_headers())
         logger.debug("Response status: %s", response.status_code)
-        if response.status_code == httpx._status_codes.codes.NOT_FOUND:
-            raise EntityIDNotFoundError
 
         try:
             response.raise_for_status()
@@ -49,6 +47,8 @@ class DisneyAPIMixin:
             logger.debug("Sending new request to %s", url)
             response = httpx.get(url, headers=auth_obj.get_headers())
             logger.debug("Response status: %s", response.status_code)
+            if response.status_code == httpx._status_codes.codes.NOT_FOUND:
+                raise EntityIDNotFoundError
             response.raise_for_status()
             data = response.json()