Fix: Pydantic and AsyncController Errors (#127)

* fix pydantic settings errors and async controller errors

* fixed CI setup

* fixed tests

Author: eadwinCode

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Install build dependencies
         run: pip install build
       - name: Build distribution

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: pytest --cov=ninja_jwt --cov-report=xml tests
       - name: Coverage

.github/workflows/test_full.yml

@@ -47,6 +47,6 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Ruff Linting Check
         run: ruff check ninja_jwt tests

Makefile

@@ -12,7 +12,10 @@ clean: ## Removing cached python compiled files
 	find . -name .ruff_cache  | xargs  rm -rfv
 
 install:clean ## Install dependencies
-	flit install --deps develop --symlink
+	pip install -r requirements.txt
+	flit install --symlink
+
+install-full:install ## Install dependencies
 	pre-commit install -f
 
 lint:fmt ## Run code linters

ninja_jwt/schema.py

@@ -82,7 +82,7 @@ def validate_values(cls, request: HttpRequest, values: Dict) -> Dict:
 
     def output_schema(self) -> Schema:
         warnings.warn(
-            "output_schema() is deprecated in favor of " "to_response_schema()",
+            "output_schema() is deprecated in favor of to_response_schema()",
             DeprecationWarning,
             stacklevel=2,
         )

ninja_jwt/utils.py

@@ -1,12 +1,12 @@
 import logging
+import typing as t
 from calendar import timegm
 from datetime import datetime
 from functools import wraps
 from importlib import import_module
 
 from django.conf import settings
 from django.utils.functional import lazy
-from django.utils.timezone import is_naive, make_aware
 
 from ninja_jwt import exceptions
 
@@ -43,35 +43,35 @@ def import_callable(path_or_callable):
         return getattr(packages, attr)
 
 
-def make_utc(dt):
-    if settings.USE_TZ and is_naive(dt):
-        return make_aware(dt, timezone=timezone.utc)
+def make_utc(dt: datetime) -> datetime:
+    if settings.USE_TZ and dt.tzinfo is None:
+        return dt.replace(tzinfo=timezone.utc)
 
     return dt
 
 
-def aware_utcnow():
+def aware_utcnow() -> datetime:
     dt = datetime.now(tz=timezone.utc)
     if not settings.USE_TZ:
         dt = dt.replace(tzinfo=None)
 
     return dt
 
 
-def datetime_to_epoch(dt):
+def datetime_to_epoch(dt: datetime) -> int:
     return timegm(dt.utctimetuple())
 
 
-def datetime_from_epoch(ts):
+def datetime_from_epoch(ts: float) -> datetime:
     dt = datetime.fromtimestamp(ts, tz=timezone.utc)
     if not settings.USE_TZ:
         dt = dt.replace(tzinfo=None)
 
     return dt
 
 
-def format_lazy(s, *args, **kwargs):
+def format_lazy(s: str, *args, **kwargs) -> str:
     return s.format(*args, **kwargs)
 
 
-format_lazy = lazy(format_lazy, str)
+format_lazy: t.Callable = lazy(format_lazy, str)

pyproject.toml

@@ -50,7 +50,7 @@ dependencies = [
     "Django >= 2.1",
     "pyjwt>=1.7.1,<3",
     "pyjwt[crypto]",
-    "django-ninja-extra >= 0.20.0",
+    "django-ninja-extra >= 0.22.9",
 ]
 
 
@@ -59,37 +59,10 @@ Documentation = "https://github.com/eadwinCode/django-ninja-jwt"
 Source = "https://github.com/eadwinCode/django-ninja-jwt"
 
 [project.optional-dependencies]
-test = [
-    "cryptography",
-    "pytest",
-    "pytest-cov",
-    "pytest-django",
-    "pytest-asyncio",
-    "ruff ==0.11.2",
-    "django-stubs",
-    "python-jose==3.4.0",
-    "click==8.1.8",
-    "freezegun"
-]
-
 crypto = [
     "cryptography>=3.3.1",
 ]
 
-dev = [
-    "pre-commit"
-]
-
-doc = [
-"mkdocs >=1.1.2,<2.0.0",
-"mkdocs-material",
-"markdown-include",
-"mdx-include >=1.4.1,<2.0.0",
-"mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0",
-"mkdocstrings"
-]
-
-
 [tool.ruff]
 select = [
     "E",  # pycodestyle errors

requirements-docs.txt

@@ -0,0 +1,6 @@
+markdown-include
+mdx-include >=1.4.1,<2.0.0
+mkdocs >=1.1.2,<2.0.0
+mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0
+mkdocs-material
+mkdocstrings

requirements-tests.txt

@@ -0,0 +1,11 @@
+click==8.1.8
+cryptography
+django-stubs
+freezegun
+ninja-schema>=0.14.1
+pytest
+pytest-asyncio==0.24.0
+pytest-cov
+pytest-django
+python-jose==3.3.0
+ruff ==0.11.2

requirements.txt

@@ -0,0 +1,5 @@
+-e .
+-r requirements-docs.txt
+-r requirements-tests.txt
+
+pre-commit

tests/test_utils.py

@@ -1,7 +1,6 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from django.test.utils import override_settings
-from django.utils import timezone
 from freezegun import freeze_time
 
 from ninja_jwt.utils import (
@@ -24,11 +23,11 @@ def test_it_should_return_the_correct_values(self):
 
         with override_settings(USE_TZ=False):
             dt = make_utc(dt)
-            assert timezone.is_naive(dt)
+            assert dt.tzinfo is None
 
         with override_settings(USE_TZ=True):
             dt = make_utc(dt)
-            assert timezone.is_aware(dt)
+            assert dt.tzinfo is not None
             assert dt.utcoffset() == timedelta(seconds=0)
 
 
@@ -39,7 +38,7 @@ def test_it_should_return_the_correct_value(self):
         with freeze_time(now):
             # Should return aware utcnow if USE_TZ == True
             with override_settings(USE_TZ=True):
-                assert timezone.make_aware(now, timezone=timezone.utc) == aware_utcnow()
+                assert now.replace(tzinfo=timezone.utc) == aware_utcnow()
 
             # Should return naive utcnow if USE_TZ == False
             with override_settings(USE_TZ=False):