@darabonba/python-generator 2.0.2 → 2.0.3

package/tests/expected/model/tea_python_tests/{models.py → models/_my_model.py}

@@ -9,324 +9,19 @@ from darabonba.request import DaraRequest
 from typing import List, Dict, Any, BinaryIO
 
 
-
-
-class MSubM(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
-
-class MainFileModelModel(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-    ):
-        self.str = str
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('str') is not None:
-            self.str = m.get('str')
-        return self
-
-class MainFileModel(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-        model: MainFileModelModel = None,
-    ):
-        self.str = str
-        self.model = model
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-        self.validate_required(self.model, 'model')
-        if self.model:
-            self.model.validate()
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        if self.model is not None:
-            result['model'] = self.model.to_map()
-
-        return result
-
-    def from_map(self, m: dict = None):
-        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 = MainFileModelModel()
-            self.model = temp_model.from_map(m.get('model'))
-
-        return self
-
-class MyModelModelModel(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-    ):
-        self.str = str
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('str') is not None:
-            self.str = m.get('str')
-        return self
-
-class MyModelModel(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-        model: MyModelModelModel = None,
-    ):
-        self.str = str
-        self.model = model
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-        self.validate_required(self.model, 'model')
-        if self.model:
-            self.model.validate()
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        if self.model is not None:
-            result['model'] = self.model.to_map()
-
-        return result
-
-    def from_map(self, m: dict = None):
-        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 = MyModelModelModel()
-            self.model = temp_model.from_map(m.get('model'))
-
-        return self
-
-class MyModelSubmodelModel(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-    ):
-        self.str = str
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('str') is not None:
-            self.str = m.get('str')
-        return self
-
-class MyModelSubmodel(DaraModel):
-    def __init__(
-        self, 
-        stringfield: str = None,
-        model: MyModelSubmodelModel = None,
-    ):
-        self.stringfield = stringfield
-        self.model = model
-
-    def validate(self):
-        self.validate_required(self.stringfield, 'stringfield')
-        self.validate_required(self.model, 'model')
-        if self.model:
-            self.model.validate()
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.stringfield is not None:
-            result['stringfield'] = self.stringfield
-        if self.model is not None:
-            result['model'] = self.model.to_map()
-
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('stringfield') is not None:
-            self.stringfield = m.get('stringfield')
-        if m.get('model') is not None:
-            temp_model = MyModelSubmodelModel()
-            self.model = temp_model.from_map(m.get('model'))
-
-        return self
-
-class MyModelSubarraymodel(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
-
-class M(DaraModel):
-    def __init__(
-        self, 
-        sub_m: MSubM = None,
-    ):
-        self.sub_m = sub_m
-
-    def validate(self):
-        self.validate_required(self.sub_m, 'sub_m')
-        if self.sub_m:
-            self.sub_m.validate()
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.sub_m is not None:
-            result['subM'] = self.sub_m.to_map()
-
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('subM') is not None:
-            temp_model = MSubM()
-            self.sub_m = temp_model.from_map(m.get('subM'))
-
-        return self
-
-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
-
-class Model(DaraModel):
-    def __init__(
-        self, 
-        str: str = None,
-    ):
-        self.str = str
-
-    def validate(self):
-        self.validate_required(self.str, 'str')
-
-    def to_map(self):
-        _map = super().to_map()
-        if _map is not None:
-            return _map
-
-        result = dict()
-        if self.str is not None:
-            result['str'] = self.str
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('str') is not None:
-            self.str = m.get('str')
-        return self
-
 class MyModel(DaraModel):
     def __init__(
-        self, 
-        model: MyModelModel = None,
+        self, *,
+        model: main_models.MyModelModel = None,
         stringfield: str = None,
         bytesfield: bytes = None,
         stringarrayfield: List[str] = None,
         mapfield: Dict[str, str] = None,
         name: str = None,
-        submodel: MyModelSubmodel = None,
+        submodel: main_models.MyModelSubmodel = None,
         submodel_map: Dict[str, main_models.MyModelSubmodel] = None,
         map_model: Dict[str, main_models.M] = None,
-        subarraymodel: List[MyModelSubarraymodel] = None,
+        subarraymodel: List[main_models.MyModelSubarraymodel] = None,
         subarray: List[main_models.M] = None,
         ssubarray: List[List[main_models.M]] = None,
         ssubmarray: List[List[SourceClient]] = None,
@@ -624,7 +319,7 @@ class MyModel(DaraModel):
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('model') is not None:
-            temp_model = MyModelModel()
+            temp_model = main_models.MyModelModel()
             self.model = temp_model.from_map(m.get('model'))
 
         if m.get('stringfield') is not None:
@@ -638,33 +333,33 @@ class MyModel(DaraModel):
         if m.get('realName') is not None:
             self.name = m.get('realName')
         if m.get('submodel') is not None:
-            temp_model = MyModelSubmodel()
+            temp_model = main_models.MyModelSubmodel()
             self.submodel = temp_model.from_map(m.get('submodel'))
 
         if m.get('submodelMap') is not None:
             self.submodel_map = {}
             for k1, v1 in m.get('submodelMap').items():
-                temp_model = MyModelSubmodel()
+                temp_model = main_models.MyModelSubmodel()
                 self.submodel_map[k1] = temp_model.from_map(v1)
 
         if m.get('mapModel') is not None:
             self.map_model = {}
             for k1, v1 in m.get('mapModel').items():
-                temp_model = M()
+                temp_model = main_models.M()
                 self.map_model[k1] = temp_model.from_map(v1)
 
         if m.get('subarraymodel') is not None:
             l1 = 0
             self.subarraymodel = []
             for k1 in m.get('subarraymodel'):
-                temp_model = MyModelSubarraymodel()
+                temp_model = main_models.MyModelSubarraymodel()
                 self.subarraymodel.append(temp_model.from_map(k1))
 
         if m.get('subarray') is not None:
             l1 = 0
             self.subarray = []
             for k1 in m.get('subarray'):
-                temp_model = M()
+                temp_model = main_models.M()
                 self.subarray.append(temp_model.from_map(k1))
 
         if m.get('ssubarray') is not None:
@@ -674,7 +369,7 @@ class MyModel(DaraModel):
                 l2 = 0
                 self.ssubarray = []
                 for k2 in k1:
-                    temp_model = M()
+                    temp_model = main_models.M()
                     self.ssubarray.append(temp_model.from_map(k2))
 
         if m.get('ssubmarray') is not None:
@@ -686,7 +381,7 @@ class MyModel(DaraModel):
                 l2 = 0
                 self.ssubmmarray = []
                 for k2 in k1:
-                    temp_model = SourceClient()
+                    temp_model = source_models.Request()
                     self.ssubmmarray.append(temp_model.from_map(k2))
 
         if m.get('maparray') is not None:
@@ -696,19 +391,19 @@ class MyModel(DaraModel):
         if m.get('moduleModelMap') is not None:
             self.module_model_map = {}
             for k1, v1 in m.get('moduleModelMap').items():
-                temp_model = SourceClient()
+                temp_model = source_models.Request()
                 self.module_model_map[k1] = temp_model.from_map(v1)
 
         if m.get('subModelMap') is not None:
             self.sub_model_map = {}
             for k1, v1 in m.get('subModelMap').items():
-                temp_model = MSubM()
+                temp_model = main_models.MSubM()
                 self.sub_model_map[k1] = temp_model.from_map(v1)
 
         if m.get('modelMap') is not None:
             self.model_map = {}
             for k1, v1 in m.get('modelMap').items():
-                temp_model = M()
+                temp_model = main_models.M()
                 self.model_map[k1] = temp_model.from_map(v1)
 
         if m.get('moduleMap') is not None:
@@ -720,7 +415,7 @@ class MyModel(DaraModel):
         if m.get('writable') is not None:
             self.writable = m.get('writable')
         if m.get('existModel') is not None:
-            temp_model = M()
+            temp_model = main_models.M()
             self.exist_model = temp_model.from_map(m.get('existModel'))
 
         if m.get('request') is not None:

package/tests/expected/model/tea_python_tests/models/_my_model_model.py

@@ -0,0 +1,45 @@
+# -*- 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 MyModelModel(DaraModel):
+    def __init__(
+        self, *,
+        str: str = None,
+        model: main_models.MyModelModelModel = None,
+    ):
+        self.str = str
+        self.model = model
+
+    def validate(self):
+        self.validate_required(self.str, 'str')
+        self.validate_required(self.model, 'model')
+        if self.model:
+            self.model.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.str is not None:
+            result['str'] = self.str
+        if self.model is not None:
+            result['model'] = self.model.to_map()
+
+        return result
+
+    def from_map(self, m: dict = None):
+        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.MyModelModelModel()
+            self.model = temp_model.from_map(m.get('model'))
+
+        return self
+

package/tests/expected/model/tea_python_tests/models/_my_model_model_model.py

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

package/tests/expected/model/tea_python_tests/models/_my_model_subarraymodel.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 MyModelSubarraymodel(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
+

package/tests/expected/model/tea_python_tests/models/_my_model_submodel.py

@@ -0,0 +1,45 @@
+# -*- 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 MyModelSubmodel(DaraModel):
+    def __init__(
+        self, *,
+        stringfield: str = None,
+        model: main_models.MyModelSubmodelModel = None,
+    ):
+        self.stringfield = stringfield
+        self.model = model
+
+    def validate(self):
+        self.validate_required(self.stringfield, 'stringfield')
+        self.validate_required(self.model, 'model')
+        if self.model:
+            self.model.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.stringfield is not None:
+            result['stringfield'] = self.stringfield
+        if self.model is not None:
+            result['model'] = self.model.to_map()
+
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('stringfield') is not None:
+            self.stringfield = m.get('stringfield')
+        if m.get('model') is not None:
+            temp_model = main_models.MyModelSubmodelModel()
+            self.model = temp_model.from_map(m.get('model'))
+
+        return self
+

package/tests/expected/model/tea_python_tests/models/_my_model_submodel_model.py

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

package/tests/expected/multi/tea_python_tests/api.py

@@ -8,8 +8,6 @@ from darabonba.request import DaraRequest
 from tea_python_tests.lib.util import Util 
 
 
-
-
 class Client:
     def __init__(self):
         pass

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

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

package/tests/expected/{python3/annotation/tea_python_tests/models.py → multi/tea_python_tests/api_models/_test_model_dir_2.py}

@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
-from Tea.model import TeaModel
+from __future__ import annotations
+from darabonba.model import DaraModel 
 
 
-class Test(TeaModel):
-    """
-    TestModel
-    """
+
+
+class TestModelDir2(DaraModel):
     def __init__(
-        self,
-        test: str = None,
+        self, *,
+        test: int = None,
     ):
-        # Alichange app id 
         self.test = test
 
     def validate(self):
@@ -33,4 +32,3 @@ class Test(TeaModel):
             self.test = m.get('test')
         return self
 
-

package/tests/expected/multi/tea_python_tests/client.py

@@ -7,8 +7,6 @@ from tea_python_tests.api import Client as APIClient
 from typing import Generator, AsyncGenerator
 
 
-
-
 class Client:
     _user: user_models.Info = None
     def __init__(self):

package/tests/expected/multi/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 import ErrException
+from ._err import ERRException
+
+__all__ = [
+    ErrException,
+    ERRException
+]