Merge pull request #1353 from vitalik/grigi/master

Add IPNetwork and Url serialisation

ninja/responses.py

@@ -1,10 +1,11 @@
 from enum import Enum
-from ipaddress import IPv4Address, IPv6Address
+from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network
 from typing import Any, FrozenSet
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.http import JsonResponse
 from pydantic import BaseModel
+from pydantic_core import Url
 
 __all__ = [
     "NinjaJSONEncoder",
@@ -21,7 +22,9 @@ class NinjaJSONEncoder(DjangoJSONEncoder):
     def default(self, o: Any) -> Any:
         if isinstance(o, BaseModel):
             return o.model_dump()
-        if isinstance(o, (IPv4Address, IPv6Address)):
+        if isinstance(o, Url):
+            return str(o)
+        if isinstance(o, (IPv4Address, IPv4Network, IPv6Address, IPv6Network)):
             return str(o)
         if isinstance(o, Enum):
             return str(o)

tests/test_response.py

@@ -6,6 +6,7 @@
 import pytest
 from django.http import HttpResponse
 from pydantic import BaseModel, ValidationError
+from pydantic_core import Url
 
 from ninja import Router
 from ninja.responses import Response
@@ -172,3 +173,10 @@ def test_enum_encoding():
     response = Response(data)
     response_data = json.loads(response.content)
     assert response_data["enum"] == str(data["enum"])
+
+
+def test_pydantic_url():
+    data = {"url": Url("https://django-ninja.dev/")}
+    response = Response(data)
+    response_data = json.loads(response.content)
+    assert response_data == {"url": "https://django-ninja.dev/"}