python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed error overlapping when validation error is caused by remove_unset root validator in base types and methods. (#1290)

Browse source 
* Ensure base type validation can handle non-dictionary values

The update introduces a condition to verify whether the values being validated are a dictionary before attempting to handle UNSET_TYPE in the aiogram base type. This adjustment helps to prevent potential errors or incorrect validation when non-dictionary values are faced.

* Added a test case for non-dictionary input in remove_unset method

* Added changelog

* Fixed tests
This commit is contained in:
Alex Root Junior 2023-08-29 02:01:54 +03:00 • committed by GitHub
parent e1be9dd668
commit 04bd0c9e7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES/1290.bugfix.rst Normal file
View file

@ -0,0 +1 @@
Fixed error overlapping when validation error is caused by remove_unset root validator in base types and methods.

2
aiogram/methods/base.py
View file

@ -61,6 +61,8 @@ class TelegramMethod(BotContextController, BaseModel, Generic[TelegramType], ABC
but UNSET might be passing to a model initialization from `Bot.method_name`, but UNSET might be passing to a model initialization from `Bot.method_name`,
so we must take care of it and remove it before fields validation. so we must take care of it and remove it before fields validation.
""" """
if not isinstance(values, dict):
return values
return {k: v for k, v in values.items() if not isinstance(v, UNSET_TYPE)} return {k: v for k, v in values.items() if not isinstance(v, UNSET_TYPE)}
if TYPE_CHECKING: if TYPE_CHECKING:

2
aiogram/types/base.py
View file

@ -28,6 +28,8 @@ class TelegramObject(BotContextController, BaseModel):
but UNSET might be passed to a model initialization from `Bot.method_name`, but UNSET might be passed to a model initialization from `Bot.method_name`,
so we must take care of it and remove it before fields validation. so we must take care of it and remove it before fields validation.
""" """
if not isinstance(values, dict):
return values
return {k: v for k, v in values.items() if not isinstance(v, UNSET_TYPE)} return {k: v for k, v in values.items() if not isinstance(v, UNSET_TYPE)}

11
tests/test_api/test_methods/test_base.py
View file

@ -3,7 +3,7 @@ from unittest.mock import sentinel
import pytest import pytest
from aiogram.methods import GetMe, TelegramMethod from aiogram.methods import GetMe, TelegramMethod
from aiogram.types import User from aiogram.types import User, TelegramObject
from tests.mocked_bot import MockedBot from tests.mocked_bot import MockedBot
@ -16,10 +16,15 @@ class TestTelegramMethodRemoveUnset:
[{"foo": "bar", "baz": sentinel.DEFAULT}, {"foo"}], [{"foo": "bar", "baz": sentinel.DEFAULT}, {"foo"}],
], ],
) )
def test_remove_unset(self, values, names): @pytest.mark.parametrize("obj", [TelegramMethod, TelegramObject])
validated = TelegramMethod.remove_unset(values) def test_remove_unset(self, values, names, obj):
validated = obj.remove_unset(values)
assert set(validated.keys()) == names assert set(validated.keys()) == names
@pytest.mark.parametrize("obj", [TelegramMethod, TelegramObject])
def test_remove_unset_non_dict(self, obj):
assert obj.remove_unset("") == ""
class TestTelegramMethodCall: class TestTelegramMethodCall:
async def test_async_emit_unsuccessful(self, bot: MockedBot): async def test_async_emit_unsuccessful(self, bot: MockedBot):