Merge branch 'develop' into fix/pydantic-creator-use-explicit-ns

Author: alistairmaclean

CHANGELOG.rst

@@ -13,6 +13,7 @@ Changelog
 ------
 Fixed
 ^^^^^
+- Fixed asyncio "no current event loop" deprecation warning by replacing `asyncio.get_event_loop()` with modern event loop handling using `get_running_loop()` with fallback to `new_event_loop()` (#1865)
 - Add support for globalns and localns in pydantic_model_creator
 
 Changed

examples/router.py

@@ -1,11 +1,7 @@
 """
 This example to use router to implement read/write separation
 """
-
-from typing import Type
-
-from tortoise import Tortoise, fields, run_async
-from tortoise.models import Model
+from tortoise import Model, Tortoise, fields, run_async
 
 
 class Event(Model):
@@ -21,10 +17,10 @@ def __str__(self):
 
 
 class Router:
-    def db_for_read(self, model: Type[Model]):
+    def db_for_read(self, model: type[Model]):
         return "slave"
 
-    def db_for_write(self, model: Type[Model]):
+    def db_for_write(self, model: type[Model]):
         return "master"
 
 

examples/signals.py

@@ -2,7 +2,7 @@
 This example demonstrates model signals usage
 """
 
-from typing import Optional, Type
+from typing import Optional
 
 from tortoise import BaseDBAsyncClient, Tortoise, fields, run_async
 from tortoise.models import Model
@@ -22,14 +22,14 @@ def __str__(self):
 
 @pre_save(Signal)
 async def signal_pre_save(
-    sender: "Type[Signal]", instance: Signal, using_db, update_fields
+    sender: "type[Signal]", instance: Signal, using_db, update_fields
 ) -> None:
     print(sender, instance, using_db, update_fields)
 
 
 @post_save(Signal)
 async def signal_post_save(
-    sender: "Type[Signal]",
+    sender: "type[Signal]",
     instance: Signal,
     created: bool,
     using_db: "Optional[BaseDBAsyncClient]",
@@ -40,14 +40,14 @@ async def signal_post_save(
 
 @pre_delete(Signal)
 async def signal_pre_delete(
-    sender: "Type[Signal]", instance: Signal, using_db: "Optional[BaseDBAsyncClient]"
+    sender: "type[Signal]", instance: Signal, using_db: "Optional[BaseDBAsyncClient]"
 ) -> None:
     print(sender, instance, using_db)
 
 
 @post_delete(Signal)
 async def signal_post_delete(
-    sender: "Type[Signal]", instance: Signal, using_db: "Optional[BaseDBAsyncClient]"
+    sender: "type[Signal]", instance: Signal, using_db: "Optional[BaseDBAsyncClient]"
 ) -> None:
     print(sender, instance, using_db)
 

tests/fields/subclass_fields.py

@@ -1,5 +1,5 @@
 from enum import Enum, IntEnum
-from typing import Any, Type
+from typing import Any
 
 from tortoise import ConfigurationError
 from tortoise.fields import CharField, IntField
@@ -13,7 +13,7 @@ class EnumField(CharField):
 
     __slots__ = ("enum_type",)
 
-    def __init__(self, enum_type: Type[Enum], **kwargs):
+    def __init__(self, enum_type: type[Enum], **kwargs):
         super().__init__(128, **kwargs)
         if not issubclass(enum_type, Enum):
             raise ConfigurationError(f"{enum_type} is not a subclass of Enum!")
@@ -48,7 +48,7 @@ class IntEnumField(IntField):
 
     __slots__ = ("enum_type",)
 
-    def __init__(self, enum_type: Type[IntEnum], **kwargs):
+    def __init__(self, enum_type: type[IntEnum], **kwargs):
         super().__init__(**kwargs)
         if not issubclass(enum_type, IntEnum):
             raise ConfigurationError(f"{enum_type} is not a subclass of IntEnum!")

tests/fields/test_time.py

@@ -2,7 +2,6 @@
 from datetime import date, datetime, time, timedelta
 from datetime import timezone as dt_timezone
 from time import sleep
-from typing import Type
 from unittest.mock import patch
 
 import pytz
@@ -18,7 +17,7 @@
 
 
 class TestEmpty(test.TestCase):
-    model: Type[Model] = testmodels.DatetimeFields
+    model: type[Model] = testmodels.DatetimeFields
 
     async def test_empty(self):
         with self.assertRaises(IntegrityError):

tests/test_queryset.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from tests.testmodels import (
     Author,
     Book,
@@ -845,7 +843,7 @@ async def test_joins_in_arithmetic_expressions(self):
 
 
 class TestNotExist(test.TestCase):
-    exp_cls: Type[NotExistOrMultiple] = DoesNotExist
+    exp_cls: type[NotExistOrMultiple] = DoesNotExist
 
     @test.requireCapability(dialect="sqlite")
     def test_does_not_exist(self):

tests/test_signals.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type
+from typing import Optional
 
 from tests.testmodels import Signals
 from tortoise import BaseDBAsyncClient
@@ -8,15 +8,15 @@
 
 @pre_save(Signals)
 async def signal_pre_save(
-    sender: "Type[Signals]", instance: Signals, using_db, update_fields
+    sender: "type[Signals]", instance: Signals, using_db, update_fields
 ) -> None:
     await Signals.filter(name="test1").update(name="test_pre-save")
     await Signals.filter(name="test5").update(name="test_pre-save")
 
 
 @post_save(Signals)
 async def signal_post_save(
-    sender: "Type[Signals]",
+    sender: "type[Signals]",
     instance: Signals,
     created: bool,
     using_db: "Optional[BaseDBAsyncClient]",
@@ -28,14 +28,14 @@ async def signal_post_save(
 
 @pre_delete(Signals)
 async def signal_pre_delete(
-    sender: "Type[Signals]", instance: Signals, using_db: "Optional[BaseDBAsyncClient]"
+    sender: "type[Signals]", instance: Signals, using_db: "Optional[BaseDBAsyncClient]"
 ) -> None:
     await Signals.filter(name="test3").update(name="test_pre-delete")
 
 
 @post_delete(Signals)
 async def signal_post_delete(
-    sender: "Type[Signals]", instance: Signals, using_db: "Optional[BaseDBAsyncClient]"
+    sender: "type[Signals]", instance: Signals, using_db: "Optional[BaseDBAsyncClient]"
 ) -> None:
     await Signals.filter(name="test4").update(name="test_post-delete")
 

tests/test_table_name.py

@@ -1,11 +1,9 @@
-from typing import Type
-
 from tortoise import Tortoise, fields
 from tortoise.contrib.test import SimpleTestCase
 from tortoise.models import Model
 
 
-def table_name_generator(model_cls: Type[Model]):
+def table_name_generator(model_cls: type[Model]):
     return f"test_{model_cls.__name__.lower()}"
 
 

tortoise/__init__.py

@@ -11,7 +11,7 @@
 from copy import deepcopy
 from inspect import isclass
 from types import ModuleType
-from typing import Any, Type, cast
+from typing import Any, cast
 
 from pypika_tortoise import Query, Table
 
@@ -34,8 +34,8 @@
 
 
 class Tortoise:
-    apps: dict[str, dict[str, Type["Model"]]] = {}
-    table_name_generator: Callable[[Type["Model"]], str] | None = None
+    apps: dict[str, dict[str, type["Model"]]] = {}
+    table_name_generator: Callable[[type["Model"]], str] | None = None
     _inited: bool = False
 
     @classmethod
@@ -53,7 +53,7 @@ def get_connection(cls, connection_name: str) -> BaseDBAsyncClient:
 
     @classmethod
     def describe_model(
-        cls, model: Type["Model"], serializable: bool = True
+        cls, model: type["Model"], serializable: bool = True
     ) -> dict[str, Any]:  # pragma: nocoverage
         """
         Describes the given list of models or ALL registered models.
@@ -79,7 +79,7 @@ def describe_model(
 
     @classmethod
     def describe_models(
-        cls, models: list[Type["Model"]] | None = None, serializable: bool = True
+        cls, models: list[type["Model"]] | None = None, serializable: bool = True
     ) -> dict[str, dict[str, Any]]:
         """
         Describes the given list of models or ALL registered models.
@@ -115,7 +115,7 @@ def describe_models(
 
     @classmethod
     def _init_relations(cls) -> None:
-        def get_related_model(related_app_name: str, related_model_name: str) -> Type["Model"]:
+        def get_related_model(related_app_name: str, related_model_name: str) -> type["Model"]:
             """
             Test, if app and model really exist. Throws a ConfigurationError with a hopefully
             helpful message. If successful, returns the requested model.
@@ -151,7 +151,7 @@ def split_reference(reference: str) -> tuple[str, str]:
                 )
             return items[0], items[1]
 
-        def init_fk_o2o_field(model: Type["Model"], field: str, is_o2o=False) -> None:
+        def init_fk_o2o_field(model: type["Model"], field: str, is_o2o=False) -> None:
             fk_object = cast(
                 "OneToOneFieldInstance | ForeignKeyFieldInstance", model._meta.fields_map[field]
             )
@@ -284,7 +284,7 @@ def init_fk_o2o_field(model: Type["Model"], field: str, is_o2o=False) -> None:
                     related_model._meta.add_field(backward_relation_name, m2m_relation)
 
     @classmethod
-    def _discover_models(cls, models_path: ModuleType | str, app_label: str) -> list[Type["Model"]]:
+    def _discover_models(cls, models_path: ModuleType | str, app_label: str) -> list[type["Model"]]:
         if isinstance(models_path, ModuleType):
             module = models_path
         else:
@@ -329,7 +329,7 @@ def init_models(
 
         :raises ConfigurationError: If models are invalid.
         """
-        app_models: list[Type[Model]] = []
+        app_models: list[type[Model]] = []
         for models_path in models_paths:
             app_models += cls._discover_models(models_path, app_label)
 
@@ -399,7 +399,7 @@ async def init(
         use_tz: bool = False,
         timezone: str = "UTC",
         routers: list[str | type] | None = None,
-        table_name_generator: Callable[[Type["Model"]], str] | None = None,
+        table_name_generator: Callable[[type["Model"]], str] | None = None,
     ) -> None:
         """
         Sets up Tortoise-ORM: loads apps and models, configures database connections but does not

tortoise/backends/base/client.py

@@ -3,7 +3,7 @@
 import abc
 import asyncio
 from collections.abc import Sequence
-from typing import Any, Generic, Type, TypeVar, cast
+from typing import Any, Generic, TypeVar, cast
 
 from pypika_tortoise import Query
 
@@ -85,17 +85,17 @@ class BaseDBAsyncClient(abc.ABC):
     Parameters get passed as kwargs, and is mostly driver specific.
 
     .. attribute:: query_class
-        :annotation: Type[pypika_tortoise.Query]
+        :annotation: type[pypika_tortoise.Query]
 
         The PyPika Query dialect (low level dialect)
 
     .. attribute:: executor_class
-        :annotation: Type[BaseExecutor]
+        :annotation: type[BaseExecutor]
 
         The executor dialect class (high level dialect)
 
     .. attribute:: schema_generator
-        :annotation: Type[BaseSchemaGenerator]
+        :annotation: type[BaseSchemaGenerator]
 
         The DDL schema generator
 
@@ -109,9 +109,9 @@ class BaseDBAsyncClient(abc.ABC):
     _parent: "BaseDBAsyncClient"
     _pool: Any
     connection_name: str
-    query_class: Type[Query] = Query
-    executor_class: Type[BaseExecutor] = BaseExecutor
-    schema_generator: Type[BaseSchemaGenerator] = BaseSchemaGenerator
+    query_class: type[Query] = Query
+    executor_class: type[BaseExecutor] = BaseExecutor
+    schema_generator: type[BaseSchemaGenerator] = BaseSchemaGenerator
     capabilities: Capabilities = Capabilities("")
 
     def __init__(self, connection_name: str, fetch_inserted: bool = True, **kwargs: Any) -> None: