@darabonba/python-generator 2.0.1 → 2.0.3

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

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+
+
+"""
+ * @remarks
+ * TestModel3
+"""
+class Test3(DaraModel):
+    def __init__(
+        self, *,
+    # model的test front comment
+        test: str = None,
+    # empty comment1
+    # empy comment2
+        test_1: str = None,
+    ):
+    # model的test front comment
+        # test desc
+        self.test = test
+    # empty comment1
+    # empy comment2
+        # test desc
+        self.test_1 = test_1
+
+    def validate(self):
+    # model的test front comment
+        self.validate_required(self.test, 'test')
+    # empty comment1
+    # empy comment2
+        self.validate_required(self.test_1, 'test_1')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+    # 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):
+        m = m or dict()
+    # 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/client.py

@@ -1114,11 +1114,11 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_models.Err1 as err :
+        except main_exceptions.Err1Exception as err :
             logging.log(logging.NOTSET, err.name)
-        except main_models.Err2 as err :
+        except main_exceptions.Err2Exception as err :
             logging.log(logging.NOTSET, err.name)
-        except source_models.Err3 as err :
+        except source_exceptions.Err3Exception as err :
             logging.log(logging.NOTSET, err.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)
@@ -1156,11 +1156,11 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_models.Err1 as err :
+        except main_exceptions.Err1Exception as err :
             logging.log(logging.NOTSET, err.name)
-        except main_models.Err2 as err :
+        except main_exceptions.Err2Exception as err :
             logging.log(logging.NOTSET, err.name)
-        except source_models.Err3 as err :
+        except source_exceptions.Err3Exception as err :
             logging.log(logging.NOTSET, err.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)

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

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._err_1 import Err1Exception
+from ._err_2 import Err2Exception
+
+__all__ = [
+    Err1Exception,
+    Err2Exception
+]

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

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.exceptions import DaraException 
+from typing import Dict
+
+
+class Err1Exception(DaraException):
+    def __init__(
+        self, *,
+        message: str = None,
+        code: str = None,
+        stack: str = None,
+        data: Dict[str, str] = None,
+    ):
+        super().__init__({
+            'message': message,
+            'code': code,
+            'stack': stack,
+        })
+        self.name = 'Err1Exception'
+        self.data = data
+

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

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.exceptions import DaraException 
+
+
+class Err2Exception(DaraException):
+    def __init__(
+        self, *,
+        message: str = None,
+        code: str = None,
+        stack: str = None,
+        access_err_message: str = None,
+    ):
+        super().__init__({
+            'message': message,
+            'code': code,
+            'stack': stack,
+        })
+        self.name = 'Err2Exception'
+        self.access_err_message = access_err_message
+

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

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._complex_request_header import ComplexRequestHeader
+from ._complex_request_configs import ComplexRequestConfigs
+from ._complex_request_part import ComplexRequestPart
+from ._complex_request import ComplexRequest
+from ._response import Response
+
+__all__ = [
+    ComplexRequestHeader,
+    ComplexRequestConfigs,
+    ComplexRequestPart,
+    ComplexRequest,
+    Response
+]

package/tests/{expected/complex/tea_python_tests/models.py → output/complex/tea_python_tests/models/_complex_request.py}

@@ -2,126 +2,23 @@
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
 from darabonba.model import DaraModel 
+from tea_python_tests import models as main_models 
 from darabonba.request import DaraRequest 
 from darabonba.response import DaraResponse 
 from Source import models as source_models 
 from Source.source_client import SourceClient 
