biased 0.1.2.dev10__tar.gz → 0.1.2.dev12__tar.gz

{biased-0.1.2.dev10 → biased-0.1.2.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: biased
-Version: 0.1.2.dev10
+Version: 0.1.2.dev12
 Summary: Various reusable components, helpers, and utilities which I would like to use in any Python project
 Author: Dmitry Tatarkin
 Author-email: Dmitry Tatarkin <tatarkin@gmail.com>

{biased-0.1.2.dev10 → biased-0.1.2.dev12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "biased"
-version = "0.1.2.dev10"
+version = "0.1.2.dev12"
 description = "Various reusable components, helpers, and utilities which I would like to use in any Python project"
 readme = "README.md"
 authors = [

biased-0.1.2.dev12/src/biased/consts.py

@@ -0,0 +1 @@
+ULID_PATTERN = r"^0[0-9A-HJKMNP-TV-Z]{25}$"

biased-0.1.2.dev12/src/biased/django/forms/ulid_form_field.py

@@ -0,0 +1,12 @@
+from django import forms
+from django.core.validators import RegexValidator
+
+from biased.consts import ULID_PATTERN
+
+
+class UlidFormField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        kwargs["min_length"] = 26
+        kwargs["max_length"] = 26
+        kwargs["validators"] = [RegexValidator(ULID_PATTERN)]
+        super().__init__(*args, **kwargs)

{biased-0.1.2.dev10 → biased-0.1.2.dev12}/src/biased/types.py

@@ -12,6 +12,7 @@ from pydantic import AfterValidator, AnyUrl, BaseModel, BeforeValidator, PlainSe
 from pydantic.json_schema import Examples, SkipJsonSchema
 from pydantic_core import Url
 
+from biased.consts import ULID_PATTERN
 from biased.utils.aba_routing_number import validate_aba_routing_number
 
 
@@ -64,9 +65,13 @@ NonNegativeMoneyAmount = Annotated[MoneyAmount, annotated_types.Ge(0)]
 
 ItemsPerPageLimit = Annotated[int, annotated_types.Ge(0), annotated_types.Le(100)]
 
-AsciiStr = Annotated[str, StringConstraints(strict=True, pattern=r"^[ -~]*$")]
+AsciiStrConstraints = StringConstraints(strict=True, pattern=r"^[ -~]*$")
 
-AlphanumStr = Annotated[str, StringConstraints(strict=True, pattern=r"^[a-zA-Z0-9]+$")]
+AsciiStr = Annotated[str, AsciiStrConstraints]
+
+AlphanumStrConstraints = StringConstraints(strict=True, pattern=r"^[a-zA-Z0-9]+$")
+
+AlphanumStr = Annotated[str, AlphanumStrConstraints]
 
 JsonPrimitiveTypes = (
     str
@@ -121,7 +126,7 @@ UlidStr = Annotated[
         to_upper=True,
         min_length=26,
         max_length=26,
-        pattern=r"^0[0-9A-HJKMNP-TV-Z]{25}$",
+        pattern=ULID_PATTERN,
     ),
     AfterValidator(lambda x: ulid.parse(x).str),
     # This Examples annotation leads to "😱 Could not render Parameters, see the console." in Swagger
@@ -131,11 +136,10 @@ UlidStr = Annotated[
     # WithJsonSchema({'type': 'string', 'example': ulid.new().str})
 ]
 
-NotEmptyString = Annotated[
-    str,
-    StringConstraints(
-        strict=True,
-        strip_whitespace=True,
-        min_length=1,
-    ),
-]
+NotEmptyStringConstraints = StringConstraints(
+    strict=True,
+    strip_whitespace=True,
+    min_length=1,
+)
+
+NotEmptyString = Annotated[str, NotEmptyStringConstraints]