Make type hinting on the generated code more IDE-friendly

telethon_generator/parser/tl_object.py

@@ -96,6 +96,17 @@ class TLObject:
             result=match.group(3),
             is_function=is_function)
 
+    def class_name(self):
+        """Gets the class name following the Python style guidelines"""
+
+        # Courtesy of http://stackoverflow.com/a/31531797/4759433
+        result = re.sub(r'_([a-z])', lambda m: m.group(1).upper(), self.name)
+        result = result[:1].upper() + result[1:].replace('_', '')
+        # If it's a function, let it end with "Request" to identify them
+        if self.is_function:
+            result += 'Request'
+        return result
+
     def sorted_args(self):
         """Returns the arguments properly sorted and ready to plug-in
            into a Python's method header (i.e., flags and those which
@@ -197,8 +208,8 @@ class TLArg:
         else:
             self.flag_indicator = False
             self.is_generic = arg_type.startswith('!')
-            self.type = arg_type.lstrip(
+            # Strip the exclamation mark always to have only the name
-                '!')  # Strip the exclamation mark always to have only the name
+            self.type = arg_type.lstrip('!')
 
             # The type may be a flag (flags.IDX?REAL_TYPE)
             # Note that 'flags' is NOT the flags name; this is determined by a previous argument
@@ -233,6 +244,22 @@ class TLArg:
 
         self.generic_definition = generic_definition
 
+    def type_hint(self):
+        result = {
+            'int': 'int',
+            'long': 'int',
+            'string': 'str',
+            'date': 'datetime',
+            'bytes': 'bytes',
+            'true': 'bool',
+        }.get(self.type, 'TLObject')
+        if self.is_vector:
+            result = 'list[{}]'.format(result)
+        if self.is_flag:
+            result += ' | None'
+
+        return result
+
     def __str__(self):
         # Find the real type representation by updating it as required
         real_type = self.type

telethon_generator/tl_generator.py

@@ -107,8 +107,7 @@ class TLGenerator:
                     if tlobject.namespace:
                         builder.write('.' + tlobject.namespace)
 
-                    builder.writeln('.{},'.format(
+                    builder.writeln('.{},'.format(tlobject.class_name()))
-                        TLGenerator.get_class_name(tlobject)))
 
                 builder.current_indent -= 1
                 builder.writeln('}')
@@ -176,8 +175,7 @@ class TLGenerator:
 
         builder.writeln()
         builder.writeln()
-        builder.writeln('class {}(TLObject):'.format(
+        builder.writeln('class {}(TLObject):'.format(tlobject.class_name()))
-            TLGenerator.get_class_name(tlobject)))
 
         # Class-level variable to store its Telegram's constructor ID
         builder.writeln('constructor_id = {}'.format(hex(tlobject.id)))
@@ -221,17 +219,10 @@ class TLGenerator:
             builder.writeln('"""')
             for arg in args:
                 if not arg.flag_indicator:
-                    builder.write(
+                    builder.writeln(':param {} {}:'.format(
-                        ':param {}: Telegram type: "{}".'
+                        arg.type_hint(), arg.name
-                        .format(arg.name, arg.type)
+                    ))
-                    )
+                    builder.current_indent -= 1  # It will auto-indent (':')
-                    if arg.is_vector:
-                        builder.write(' Must be a list.'.format(arg.name))
-
-                    if arg.is_generic:
-                        builder.write(' Must be another TLObject request.')
-
-                    builder.writeln()
 
             # We also want to know what type this request returns
             # or to which type this constructor belongs to
@@ -246,12 +237,11 @@ class TLGenerator:
                 builder.writeln('This type has no constructors.')
             elif len(constructors) == 1:
                 builder.writeln('Instance of {}.'.format(
-                    TLGenerator.get_class_name(constructors[0])
+                    constructors[0].class_name()
                 ))
             else:
                 builder.writeln('Instance of either {}.'.format(
-                    ', '.join(TLGenerator.get_class_name(c)
+                    ', '.join(c.class_name() for c in constructors)
-                              for c in constructors)
                 ))
 
             builder.writeln('"""')
@@ -319,7 +309,8 @@ class TLGenerator:
         builder.writeln('def on_send(self, writer):')
         builder.writeln(
             'writer.write_int({}.constructor_id, signed=False)'
-                .format(TLGenerator.get_class_name(tlobject)))
+            .format(tlobject.class_name())
+        )
 
         for arg in tlobject.args:
             TLGenerator.write_onsend_code(builder, arg,
@@ -331,8 +322,8 @@ class TLGenerator:
         builder.writeln('@staticmethod')
         builder.writeln('def empty():')
         builder.writeln('return {}({})'.format(
-            TLGenerator.get_class_name(tlobject), ', '.join(
+            tlobject.class_name(), ', '.join('None' for _ in range(len(args)))
-                'None' for _ in range(len(args)))))
+        ))
         builder.end_block()
 
         # Write the on_response(self, reader) function
@@ -414,20 +405,6 @@ class TLGenerator:
                 'self.{0} = {1}({0})'.format(arg.name, get_input_code)
             )
 
-    @staticmethod
-    def get_class_name(tlobject):
-        """Gets the class name following the Python style guidelines"""
-
-        # Courtesy of http://stackoverflow.com/a/31531797/4759433
-        result = re.sub(r'_([a-z])', lambda m: m.group(1).upper(),
-                        tlobject.name)
-        result = result[:1].upper() + result[1:].replace(
-            '_', '')  # Replace again to fully ensure!
-        # If it's a function, let it end with "Request" to identify them
-        if tlobject.is_function:
-            result += 'Request'
-        return result
-
     @staticmethod
     def get_file_name(tlobject, add_extension=False):
         """Gets the file name in file_name_format.py for the given TLObject"""