-from tea_python_tests import models as main_models 
-from typing import List, Dict, BinaryIO, Any
-
-
-
-
-class ComplexRequestHeader(DaraModel):
-    def __init__(
-        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).
-        # 
-        # >Notice:  The network type of the new instance must be the same as that of the security group specified by the `SecurityGroupId` parameter. For example, if the specified security group is of the VPC type, the new instance is also of the VPC type and you must specify `VSwitchId`.
-        # 
-        # If you do not use `LaunchTemplateId` or `LaunchTemplateName` to specify a launch template, you must specify SecurityGroupId. Take note of the following items:
-        # 
-        # *   You can set `SecurityGroupId` to specify a single security group or set `SecurityGroupIds.N` to specify one or more security groups. However, you cannot specify both `SecurityGroupId` and `SecurityGroupIds.N`.
-        # *   If `NetworkInterface.N.InstanceType` is set to `Primary`, you cannot specify `SecurityGroupId` or `SecurityGroupIds.N` but can specify `NetworkInterface.N.SecurityGroupId` or `NetworkInterface.N.SecurityGroupIds.N`.
-        self.content = content
-
-    def validate(self):
-        self.validate_required(self.content, 'content')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        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
-
-class ComplexRequestConfigs(DaraModel):
-    def __init__(
-        self, 
-        key: str = None,
-        value: List[str] = None,
-        extra: Dict[str, str] = None,
-    ):
-        self.key = key
-        self.value = value
-        self.extra = extra
-
-    def validate(self):
-        self.validate_required(self.key, 'key')
-        self.validate_required(self.value, 'value')
-        self.validate_required(self.extra, 'extra')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        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
+from typing import BinaryIO, List, Dict, Any
 
-    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
-
-class ComplexRequestPart(DaraModel):
-    def __init__(
-        self, 
-        part_number: str = None,
-    ):
-        # PartNumber
-        self.part_number = part_number
-
-    def validate(self):
-        pass
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        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
 
 class ComplexRequest(DaraModel):
     def __init__(
-        self, 
+        self, *,
         access_key: str = None,
         body: BinaryIO = None,
         strs: List[str] = None,
         map_list: List[Dict[str, Any]] = None,
-        header: ComplexRequestHeader = None,
-        configs: ComplexRequestConfigs = None,
+        header: main_models.ComplexRequestHeader = None,
+        configs: main_models.ComplexRequestConfigs = None,
         num: int = None,
         i_64: int = None,
         f_64: float = None,
@@ -159,7 +56,7 @@ class ComplexRequest(DaraModel):
         print: str = None,
         exec: str = None,
         str: str = None,
-        part: List[ComplexRequestPart] = None,
+        part: List[main_models.ComplexRequestPart] = None,
     ):
         self.access_key = access_key
         # Body
@@ -401,10 +298,9 @@ class ComplexRequest(DaraModel):
             result['numMap'] = self.num_map
         if self.model_map is not None:
             result['modelMap'] = {}
-            for k1, v1 in k.items():
+            for k1, v1 in self.model_map.items():
                 result['modelMap'][k1] = v1.to_map() if v1 else None
 
-
         if self.request is not None:
             result['request'] = self.request.to_map()
 
@@ -424,12 +320,9 @@ class ComplexRequest(DaraModel):
         if self.str is not None:
             result['srt'] = self.str
         if self.part is not None:
-            l1 = 0
             result['Part'] = []
             for k1 in self.part:
-                l1 += 1
-                result['Part'][l1] = k1.to_map() if k1 else None
-
+                result['Part'].append(k1.to_map() if k1 else None)
 
         return result
 
@@ -444,11 +337,11 @@ class ComplexRequest(DaraModel):
         if m.get('mapList') is not None:
             self.map_list = m.get('mapList')
         if m.get('header') is not None:
-            temp_model = ComplexRequestHeader
+            temp_model = main_models.ComplexRequestHeader()
             self.header = temp_model.from_map(m.get('header'))
 
         if m.get('configs') is not None:
-            temp_model = ComplexRequestConfigs
+            temp_model = main_models.ComplexRequestConfigs()
             self.configs = temp_model.from_map(m.get('configs'))
 
         if m.get('num') is not None:
@@ -500,10 +393,12 @@ class ComplexRequest(DaraModel):
         if m.get('byt') is not None:
             self.byt = m.get('byt')
         if m.get('req') is not None:
-            self.req = DaraRequest.from_map(m.get('req'))
+            temp_model = DaraRequest()
+            self.req = temp_model.from_map(m.get('req'))
 
         if m.get('resp') is not None:
-            self.resp = DaraResponse.from_map(m.get('resp'))
+            temp_model = DaraResponse()
+            self.resp = temp_model.from_map(m.get('resp'))
 
         if m.get('map') is not None:
             self.map = m.get('map')
@@ -512,15 +407,18 @@ class ComplexRequest(DaraModel):
         if m.get('modelMap') is not None:
             self.model_map = {}
             for k1, v1 in m.get('modelMap').items():
-                self.model_map[k1] = SourceClient.from_map(v1)
+                temp_model = source_models.Request()
+                self.model_map[k1] = temp_model.from_map(v1)
 
         if m.get('request') is not None:
