python-kanka 2.4.0__py3-none-any.whl → 2.5.0__py3-none-any.whl

kanka/_version.py

@@ -1,3 +1,3 @@
 """Version information for python-kanka."""
 
-__version__ = "2.4.0"
+__version__ = "2.5.0"

kanka/client.py

@@ -321,19 +321,29 @@ class KankaClient:
         response = self._request("GET", f"entities/{entity_id}")
         return response["data"]  # type: ignore[no-any-return]
 
-    def entities(self, **filters) -> list[dict[str, Any]]:
+    def entities(
+        self, page: int = 1, limit: int = 15, **filters
+    ) -> list[dict[str, Any]]:
         """Access the /entities endpoint with filters.
 
         This endpoint provides a unified way to query entities across all types
         with various filtering options.
 
         Args:
+            page: Page number (default: 1)
+            limit: Number of results per page (default: 15)
             **filters: Filter parameters like types, name, is_private, tags
 
         Returns:
             List of entity data
+
+        Note:
+            Pagination information is available after calling entities():
+            - client.last_entities_meta: Contains total count, current page, etc.
+            - client.last_entities_links: Contains URLs for first, last, prev, next
+            - client.entities_has_next_page: True if more pages are available
         """
-        params: dict[str, int | str] = {}
+        params: dict[str, int | str] = {"page": page, "limit": limit}
 
         # Handle special filters
         if "types" in filters and isinstance(filters["types"], list):
@@ -355,6 +365,8 @@ class KankaClient:
                     params[key] = filters[key]
 
         response = self._request("GET", "entities", params=params)
+        self._last_entities_meta = response.get("meta", {})
+        self._last_entities_links = response.get("links", {})
         return response["data"]  # type: ignore[no-any-return]
 
     def _parse_rate_limit_headers(self, response) -> float | None:
@@ -692,3 +704,27 @@ class KankaClient:
             Dict[str, Any]: Links for pagination including first, last, prev, next URLs
         """
         return getattr(self, "_last_search_links", {})
+
+    @property
+    def last_entities_meta(self) -> dict[str, Any]:
+        """Get metadata from the last entities() call.
+
+        Returns:
+            Dict[str, Any]: Pagination metadata including current_page, from, to,
+                           last_page, per_page, total
+        """
+        return getattr(self, "_last_entities_meta", {})
+
+    @property
+    def last_entities_links(self) -> dict[str, Any]:
+        """Get pagination links from the last entities() call.
+
+        Returns:
+            Dict[str, Any]: Links for pagination including first, last, prev, next URLs
+        """
+        return getattr(self, "_last_entities_links", {})
+
+    @property
+    def entities_has_next_page(self) -> bool:
+        """Check if more pages are available from the last entities() call."""
+        return bool(getattr(self, "_last_entities_links", {}).get("next"))

kanka/managers.py

@@ -1,10 +1,12 @@
 """Entity managers for Kanka API."""
 
+import contextlib
 import hashlib
 import re
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, List, TypeVar  # noqa: UP035
 
+from .exceptions import NotFoundError
 from .models.base import Entity, Post
 from .models.common import EntityAsset, EntityImageInfo
 
@@ -420,6 +422,22 @@ class EntityManager[T: Entity]:
             return m.group(1), m.group(2)
         return None
 
+    @staticmethod
+    def _extract_gallery_uuid(url: str | None) -> str | None:
+        """Extract gallery image UUID from a CDN URL.
+
+        The UUID is the filename stem in the URL path, e.g.
+        ``https://cdn-ugc.kanka.io/campaigns/123/a1b2-...-c3d4.webp``
+        yields ``a1b2-...-c3d4``.
+        """
+        if not url:
+            return None
+        m = re.search(
+            r"/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.\w+",
+            url,
+        )
+        return m.group(1) if m else None
+
     @staticmethod
     def _rewrite_image_srcs(html: str, url_map: dict[str, str]) -> str:
         """Rewrite <img src="key"> tags, replacing keys with CDN URLs."""
@@ -480,18 +498,22 @@ class EntityManager[T: Entity]:
         for placeholder, file_path in images.items():
             file_path = Path(file_path)
             file_hash = self._compute_file_hash(file_path)
-            used_names.add(placeholder)
+            # Truncate to match what _format_managed_asset_name stores
+            lookup_name = placeholder[:32]
+            used_names.add(lookup_name)
 
-            if placeholder in managed:
-                old_hash, old_asset = managed[placeholder]
+            if lookup_name in managed:
+                old_hash, old_asset = managed[lookup_name]
                 if old_hash == file_hash:
                     # Same file, reuse URL
                     if old_asset.url:
                         url_map[placeholder] = old_asset.url
                     continue
                 else:
-                    # Changed file, delete old and upload new
-                    self.delete_asset(entity_id, old_asset.id)
+                    # Changed file, delete old asset and its gallery image
+                    self.delete_asset(
+                        entity_id, old_asset.id, delete_gallery_image=True
+                    )
 
             managed_name = self._format_managed_asset_name(placeholder, file_hash)
             asset = self.create_file_asset(entity_id, file_path, name=managed_name)
@@ -501,7 +523,7 @@ class EntityManager[T: Entity]:
         # Orphan cleanup: delete managed assets not in current images dict
         for name_part, (_, old_asset) in managed.items():
             if name_part not in used_names:
-                self.delete_asset(entity_id, old_asset.id)
+                self.delete_asset(entity_id, old_asset.id, delete_gallery_image=True)
 
         if url_map:
             return self._rewrite_image_srcs(entry, url_map)
@@ -860,19 +882,39 @@ class EntityManager[T: Entity]:
         response = self.client._request("POST", endpoint, json=data)
         return EntityAsset(**response["data"])
 
-    def delete_asset(self, entity_or_id: T | int, asset_id: int) -> bool:
+    def delete_asset(
+        self,
+        entity_or_id: T | int,
+        asset_id: int,
+        *,
+        delete_gallery_image: bool = False,
+    ) -> bool:
         """Delete an asset from an entity.
 
         Args:
             entity_or_id: The entity or its entity_id
             asset_id: The asset ID
