@darabonba/python-generator 2.0.2 → 2.0.3

package/tests/{output/complex/tea_python_tests/exceptions.py → expected/multi/tea_python_tests/exceptions/_err.py}

@@ -2,38 +2,37 @@
 # 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):
+class ERRException(DaraException):
     def __init__(
-        self, 
+        self, *,
         message: str = None,
         code: str = None,
         stack: str = None,
-        data: Dict[str, str] = None,
+        test: int = None,
     ):
         super().__init__({
             'message': message,
             'code': code,
             'stack': stack,
         })
-        self.name = 'Err1Exception'
-        self.data = data
+        self.name = 'ERRException'
+        self.test = test
 
-class Err2Exception(DaraException):
+class ErrException(DaraException):
     def __init__(
-        self, 
+        self, *,
         message: str = None,
         code: str = None,
         stack: str = None,
-        access_err_message: str = None,
+        test: str = None,
     ):
         super().__init__({
             'message': message,
             'code': code,
             'stack': stack,
         })
-        self.name = 'Err2Exception'
-        self.access_err_message = access_err_message
+        self.name = 'ErrException'
+        self.test = test
 

package/tests/expected/multi/tea_python_tests/model/user_exceptions/__init__.py

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

package/tests/expected/multi/tea_python_tests/model/user_exceptions/_err.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 ErrException(DaraException):
+    def __init__(
+        self, *,
+        message: str = None,
+        code: str = None,
+        stack: str = None,
+        msg: str = None,
+    ):
+        super().__init__({
+            'message': message,
+            'code': code,
+            'stack': stack,
+        })
+        self.name = 'ErrException'
+        self.msg = msg
+

package/tests/expected/multi/tea_python_tests/model/{user_exceptions.py → user_exceptions/_err_1.py}