-            self.request = SourceClient.from_map(m.get('request'))
+            temp_model = source_models.Request()
+            self.request = temp_model.from_map(m.get('request'))
 
         if m.get('client') is not None:
             self.client = m.get('client')
         if m.get('instance') is not None:
-            self.instance = SourceClient.from_map(m.get('instance'))
+            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')
@@ -536,35 +434,8 @@ class ComplexRequest(DaraModel):
             l1 = 0
             self.part = []
             for k1 in m.get('Part'):
-                l1 += 1
-                temp_model = ComplexRequestPart
-                self.part[l1] = temp_model.from_map(k1)
-
-        return self
+                temp_model = main_models.ComplexRequestPart()
+                self.part.append(temp_model.from_map(k1))
 
-class Response(DaraModel):
-    def __init__(
-        self, 
-        instance: main_models.ComplexRequestPart = None,
-    ):
-        self.instance = instance
-
-    def validate(self):
-        self.validate_required(self.instance, 'instance')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        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/complex/tea_python_tests/models/_complex_request_configs.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+from typing import List, Dict
+
+
+class ComplexRequestConfigs(DaraModel):
+    def __init__(
+        self, *,
+        key: str = None,
+        value: List[str] = None,
+        extra: Dict[str, str] = None,
+    ):
+        self.key = key
+        self.value = value
+        self.extra = extra
+
+    def validate(self):
+        self.validate_required(self.key, 'key')
+        self.validate_required(self.value, 'value')
+        self.validate_required(self.extra, 'extra')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        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

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+
+
+
+
+class ComplexRequestHeader(DaraModel):
+    def __init__(
+        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).
+        # 
+        # >Notice:  The network type of the new instance must be the same as that of the security group specified by the `SecurityGroupId` parameter. For example, if the specified security group is of the VPC type, the new instance is also of the VPC type and you must specify `VSwitchId`.
+        # 
+        # If you do not use `LaunchTemplateId` or `LaunchTemplateName` to specify a launch template, you must specify SecurityGroupId. Take note of the following items:
+        # 
+        # *   You can set `SecurityGroupId` to specify a single security group or set `SecurityGroupIds.N` to specify one or more security groups. However, you cannot specify both `SecurityGroupId` and `SecurityGroupIds.N`.
+        # *   If `NetworkInterface.N.InstanceType` is set to `Primary`, you cannot specify `SecurityGroupId` or `SecurityGroupIds.N` but can specify `NetworkInterface.N.SecurityGroupId` or `NetworkInterface.N.SecurityGroupIds.N`.
+        self.content = content
+
+    def validate(self):
+        self.validate_required(self.content, 'content')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        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

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+
+
+class ComplexRequestPart(DaraModel):
+    def __init__(
+        self, *,
+        part_number: str = None,
+    ):
+        # PartNumber
+        self.part_number = part_number
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        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

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+from tea_python_tests import models as main_models 
+
+
+class Response(DaraModel):
+    def __init__(
+        self, *,
+        instance: main_models.ComplexRequestPart = None,
+    ):
+        self.instance = instance
+
+    def validate(self):
+        self.validate_required(self.instance, 'instance')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        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/__init__.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._main_file import MainFileException
+
+__all__ = [
+    MainFileException
+]

package/tests/output/model/tea_python_tests/{exceptions.py → 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/__init__.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._msub_m import MSubM
+from ._main_file_model_model import MainFileModelModel
+from ._main_file_model import MainFileModel
+from ._my_model_model_model import MyModelModelModel
+from ._my_model_model import MyModelModel
+from ._my_model_submodel_model import MyModelSubmodelModel
+from ._my_model_submodel import MyModelSubmodel
+from ._my_model_subarraymodel import MyModelSubarraymodel
+from ._m import M
+from ._class import Class
+from ._model import Model
+from ._my_model import MyModel
+
+__all__ = [
+    MSubM,
+    MainFileModelModel,
+    MainFileModel,
+    MyModelModelModel,
+    MyModelModel,
+    MyModelSubmodelModel,
+    MyModelSubmodel,
+    MyModelSubarraymodel,
+    M,
+    Class,
+    Model,
+    MyModel
+]

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

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+
+
+class Class(DaraModel):
+    def __init__(self):
+        pass
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        return self
+