+            delete_gallery_image: If True, also delete the underlying gallery
+                image. This prevents orphaned images from accumulating in the
+                campaign gallery.
 
         Returns:
             True if successful
         """
         entity_id = self._extract_entity_id(entity_or_id)
+
+        gallery_uuid: str | None = None
+        if delete_gallery_image:
+            asset = self.get_asset(entity_id, asset_id)
+            gallery_uuid = self._extract_gallery_uuid(asset.url)
+
         url = f"entities/{entity_id}/entity_assets/{asset_id}"
         self.client._request("DELETE", url)
+
+        if gallery_uuid:
+            with contextlib.suppress(NotFoundError):
+                self.client.gallery_delete(gallery_uuid)
+
         return True
 
     @property

{python_kanka-2.4.0.dist-info → python_kanka-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-kanka
-Version: 2.4.0
+Version: 2.5.0
 Summary: Python client for the Kanka API
 Project-URL: Homepage, https://github.com/ervwalter/python-kanka
 Project-URL: Documentation, https://github.com/ervwalter/python-kanka#readme

{python_kanka-2.4.0.dist-info → python_kanka-2.5.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 kanka/__init__.py,sha256=S_Pl6xBtHOpUGr3eOEkq4QEMtByZx4kEWYoQfv3LLrQ,2102
-kanka/_version.py,sha256=30224eiQWh6j76ENYkrUAokZWDfKTM2XhHv0cH0kYdo,67
-kanka/client.py,sha256=AVLFcrLCwMfof-oTuUuzfNFe10k4Ai2JCkkncfv6YYY,23598
+kanka/_version.py,sha256=CbCNgca30mRPFdjB04QfU2j2_o36aDbjiakPVgp44gE,67
+kanka/client.py,sha256=r4Q0IyF0LwD8VPHB5dV2fhfLTS5tLcwUJqcEWoWoHxU,25095
 kanka/exceptions.py,sha256=A4P7T7VO_Rp5IYldvFaecE3z4N7WYDgCDojYPu_yDzk,3871
-kanka/managers.py,sha256=O3ENwnbWtOqGnuLuDP0xFdlxvABAtDI2SBRUJay5s5s,32801
+kanka/managers.py,sha256=QQN4HX8CDyx8zLvJ2Bvh8f-h7xGy8E7ClY4CnYMlK5E,34225
 kanka/py.typed,sha256=mZgbv7X8oKfyMzYIbodUlHrC15905jgP-ZbYviEIL18,86
 kanka/types.py,sha256=onIdSW-3rh6Bqv2VTvx6INFa7tkaQxqg6gJkiAh8YGA,262
 kanka/models/__init__.py,sha256=IFdzawDK_lhS50puRunnZZalh2S5DOPU96ASHeFITUw,1329
 kanka/models/base.py,sha256=GOt9I2eNb-R_2oD0fbU0LE3y9gWL0x3_2SQ9I5yuq3Y,4037
 kanka/models/common.py,sha256=0RF33RupotK0mWjvWc9oIdQZF7ko5FNc_GG5wUIZOOE,6682
 kanka/models/entities.py,sha256=-2ztBZn8-K8czQyd9vPnEtn4eS666v9firmk7UPDT5A,8885
-python_kanka-2.4.0.dist-info/METADATA,sha256=Pv30M3vFabZVtTY-6lLWpLPLxbghL6tLGDnbhbKPvV0,3249
-python_kanka-2.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-python_kanka-2.4.0.dist-info/licenses/LICENSE,sha256=37op2CRJ_dU2qGU-iJjczcP-ljtJjpKAgBdKFaiF2GY,1067
-python_kanka-2.4.0.dist-info/RECORD,,
+python_kanka-2.5.0.dist-info/METADATA,sha256=-RkLCqgQEN4QtIMsePgKYupX2ZWvvZMXpo2T_-fDnpI,3249
+python_kanka-2.5.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_kanka-2.5.0.dist-info/licenses/LICENSE,sha256=37op2CRJ_dU2qGU-iJjczcP-ljtJjpKAgBdKFaiF2GY,1067
+python_kanka-2.5.0.dist-info/RECORD,,

{python_kanka-2.4.0.dist-info → python_kanka-2.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.28.0
+Generator: hatchling 1.29.0
 Root-Is-Purelib: true
 Tag: py3-none-any