@@ -1,29 +1,12 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.exceptions import DaraException 
-import user_models 
+from tea_python_tests import user_exceptions as main_exceptions 
 
 
-class ErrException(DaraException):
+class Err1Exception(main_exceptions.BaseInfoException):
     def __init__(
-        self, 
-        message: str = None,
-        code: str = None,
-        stack: str = None,
-        msg: str = None,
-    ):
-        super().__init__({
-            'message': message,
-            'code': code,
-            'stack': stack,
-        })
-        self.name = 'ErrException'
-        self.msg = msg
-
-class Err1Exception(user_models.BaseInfo, DaraException):
-    def __init__(
-        self, 
+        self, *,
         max_attemp: int = None,
         autoretry: bool = None,
         ignore_ssl: bool = None,
@@ -69,15 +52,3 @@ class Err1Exception(user_models.BaseInfo, DaraException):
         self.name = 'Err1Exception'
         self.msg = msg
 
-class Err2Exception(ErrException):
-    def __init__(
-        self, 
-        msg: str = None,
-        msg_2: str = None,
-    ):
-        super().__init__(
-            msg = msg,
-        )
-        self.name = 'Err2Exception'
-        self.msg_2 = msg_2
-

package/tests/expected/multi/tea_python_tests/model/user_exceptions/_err_2.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from tea_python_tests import user_exceptions as main_exceptions 
+
+
+class Err2Exception(main_exceptions.ErrException):
+    def __init__(
+        self, *,
+        msg: str = None,
+        msg_2: str = None,
+    ):
+        super().__init__(
+            msg = msg,
+        )
+        self.name = 'Err2Exception'
+        self.msg_2 = msg_2
+

package/tests/expected/multi/tea_python_tests/model/user_models/__init__.py

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

package/tests/expected/multi/tea_python_tests/model/user_models/_base_info.py

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from alibabacloud_tea_util import models as darautil_models 
+
+
+
+
+class BaseInfo(darautil_models.RuntimeOptions):
+    def __init__(
+        self, *,
+        autoretry: bool = None,
+        ignore_ssl: bool = None,
+        key: str = None,
+        cert: str = None,
+        ca: str = None,
+        max_attempts: int = None,
+        backoff_policy: str = None,
+        backoff_period: int = None,
+        read_timeout: int = None,
+        connect_timeout: int = None,
+        http_proxy: str = None,
+        https_proxy: str = None,
+        no_proxy: str = None,
+        max_idle_conns: int = None,
+        local_addr: str = None,
+        socks_5proxy: str = None,
+        socks_5net_work: str = None,
+        keep_alive: bool = None,
+        max_attemp: int = None,
+    ):
+        super().__init__(
+            autoretry = autoretry,
+            ignore_ssl = ignore_ssl,
+            key = key,
+            cert = cert,
+            ca = ca,
+            max_attempts = max_attempts,
+            backoff_policy = backoff_policy,
+            backoff_period = backoff_period,
+            read_timeout = read_timeout,
+            connect_timeout = connect_timeout,
+            http_proxy = http_proxy,
+            https_proxy = https_proxy,
+            no_proxy = no_proxy,
+            max_idle_conns = max_idle_conns,
+            local_addr = local_addr,
+            socks_5proxy = socks_5proxy,
+            socks_5net_work = socks_5net_work,
+            keep_alive = keep_alive,
+        )
+        self.max_attemp = max_attemp
+
+    def validate(self):
+        self.validate_required(self.max_attemp, 'max_attemp')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.max_attemp is not None:
+            result['maxAttemp'] = self.max_attemp
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('maxAttemp') is not None:
+            self.max_attemp = m.get('maxAttemp')
+        return self
+

package/tests/expected/multi/tea_python_tests/model/{user_models.py → user_models/_info.py}

@@ -1,78 +1,12 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from alibabacloud_tea_util import models as darautil_models 
+from tea_python_tests import user_models as main_models 
 
 
-
-
-class BaseInfo(darautil_models.RuntimeOptions):
-    def __init__(
-        self, 
-        autoretry: bool = None,
-        ignore_ssl: bool = None,
-        key: str = None,
-        cert: str = None,
-        ca: str = None,
-        max_attempts: int = None,
-        backoff_policy: str = None,
-        backoff_period: int = None,
-        read_timeout: int = None,
-        connect_timeout: int = None,
-        http_proxy: str = None,
-        https_proxy: str = None,
-        no_proxy: str = None,
-        max_idle_conns: int = None,
-        local_addr: str = None,
-        socks_5proxy: str = None,
-        socks_5net_work: str = None,
-        keep_alive: bool = None,
-        max_attemp: int = None,
-    ):
-        super().__init__(
-            autoretry = autoretry,
-            ignore_ssl = ignore_ssl,
-            key = key,
-            cert = cert,
-            ca = ca,
-            max_attempts = max_attempts,
-            backoff_policy = backoff_policy,
-            backoff_period = backoff_period,
-            read_timeout = read_timeout,
-            connect_timeout = connect_timeout,
-            http_proxy = http_proxy,
-            https_proxy = https_proxy,
-            no_proxy = no_proxy,
-            max_idle_conns = max_idle_conns,
-            local_addr = local_addr,
-            socks_5proxy = socks_5proxy,
-            socks_5net_work = socks_5net_work,
-            keep_alive = keep_alive,
-        )
-        self.max_attemp = max_attemp
-
-    def validate(self):
-        self.validate_required(self.max_attemp, 'max_attemp')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.max_attemp is not None:
-            result['maxAttemp'] = self.max_attemp
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('maxAttemp') is not None:
-            self.max_attemp = m.get('maxAttemp')
-        return self
-
-class Info(BaseInfo):
+class Info(main_models.BaseInfo):
     def __init__(
-        self, 
+        self, *,
         max_attemp: int = None,
         autoretry: bool = None,
         ignore_ssl: bool = None,

package/tests/expected/multi/tea_python_tests/models/__init__.py

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

package/tests/expected/multi/tea_python_tests/models/_test_model_dir.py

@@ -0,0 +1,79 @@
+# -*- 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.model import user_models as user_models 
+from typing import Any
+
+
+class TestModelDIR(DaraModel):
+    def __init__(
+        self, *,
+        test: str = None,
+        a: Any = None,
+    ):
+        self.test = test
+        self.a = a
+
+    def validate(self):
+        self.validate_required(self.test, 'test')
+        self.validate_required(self.a, 'a')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.test is not None:
+            result['test'] = self.test
+        if self.a is not None:
+            result['a'] = self.a
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('test') is not None:
+            self.test = m.get('test')
+        if m.get('a') is not None:
+            self.a = m.get('a')
+        return self
+
+
+
+class TestModelDir(DaraModel):
+    def __init__(
+        self, *,
+        test: int = None,
+        m: user_models.Info = None,
+    ):
+        self.test = test
+        self.m = m
+
+    def validate(self):
+        self.validate_required(self.test, 'test')
+        self.validate_required(self.m, 'm')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.test is not None:
+            result['test'] = self.test
+        if self.m is not None:
+            result['m'] = self.m.to_map()
+
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('test') is not None:
+            self.test = m.get('test')
+        if m.get('m') is not None:
+            temp_model = user_models.Info()
+            self.m = temp_model.from_map(m.get('m'))
+
+        return self
+

package/tests/expected/{python2/empty/tea_python_tests/client.py → typedef/tea_python_tests/models/__init__.py}

@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
-class Client(object):
-    def __init__(self):
-        pass
+from __future__ import annotations
+
+
+
+from ._m import M
+
+__all__ = [
+    M
+]

package/tests/{output/typedef/tea_python_tests/models.py → expected/typedef/tea_python_tests/models/_m.py}

@@ -10,7 +10,7 @@ from Tea.model import TeaModel
 
 class M(DaraModel):
     def __init__(
-        self, 
+        self, *,
         a: Request = None,
         b: TeaModel = None,
     ):

package/tests/fixtures/multi/api.dara

@@ -1,6 +1,10 @@
 import "./model/user" User;
 import "./lib/util" Util;
 
+model TestModelDir2  {
+    test: number,
+}
+
 init(){
 }
 

package/tests/fixtures/multi/main.dara

@@ -4,6 +4,24 @@ import "./api" API;
 
 type @user = User.Info
 
+model TestModelDir  {
+    test: number,
+    m: User.Info
+}
+
+model TestModelDIR  {
+    test: string,
+    a: any,
+}
+
+exception err {
+    test: string,
+}
+
+exception ERR {
+    test: number,
+}
+
 init(){
     @user = new User.Info{
         name = 'test',