refactor: remove pydantic 2.10- compatibility layer

Author: azmeuk

scim2_models/resources/schema.py

@@ -10,6 +10,7 @@
 from typing import Union
 from typing import get_origin
 
+from pydantic import Base64Bytes
 from pydantic import Field
 from pydantic import create_model
 from pydantic import field_validator
@@ -29,7 +30,6 @@
 from ..reference import ExternalReference
 from ..reference import Reference
 from ..reference import URIReference
-from ..utils import Base64Bytes
 from ..utils import _normalize_attribute_name
 from .resource import Resource
 

scim2_models/resources/user.py

@@ -3,6 +3,7 @@
 from typing import ClassVar
 from typing import Literal
 
+from pydantic import Base64Bytes
 from pydantic import EmailStr
 from pydantic import Field
 
@@ -14,7 +15,6 @@
 from ..attributes import ComplexAttribute
 from ..reference import ExternalReference
 from ..reference import Reference
-from ..utils import Base64Bytes
 from .resource import AnyExtension
 from .resource import Resource
 

scim2_models/utils.py

@@ -1,14 +1,8 @@
-import base64
 import re
 from typing import TYPE_CHECKING
-from typing import Annotated
-from typing import Literal
 from typing import Union
 
-from pydantic import EncodedBytes
-from pydantic import EncoderProtocol
 from pydantic.alias_generators import to_snake
-from pydantic_core import PydanticCustomError
 
 if TYPE_CHECKING:
     from .base import BaseModel
@@ -29,57 +23,6 @@ def _int_to_str(status: int | None) -> str | None:
     return None if status is None else str(status)
 
 
-# Copied from Pydantic 2.10 repository
-class _Base64Encoder(EncoderProtocol):  # pragma: no cover
-    """Standard (non-URL-safe) Base64 encoder."""
-
-    @classmethod
-    def decode(cls, data: bytes) -> bytes:
-        """Decode the data from base64 encoded bytes to original bytes data.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-
-        """
-        try:
-            return base64.b64decode(data)
-        except ValueError as e:
-            raise PydanticCustomError(
-                "base64_decode", "Base64 decoding error: '{error}'", {"error": str(e)}
-            ) from e
-
-    @classmethod
-    def encode(cls, value: bytes) -> bytes:
-        """Encode the data from bytes to a base64 encoded bytes.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-
-        """
-        return base64.b64encode(value)
-
-    @classmethod
-    def get_json_format(cls) -> Literal["base64"]:
-        """Get the JSON format for the encoded data.
-
-        Returns:
-            The JSON format for the encoded data.
-
-        """
-        return "base64"
-
-
-# Compatibility with Pydantic <2.10
-# https://pydantic.dev/articles/pydantic-v2-10-release#use-b64decode-and-b64encode-for-base64bytes-and-base64str-types
-Base64Bytes = Annotated[bytes, EncodedBytes(encoder=_Base64Encoder)]
-
-
 def _to_camel(string: str) -> str:
     """Transform strings to camelCase.
 

tests/test_dynamic_resources.py

@@ -1,6 +1,8 @@
 import datetime
 from typing import Literal
 
+from pydantic import Base64Bytes
+
 from scim2_models.annotations import CaseExact
 from scim2_models.annotations import Mutability
 from scim2_models.annotations import Required
@@ -14,7 +16,6 @@
 from scim2_models.resources.resource import Resource
 from scim2_models.resources.schema import Attribute
 from scim2_models.resources.schema import Schema
-from scim2_models.utils import Base64Bytes
 
 
 def test_make_group_model_from_schema(load_sample):