From 9503759d21cb262a974064fe93d4d7ab7f23bc3a Mon Sep 17 00:00:00 2001 From: luoshuijs Date: Wed, 25 Oct 2023 17:23:01 +0800 Subject: [PATCH] :fire: Remove `core/sqlmodel` --- core/services/quiz/repositories.py | 2 +- core/sqlmodel/__init__.py | 0 core/sqlmodel/session.py | 3 --- gram_core | 2 +- plugins/tools/genshin.py | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 core/sqlmodel/__init__.py delete mode 100644 core/sqlmodel/session.py diff --git a/core/services/quiz/repositories.py b/core/services/quiz/repositories.py index c914c562..a8a1fa91 100644 --- a/core/services/quiz/repositories.py +++ b/core/services/quiz/repositories.py @@ -1,11 +1,11 @@ from typing import List from sqlmodel import select +from sqlmodel.ext.asyncio.session import AsyncSession from core.base_service import BaseService from core.dependence.database import Database from core.services.quiz.models import AnswerDB, QuestionDB -from core.sqlmodel.session import AsyncSession __all__ = ("QuizRepository",) diff --git a/core/sqlmodel/__init__.py b/core/sqlmodel/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/core/sqlmodel/session.py b/core/sqlmodel/session.py deleted file mode 100644 index 92df4a9b..00000000 --- a/core/sqlmodel/session.py +++ /dev/null @@ -1,3 +0,0 @@ -from gram_core.sqlmodel.session import AsyncSession - -__all__ = ("AsyncSession",) diff --git a/gram_core b/gram_core index 0db711d9..94dc4773 160000 --- a/gram_core +++ b/gram_core @@ -1 +1 @@ -Subproject commit 0db711d96a3f479b0b5970b1cf26b9a6be3e2404 +Subproject commit 94dc4773d9dcc70fb12e58356bea4288bc82f1f6 diff --git a/plugins/tools/genshin.py b/plugins/tools/genshin.py index 803377ea..f5e75dc6 100644 --- a/plugins/tools/genshin.py +++ b/plugins/tools/genshin.py @@ -14,6 +14,7 @@ from simnet.utils.player import recognize_game_biz from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm.exc import StaleDataError from sqlmodel import BigInteger, Column, DateTime, Field, Index, Integer, SQLModel, String, delete, func, select +from sqlmodel.ext.asyncio.session import AsyncSession from telegram.ext import ContextTypes from core.basemodel import RegionEnum @@ -25,7 +26,6 @@ from core.services.cookies.services import CookiesService, PublicCookiesService from core.services.devices import DevicesService from core.services.players.services import PlayersService from core.services.users.services import UserService -from core.sqlmodel.session import AsyncSession from gram_core.services.cookies.models import CookiesStatusEnum from utils.log import logger