Add HiddenKeyboard and ForcedReplyKeyboard custom types and improve type annotation (#4481)

generator/pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dynamic = ["version"]
-
+dependencies = ["typing-extensions~=4.12.2"]
 [project.optional-dependencies]
 dev = ["pytest~=7.3"]
 

generator/src/telethon_generator/_impl/codegen/generator.py

@@ -97,7 +97,8 @@ def generate(fs: FakeFs, tl: ParsedTl) -> None:
                 "# pyright: reportUnusedImport=false, reportConstantRedefinition=false"
             )
             writer.write("import struct")
-            writer.write("from typing import Optional, Self, Sequence")
+            writer.write("from typing import Optional, Sequence")
+            writer.write("from typing_extensions import Self")
             writer.write("from .. import abcs")
             writer.write("from ..core import Reader, Serializable, serialize_bytes_to")
             writer.write("_bytes = bytes | bytearray | memoryview")
@@ -163,7 +164,8 @@ def generate(fs: FakeFs, tl: ParsedTl) -> None:
         if function_path not in fs:
             writer.write("# pyright: reportUnusedImport=false")
             writer.write("import struct")
-            writer.write("from typing import Optional, Self, Sequence")
+            writer.write("from typing import Optional, Sequence")
+            writer.write("from typing_extensions import Self")
             writer.write("from .. import abcs")
             writer.write("from ..core import Request, serialize_bytes_to")
             writer.write("_bytes = bytes | bytearray | memoryview")
@@ -192,14 +194,14 @@ def generate(fs: FakeFs, tl: ParsedTl) -> None:
     writer.write(
         "from .core import Serializable, Reader, deserialize_bool, deserialize_i32_list, deserialize_i64_list, deserialize_identity, single_deserializer, list_deserializer"
     )
-    writer.write("from typing import cast, Type")
+    writer.write("from typing import Final, Type")
     writer.write(f"LAYER = {tl.layer!r}")
     writer.write(
-        "TYPE_MAPPING = {t.constructor_id(): t for t in cast(tuple[Type[Serializable]], ("
+        "TYPE_MAPPING: Final[dict[int, Type[Serializable]]] = {t.constructor_id(): t for t in ("
     )
     for name in sorted(generated_type_names):
         writer.write(f"  types.{name},")
-    writer.write("))}")
+    writer.write(")}")
     writer.write("RESPONSE_MAPPING = {")
     for functiondef in tl.functiondefs:
         writer.write(

generator/src/telethon_generator/_impl/tl_parser/tl/definition.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from typing import Self
+
+from typing_extensions import Self
 
 from ..utils import infer_id
 from .parameter import Parameter, TypeDefNotImplementedError

generator/src/telethon_generator/_impl/tl_parser/tl/flag.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from typing import Self
+
+from typing_extensions import Self
 
 
 @dataclass

generator/src/telethon_generator/_impl/tl_parser/tl/parameter.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from typing import Self
+
+from typing_extensions import Self
 
 from .parameter_type import BaseParameter
 

generator/src/telethon_generator/_impl/tl_parser/tl/ty.py

@@ -1,6 +1,8 @@
 from collections.abc import Iterator
 from dataclasses import dataclass
-from typing import Optional, Self
+from typing import Optional
+
+from typing_extensions import Self
 
 
 @dataclass