MouseTools 4.5.0__tar.gz → 4.5.1__tar.gz

{mousetools-4.5.0 → mousetools-4.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.5.0
+Version: 4.5.1
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -17,6 +17,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: more-itertools>=10.7.0
 Requires-Dist: pycryptodome>=3.22.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: requests>=2.32.3

{mousetools-4.5.0 → mousetools-4.5.1}/mousetools/channels/manager.py

@@ -1,6 +1,8 @@
 import logging
 from typing import Optional, Union
 
+from more_itertools import batched
+
 from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
 from mousetools.mixins.couchbase import CouchbaseMixin
 
@@ -84,20 +86,28 @@ class ChannelManager(CouchbaseMixin):
             "Refreshing %d children channels and %d parent channels", len(children_channels), len(parent_channels)
         )
 
+        self._refresh_children(children_channels)
+
+        self._refresh_parents(parent_channels)
+
+    def _refresh_children(self, children_channels: dict[str, CouchbaseChildChannel]) -> None:
         if children_channels:
             logger.debug("Refreshing children channels")
-            children_results = self.get_channel_data(list(children_channels.keys()))
-            for children_channel, result in zip(children_channels.values(), children_results):
-                children_channel._refresh_from_manager(result)
+            for _channels in batched(children_channels, 100):
+                children_results = self.get_channel_data(_channels)
+                for channel_id, result in zip(_channels, children_results):
+                    children_channels[channel_id]._refresh_from_manager(result)
 
+    def _refresh_parents(self, parent_channels: dict[str, CouchbaseChannel]) -> None:
         if parent_channels:
             logger.debug("Refreshing parent channels")
-            parent_results = self.get_channel_changes(list(parent_channels.keys()))
-            for channel_id, parent_channel in parent_channels.items():
-                copy_results = parent_results.copy()
-                new_results = []
-                for result in copy_results["results"]:
-                    if channel_id in result["id"]:
-                        new_results.append(result)
-                copy_results["results"] = new_results
-                parent_channel._refresh_from_manager(copy_results)
+            for _channels in batched(parent_channels, 100):
+                parent_results = self.get_channel_changes(_channels)
+                for channel_id in _channels:
+                    copy_results = parent_results.copy()
+                    new_results = []
+                    for result in copy_results["results"]:
+                        if channel_id in result["id"]:
+                            new_results.append(result)
+                    copy_results["results"] = new_results
+                    parent_channels[channel_id]._refresh_from_manager(copy_results)

{mousetools-4.5.0 → mousetools-4.5.1}/mousetools/mixins/couchbase.py

@@ -37,9 +37,15 @@ class CouchbaseMixin:
             "json": True,
         }
 
-        logger.info("Sending request for channel data: %s", _channel_names)
+        logger.info(
+            "Sending request for channel data: %s", f"{len(channel_name)} channels" if return_list else _channel_names
+        )
         response = requests.post(self._couchbase_url + "/_bulk_get", json=payload, headers=self._headers, timeout=10)
-        logger.debug("Response status for %s: %s", _channel_names, response.status_code)
+        logger.debug(
+            "Response status for %s: %s",
+            f"{len(channel_name)} channels" if return_list else _channel_names,
+            response.status_code,
+        )
         results = []
         try:
             response.raise_for_status()
@@ -93,9 +99,16 @@ class CouchbaseMixin:
             if since:
                 payload["since"] = since
 
-            logger.info("Sending request for channel changes: %s", channel_name)
+            logger.info(
+                "Sending request for channel changes: %s",
+                f"{len(channel_name)} channels" if len(channel_name) > 1 else channel_name[0],
+            )
             response = requests.post(self._couchbase_url + "/_changes", json=payload, headers=self._headers, timeout=10)
-            logger.debug("Response status for %s: %s", channel_name, response.status_code)
+            logger.debug(
+                "Response status for %s: %s",
+                f"{len(channel_name)} channels" if len(channel_name) > 1 else channel_name[0],
+                response.status_code,
+            )
             response.raise_for_status()
             data = response.json()
         except requests.HTTPError as err:

{mousetools-4.5.0 → mousetools-4.5.1}/mousetools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.5.0
+Version: 4.5.1
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -17,6 +17,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: more-itertools>=10.7.0
 Requires-Dist: pycryptodome>=3.22.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: requests>=2.32.3

{mousetools-4.5.0 → mousetools-4.5.1}/mousetools.egg-info/requires.txt

@@ -1,3 +1,4 @@
+more-itertools>=10.7.0
 pycryptodome>=3.22.0
 python-dateutil>=2.9.0.post0
 requests>=2.32.3

{mousetools-4.5.0 → mousetools-4.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mousetools"
-version = "4.5.0"
+version = "4.5.1"
 authors = [{name = "Scott Caratozzolo"}]
 description = "An unofficial Python wrapper for Disney's API"
 readme = "README.md"
@@ -8,6 +8,7 @@ license = "MIT"
 license-files = ["LICENSE"]
 requires-python = ">=3.9, <4.0"
 dependencies = [
+    "more-itertools>=10.7.0",
     "pycryptodome>=3.22.0",
     "python-dateutil>=2.9.0.post0",
     "requests>=2.32.3",