python3-discogs-client 2.8__tar.gz → 2.9__tar.gz

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python3-discogs-client
-Version: 2.8
+Version: 2.9
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla
@@ -26,6 +26,7 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/discogs_client/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.8'
+__version__ = '2.9'
 __version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())
 
 from discogs_client.client import Client

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/discogs_client/client.py

@@ -19,6 +19,7 @@ class Client:
         self.user_agent = user_agent
         self.verbose = False
         self._fetcher = RequestsFetcher()
+        self._trust_per_page = True  # Default: True
 
         if consumer_key and consumer_secret:
             self.set_consumer_key(consumer_key, consumer_secret)
@@ -219,3 +220,13 @@ class Client:
         """
         self._fetcher.connect_timeout = connect
         self._fetcher.read_timeout = read
+
+    @property
+    def trust_per_page(self) -> bool:
+        return self._trust_per_page
+
+    @trust_per_page.setter
+    def trust_per_page(self, value: bool) -> None:
+        if not isinstance(value, bool):
+            raise ValueError("trust_per_page must be a bool")
+        self._trust_per_page = value

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/discogs_client/models.py

@@ -354,18 +354,42 @@ class BasePaginatedResponse:
         return item
 
     def __getitem__(self, index):
-        page_index = index // self.per_page + 1
-        offset = index % self.per_page
+        """Retrieve an item by its index.
 
-        try:
-            page = self.page(page_index)
-        except HTTPError as e:
-            if e.status_code == 404:
-                raise IndexError(e.msg)
-            else:
+        By default, uses the API's ``per_page`` value to calculate the page
+        containing the item directly. If the API returns fewer items per page
+        than reported, this may yield incorrect results — set
+        ``client.trust_per_page = False`` to fall back to a sequential page
+        walk at the cost of performance.
+        """
+        if self.client._trust_per_page:
+            page_index = index // self.per_page + 1
+            offset = index % self.per_page
+
+            try:
+                page = self.page(page_index)
+            except HTTPError as e:
+                if e.status_code == 404:
+                    raise IndexError(e.msg) from e
+                raise
+
+            return page[offset]
+
+        # Fallback to sequential page loading if we're not trusting the per_page parameter
+        current = 0
+        page_index = 1
+        while True:
+            try:
+                page = self.page(page_index)
+            except HTTPError as e:
+                if e.status_code == 404:
+                    raise IndexError(e.msg) from e
                 raise
+            if current + len(page) > index:
+                return page[index - current]
+            current += len(page)
+            page_index += 1
 
-        return page[offset]
 
     def __len__(self):
         return self.count

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/discogs_client/tests/test_core.py

@@ -111,6 +111,46 @@ class CoreTestCase(DiscogsClientTestCase):
         results.per_page = 10
         self.assertTrue(results._num_pages is None)
 
+    def test_pagination_index_without_trust_per_page_and_short_pages(self):
+        """Without trust_per_page, sequential page walking handles under-filled pages correctly."""
+        client = Client('ua')
+        client.trust_per_page = False  # opt into sequential walk
+        client._base_url = ''
+        client._trust_per_page = False
+        client._fetcher = MemoryFetcher({
+            '/artists/1': (
+                b'{"id": 1, "name": "Badger", "releases_url": "/artists/1/releases"}',
+                200,
+            ),
+            '/artists/1/releases?page=1&per_page=50': (
+                b'{"pagination": {"per_page": 50, "pages": 3, "items": 5}, '
+                b'"releases": ['
+                b'{"id": 101, "type": "release", "title": "A"},'
+                b'{"id": 102, "type": "release", "title": "B"}'
+                b']}',
+                200,
+            ),
+            '/artists/1/releases?page=2&per_page=50': (
+                b'{"pagination": {"per_page": 50, "pages": 3, "items": 5}, '
+                b'"releases": [{"id": 103, "type": "release", "title": "C"}]}',
+                200,
+            ),
+            '/artists/1/releases?page=3&per_page=50': (
+                b'{"pagination": {"per_page": 50, "pages": 3, "items": 5}, '
+                b'"releases": ['
+                b'{"id": 104, "type": "release", "title": "D"},'
+                b'{"id": 105, "type": "release", "title": "E"}'
+                b']}',
+                200,
+            ),
+        })
+
+        results = client.artist(1).releases
+        self.assertEqual(results[0].id, 101)  # page 1
+        self.assertEqual(results[2].id, 103)  # page 2, cross-page
+        self.assertEqual(results[4].id, 105)  # page 3, last item
+        self.assertRaises(IndexError, lambda: results[5])
+
     def test_timeout_defaults_to_none(self):
         # Need to create client without LoggingDelegator here
         # self.d would throw AttributeError trying to access timeout properties on LoggingDelegator

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/python3_discogs_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python3-discogs-client
-Version: 2.8
+Version: 2.9
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla
@@ -26,6 +26,7 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{python3_discogs_client-2.8 → python3_discogs_client-2.9}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
         name='python3-discogs-client',
-        version='2.8',
+        version='2.9',
         description='Python API client for Discogs',
         long_description='This is an active fork of the official "Discogs API client for Python", which was deprecated by discogs.com as of June 2020. We think it is a very useful Python module and decided to continue maintaining it. Please visit: https://github.com/joalla/discogs_client for more information.',
         url='https://github.com/joalla/discogs_client',