@darabonba/python-generator 2.0.4 → 2.0.5

package/tests/output/comment/tea_python_tests/models/_test_3.py

@@ -10,7 +10,7 @@ from darabonba.model import DaraModel
 """
 class Test3(DaraModel):
     def __init__(
-        self, *,
+        self,
     # model的test front comment
         test: str = None,
     # empty comment1
@@ -33,18 +33,19 @@ class Test3(DaraModel):
         self.validate_required(self.test_1, 'test_1')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
     # model的test front comment
         if self.test is not None:
             result['test'] = self.test
+
     # empty comment1
     # empy comment2
         if self.test_1 is not None:
             result['test1'] = self.test_1
+
         return result
 
     def from_map(self, m: dict = None):
@@ -52,10 +53,12 @@ class Test3(DaraModel):
     # model的test front comment
         if m.get('test') is not None:
             self.test = m.get('test')
+
     # empty comment1
     # empy comment2
         if m.get('test1') is not None:
             self.test_1 = m.get('test1')
+
         return self
 
     # odel的test back comment

package/tests/output/complex/tea_python_tests/exceptions/_err_1.py

@@ -7,7 +7,7 @@ from typing import Dict
 
 class Err1Exception(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,

package/tests/output/complex/tea_python_tests/exceptions/_err_2.py

@@ -6,7 +6,7 @@ from darabonba.exceptions import DaraException
 
 class Err2Exception(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,

package/tests/output/complex/tea_python_tests/models/_complex_request.py

@@ -12,7 +12,7 @@ from typing import BinaryIO, List, Dict, Any
 
 class ComplexRequest(DaraModel):
     def __init__(
-        self, *,
+        self,
         access_key: str = None,
         body: BinaryIO = None,
         strs: List[str] = None,
@@ -130,62 +130,18 @@ class ComplexRequest(DaraModel):
         self.validate_required(self.b, 'b')
         self.validate_required(self.f_32, 'f_32')
         self.validate_required(self.f_64list, 'f_64list')
-        if self.f_64list:
-            for k in self.f_64list:
-                if k:
-                    k.validate()
         self.validate_required(self.float_list, 'float_list')
-        if self.float_list:
-            for k in self.float_list:
-                if k:
-                    k.validate()
         self.validate_required(self.booleant_list, 'booleant_list')
-        if self.booleant_list:
-            for k in self.booleant_list:
-                if k:
-                    k.validate()
         self.validate_required(self.i_32, 'i_32')
         self.validate_required(self.string_list, 'string_list')
         self.validate_required(self.int_list, 'int_list')
-        if self.int_list:
-            for k in self.int_list:
-                if k:
-                    k.validate()
         self.validate_required(self.int_32list, 'int_32list')
-        if self.int_32list:
-            for k in self.int_32list:
-                if k:
-                    k.validate()
         self.validate_required(self.int_16list, 'int_16list')
-        if self.int_16list:
-            for k in self.int_16list:
-                if k:
-                    k.validate()
         self.validate_required(self.int_64list, 'int_64list')
-        if self.int_64list:
-            for k in self.int_64list:
-                if k:
-                    k.validate()
         self.validate_required(self.long_list, 'long_list')
-        if self.long_list:
-            for k in self.long_list:
-                if k:
-                    k.validate()
         self.validate_required(self.uint_64list, 'uint_64list')
-        if self.uint_64list:
-            for k in self.uint_64list:
-                if k:
-                    k.validate()
         self.validate_required(self.uint_32list, 'uint_32list')
-        if self.uint_32list:
-            for k in self.uint_32list:
-                if k:
-                    k.validate()
         self.validate_required(self.uint_16list, 'uint_16list')
-        if self.uint_16list:
-            for k in self.uint_16list:
-                if k:
-                    k.validate()
         self.validate_required(self.u_64, 'u_64')
         self.validate_required(self.u_32, 'u_32')
         self.validate_required(self.u_16, 'u_16')
@@ -196,15 +152,11 @@ class ComplexRequest(DaraModel):
         self.validate_required(self.resp, 'resp')
         self.validate_required(self.map, 'map')
         self.validate_required(self.num_map, 'num_map')
-        if self.num_map:
-            for v in self.num_map.values():
-                if v:
-                    v.validate()
         self.validate_required(self.model_map, 'model_map')
         if self.model_map:
-            for v in self.model_map.values():
-                if v:
-                    v.validate()
+            for v1 in self.model_map.values():
+                 if v1:
+                    v1.validate()
         self.validate_required(self.request, 'request')
         self.validate_required(self.client, 'client')
         self.validate_required(self.instance, 'instance')
@@ -214,24 +166,27 @@ class ComplexRequest(DaraModel):
         self.validate_required(self.exec, 'exec')
         self.validate_required(self.str, 'str')
         if self.part:
-            for k in self.part:
-                if k:
-                    k.validate()
+            for v1 in self.part:
+                 if v1:
+                    v1.validate()
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.access_key is not None:
             result['accessKey'] = self.access_key
+
         if self.body is not None:
             result['Body'] = self.body
+
         if self.strs is not None:
             result['Strs'] = self.strs
+
         if self.map_list is not None:
             result['mapList'] = self.map_list
+
         if self.header is not None:
             result['header'] = self.header.to_map()
 
@@ -240,52 +195,76 @@ class ComplexRequest(DaraModel):
 
         if self.num is not None:
             result['num'] = self.num
+
         if self.i_64 is not None:
             result['i64'] = self.i_64
+
         if self.f_64 is not None:
             result['f64'] = self.f_64
+
         if self.b is not None:
             result['b'] = self.b
+
         if self.f_32 is not None:
             result['f32'] = self.f_32
+
         if self.f_64list is not None:
             result['f64List'] = self.f_64list
+
         if self.float_list is not None:
             result['floatList'] = self.float_list
+
         if self.booleant_list is not None:
             result['booleantList'] = self.booleant_list
+
         if self.i_32 is not None:
             result['i32'] = self.i_32
+
         if self.string_list is not None:
             result['stringList'] = self.string_list
+
         if self.int_list is not None:
             result['intList'] = self.int_list
+
         if self.int_32list is not None:
             result['int32List'] = self.int_32list
+
         if self.int_16list is not None:
             result['int16List'] = self.int_16list
+
         if self.int_64list is not None:
             result['int64List'] = self.int_64list
+
         if self.long_list is not None:
             result['longList'] = self.long_list
+
         if self.uint_64list is not None:
             result['uint64List'] = self.uint_64list
+
         if self.uint_32list is not None:
             result['uint32List'] = self.uint_32list
+
         if self.uint_16list is not None:
             result['uint16List'] = self.uint_16list
+
         if self.u_64 is not None:
             result['u64'] = self.u_64
+
         if self.u_32 is not None:
             result['u32'] = self.u_32
+
         if self.u_16 is not None:
             result['u16'] = self.u_16
+
         if self.obj is not None:
             result['obj'] = self.obj
+
         if self.any is not None:
             result['any'] = self.any
+
         if self.byt is not None:
             result['byt'] = self.byt
+
         if self.req is not None:
             result['req'] = self.req.to_map()
 
@@ -294,10 +273,12 @@ class ComplexRequest(DaraModel):
 
         if self.map is not None:
             result['map'] = self.map
+
         if self.num_map is not None:
             result['numMap'] = self.num_map
+
+        result['modelMap'] = {}
         if self.model_map is not None:
-            result['modelMap'] = {}
             for k1, v1 in self.model_map.items():
                 result['modelMap'][k1] = v1.to_map() if v1 else None
 
@@ -306,21 +287,27 @@ class ComplexRequest(DaraModel):
 
         if self.client is not None:
             result['client'] = self.client
+
         if self.instance is not None:
             result['instance'] = self.instance.to_map()
 
         if self.from_ is not None:
             result['from'] = self.from_
+
         if self.self_ is not None:
             result['self'] = self.self_
+
         if self.print is not None:
             result['print'] = self.print
+
         if self.exec is not None:
             result['exec'] = self.exec
+
         if self.str is not None:
             result['srt'] = self.str
+
+        result['Part'] = []
         if self.part is not None:
-            result['Part'] = []
             for k1 in self.part:
                 result['Part'].append(k1.to_map() if k1 else None)
 
@@ -330,12 +317,16 @@ class ComplexRequest(DaraModel):
         m = m or dict()
         if m.get('accessKey') is not None:
             self.access_key = m.get('accessKey')
+
         if m.get('Body') is not None:
             self.body = m.get('Body')
+
         if m.get('Strs') is not None:
             self.strs = m.get('Strs')
+
         if m.get('mapList') is not None:
             self.map_list = m.get('mapList')
+
         if m.get('header') is not None:
             temp_model = main_models.ComplexRequestHeader()
             self.header = temp_model.from_map(m.get('header'))
@@ -346,52 +337,76 @@ class ComplexRequest(DaraModel):
 
         if m.get('num') is not None:
             self.num = m.get('num')
+
         if m.get('i64') is not None:
             self.i_64 = m.get('i64')
+
         if m.get('f64') is not None:
             self.f_64 = m.get('f64')
+
         if m.get('b') is not None:
             self.b = m.get('b')
+
         if m.get('f32') is not None:
             self.f_32 = m.get('f32')
+
         if m.get('f64List') is not None:
             self.f_64list = m.get('f64List')
+
         if m.get('floatList') is not None:
             self.float_list = m.get('floatList')
+
         if m.get('booleantList') is not None:
             self.booleant_list = m.get('booleantList')
+
         if m.get('i32') is not None:
             self.i_32 = m.get('i32')
+
         if m.get('stringList') is not None:
             self.string_list = m.get('stringList')
+
         if m.get('intList') is not None:
             self.int_list = m.get('intList')
+
         if m.get('int32List') is not None:
             self.int_32list = m.get('int32List')
+
         if m.get('int16List') is not None:
             self.int_16list = m.get('int16List')
+
         if m.get('int64List') is not None:
             self.int_64list = m.get('int64List')
+
         if m.get('longList') is not None:
             self.long_list = m.get('longList')
+
         if m.get('uint64List') is not None:
             self.uint_64list = m.get('uint64List')
+
         if m.get('uint32List') is not None:
             self.uint_32list = m.get('uint32List')
+
         if m.get('uint16List') is not None:
             self.uint_16list = m.get('uint16List')
+
         if m.get('u64') is not None:
             self.u_64 = m.get('u64')
+
         if m.get('u32') is not None:
             self.u_32 = m.get('u32')
+
         if m.get('u16') is not None:
             self.u_16 = m.get('u16')
+
         if m.get('obj') is not None:
             self.obj = m.get('obj')
+
         if m.get('any') is not None:
             self.any = m.get('any')
+
         if m.get('byt') is not None:
             self.byt = m.get('byt')
+
         if m.get('req') is not None:
             temp_model = DaraRequest()
             self.req = temp_model.from_map(m.get('req'))
@@ -402,10 +417,12 @@ class ComplexRequest(DaraModel):
 
         if m.get('map') is not None:
             self.map = m.get('map')
+
         if m.get('numMap') is not None:
             self.num_map = m.get('numMap')
+
+        self.model_map = {}
         if m.get('modelMap') is not None:
-            self.model_map = {}
             for k1, v1 in m.get('modelMap').items():
                 temp_model = source_models.Request()
                 self.model_map[k1] = temp_model.from_map(v1)
@@ -416,23 +433,28 @@ class ComplexRequest(DaraModel):
 
         if m.get('client') is not None:
             self.client = m.get('client')
+
         if m.get('instance') is not None:
             temp_model = source_models.RequestInstance()
             self.instance = temp_model.from_map(m.get('instance'))
 
         if m.get('from') is not None:
             self.from_ = m.get('from')
+
         if m.get('self') is not None:
             self.self_ = m.get('self')
+
         if m.get('print') is not None:
             self.print = m.get('print')
+
         if m.get('exec') is not None:
             self.exec = m.get('exec')
+
         if m.get('srt') is not None:
             self.str = m.get('srt')
+
+        self.part = []
         if m.get('Part') is not None:
-            l1 = 0
-            self.part = []
             for k1 in m.get('Part'):
                 temp_model = main_models.ComplexRequestPart()
                 self.part.append(temp_model.from_map(k1))

package/tests/output/complex/tea_python_tests/models/_complex_request_configs.py

@@ -7,7 +7,7 @@ from typing import List, Dict
 
 class ComplexRequestConfigs(DaraModel):
     def __init__(
-        self, *,
+        self,
         key: str = None,
         value: List[str] = None,
         extra: Dict[str, str] = None,
@@ -22,26 +22,31 @@ class ComplexRequestConfigs(DaraModel):
         self.validate_required(self.extra, 'extra')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.key is not None:
             result['key'] = self.key
+
         if self.value is not None:
             result['value'] = self.value
+
         if self.extra is not None:
             result['extra'] = self.extra
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('key') is not None:
             self.key = m.get('key')
+
         if m.get('value') is not None:
             self.value = m.get('value')
+
         if m.get('extra') is not None:
             self.extra = m.get('extra')
+
         return self
 

package/tests/output/complex/tea_python_tests/models/_complex_request_header.py

@@ -8,7 +8,7 @@ from darabonba.model import DaraModel
 
 class ComplexRequestHeader(DaraModel):
     def __init__(
-        self, *,
+        self,
         content: str = None,
     ):
         # The ID of the security group to which you want to assign the instance. Instances in the same security group can communicate with each other. The maximum number of instances that a security group can contain depends on the type of the security group. For more information, see the "Security group limits" section in [Limits](https://help.aliyun.com/document_detail/25412.html#SecurityGroupQuota).
@@ -25,18 +25,19 @@ class ComplexRequestHeader(DaraModel):
         self.validate_required(self.content, 'content')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.content is not None:
             result['Content'] = self.content
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('Content') is not None:
             self.content = m.get('Content')
+
         return self
 

package/tests/output/complex/tea_python_tests/models/_complex_request_part.py

@@ -6,7 +6,7 @@ from darabonba.model import DaraModel
 
 class ComplexRequestPart(DaraModel):
     def __init__(
-        self, *,
+        self,
         part_number: str = None,
     ):
         # PartNumber
@@ -16,18 +16,19 @@ class ComplexRequestPart(DaraModel):
         pass
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.part_number is not None:
             result['PartNumber'] = self.part_number
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('PartNumber') is not None:
             self.part_number = m.get('PartNumber')
+
         return self
 

package/tests/output/complex/tea_python_tests/models/_response.py

@@ -7,7 +7,7 @@ from tea_python_tests import models as main_models
 
 class Response(DaraModel):
     def __init__(
-        self, *,
+        self,
         instance: main_models.ComplexRequestPart = None,
     ):
         self.instance = instance
@@ -16,18 +16,19 @@ class Response(DaraModel):
         self.validate_required(self.instance, 'instance')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.instance is not None:
             result['instance'] = self.instance
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('instance') is not None:
             self.instance = m.get('instance')
+
         return self
 

package/tests/output/model/tea_python_tests/exceptions/_main_file.py

@@ -8,7 +8,7 @@ from typing import Dict
 
 class MainFileException(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,

package/tests/output/model/tea_python_tests/models/_class.py

@@ -11,11 +11,10 @@ class Class(DaraModel):
         pass
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         return result
 
     def from_map(self, m: dict = None):

package/tests/output/model/tea_python_tests/models/_m.py

@@ -7,7 +7,7 @@ from tea_python_tests import models as main_models
 
 class M(DaraModel):
     def __init__(
-        self, *,
+        self,
         sub_m: main_models.MSubM = None,
     ):
         self.sub_m = sub_m
@@ -18,11 +18,10 @@ class M(DaraModel):
             self.sub_m.validate()
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.sub_m is not None:
             result['subM'] = self.sub_m.to_map()
 

package/tests/output/model/tea_python_tests/models/_main_file_model.py

@@ -7,7 +7,7 @@ from tea_python_tests import models as main_models
 
 class MainFileModel(DaraModel):
     def __init__(
-        self, *,
+        self,
         str: str = None,
         model: main_models.MainFileModelModel = None,
     ):
@@ -21,13 +21,13 @@ class MainFileModel(DaraModel):
             self.model.validate()
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.str is not None:
             result['str'] = self.str
+
         if self.model is not None:
             result['model'] = self.model.to_map()
 
@@ -37,6 +37,7 @@ class MainFileModel(DaraModel):
         m = m or dict()
         if m.get('str') is not None:
             self.str = m.get('str')
+
         if m.get('model') is not None:
             temp_model = main_models.MainFileModelModel()
             self.model = temp_model.from_map(m.get('model'))