#1370 added possibility to check X | None on Python >= 3.10

aiogram/filters/callback_data.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import sys
+import types
 import typing
 from decimal import Decimal
 from enum import Enum
@@ -29,6 +31,11 @@
 MAX_CALLBACK_LENGTH: int = 64
 
 
+_UNION_TYPES = {typing.Union}
+if sys.version_info >= (3, 10):  # pragma: no cover
+    _UNION_TYPES.add(types.UnionType)
+
+
 class CallbackDataException(Exception):
     pass
 
@@ -195,6 +202,6 @@ def _check_field_is_nullable(field: FieldInfo) -> bool:
     if not field.is_required():
         return True
 
-    return typing.get_origin(field.annotation) is typing.Union and type(None) in typing.get_args(
+    return typing.get_origin(field.annotation) in _UNION_TYPES and type(None) in typing.get_args(
         field.annotation
     )

tests/test_filters/test_callback_data.py

@@ -1,3 +1,4 @@
+import sys
 from decimal import Decimal
 from enum import Enum, auto
 from fractions import Fraction
@@ -163,6 +164,16 @@ class TgData(CallbackData, prefix="tg"):
 
         assert TgData.unpack("tg:123:") == TgData(chat_id=123, thread_id=None)
 
+    @pytest.mark.skipif(sys.version_info < (3, 10), reason="UnionType is added in Python 3.10")
+    def test_unpack_optional_wo_default_union_type(self):
+        """Test CallbackData without default optional."""
+
+        class TgData(CallbackData, prefix="tg"):
+            chat_id: int
+            thread_id: int | None
+
+        assert TgData.unpack("tg:123:") == TgData(chat_id=123, thread_id=None)
+
     def test_build_filter(self):
         filter_object = MyCallback.filter(F.foo == "test")
         assert isinstance(filter_object.rule, MagicFilter)