Merge conflicts

sanic_ext/extensions/injection/constructor.py

@@ -20,7 +20,12 @@
 from sanic.exceptions import ServerError
 
 from sanic_ext.exceptions import InitError
-from sanic_ext.utils.typing import is_attrs, is_optional, is_pydantic, is_msgspec
+from sanic_ext.utils.typing import (
+    is_attrs,
+    is_msgspec,
+    is_optional,
+    is_pydantic,
+)
 
 if TYPE_CHECKING:
     from .registry import ConstantRegistry, InjectionRegistry

sanic_ext/extensions/openapi/types.py

@@ -17,7 +17,13 @@
 
 from sanic_routing.patterns import alpha, ext, nonemptystr, parse_date, slug
 
-from sanic_ext.utils.typing import is_attrs, is_generic, is_pydantic, is_msgspec
+from sanic_ext.utils.typing import (
+    UnionType,
+    is_attrs,
+    is_generic,
+    is_msgspec,
+    is_pydantic,
+)
 
 try:
     import attrs
@@ -28,7 +34,8 @@
 
 try:
     import msgspec
-    from msgspec.inspect import type_info as msgspec_type_info, Metadata as MsgspecMetadata
+    from msgspec.inspect import Metadata as MsgspecMetadata
+    from msgspec.inspect import type_info as msgspec_type_info
 
     MsgspecMetadata: Any = MsgspecMetadata
     NODEFAULT: Any = msgspec.NODEFAULT
@@ -40,13 +47,14 @@ class MsgspecAdapter(msgspec.Struct):
         metadata: dict
 
 except ImportError:
+
     def msgspec_type_info(struct):
         pass
 
     class MsgspecAdapter:
         pass
 
-    MsgspecMetadata  = object()
+    MsgspecMetadata = object()
     NODEFAULT = object()
     UNSET = object()
 
@@ -124,7 +132,7 @@ def make(value, **kwargs):
         _type = type(value)
         origin = get_origin(value)
         args = get_args(value)
-        if origin is Union:
+        if origin in (Union, UnionType):
             if type(None) in args:
                 kwargs["nullable"] = True
 
@@ -332,8 +340,10 @@ def make(cls, value: Any, **kwargs):
                 fields = [
                     MsgspecAdapter(
                         name=f.name,
-                        default=MISSING if f.default in (UNSET, NODEFAULT) else f.default,
-                        metadata=getattr(f.type, 'extra', {})
+                        default=MISSING
+                        if f.default in (UNSET, NODEFAULT)
+                        else f.default,
+                        metadata=getattr(f.type, "extra", {}),
                     )
                     for f in msgspec_type_info(value).fields
                 ]

sanic_ext/extras/validation/check.py

@@ -13,7 +13,12 @@
     get_origin,
 )
 
-from sanic_ext.utils.typing import UnionType, is_generic, is_optional, is_msgspec
+from sanic_ext.utils.typing import (
+    UnionType,
+    is_generic,
+    is_msgspec,
+    is_optional,
+)
 
 MISSING: Tuple[Any, ...] = (_HAS_DEFAULT_FACTORY,)
 
@@ -32,6 +37,7 @@
 
 try:
     import msgspec
+
     MSGSPEC = True
 except ImportError:
     MSGSPEC = False
@@ -179,7 +185,9 @@ def check_data(model, data, schema, allow_multiple=False, allow_coerce=False):
 
     if MSGSPEC and is_msgspec(model):
         try:
-            return msgspec.from_builtins(hydration_values, model, str_values=True, str_keys=True)
+            return msgspec.from_builtins(
+                hydration_values, model, str_values=True, str_keys=True
+            )
         except msgspec.ValidationError as e:
             raise TypeError(e)
     else:

sanic_ext/extras/validation/schema.py

@@ -31,6 +31,7 @@
 try:
     from msgspec.inspect import type_info as msgspec_type_info
 except ModuleNotFoundError:
+
     def msgspec_type_info(val):
         pass
 
@@ -42,7 +43,9 @@ def make_schema(agg, item):
     if is_generic(item) and (args := get_args(item)):
         for arg in args:
             make_schema(agg, arg)
-    elif item.__name__ not in agg and (is_dataclass(item) or is_attrs(item) or is_msgspec(item)):
+    elif item.__name__ not in agg and (
+        is_dataclass(item) or is_attrs(item) or is_msgspec(item)
+    ):
         if is_dataclass(item):
             fields = item.__dataclass_fields__
         elif is_msgspec(item):

sanic_ext/utils/typing.py

@@ -49,6 +49,7 @@ def is_pydantic(model):
         issubclass(model, BaseModel) or hasattr(model, "__pydantic_model__")
     )
 
+
 def is_attrs(model):
     return ATTRS and (hasattr(model, "__attrs_attrs__"))
 

tests/extensions/openapi/test_model_fields.py

@@ -1,10 +1,10 @@
 from dataclasses import dataclass, field
-from typing import List, Annotated
+from typing import Annotated, List
 from uuid import UUID
 
 import attrs
 import pytest
-from msgspec import Struct, Meta
+from msgspec import Meta, Struct
 from pydantic import BaseModel, Field
 from pydantic.dataclasses import dataclass as pydataclass
 
@@ -50,8 +50,15 @@ class FooPydanticDataclass:
 
 class FooStruct(Struct):
     links: List[UUID]
-    priority: Annotated[int, Meta(extra={"openapi": {"exclusiveMinimum": 1, "exclusiveMaximum": 10}})]
-    ident: Annotated[str, Meta(extra={"openapi": {"example": "ABC123"}})] = "XXXX"
+    priority: Annotated[
+        int,
+        Meta(
+            extra={"openapi": {"exclusiveMinimum": 1, "exclusiveMaximum": 10}}
+        ),
+    ]
+    ident: Annotated[
+        str, Meta(extra={"openapi": {"example": "ABC123"}})
+    ] = "XXXX"
 
 
 @pytest.mark.parametrize(

tests/extensions/openapi/test_typing.py

@@ -41,6 +41,8 @@ def test_dict_values_nested():
 ]
 if sys.version_info >= (3, 9):
     params.append(({"foo": list[str]}, True))
+if sys.version_info >= (3, 10):
+    params.append(({"foo": str | None}, True))
 
 
 @pytest.mark.parametrize("item,expected", params)

tests/extra/test_validation_msgspec.py

@@ -1,9 +1,8 @@
 import sys
-
-from msgspec import Struct
 from typing import List, Optional
 
 import pytest
+from msgspec import Struct
 from sanic import json
 from sanic.views import HTTPMethodView
 

tox.ini

@@ -13,7 +13,7 @@ python =
 extras = test
 deps =
     git+https://github.com/sanic-org/sanic.git#egg=sanic
-    pydantic
+    pydantic<2.0.0
     attrs
     msgspec
 ;     sanic21.6: sanic==21.6