pydantic v2 upgrade: Added support for pydantic v2 and dropped black linting

Author: eadwinCode

.github/workflows/test_full.yml

@@ -37,9 +37,7 @@ jobs:
         run: pip install flit
       - name: Install Dependencies
         run: flit install --symlink
-      - name: Black
-        run: black --check ellar_jwt tests
       - name: Linting check
-        run: ruff check ellar_jwt tests &  ruff check tests
+        run: ruff check ellar_jwt tests
       - name: mypy
         run: mypy ellar_jwt

Makefile

@@ -18,12 +18,11 @@ install-full: ## Install dependencies
 	pre-commit install -f
 
 lint: ## Run code linters
-	black --check ellar_jwt tests
 	ruff check ellar_jwt tests
 	mypy ellar_jwt
 
 fmt format: ## Run code formatters
-	black ellar_jwt tests
+	ruff format ellar_jwt tests
 	ruff check --fix ellar_jwt tests
 
 test: ## Run tests

ellar_jwt/schemas.py

@@ -3,8 +3,8 @@
 from datetime import timedelta
 
 from ellar.common import Serializer
+from ellar.pydantic import AnyUrl, Field, field_validator
 from jwt import algorithms
-from pydantic import AnyHttpUrl, Field, validator
 
 
 class JWTConfiguration(Serializer):
@@ -26,14 +26,14 @@ class JWTConfiguration(Serializer):
     audience: t.Optional[str] = Field(None)
 
     issuer: t.Optional[str] = Field(None)
-    jwk_url: t.Optional[AnyHttpUrl] = Field(None)
+    jwk_url: t.Optional[AnyUrl] = Field(None)
 
     jti: t.Optional[str] = Field("jti")
     lifetime: timedelta = Field(timedelta(minutes=5))
 
     json_encoder: t.Any = Field(default=json.JSONEncoder)
 
-    @validator("algorithm")
+    @field_validator("algorithm", mode="before")
     def _validate_algorithm(cls, value: str) -> str:
         """
         Ensure that the nominated algorithm is recognized, and that cryptography is installed for those

ellar_jwt/services.py

@@ -4,6 +4,8 @@
 
 import anyio
 import jwt
+from ellar.common import serialize_object
+from ellar.core import Config
 from ellar.di import injectable
 from jwt import InvalidAlgorithmError, InvalidTokenError, PyJWKClient, PyJWKClientError
 
@@ -16,11 +18,14 @@
 
 @injectable
 class JWTService:
-    def __init__(self, jwt_config: JWTConfiguration) -> None:
+    def __init__(self, jwt_config: JWTConfiguration, config: Config) -> None:
         self.jwt_config = jwt_config
+        self._encoders = config.SERIALIZER_CUSTOM_ENCODER
 
     def get_jwks_client(self, jwt_config: JWTConfiguration) -> t.Optional[PyJWKClient]:
-        jwks_client = PyJWKClient(jwt_config.jwk_url) if jwt_config.jwk_url else None
+        jwks_client = (
+            PyJWKClient(str(jwt_config.jwk_url)) if jwt_config.jwk_url else None
+        )
         return jwks_client
 
     def get_leeway(self, jwt_config: JWTConfiguration) -> timedelta:
@@ -60,7 +65,9 @@ def sign(
         Returns an encoded token for the given payload dictionary.
         """
         _jwt_config = self._merge_configurations(**jwt_config)
-        jwt_payload = Token(jwt_config=_jwt_config).build(payload.copy())
+        jwt_payload = Token(jwt_config=_jwt_config).build(
+            serialize_object(payload.copy(), encoders=self._encoders)
+        )
 
         return jwt.encode(
             jwt_payload,
@@ -93,9 +100,9 @@ def decode(
         """
         try:
             _jwt_config = self._merge_configurations(**jwt_config)
-            return jwt.decode(  # type: ignore[no-any-return]
+            return jwt.decode(
                 token,
-                self.get_verifying_key(token, _jwt_config),
+                self.get_verifying_key(token, _jwt_config),  # type:ignore[arg-type]
                 algorithms=[_jwt_config.algorithm],
                 audience=_jwt_config.audience,
                 issuer=_jwt_config.issuer,

pyproject.toml

@@ -40,7 +40,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ellar >= 0.4.4",
+    "ellar >= 0.5.8",
     "pyjwt>=1.7.1,<3",
     "pyjwt[crypto]"
 ]
@@ -66,7 +66,6 @@ test = [
     "ruff ==0.1.7",
     "mypy == 1.7.1",
     "ruff ==0.1.7",
-    "black == 23.11.0",
     "pytest-asyncio",
     "autoflake",
     "types-python-dateutil",