ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-28 00:31:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

♿ reuse type check code for dependent

Browse Source
This commit is contained in:
yanyongyu
2022-01-28 14:49:04 +08:00
parent 1271a757c9
commit ad712c59b3
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nonebot/dependencies/__init__.py
View File

@ -17,10 +17,10 @@ from nonebot.log import logger
from nonebot.exception import TypeMisMatch
from nonebot.utils import run_sync, is_coroutine_callable
from .utils import get_typed_signature
from .utils import check_field_type, get_typed_signature
T = TypeVar("T", bound="Dependent")
R = TypeVar("R")
T = TypeVar("T", bound="Dependent")
class Param(abc.ABC, FieldInfo):
@ -196,16 +196,16 @@ class Dependent(Generic[R]):
value = await field_info._solve(**params)
if value == Undefined:
value = field.get_default()
_, errs_ = field.validate(value, values, loc=(str(field_info), field.alias))
if errs_:
try:
values[field.name] = check_field_type(field, value)
except TypeMisMatch:
logger.debug(
f"{field_info} "
f"type {type(value)} not match depends {self.call} "
f"annotation {field._type_display()}, ignored"
)
raise TypeMisMatch(field, value)
else:
values[field.name] = value
raise
return values