@darabonba/python-generator 2.0.2 → 2.0.4

package/lib/helper.js

@@ -1,6 +1,7 @@
 'use strict';
 const DSL = require('@darabonba/parser');
-
+const fs = require('fs');
+const path = require('path');
 const keywords = [
   'False', 'None', 'True', '__peg_parser__', 'and',
   'as', 'assert', 'async', 'await', 'break',
@@ -393,7 +394,26 @@ function _escape(str) {
   return str.includes('-') ? `'${str}'` : str;
 }
 
+function _removeFilesInDirectory(directoryPath) {
+  if(!fs.existsSync(directoryPath)) {
+    return;
+  }
+  const files = fs.readdirSync(directoryPath);
+  for (const file of files) {
+    const filePath = path.join(directoryPath, file);
+    const stat = fs.statSync(filePath);
+
+    if (stat.isDirectory()) {
+      _removeFilesInDirectory(filePath);
+      fs.rmdirSync(filePath);
+    } else {
+      fs.unlinkSync(filePath);
+    }
+  }
+}
+
 module.exports = {
+  _removeFilesInDirectory,
   _name,
   _escape,
   _vid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "The darabonba generator for Python",
   "main": "lib/generator.js",
   "directories": {

package/tests/expected/{python3/model/tea_python_tests/client.py → annotation/tea_python_tests/models/__init__.py}

@@ -3,6 +3,9 @@
 from __future__ import annotations
 
 
-class Client:
-    def __init__(self):
-        pass
+
+from ._test import Test
+
+__all__ = [
+    Test
+]

package/tests/expected/annotation/tea_python_tests/{models.py → models/_test.py}

@@ -10,7 +10,7 @@ from darabonba.model import DaraModel
 """
 class Test(DaraModel):
     def __init__(
-        self, 
+        self, *,
         test: str = None,
     ):
         # Alichange app id

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

@@ -16,7 +16,7 @@ from darabonba.utils.stream import Stream as DaraStream
 from darabonba.url import Url as DaraURL 
 from darabonba.utils.xml import XML as DaraXML 
 import sys 
-from typing import List, Any, BytesIO, StringIO
+from typing import List, Any
 
 
 class Client:
@@ -618,8 +618,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)
@@ -669,8 +669,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)

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

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._test_1 import Test1
+from ._test_2 import Test2
+from ._test_3 import Test3
+
+__all__ = [
+    Test1,
+    Test2,
+    Test3
+]

package/tests/expected/comment/tea_python_tests/models/_test_1.py

@@ -0,0 +1,91 @@
+# -*- 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
+
+
+# import comment
+
+
+"""
+ * @remarks
+ * TestModel
+"""
+class Test1(DaraModel):
+    def __init__(
+        self, *,
+        test: str = None,
+    # odel的test back comment
+        test_2: str = None,
+    # odel的test2 back comment
+        test_3: List[List[str]] = None,
+        test_5: str = None,
+        sts: str = None,
+        a_sts: str = None,
+    ):
+        # test desc
+        self.test = test
+    # odel的test back comment
+        # test2 desc
+        self.test_2 = test_2
+    # odel的test2 back comment
+        # test3 desc
+        self.test_3 = test_3
+        # test desc
+        self.test_5 = test_5
+        # sts desc
+        self.sts = sts
+        # asts desc
+        self.a_sts = a_sts
+
+    def validate(self):
+        self.validate_required(self.test, 'test')
+    # odel的test back comment
+        self.validate_required(self.test_2, 'test_2')
+    # odel的test2 back comment
+        self.validate_required(self.test_3, 'test_3')
+        self.validate_required(self.test_5, 'test_5')
+        self.validate_required(self.sts, 'sts')
+        self.validate_required(self.a_sts, 'a_sts')
+
+    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
+    # odel的test back comment
+        if self.test_2 is not None:
+            result['test2'] = self.test_2
+    # odel的test2 back comment
+        if self.test_3 is not None:
+            result['test3'] = self.test_3
+        if self.test_5 is not None:
+            result['test5'] = self.test_5
+        if self.sts is not None:
+            result['sts'] = self.sts
+        if self.a_sts is not None:
+            result['asts'] = self.a_sts
+        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')
+    # odel的test back comment
+        if m.get('test2') is not None:
+            self.test_2 = m.get('test2')
+    # odel的test2 back comment
+        if m.get('test3') is not None:
+            self.test_3 = m.get('test3')
+        if m.get('test5') is not None:
+            self.test_5 = m.get('test5')
+        if m.get('sts') is not None:
+            self.sts = m.get('sts')
+        if m.get('asts') is not None:
+            self.a_sts = m.get('asts')
+        return self
+

package/tests/expected/comment/tea_python_tests/models/_test_2.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+
+
+"""
+ * @remarks
+ * TestModel2
+"""
+class Test2(DaraModel):
+    def __init__(
+        self, *,
+    # model的test front comment
+        test: str = None,
+    # model的test front comment
+        test_2: str = None,
+    ):
+    # model的test front comment
+        # test desc
+        self.test = test
+    # model的test front comment
+        # test2 desc
+        self.test_2 = test_2
+
+    def validate(self):
+    # model的test front comment
+        self.validate_required(self.test, 'test')
+    # model的test front comment
+        self.validate_required(self.test_2, 'test_2')
+
+    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
+    # model的test front comment
+        if self.test_2 is not None:
+            result['test2'] = self.test_2
+        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')
+    # model的test front comment
+        if m.get('test2') is not None:
+            self.test_2 = m.get('test2')
+        return self
+

package/tests/expected/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/expected/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/expected/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/expected/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/expected/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/expected/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/{output/complex/tea_python_tests/models.py → expected/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
-
-    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
+from typing import BinaryIO, List, Dict, Any
 
-    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
@@ -440,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:
@@ -510,17 +407,17 @@ class ComplexRequest(DaraModel):
         if m.get('modelMap') is not None:
             self.model_map = {}
             for k1, v1 in m.get('modelMap').items():
-                temp_model = SourceClient()
+                temp_model = source_models.Request()
                 self.model_map[k1] = temp_model.from_map(v1)
 
         if m.get('request') is not None:
-            temp_model = SourceClient()
+            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:
-            temp_model = SourceClient()
+            temp_model = source_models.RequestInstance()
             self.instance = temp_model.from_map(m.get('instance'))
 
         if m.get('from') is not None:
@@ -537,34 +434,8 @@ class ComplexRequest(DaraModel):
             l1 = 0
             self.part = []
             for k1 in m.get('Part'):
-                temp_model = ComplexRequestPart()
+                temp_model = main_models.ComplexRequestPart()
                 self.part.append(temp_model.from_map(k1))
 
         return self
 
-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
-