django-display-ids 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

django_display_ids/converters.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .conf import SLUG_REGEX
+from .conf import SLUG_REGEX, get_setting
 
 __all__ = [
     "DISPLAY_ID_REGEX",
@@ -19,6 +19,9 @@ __all__ = [
 DISPLAY_ID_REGEX = r"[a-z]{1,16}_[0-9A-Za-z]{22}"
 UUID_REGEX = r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
 
+# Slug regex from settings (respects DISPLAY_IDS["SLUG_REGEX"] Django setting)
+_SLUG_REGEX: str = str(get_setting("SLUG_REGEX"))
+
 
 class BaseConverter:
     """Base class for URL path converters with pass-through conversion."""
@@ -78,7 +81,7 @@ class DisplayIDOrSlugConverter(BaseConverter):
 
     Matches either format:
     - Display ID: {prefix}_{base62}
-    - Slug: Django's default slug pattern [-a-zA-Z0-9_]+
+    - Slug: matches DISPLAY_IDS["SLUG_REGEX"] setting (default: [-a-zA-Z0-9_]+)
 
     Example:
         from django.urls import path, register_converter
@@ -91,7 +94,7 @@ class DisplayIDOrSlugConverter(BaseConverter):
         ]
     """
 
-    regex = rf"(?:{DISPLAY_ID_REGEX}|{SLUG_REGEX})"
+    regex = rf"(?:{DISPLAY_ID_REGEX}|{_SLUG_REGEX})"
 
 
 class DisplayIDOrUUIDOrSlugConverter(BaseConverter):
@@ -100,7 +103,7 @@ class DisplayIDOrUUIDOrSlugConverter(BaseConverter):
     Matches any of:
     - Display ID: {prefix}_{base62}
     - UUID: hyphenated (e.g., 550e8400-e29b-41d4-a716-446655440000)
-    - Slug: Django's default slug pattern [-a-zA-Z0-9_]+
+    - Slug: matches DISPLAY_IDS["SLUG_REGEX"] setting (default: [-a-zA-Z0-9_]+)
 
     Example:
         from django.urls import path, register_converter
@@ -113,7 +116,7 @@ class DisplayIDOrUUIDOrSlugConverter(BaseConverter):
         ]
     """
 
-    regex = rf"(?:{DISPLAY_ID_REGEX}|{UUID_REGEX}|{SLUG_REGEX})"
+    regex = rf"(?:{DISPLAY_ID_REGEX}|{UUID_REGEX}|{_SLUG_REGEX})"
 
 
 def make_display_id_or_slug_converter(
@@ -140,8 +143,6 @@ def make_display_id_or_slug_converter(
             path("products/<display_id_or_slug:id>/", ProductDetailView.as_view()),
         ]
     """
-    from .conf import get_setting
-
     pattern = slug_regex if slug_regex is not None else get_setting("SLUG_REGEX")
 
     class CustomDisplayIDOrSlugConverter(DisplayIDOrSlugConverter):
@@ -176,8 +177,6 @@ def make_display_id_or_uuid_or_slug_converter(
             path("products/<identifier:id>/", ProductDetailView.as_view()),
         ]
     """
-    from .conf import get_setting
-
     pattern = slug_regex if slug_regex is not None else get_setting("SLUG_REGEX")
 
     class CustomDisplayIDOrUUIDOrSlugConverter(DisplayIDOrUUIDOrSlugConverter):

django_display_ids/managers.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import uuid
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from django.db import models
@@ -51,14 +52,15 @@ class DisplayIDQuerySet(models.QuerySet[M]):
 
     def get_by_display_id(
         self,
-        value: str,
+        value: str | uuid.UUID,
         *,
         prefix: str | None = None,
     ) -> M:
         """Get an object by its display ID.
 
         Args:
-            value: The display ID string (e.g., "inv_1a2B3c4D5e6F7g8H").
+            value: The display ID string (e.g., "inv_1a2B3c4D5e6F7g8H"),
+                or a UUID instance for direct UUID lookup.
             prefix: Expected prefix for validation. If None, uses model's prefix.
 
         Returns:
@@ -70,9 +72,19 @@ class DisplayIDQuerySet(models.QuerySet[M]):
             UnknownPrefixError: If the prefix doesn't match expected.
             ObjectNotFoundError: If no matching object exists.
         """
-        # Get model config
         model = self.model
         uuid_field = self._get_uuid_field()
+
+        # UUID objects skip display ID parsing entirely
+        if isinstance(value, uuid.UUID):
+            try:
+                return self.get(**{uuid_field: value})
+            except model.DoesNotExist:  # type: ignore[attr-defined]
+                raise ObjectNotFoundError(
+                    str(value), model_name=model.__name__
+                ) from None
+
+        # Get model config
         expected_prefix = prefix or self._get_model_prefix()
 
         # Require a prefix for display ID lookups
@@ -99,7 +111,7 @@ class DisplayIDQuerySet(models.QuerySet[M]):
 
     def get_by_identifier(
         self,
-        value: str,
+        value: str | uuid.UUID,
         *,
         strategies: tuple[StrategyName, ...] | None = None,
         prefix: str | None = None,
@@ -109,7 +121,8 @@ class DisplayIDQuerySet(models.QuerySet[M]):
         Tries each strategy in order and returns the first match.
 
         Args:
-            value: The identifier string (display ID, UUID, or slug).
+            value: The identifier string (display ID, UUID, or slug),
+                or a UUID instance for direct UUID lookup.
             strategies: Strategies to try. Defaults to settings.
             prefix: Expected display ID prefix for validation.
 
@@ -124,6 +137,16 @@ class DisplayIDQuerySet(models.QuerySet[M]):
         """
         model = self.model
         uuid_field = self._get_uuid_field()
+
+        # UUID objects skip strategy parsing entirely
+        if isinstance(value, uuid.UUID):
+            try:
+                return self.get(**{uuid_field: value})
+            except model.DoesNotExist:  # type: ignore[attr-defined]
+                raise ObjectNotFoundError(
+                    str(value), model_name=model.__name__
+                ) from None
+
         slug_field = self._get_slug_field()
         expected_prefix = prefix or self._get_model_prefix()
         lookup_strategies = strategies or self._get_strategies()
@@ -144,14 +167,14 @@ class DisplayIDQuerySet(models.QuerySet[M]):
         try:
             return self.get(**lookup)
         except model.DoesNotExist:  # type: ignore[attr-defined]
-            raise ObjectNotFoundError(value, model_name=model.__name__) from None
+            raise ObjectNotFoundError(str(value), model_name=model.__name__) from None
         except model.MultipleObjectsReturned:  # type: ignore[attr-defined]
             count = self.filter(**lookup).count()
-            raise AmbiguousIdentifierError(value, count) from None
+            raise AmbiguousIdentifierError(str(value), count) from None
 
     def get_by_identifiers(
         self,
-        values: Sequence[str],
+        values: Sequence[str | uuid.UUID],
         *,
         strategies: tuple[StrategyName, ...] | None = None,
         prefix: str | None = None,
@@ -162,7 +185,8 @@ class DisplayIDQuerySet(models.QuerySet[M]):
         then executes a single database query using `__in` lookups.
 
         Args:
-            values: A sequence of identifier strings (display IDs, UUIDs, or slugs).
+            values: A sequence of identifier strings (display IDs, UUIDs, or slugs)
+                or UUID instances. UUID instances skip strategy parsing.
             strategies: Strategies to try. Defaults to settings.
             prefix: Expected display ID prefix for validation.
 
@@ -178,6 +202,7 @@ class DisplayIDQuerySet(models.QuerySet[M]):
                 'inv_2aUyqjCzEIiEcYMKj7TZtw',
                 'inv_7kN3xPqRmLwYvTzJ5HfUaB',
                 '550e8400-e29b-41d4-a716-446655440000',
+                uuid.UUID('550e8400-e29b-41d4-a716-446655440000'),
             ])
         """
         if not values:
@@ -193,6 +218,11 @@ class DisplayIDQuerySet(models.QuerySet[M]):
         slugs: list[str] = []
 
         for value in values:
+            # UUID objects skip strategy parsing entirely
+            if isinstance(value, uuid.UUID):
+                uuids.append(value)
+                continue
+
             result = parse_identifier(
                 value, lookup_strategies, expected_prefix=expected_prefix
             )
@@ -253,7 +283,7 @@ class DisplayIDManager(models.Manager[M]):
 
     def get_by_display_id(
         self,
-        value: str,
+        value: str | uuid.UUID,
         *,
         prefix: str | None = None,
     ) -> M:
@@ -265,7 +295,7 @@ class DisplayIDManager(models.Manager[M]):
 
     def get_by_identifier(
         self,
-        value: str,
+        value: str | uuid.UUID,
         *,
         strategies: tuple[StrategyName, ...] | None = None,
         prefix: str | None = None,
@@ -280,7 +310,7 @@ class DisplayIDManager(models.Manager[M]):
 
     def get_by_identifiers(
         self,
-        values: Sequence[str],
+        values: Sequence[str | uuid.UUID],
         *,
         strategies: tuple[StrategyName, ...] | None = None,
         prefix: str | None = None,

django_display_ids/resolver.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import uuid
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from django.db import models
@@ -23,7 +24,7 @@ M = TypeVar("M", bound=models.Model)
 def resolve_object(
     *,
     model: type[M],
-    value: str,
+    value: str | uuid.UUID,
     strategies: tuple[StrategyName, ...] = DEFAULT_STRATEGIES,
     prefix: str | None = None,
     uuid_field: str = "id",
@@ -36,7 +37,8 @@ def resolve_object(
 
     Args:
         model: The Django model class.
-        value: The identifier string (UUID, display ID, or slug).
+        value: The identifier string (UUID, display ID, or slug),
+            or a UUID instance for direct UUID lookup.
         strategies: Tuple of strategy names to try in order.
         prefix: Expected display ID prefix (for validation).
         uuid_field: Name of the UUID field on the model.
@@ -53,9 +55,6 @@ def resolve_object(
         AmbiguousIdentifierError: If multiple objects match (slug lookup).
         TypeError: If queryset is not for the specified model.
     """
-    # Parse the identifier to determine type
-    result = parse_identifier(value, strategies, expected_prefix=prefix)
-
     # Get the base queryset
     if queryset is not None:
         if queryset.model is not model:
@@ -67,6 +66,16 @@ def resolve_object(
     else:
         qs = model._default_manager.all()
 
+    # UUID objects skip strategy parsing entirely
+    if isinstance(value, uuid.UUID):
+        try:
+            return qs.get(**{uuid_field: value})
+        except model.DoesNotExist:  # type: ignore[attr-defined]
+            raise ObjectNotFoundError(str(value), model_name=model.__name__) from None
+
+    # Parse the identifier to determine type
+    result = parse_identifier(value, strategies, expected_prefix=prefix)
+
     # Build the lookup based on strategy
     lookup: dict[str, Any]
     if result.strategy in ("uuid", "display_id"):

{django_display_ids-0.4.0.dist-info → django_display_ids-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-display-ids
-Version: 0.4.0
+Version: 0.4.1
 Summary: Stripe-like prefixed IDs for Django. Works with existing UUIDs — no schema changes.
 Keywords: django,stripe,uuid,base62,prefixed-id,drf,shortuuid,nanoid,ulid
 License: MIT
@@ -19,6 +19,7 @@ Requires-Dist: django>=4.2
 Requires-Python: >=3.12
 Project-URL: Documentation, https://django-display-ids.readthedocs.io/
 Project-URL: Repository, https://github.com/josephabrahams/django-display-ids
+Project-URL: Changelog, https://github.com/josephabrahams/django-display-ids/blob/main/CHANGELOG.md
 Description-Content-Type: text/markdown
 
 # django-display-ids

{django_display_ids-0.4.0.dist-info → django_display_ids-0.4.1.dist-info}/RECORD

@@ -7,19 +7,19 @@ django_display_ids/contrib/drf_spectacular/__init__.py,sha256=9swSJge_dQldC4AZMk
 django_display_ids/contrib/rest_framework/__init__.py,sha256=pKV6BVB7k0dJm29C7XMr0M-wK2lXPUgW8Hf4BZHHwuE,198
 django_display_ids/contrib/rest_framework/serializers.py,sha256=Jp-z7qHafxkGNYv30YC9rrqLt936SrhONJv3rqfQaC0,4049
 django_display_ids/contrib/rest_framework/views.py,sha256=I6jpsdpM1sRKrPBVyrjypsKgFyUdu6WljGcffHXDiCw,5961
-django_display_ids/converters.py,sha256=ElwrfA7DXiadSZ-Sjvl6ZALgH7tfEZ-tLI7UdE6MsAs,5797
+django_display_ids/converters.py,sha256=KGD5FYWkuXztO-6TvTtPwMP7xbnAXAaYuk9LvIpxkBM,5918
 django_display_ids/encoding.py,sha256=csIwUZaQKSOLwRU6-DWGTNGvSxmroyK0Yt7TBCo0AFE,2945
 django_display_ids/examples.py,sha256=gap5NNPTmE7B5uxiYKoMoK8G-OEtL1Ek0W039l6oJ9I,2689
 django_display_ids/exceptions.py,sha256=ATIW6SLM9zQ0s-26c3qdQfnPDbuiMpMZK6fxdyQN0tA,3085
-django_display_ids/managers.py,sha256=PymcK4BZL6UsUOtoloHP34MCRNmvNHSKEcOImhZxGag,9779
+django_display_ids/managers.py,sha256=I7qY1V64lDPplhE56ueARICFOHEQqCJhme6LQfBWo_o,11031
 django_display_ids/models.py,sha256=_hmgAR4HC3I-5wU2DND6uNLjEllu1Y9eaXeBQ9dWMNI,4313
 django_display_ids/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_display_ids/resolver.py,sha256=ZlDVoxX0PmVf0MSwPyiNNwQVzdqJGDGE8fm2iyV7QjE,2848
+django_display_ids/resolver.py,sha256=YhgfkBEVKFsAA9UB66cbyND46sWYWBHPqOJy-yQWstA,3229
 django_display_ids/strategies.py,sha256=Rq00-AW_FB8-K04u2oBK5J6kPiYgsE3TdYlLyK_zro0,4436
 django_display_ids/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_display_ids/templatetags/display_ids.py,sha256=4KHE8r8mgSKb7LgIuXJaJB_3UGrzRZvTdLqSCYQtb5I,1157
 django_display_ids/typing.py,sha256=2O3kT7XKkiE7WI9A5KkILPM-Zi7-zCy5gVvXQL_J2mI,478
 django_display_ids/views.py,sha256=uAXQJryWQNnTSHIjTLhisrYnNiaTo1pLzkUdvYyOLRs,4992
-django_display_ids-0.4.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-django_display_ids-0.4.0.dist-info/METADATA,sha256=La5mR7VliD_sGMKjFazUtnrgPFPQ1anLrsxWou9_ej8,5259
-django_display_ids-0.4.0.dist-info/RECORD,,
+django_display_ids-0.4.1.dist-info/WHEEL,sha256=iHtWm8nRfs0VRdCYVXocAWFW8ppjHL-uTJkAdZJKOBM,80
+django_display_ids-0.4.1.dist-info/METADATA,sha256=irrOfygrirWeDRa2mCNHvsnKpb6VJRd_8Ty1orTkRGg,5359
+django_display_ids-0.4.1.dist-info/RECORD,,

{django_display_ids-0.4.0.dist-info → django_display_ids-0.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.28
+Generator: uv 0.9.30
 Root-Is-Purelib: true
 Tag: py3-none-any