biased 0.1.2.dev7__tar.gz → 0.1.2.dev11__tar.gz

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/PKG-INFO

@@ -1,18 +1,21 @@
 Metadata-Version: 2.3
 Name: biased
-Version: 0.1.2.dev7
+Version: 0.1.2.dev11
 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>
+Requires-Dist: injector>=0.22.0
 Requires-Dist: pydantic>=2
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: structlog>=25.4.0
 Requires-Dist: ulid-py>=1.1.0
 Requires-Dist: django>=5.2.6 ; extra == 'django'
+Requires-Dist: django-jsonform>=2.23.2 ; extra == 'django-jsonform'
 Requires-Dist: django-redis>=6.0.0 ; extra == 'django-redis'
 Requires-Dist: django-ninja>=1.4.3 ; extra == 'ninja'
 Requires-Python: >=3.12
 Provides-Extra: django
+Provides-Extra: django-jsonform
 Provides-Extra: django-redis
 Provides-Extra: ninja
 Description-Content-Type: text/markdown

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "biased"
-version = "0.1.2.dev7"
+version = "0.1.2.dev11"
 description = "Various reusable components, helpers, and utilities which I would like to use in any Python project"
 readme = "README.md"
 authors = [
@@ -8,6 +8,7 @@ authors = [
 ]
 requires-python = ">=3.12"
 dependencies = [
+    "injector>=0.22.0",
     "pydantic>=2",
     "python-dateutil>=2.9.0.post0",
     "structlog>=25.4.0",
@@ -24,7 +25,15 @@ ninja = [
 django-redis = [
     "django-redis>=6.0.0",
 ]
+django-jsonform = [
+    "django-jsonform>=2.23.2",
+]
 
 [build-system]
 requires = ["uv_build>=0.8.16,<0.9.0"]
 build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "rust-just>=1.43.0",
+]

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

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

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/src/biased/django/admin.py

@@ -122,11 +122,15 @@ def html_image_tag(short_description: str, attributes: dict[str, Any] | None = N
 
 
 def url_link(short_description: str, content: str = "-", target: str = "_self"):
-    def wrapper(func: Callable[[ModelAdmin, Model], dict[str, str]]):
+    def wrapper(func: Callable[[ModelAdmin, Model], dict[str, str] | None]):
         def field_func(self, obj):
-            params = dict(content=content, target=target)
-            params.update(func(self, obj))
-            return format_html('<a href="{url}" target="{target}">{content}</a>', **params)
+            result = func(self, obj)
+            if result is None:
+                return content
+            else:
+                params = dict(content=content, target=target)
+                params.update(func(self, obj))
+                return format_html('<a href="{url}" target="{target}">{content}</a>', **params)
 
         field_func.short_description = short_description
         return field_func

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/src/biased/django/forms/pydantic_model_form_field.py

@@ -6,6 +6,7 @@ from django.forms.fields import InvalidJSONInput
 from pydantic import BaseModel
 
 
+# Consider to use [django-pydantic-field](https://github.com/surenkov/django-pydantic-field) instead
 class PydanticModelFormField(JSONField):
     default_error_messages = {
         "invalid": "Enter a valid JSON.",

biased-0.1.2.dev11/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.dev7 → biased-0.1.2.dev11}/src/biased/django/models/pydantic_model_field.py

@@ -7,6 +7,7 @@ from biased.django.forms.pydantic_model_form_field import PydanticModelFormField
 from biased.utils.default_json_encoder import DefaultJsonEncoder
 
 
+# Consider to use [django-pydantic-field](https://github.com/surenkov/django-pydantic-field) instead
 class PydanticModelField(JSONField):
     default_error_messages = {
         "invalid": "Value must be valid JSON.",

biased-0.1.2.dev11/src/biased/django_jsonform/apps.py

@@ -0,0 +1,11 @@
+from logging import getLogger
+
+from django.apps import AppConfig
+
+log = getLogger(__name__)
+
+
+class BiasedDjangoJsonformConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "biased.django_jsonform"
+    label = "biased_django_jsonform"

biased-0.1.2.dev11/src/biased/django_jsonform/jsonform_action.py

@@ -0,0 +1,18 @@
+from typing import TypeVar
+
+from admin_form_action import Decorator, form_action
+from django import forms
+from django.contrib.admin import ModelAdmin
+
+FormT = TypeVar("FormT", bound=forms.Form)
+ModelAdminT = TypeVar("ModelAdminT", bound=ModelAdmin)
+
+
+def jsonform_action[FormT: forms.Form](
+    form_class: type[FormT],
+    *,
+    template: str | None = None,
+) -> Decorator[ModelAdminT, FormT]:
+    if template is None:
+        template = "admin_form_action/django_jsonform_form.html"
+    return form_action(form_class=form_class, template=template)

biased-0.1.2.dev11/src/biased/django_jsonform/templates/admin_form_action/django_jsonform_form.html

@@ -0,0 +1,9 @@
+{% extends "admin_form_action/form.html" %}
+
+{% block extrastyle %}{{ block.super }}
+<link rel="stylesheet" href="/static/dist/jsoneditor.min.css">
+{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+<script src="/static/dist/jsoneditor.min.js"></script>
+{% endblock %}

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/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
 
 
@@ -121,7 +122,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

{biased-0.1.2.dev7 → biased-0.1.2.dev11}/src/biased/utils/default_json_encoder.py

@@ -53,7 +53,7 @@ class DefaultJsonEncoder(JSONEncoder):
             return r
         if isinstance(o, timedelta):
             return _duration_iso_string(o)
-        if isinstance(o, (Decimal, UUID, ULID, AnyUrl)):
+        if isinstance(o, Decimal | UUID | ULID | AnyUrl):
             return str(o)
         if isinstance(o, BaseModel):
             return o.model_dump()