@darabonba/python-generator 2.0.7 → 2.0.9

package/ChangeLog.md

@@ -1,5 +1,14 @@
 # ChangeLog
 
+# 2.0.9
+- Fixed the arr & map init error in from map
+
+# 2.0.8
+- Optimized the directory structure of models
+
+# 2.0.7
+- Fixed the FileField from.
+
 # 2.0.6
 - Fixed the from map init submodel name.
 

package/lib/generator.js

@@ -328,7 +328,7 @@ setup(
     if (models.length > 0 || subModels.length > 0) {
       // 存一笔 models
       this.modelInitBefore(ast, level);
-      this.visitModelInit(subModels.concat(models));
+      this.visitModelInit(models, subModels);
     }
 
     const exceptions = ast.moduleBody.nodes.filter((item) => {
@@ -1242,23 +1242,23 @@ setup(
       this.emit(`temp_model = ${this.getModelName(subModelName)}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.type === 'array' || fieldValue.fieldType === 'array') {
-      this.emit(`for k${deep} in ${value}:\n`, level);
       let subKey = key;
       if(deep > 1) {
         subKey = `l${deep - 1}`;
-        this.emit(`${subKey} = []\n`, level + 2);
+        this.emit(`${subKey} = []\n`, level);
       }
+      this.emit(`for k${deep} in ${value}:\n`, level);
       this.visitFromField(fieldValue.fieldItemType || fieldValue.subType, fieldName, `${subKey}`, `k${deep}`, level + 2, true);
       if(deep > 1) {
         this.emitFieldConvert(key, subKey, level, arr);
       }
     } else if (fieldValue.fieldType === 'map' || fieldValue.type === 'map') {
-      this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
       let subKey = key;
       if(deep > 1) {
         subKey = `d${deep - 1}`;
-        this.emit(`${subKey} = {}\n`, level + 2);
+        this.emit(`${subKey} = {}\n`, level);
       }
+      this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
       this.visitFromField(fieldValue.valueType, fieldName, `${subKey}[k${deep}]`, `v${deep}`, level + 2);
       if(deep > 1) {
         this.emitFieldConvert(key, subKey, level, arr);
@@ -1433,13 +1433,13 @@ setup(
     return extendFileds.concat(ast.nodes);
   }
 
-  visitModel(modelBody, modelName, extendOn, level) {
+  visitModel(modelBody, modelName, extendOn, level, filename) {
     // const modelDir = path.join(path.dirname(filepath), this.modelDir);
     this.emit(`class ${modelName}`, level);
     this.visitExtendOn(extendOn);
     this.emit(':\n');
     this.visitModelBody(modelBody, level + 2, modelName);
-    this.saveBuffer(path.join(this.modelPath, `_${_snakeCase(modelName)}.py`));
+    this.saveBuffer(path.join(this.modelPath, filename || `_${_snakeCase(modelName)}.py`));
     this.usedTypes = [];
     this.imports = [];
     this.output = '';
@@ -1481,7 +1481,7 @@ setup(
     this.visitModel(ast.modelBody, modelName, ast.extendOn, level);
   }
 
-  visitModelInit(models) {
+  visitModelInit(models, subModels) {
     const modelNames = [];
     const moreExports = this.moreExports || [];
     for (let i = 0; i < models.length; i++) {
@@ -1490,6 +1490,14 @@ setup(
       modelNames.push(modelName);
       this.emit(`from ._${_snakeCase(modelName)} import ${modelName}\n`);
     }
+
+    for (let i = 0; i < subModels.length; i++) {
+      const ast = subModels[i];
+      const modelName = _subModelName(_name(ast.modelName));
+      const mainModelName = _name(ast.modelName).split('.')[0];
+      modelNames.push(modelName);
+      this.emit(`from ._${_snakeCase(mainModelName)} import ${modelName}\n`);
+    }
     
     this.emit('\n__all__ = [\n');
     this.emit(modelNames.join(',\n    '), 2);
@@ -1629,7 +1637,8 @@ setup(
   eachSubModel(ast, level) {
     assert.equal(ast.type, 'model');
     const modelName = _subModelName(_name(ast.modelName));
-    this.visitModel(ast.modelBody, modelName, ast.extendOn, level);
+    const mainModelName = _name(ast.modelName).split('.')[0];
+    this.visitModel(ast.modelBody, modelName, ast.extendOn, level, `_${_snakeCase(mainModelName)}.py`);
   }
 
   visitObjectFieldValue(ast, level) {

package/package.json

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

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

@@ -4,16 +4,16 @@ 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
+from ._complex_request import ComplexRequestHeader
+from ._complex_request import ComplexRequestConfigs
+from ._complex_request import ComplexRequestPart
 
 __all__ = [
+    ComplexRequest,
+    Response,
     ComplexRequestHeader,
     ComplexRequestConfigs,
-    ComplexRequestPart,
-    ComplexRequest,
-    Response
+    ComplexRequestPart
 ]

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

@@ -461,3 +461,113 @@ class ComplexRequest(DaraModel):
 
         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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            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
+
+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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            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
+
+
+
+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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            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/expected/model/tea_python_tests/models/__init__.py

@@ -4,20 +4,24 @@ 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
+from ._m import MSubM
+from ._main_file import MainFileModelModel
+from ._main_file import MainFileModel
+from ._my_model import MyModelModelModel
+from ._my_model import MyModelModel
+from ._my_model import MyModelSubmodelModel
+from ._my_model import MyModelSubmodel
+from ._my_model import MyModelSubarraymodel
 
 __all__ = [
+    M,
+    Class,
+    Model,
+    MyModel,
     MSubM,
     MainFileModelModel,
     MainFileModel,
@@ -25,9 +29,5 @@ __all__ = [
     MyModelModel,
     MyModelSubmodelModel,
     MyModelSubmodel,
-    MyModelSubarraymodel,
-    M,
-    Class,
-    Model,
-    MyModel
+    MyModelSubarraymodel
 ]

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

@@ -35,3 +35,22 @@ class M(DaraModel):
 
         return self
 
+
+
+class MSubM(DaraModel):
+    def __init__(self):
+        pass
+    def validate(self):
+        pass
+
+    def to_map(self):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        return self
+

package/tests/{output/model/tea_python_tests/models/_main_file_model.py → expected/model/tea_python_tests/models/_main_file.py}

@@ -44,3 +44,30 @@ class MainFileModel(DaraModel):
 
         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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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.py

@@ -450,8 +450,8 @@ class MyModel(DaraModel):
         self.ssubarray = []
         if m.get('ssubarray') is not None:
             for k1 in m.get('ssubarray'):
+                l1 = []
                 for k2 in k1:
-                    l1 = []
                     temp_model = main_models.M()
                     l1.append(temp_model.from_map(k2))
                 self.ssubarray.append(l1)
@@ -465,8 +465,8 @@ class MyModel(DaraModel):
         self.ssubmmarray = []
         if m.get('ssubmmarray') is not None:
             for k1 in m.get('ssubmmarray'):
+                l1 = []
                 for k2 in k1:
-                    l1 = []
                     temp_model = source_models.Request()
                     l1.append(temp_model.from_map(k2))
                 self.ssubmmarray.append(l1)
@@ -474,10 +474,10 @@ class MyModel(DaraModel):
         self.sssubmmarray = []
         if m.get('sssubmmarray') is not None:
             for k1 in m.get('sssubmmarray'):
+                l1 = []
                 for k2 in k1:
-                    l1 = []
+                    l2 = []
                     for k3 in k2:
-                        l2 = []
                         temp_model = source_models.Request()
                         l2.append(temp_model.from_map(k3))
                     l1.append(l2)
@@ -498,8 +498,8 @@ class MyModel(DaraModel):
         self.arr_module_model_map = []
         if m.get('arrModuleModelMap') is not None:
             for k1 in m.get('arrModuleModelMap'):
+                d1 = {}
                 for k2, v2 in k1.items():
-                    d1 = {}
                     temp_model = source_models.Request()
                     d1[k2] = temp_model.from_map(v2)
                 self.arr_module_model_map.append(d1)
@@ -507,10 +507,10 @@ class MyModel(DaraModel):
         self.arrs_module_model_map = []
         if m.get('arrsModuleModelMap') is not None:
             for k1 in m.get('arrsModuleModelMap'):
+                l1 = []
                 for k2 in k1:
-                    l1 = []
+                    d2 = {}
                     for k3, v3 in k2.items():
-                        d2 = {}
                         temp_model = source_models.Request()
                         d2[k3] = temp_model.from_map(v3)
                     l1.append(d2)
@@ -598,3 +598,152 @@ class MyModel(DaraModel):
 
         return self
 
+class MyModelSubarraymodel(DaraModel):
+    def __init__(self):
+        pass
+    def validate(self):
+        pass
+
+    def to_map(self):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        return self
+
+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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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
+
+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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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: 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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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
+
+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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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/modelConfig/tea_python_tests/models/__init__.py

@@ -4,20 +4,24 @@ 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
+from ._m import MSubM
+from ._main_file import MainFileModelModel
+from ._main_file import MainFileModel
+from ._my_model import MyModelModelModel
+from ._my_model import MyModelModel
+from ._my_model import MyModelSubmodelModel
+from ._my_model import MyModelSubmodel
+from ._my_model import MyModelSubarraymodel
 
 __all__ = [
+    M,
+    Class,
+    Model,
+    MyModel,
     MSubM,
     MainFileModelModel,
     MainFileModel,
@@ -25,9 +29,5 @@ __all__ = [
     MyModelModel,
     MyModelSubmodelModel,
     MyModelSubmodel,
-    MyModelSubarraymodel,
-    M,
-    Class,
-    Model,
-    MyModel
+    MyModelSubarraymodel
 ]

package/tests/expected/modelConfig/tea_python_tests/models/_m.py

@@ -35,3 +35,22 @@ class M(DaraModel):
 
         return self
 
+
+
+class MSubM(DaraModel):
+    def __init__(self):
+        pass
+    def validate(self):
+        pass
+
+    def to_map(self):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        return self
+

package/tests/expected/modelConfig/tea_python_tests/models/{_main_file_model.py → _main_file.py}

@@ -44,3 +44,30 @@ class MainFileModel(DaraModel):
 
         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):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        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
+