ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-17 16:20:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡ check param first then dependencies

Browse Source
This commit is contained in:
yanyongyu 2021-12-05 17:29:38 +08:00
parent 59e139724b
commit c25ee1cb56
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nonebot/dependencies/__init__.py
View File

@ -131,7 +131,6 @@ def get_dependent(
return dependent return dependent
# FIXME: check param types first then run dependencies
async def solve_dependencies( async def solve_dependencies(
*, *,
_dependent: Dependent, _dependent: Dependent,
@ -143,6 +142,24 @@ async def solve_dependencies(
values: Dict[str, Any] = {} values: Dict[str, Any] = {}
dependency_cache = {} if _dependency_cache is None else _dependency_cache dependency_cache = {} if _dependency_cache is None else _dependency_cache
# usual dependency
for field in _dependent.params:
field_info = field.field_info
assert isinstance(field_info, Param), "Params must be subclasses of Param"
value = field_info._solve(**params)
if value == Undefined:
value = field.get_default()
_, errs_ = field.validate(value, values, loc=(str(field_info), field.alias))
if errs_:
logger.debug(
f"{field_info} "
f"type {type(value)} not match depends {_dependent.func} "
f"annotation {field._type_display()}, ignored"
)
raise SkippedException
else:
values[field.name] = value
# solve sub dependencies # solve sub dependencies
sub_dependent: Dependent sub_dependent: Dependent
for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies): for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies):
@ -183,24 +200,6 @@ async def solve_dependencies(
if sub_dependent.cache_key not in dependency_cache: if sub_dependent.cache_key not in dependency_cache:
dependency_cache[sub_dependent.cache_key] = solved dependency_cache[sub_dependent.cache_key] = solved
# usual dependency
for field in _dependent.params:
field_info = field.field_info
assert isinstance(field_info, Param), "Params must be subclasses of Param"
value = field_info._solve(**params)
if value == Undefined:
value = field.get_default()
_, errs_ = field.validate(value, values, loc=(str(field_info), field.alias))
if errs_:
logger.debug(
f"{field_info} "
f"type {type(value)} not match depends {_dependent.func} "
f"annotation {field._type_display()}, ignored"
)
raise SkippedException
else:
values[field.name] = value
return values, dependency_cache return values, dependency_cache