fix: Q importing bug due to moving from query_utils.py to expressions.py in V0.18.0

Author: NightMarcher

examples/service/models/demo/account.py

@@ -1,6 +1,6 @@
 from fastapi_esql import BaseModel
-from tortoise.contrib.pydantic import pydantic_model_creator
 from tortoise import fields
+from tortoise.contrib.pydantic import pydantic_model_creator
 
 from examples.service.constants.enums import GenderEnum, LocaleEnum
 

examples/service/routers/account.py

@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Body, Query
 from fastapi_esql.utils.sqlizer import RawSQL
 from pydantic import BaseModel, Field
-from tortoise.expressions import Q
+from tortoise.queryset import Q
 
 from examples.service.constants.enums import GenderEnum, LocaleEnum
 from examples.service.managers.demo.account import AccountMgr

fastapi_esql/orm/base_manager.py

@@ -1,13 +1,12 @@
 from logging import getLogger
 from typing import Any, Dict, List, Optional, Union
 
-from tortoise.backends.base.client import BaseDBAsyncClient
-from tortoise.expressions import Q
-from tortoise.models import Model
+from tortoise import BaseDBAsyncClient, Model
+from tortoise.queryset import Q
 
 from .base_app import AppMetaclass
-from ..utils.sqlizer import SQLizer
 from ..utils.cursor_handler import CursorHandler
+from ..utils.sqlizer import SQLizer
 
 logger = getLogger(__name__)
 

fastapi_esql/orm/base_model.py

@@ -1,5 +1,4 @@
-from tortoise import fields
-from tortoise.models import Model
+from tortoise import Model, fields
 
 
 class BaseModel(Model):

fastapi_esql/utils/cursor_handler.py

@@ -1,7 +1,7 @@
 from logging import Logger
 from typing import Any, Dict, List, Optional
 
-from tortoise.backends.base.client import BaseDBAsyncClient
+from tortoise import BaseDBAsyncClient
 
 
 class CursorHandler:

fastapi_esql/utils/sqlizer.py

@@ -2,8 +2,8 @@
 from json import dumps
 from typing import Any, Dict, List, Optional, Union
 
-from tortoise.expressions import Q
-from tortoise.models import Model
+from tortoise import Model
+from tortoise.queryset import Q
 from tortoise.query_utils import QueryModifier
 
 from ..const.error import QsParsingError, WrongParamsError