From c84e3538bccf91bcfba65cd0bdb3a6ef4cebeb48 Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Thu, 28 Nov 2024 00:22:34 +0800
Subject: [PATCH] :label: update type hints 3

---
 nonebot_bison/config/subs_io/nbesf_model/v3.py | 7 ++++---
 nonebot_bison/config/subs_io/utils.py          | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nonebot_bison/config/subs_io/nbesf_model/v3.py b/nonebot_bison/config/subs_io/nbesf_model/v3.py
index 0113394..c6f1c03 100644
--- a/nonebot_bison/config/subs_io/nbesf_model/v3.py
+++ b/nonebot_bison/config/subs_io/nbesf_model/v3.py
@@ -8,11 +8,12 @@ from pydantic import BaseModel
 from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
 
-from ....types import Tag
-from ....types import Category
+from nonebot_bison.types import Tag
+from nonebot_bison.types import Category
+from nonebot_bison.types import Target as T_Target
+
 from ..utils import NBESFParseErr
 from .base import NBESFBase, SubReceipt
-from ....types import Target as T_Target
 from ...db_model import Cookie as DBCookie
 from ...db_config import SubscribeDupException, config
 
diff --git a/nonebot_bison/config/subs_io/utils.py b/nonebot_bison/config/subs_io/utils.py
index 1ba7558..21c3a5a 100644
--- a/nonebot_bison/config/subs_io/utils.py
+++ b/nonebot_bison/config/subs_io/utils.py
@@ -1,4 +1,6 @@
-from ..db_model import Model
+from typing import Any
+
+from sqlalchemy.orm import DeclarativeBase
 
 
 class NBESFVerMatchErr(Exception): ...
@@ -7,7 +9,7 @@ class NBESFVerMatchErr(Exception): ...
 class NBESFParseErr(Exception): ...
 
 
-def row2dict(row: Model) -> dict:
+def row2dict(row: DeclarativeBase) -> dict[str, Any]:
     d = {}
     for column in row.__table__.columns:
         d[column.name] = str(getattr(row, column.name))