@darabonba/python-generator 1.2.8 → 1.2.11

package/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm run ci
+    - run: npm run test

package/ChangeLog.md

@@ -1,5 +1,17 @@
 # ChangeLog
 
+## 1.2.11 - 2022-07-11
+
+* Support complex list(`array-in-array`).
+
+## 1.2.10 - 2022-05-31
+
+* Fix import package for typedef.
+
+## 1.2.9 - 2022-05-31
+
+* Support Typedef.
+
 ## 1.2.8 - 2020-03-17
 
 * Improve TeaModel to avoid serialization exception.

package/README-CN.md

@@ -3,15 +3,12 @@
 # Darabonba Python 生成器
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
 [![codecov][cov-image]][cov-url]
 [![David deps][david-image]][david-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/@darabonba/python-generator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@darabonba/python-generator
-[travis-image]: https://img.shields.io/travis/aliyun/darabonba-python-generator.svg?style=flat-square
-[travis-url]: https://travis-ci.org/aliyun/darabonba-python-generator
 [cov-image]: https://codecov.io/gh/aliyun/darabonba-python-generator/branch/master/graph/badge.svg
 [cov-url]: https://codecov.io/gh/aliyun/darabonba-python-generator
 [david-image]: https://img.shields.io/david/aliyun/darabonba-python-generator.svg?style=flat-square

package/README.md

@@ -3,15 +3,12 @@ English | [简体中文](/README-CN.md)
 # Darabonba Python Generator
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
 [![codecov][cov-image]][cov-url]
 [![David deps][david-image]][david-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/@darabonba/python-generator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@darabonba/python-generator
-[travis-image]: https://img.shields.io/travis/aliyun/darabonba-python-generator.svg?style=flat-square
-[travis-url]: https://travis-ci.org/aliyun/darabonba-python-generator
 [cov-image]: https://codecov.io/gh/aliyun/darabonba-python-generator/branch/master/graph/badge.svg
 [cov-url]: https://codecov.io/gh/aliyun/darabonba-python-generator
 [david-image]: https://img.shields.io/david/aliyun/darabonba-python-generator.svg?style=flat-square

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.8",
+  "version": "1.2.11",
   "description": "The darabonba generator for Python",
   "main": "src/generator.js",
   "directories": {

package/src/generator.js

@@ -14,11 +14,18 @@ class Generator {
       throw new Error('`option.outputDir` should not empty');
     }
     this.lang = lang;
+    this.typedef = meta[lang] && meta[lang].typedef ? meta[lang].typedef : {};
     this.initConfig(meta);
   }
 
   visit(ast) {
     this.imports = this.resolveImports(ast);
+    this.imports.typedef = this.typedef;
+    Object.keys(this.typedef).forEach((def) => {
+      if (this.typedef[def].package && !this.imports.requirePackage.includes(this.typedef[def].package)) {
+        this.imports.requirePackage.push(this.typedef[def].package);
+      }
+    });
     const objects = [];
 
     // combine client code
@@ -120,6 +127,7 @@ class Generator {
     let thirdPackageModel = {};
     let thirdPackageClient = {};
     let thirdPackageClientAlias = {};
+    let importsTypedef = {};
 
     if (imports.length > 0) {
       const lockPath = path.join(this.config.pkgDir, '.libraries.json');
@@ -158,6 +166,20 @@ class Generator {
           modelDir = daraMeta[this.lang].modelDirName
             ? daraMeta[this.lang].modelDirName
             : this.config.model.dir;
+          if (daraMeta[this.lang].typedef) {
+            importsTypedef[aliasId] = {};
+            const moduleTypedef = daraMeta[this.lang].typedef;
+            Object.keys(moduleTypedef || {}).forEach((types) => {
+              if (!importsTypedef[aliasId][types]) {
+                importsTypedef[aliasId][types] = {};
+              }
+              importsTypedef[aliasId][types].import = moduleTypedef[types].import;
+              importsTypedef[aliasId][types].type = moduleTypedef[types].type;
+              if (moduleTypedef[types].package && !requirePackage.includes(moduleTypedef[types].package)) {
+                requirePackage.push(moduleTypedef[types].package);
+              }
+            });
+          }
         } else {
           packageName = daraMeta.name;
           clientName = this.config.clientName;
@@ -197,6 +219,7 @@ class Generator {
       thirdPackageClient,
       thirdPackageClientAlias,
       thirdPackageModel,
+      importsTypedef,
     };
   }
 }

package/src/langs/common/combinator.js

@@ -36,6 +36,8 @@ class BaseCombinator {
     this.thirdPackageClient = imports.thirdPackageClient;
     this.thirdPackageClientAlias = imports.thirdPackageClientAlias;
     this.thirdPackageModel = imports.thirdPackageModel;
+    this.typedef = imports.typedef;
+    this.importsTypedef = imports.importsTypedef;
 
     _config(this.config);
   }

package/src/langs/python/combinator.js

@@ -202,6 +202,38 @@ class Combinator extends CombinatorBase {
     return resultName;
   }
 
+  addTypedefInclude(typeName) {
+    let accessPath = typeName.split('.');
+    let importName = '';
+    let fromName = '';
+    let typedefModule = {};
+    if (accessPath.length === 2) {
+      if (this.importsTypedef[accessPath[0]] && this.importsTypedef[accessPath[0]][accessPath[1]]) {
+        typedefModule = this.importsTypedef[accessPath[0]][accessPath[1]];
+      }
+    } else if (accessPath.length === 1 && this.typedef[accessPath[0]]) {
+      typedefModule = this.typedef[accessPath[0]];
+    }
+    if (typedefModule.import || typedefModule.package) {
+      if (typedefModule.import) {
+        fromName = typedefModule.import;
+      }
+      if (typedefModule.type) {
+        importName = typedefModule.type;
+      }
+    }
+
+    let existResult = this.includeList.some(item => item.import === importName && item.from === fromName);
+    if (!existResult) {
+      this.includeList.push({
+        'from': fromName,
+        'import': importName,
+        'alias': '',
+      });
+    }
+    return typedefModule.type || typeName;
+  }
+
   simpleImport(imp, from = null) {
     let existResult = this.includeList.some(item => {
       if (item.import === imp && item.from === from) {
@@ -213,7 +245,7 @@ class Combinator extends CombinatorBase {
         from: from,
         import: imp
       });
-    } 
+    }
   }
 
   combine(objectArr = []) {
@@ -402,7 +434,7 @@ class Combinator extends CombinatorBase {
     } else if (obj.objectType === 'model' || !this.config.typeMap[obj] && !this.thirdPackageNamespace[obj]) {
       if (_type(obj) === target) {
         return true;
-      } 
+      }
     }
     return false;
   }
@@ -916,7 +948,7 @@ class Combinator extends CombinatorBase {
     this.levelDown();
   }
 
-  emitNotes(emitter, notes) {}
+  emitNotes(emitter, notes) { }
 
   emitConstruct(emitter, construct, props, isModule = false) {
     if (construct.params.length + props.length > 0) {
@@ -950,7 +982,7 @@ class Combinator extends CombinatorBase {
             } else {
               emitter.emitln(`${_name(prop.name)}: ${typeHints} = None,`, this.level);
             }
-            
+
           }
         });
       }
@@ -1200,7 +1232,7 @@ class Combinator extends CombinatorBase {
     let importList = this.includeList.filter(node => !node.from && node.import);
     let aliasList = this.includeList.filter(node => node.from && node.alias);
     let list = this.includeList.filter(node => node.from && !node.alias);
-    
+
     let from = {};
     let fromList = [];
 
@@ -1489,7 +1521,7 @@ class Combinator extends CombinatorBase {
           if (item instanceof AnnotationItem) {
             if (item.mode === 'single') {
               emit.emit(`# ${item.content}`, this.level);
-            } 
+            }
             tmp.push(emit.output);
             return true;
           }
@@ -1761,7 +1793,7 @@ class Combinator extends CombinatorBase {
       const quote = this._adaptedQuotes(behavior.key, emitter);
       emitter.emit(`${emit.output}[${quote}${behavior.key}${quote}] = `, this.level);
     }
-    
+
     this.grammerValue(emitter, behavior.value);
     emitter.emitln('');
   }

package/src/langs/python2/combinator.js

@@ -198,6 +198,38 @@ class Combinator extends CombinatorBase {
     return resultName;
   }
 
+  addTypedefInclude(typeName) {
+    let accessPath = typeName.split('.');
+    let importName = '';
+    let fromName = '';
+    let typedefModule = {};
+    if (accessPath.length === 2) {
+      if (this.importsTypedef[accessPath[0]] && this.importsTypedef[accessPath[0]][accessPath[1]]) {
+        typedefModule = this.importsTypedef[accessPath[0]][accessPath[1]];
+      }
+    } else if (accessPath.length === 1 && this.typedef[accessPath[0]]) {
+      typedefModule = this.typedef[accessPath[0]];
+    }
+    if (typedefModule.import || typedefModule.package) {
+      if (typedefModule.import) {
+        fromName = typedefModule.import;
+      }
+      if (typedefModule.type) {
+        importName = typedefModule.type;
+      }
+    }
+
+    let existResult = this.includeList.some(item => item.import === importName && item.from === fromName);
+    if (!existResult) {
+      this.includeList.push({
+        'from': fromName,
+        'import': importName,
+        'alias': '',
+      });
+    }
+    return typedefModule.type || typeName;
+  }
+
   combine(objectArr = []) {
     super.combine(objectArr);
     this.config.dir = this.config.outputDir + '/' + this.config.package + '/';

package/src/resolver/base.js

@@ -153,7 +153,7 @@ class BaseResolver {
   }
 
   resolveType(typeNode, sourceNode, prop) {
-    let typeInfo = {objectType: 'module'};
+    let typeInfo = { objectType: 'module' };
     if (typeNode.idType) {
       if (typeNode.idType === 'model') {
         typeInfo['objectType'] = 'model';
@@ -162,6 +162,9 @@ class BaseResolver {
       } else if (typeNode.idType === 'module') {
         typeInfo['lexeme'] = this.combinator.addInclude(typeNode.lexeme);
         return typeInfo;
+      } else if (typeNode.idType === 'typedef') {
+        typeInfo['lexeme'] = this.combinator.addTypedefInclude(typeNode.lexeme);
+        return typeInfo;
       } else if (typeNode.idType === 'builtin_model') {
         typeInfo['objectType'] = 'builtin_model';
         return this.combinator.addInclude(typeNode.lexeme);
@@ -169,7 +172,7 @@ class BaseResolver {
       debug.stack(typeNode, sourceNode);
     } else if (typeNode.type) {
       if (typeNode.type === 'fieldType') {
-        return this.resolveType(typeNode.fieldType, typeNode);
+        return this.resolveType(typeNode.fieldType, typeNode, prop);
       } else if (typeNode.type === 'modelBody') {
         // is sub model
         typeInfo['objectType'] = 'model';
@@ -213,6 +216,13 @@ class BaseResolver {
         typeInfo['objectType'] = 'model';
         typeInfo['lexeme'] = this.combinator.addModelInclude(tmp.join('.'));
         return typeInfo;
+      } else if (typeNode.type === 'moduleTypedef') {
+        let tmp = [];
+        typeNode.path.forEach(item => {
+          tmp.push(item.lexeme);
+        });
+        typeInfo['lexeme'] = this.combinator.addTypedefInclude(tmp.join('.'));
+        return typeInfo;
       } else if (typeNode.type === 'subModel') {
         let tmp = [];
         typeNode.path.forEach(item => {
@@ -229,14 +239,14 @@ class BaseResolver {
       let itemType;
       if (sourceNode.fieldItemType.type === 'modelBody') {
         typeInfo['objectType'] = 'model';
-        typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.itemType);
+        typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.itemType ? sourceNode.itemType : prop);
         itemType = typeInfo;
       } else if (sourceNode.fieldItemType.idType === 'model') {
         typeInfo['objectType'] = 'model';
         typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.fieldItemType.lexeme);
         itemType = typeInfo;
       } else {
-        itemType = this.resolveType(sourceNode.fieldItemType, sourceNode);
+        itemType = this.resolveType(sourceNode.fieldItemType, sourceNode, sourceNode.itemType ? sourceNode.itemType : prop);
       }
       const arrayType = {
         lexeme: 'array',

package/tests/expected/python2/complex/tea_python_tests/client.py

@@ -163,6 +163,18 @@ class Client(SourceClient):
             '1'
         ]
 
+    @staticmethod
+    def array_2():
+        temp = source_models.Config()
+        any_arr = [
+            temp
+        ]
+        return [
+            [
+                any_arr
+            ]
+        ]
+
     def template_string(self):
         return '/%s' % TeaConverter.to_unicode(self._protocol)
 

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

@@ -89,8 +89,38 @@ class ComplexRequestPart(TeaModel):
         return self
 
 
+class ComplexRequestComplexList(TeaModel):
+    def __init__(self, name=None, code=None):
+        self.name = name  # type: str
+        self.code = code  # type: int
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super(ComplexRequestComplexList, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.name is not None:
+            result['Name'] = self.name
+        if self.code is not None:
+            result['Code'] = self.code
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.name = m.get('Name')
+        if m.get('Code') is not None:
+            self.code = m.get('Code')
+        return self
+
+
 class ComplexRequest(TeaModel):
-    def __init__(self, access_key=None, body=None, strs=None, header=None, num=None, configs=None, part=None):
+    def __init__(self, access_key=None, body=None, strs=None, header=None, num=None, configs=None, part=None,
+                 complex_list=None, complex_list_1=None):
         self.access_key = access_key  # type: str
         # Body
         self.body = body  # type: READABLE
@@ -102,6 +132,8 @@ class ComplexRequest(TeaModel):
         self.configs = configs  # type: ComplexRequestConfigs
         # Part
         self.part = part  # type: list[ComplexRequestPart]
+        self.complex_list = complex_list  # type: list[list[list[ComplexRequestComplexList]]]
+        self.complex_list_1 = complex_list_1  # type: list[list[dict[str, str]]]
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -118,6 +150,14 @@ class ComplexRequest(TeaModel):
             for k in self.part:
                 if k:
                     k.validate()
+        self.validate_required(self.complex_list, 'complex_list')
+        if self.complex_list:
+            for k in self.complex_list:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
+        self.validate_required(self.complex_list_1, 'complex_list_1')
 
     def to_map(self):
         _map = super(ComplexRequest, self).to_map()
@@ -141,6 +181,18 @@ class ComplexRequest(TeaModel):
         if self.part is not None:
             for k in self.part:
                 result['Part'].append(k.to_map() if k else None)
+        result['complexList'] = []
+        if self.complex_list is not None:
+            for k in self.complex_list:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['complexList'].append(l1)
+        if self.complex_list_1 is not None:
+            result['complexList1'] = self.complex_list_1
         return result
 
     def from_map(self, m=None):
@@ -164,6 +216,19 @@ class ComplexRequest(TeaModel):
             for k in m.get('Part'):
                 temp_model = ComplexRequestPart()
                 self.part.append(temp_model.from_map(k))
+        self.complex_list = []
+        if m.get('complexList') is not None:
+            for k in m.get('complexList'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list.append(l1)
+        if m.get('complexList1') is not None:
+            self.complex_list_1 = m.get('complexList1')
         return self
 
 

package/tests/expected/python2/typedef/setup.py

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+"""
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+"""
+
+import os
+import sys
+from setuptools import setup, find_packages
+
+"""
+setup module for tea_python_tests.
+
+Created on 28/05/2022
+
+@author: Alibaba
+"""
+
+PACKAGE = "tea_python_tests"
+NAME = "tea_python_tests" or "alibabacloud-package"
+DESCRIPTION = "Generate setup.py"
+AUTHOR = "Alibaba"
+AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
+URL = "https://github.com/"
+VERSION = __import__(PACKAGE).__version__
+REQUIRES = [
+    "requests>=2.21.0, <3.0.0",
+    "alibabacloud-tea-py2>=0.0.4, <1.0.0"
+]
+
+LONG_DESCRIPTION = ''
+
+if os.path.exists('./README.md'):
+    if sys.version_info.major == 2:
+        with open("README.md") as fp:
+            LONG_DESCRIPTION = fp.read()
+    else:
+        with open("README.md", encoding="utf-8") as fp:
+            LONG_DESCRIPTION = fp.read()
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
+    author=AUTHOR,
+    author_email=AUTHOR_EMAIL,
+    license="Apache License 2.0",
+    url=URL,
+    keywords=["tea","python","tests"],
+    packages=find_packages(exclude=["tests*"]),
+    include_package_data=True,
+    platforms="any",
+    install_requires=REQUIRES,
+    classifiers=(
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Topic :: Software Development"
+    )
+)

package/tests/expected/python2/typedef/tea_python_tests/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

package/tests/expected/python2/typedef/tea_python_tests/client.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import unicode_literals
+
+from requests import Request
+from Tea.model import TeaModel
+from Source.source_client import SourceClient
+
+from tea_python_tests import models as main_models
+
+
+class Client(object):
+    _vid = None  # type: Request
+    _model = None  # type: TeaModel
+
+    def __init__(self, request, model):
+        self._vid = request
+        self._model = model
+
+    def main(self, test_1, test_2):
+        oss = SourceClient(test_1)
+        m = main_models.M(
+            a=test_1,
+            b=test_2
+        )
+        self._vid = test_1
+        self._model = test_2
+
+    def test_http_request(self, req):
+        return self.test_http_request_with('test', req)
+
+    @staticmethod
+    def test_http_request_with(method, req):
+        raise Exception('Un-implemented')
+
+    @staticmethod
+    def test_http_header(method, headers):
+        raise Exception('Un-implemented')

package/tests/expected/python2/typedef/tea_python_tests/models.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from Tea.model import TeaModel
+from requests import Request
+
+
+class M(TeaModel):
+    def __init__(self, a=None, b=None):
+        self.a = a  # type: Request
+        self.b = b  # type: TeaModel
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super(M, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.a is not None:
+            result['a'] = self.a
+        if self.b is not None:
+            result['b'] = self.b
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('a') is not None:
+            self.a = m.get('a')
+        if m.get('b') is not None:
+            self.b = m.get('b')
+        return self
+
+

package/tests/expected/python3/complex/tea_python_tests/client.py

@@ -337,6 +337,18 @@ class Client(SourceClient):
             '1'
         ]
 
+    @staticmethod
+    def array_2() -> List[List[Any]]:
+        temp = source_models.Config()
+        any_arr = [
+            temp
+        ]
+        return [
+            [
+                any_arr
+            ]
+        ]
+
     def template_string(self) -> str:
         return f'/{self._protocol}'
 

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

@@ -101,6 +101,39 @@ class ComplexRequestPart(TeaModel):
         return self
 
 
+class ComplexRequestComplexList(TeaModel):
+    def __init__(
+        self,
+        name: str = None,
+        code: int = None,
+    ):
+        self.name = name
+        self.code = code
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.name is not None:
+            result['Name'] = self.name
+        if self.code is not None:
+            result['Code'] = self.code
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.name = m.get('Name')
+        if m.get('Code') is not None:
+            self.code = m.get('Code')
+        return self
+
+
 class ComplexRequest(TeaModel):
     def __init__(
         self,
@@ -111,6 +144,8 @@ class ComplexRequest(TeaModel):
         num: int = None,
         configs: ComplexRequestConfigs = None,
         part: List[ComplexRequestPart] = None,
+        complex_list: List[List[List[ComplexRequestComplexList]]] = None,
+        complex_list_1: List[List[Dict[str, str]]] = None,
     ):
         self.access_key = access_key
         # Body
@@ -123,6 +158,8 @@ class ComplexRequest(TeaModel):
         self.configs = configs
         # Part
         self.part = part
+        self.complex_list = complex_list
+        self.complex_list_1 = complex_list_1
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -139,6 +176,14 @@ class ComplexRequest(TeaModel):
             for k in self.part:
                 if k:
                     k.validate()
+        self.validate_required(self.complex_list, 'complex_list')
+        if self.complex_list:
+            for k in self.complex_list:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
+        self.validate_required(self.complex_list_1, 'complex_list_1')
 
     def to_map(self):
         _map = super().to_map()
@@ -162,6 +207,18 @@ class ComplexRequest(TeaModel):
         if self.part is not None:
             for k in self.part:
                 result['Part'].append(k.to_map() if k else None)
+        result['complexList'] = []
+        if self.complex_list is not None:
+            for k in self.complex_list:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['complexList'].append(l1)
+        if self.complex_list_1 is not None:
+            result['complexList1'] = self.complex_list_1
         return result
 
     def from_map(self, m: dict = None):
@@ -185,6 +242,19 @@ class ComplexRequest(TeaModel):
             for k in m.get('Part'):
                 temp_model = ComplexRequestPart()
                 self.part.append(temp_model.from_map(k))
+        self.complex_list = []
+        if m.get('complexList') is not None:
+            for k in m.get('complexList'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list.append(l1)
+        if m.get('complexList1') is not None:
+            self.complex_list_1 = m.get('complexList1')
         return self
 
 

package/tests/expected/python3/typedef/setup.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+"""
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+"""
+
+import os
+from setuptools import setup, find_packages
+
+"""
+setup module for tea_python_tests.
+
+Created on 28/05/2022
+
+@author: Alibaba
+"""
+
+PACKAGE = "tea_python_tests"
+NAME = "tea_python_tests" or "alibabacloud-package"
+DESCRIPTION = "Generate setup.py"
+AUTHOR = "Alibaba"
+AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
+URL = "https://github.com/"
+VERSION = __import__(PACKAGE).__version__
+REQUIRES = [
+    "requests>=2.21.0, <3.0.0",
+    "alibabacloud-tea>=0.2.9, <1.0.0"
+]
+
+LONG_DESCRIPTION = ''
+if os.path.exists('./README.md'):
+    with open("README.md", encoding='utf-8') as fp:
+        LONG_DESCRIPTION = fp.read()
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
+    author=AUTHOR,
+    author_email=AUTHOR_EMAIL,
+    license="Apache License 2.0",
+    url=URL,
+    keywords=["tea","python","tests"],
+    packages=find_packages(exclude=["tests*"]),
+    include_package_data=True,
+    platforms="any",
+    install_requires=REQUIRES,
+    python_requires=">=3.6",
+    classifiers=(
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        "Topic :: Software Development"
+    )
+)

package/tests/expected/python3/typedef/tea_python_tests/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

package/tests/expected/python3/typedef/tea_python_tests/client.py

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from requests import Request, Response
+from Tea.model import TeaModel
+from Source.source_client import SourceClient
+
+from tea_python_tests import models as main_models
+
+
+class Client:
+    _vid: Request = None
+    _model: TeaModel = None
+
+    def __init__(
+        self, 
+        request: Request,
+        model: TeaModel,
+    ):
+        self._vid = request
+        self._model = model
+
+    def main(
+        self,
+        test_1: Request,
+        test_2: TeaModel,
+    ) -> None:
+        oss = SourceClient(test_1)
+        m = main_models.M(
+            a=test_1,
+            b=test_2
+        )
+        self._vid = test_1
+        self._model = test_2
+
+    async def main_async(
+        self,
+        test_1: Request,
+        test_2: TeaModel,
+    ) -> None:
+        oss = SourceClient(test_1)
+        m = main_models.M(
+            a=test_1,
+            b=test_2
+        )
+        self._vid = test_1
+        self._model = test_2
+
+    def test_http_request(
+        self,
+        req: Request,
+    ) -> Response:
+        return self.test_http_request_with('test', req)
+
+    async def test_http_request_async(
+        self,
+        req: Request,
+    ) -> Response:
+        return self.test_http_request_with('test', req)
+
+    @staticmethod
+    def test_http_request_with(
+        method: str,
+        req: Request,
+    ) -> Response:
+        raise Exception('Un-implemented')
+
+    @staticmethod
+    def test_http_header(
+        method: str,
+        headers: Dict[str, Any],
+    ) -> Response:
+        raise Exception('Un-implemented')

package/tests/expected/python3/typedef/tea_python_tests/models.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from Tea.model import TeaModel
+from requests import Request
+
+
+class M(TeaModel):
+    def __init__(
+        self,
+        a: Request = None,
+        b: TeaModel = None,
+    ):
+        self.a = a
+        self.b = b
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.a is not None:
+            result['a'] = self.a
+        if self.b is not None:
+            result['b'] = self.b
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('a') is not None:
+            self.a = m.get('a')
+        if m.get('b') is not None:
+            self.b = m.get('b')
+        return self
+
+

package/tests/fixtures/complex/main.dara

@@ -29,6 +29,13 @@ model ComplexRequest = {
       partNumber?: string(description='PartNumber', name='PartNumber')
     }
   ](description='Part', name='Part'),
+  complexList: [[[ 
+    {
+      name?: string(name='Name'),
+      code?: int32(name='Code'),
+    }
+  ]]](name='complexList'),
+  complexList1: [[map[string]string]],
 }
 
 async function hello(request: object, strs: [ string ]): [ string ] {
@@ -138,6 +145,12 @@ static function array1(): [ string ] {
   return ["1"];
 }
 
+static function array2(): [[ any ]] {
+  var temp = new Source.Config{};
+  var anyArr : [Source.Config] = [temp];
+  return [[anyArr]];
+}
+
 async function TemplateString(): string {
   return `/${@protocol}`;
 }

package/tests/fixtures/typedef/.libraries.json

@@ -0,0 +1,3 @@
+{
+    "alibabacloud:OSS:*": "libraries/alibabacloud-OSS-0.0.1"
+}

package/tests/fixtures/typedef/Darafile

@@ -0,0 +1,61 @@
+{
+  "scope": "darabonba",
+  "name": "main",
+  "version": "0.0.1",
+  "main": "./main.dara",
+  "libraries": {
+    "OSS": "alibabacloud:OSS:*"
+  },
+  "python": {
+    "package": "tea_python_tests",
+    "clientName": "client",
+    "typedef": {
+      "HttpResponse": {
+        "import": "requests",
+        "type": "Response",
+        "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
+      },
+      "TeaModel": {
+        "import": "Tea.model",
+        "type": "TeaModel",
+        "package": "alibabacloud-tea:0.2.9"
+      },
+      "TeaException": {
+        "import": "Tea.exceptions",
+        "type": "TeaException",
+        "package": "alibabacloud-tea:0.2.9"
+      }
+    }
+  },
+  "python2": {
+    "package": "tea_python_tests",
+    "clientName": "client",
+    "typedef": {
+      "HttpResponse": {
+        "import": "requests",
+        "type": "Response",
+        "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
+      },
+      "TeaModel": {
+        "import": "Tea.model",
+        "type": "TeaModel",
+        "package": "alibabacloud-tea-py2:0.0.4"
+      },
+      "TeaException": {
+        "import": "Tea.exceptions",
+        "type": "TeaException",
+        "package": "alibabacloud-tea-py2:0.0.4"
+      }
+    }
+  }
+}

package/tests/fixtures/typedef/libraries/alibabacloud-OSS-0.0.1/Darafile

@@ -0,0 +1,40 @@
+{
+  "name": "OSS",
+  "main": "./oss.dara",
+  "libraries": {},
+  "releases": {
+    "go": "github.com/aliyun/darabonba-go-generator"
+  },
+  "python": {
+    "package": "Source",
+    "clientName": "source_client",
+    "typedef": {
+      "HttpRequest": {
+        "import": "requests",
+        "type": "Request",
+        "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
+      }
+    }
+  },
+  "python2": {
+    "package": "Source",
+    "clientName": "source_client",
+    "typedef": {
+      "HttpRequest": {
+        "import": "requests",
+        "type": "Request",
+        "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
+      }
+    }
+  }
+}

package/tests/fixtures/typedef/libraries/alibabacloud-OSS-0.0.1/oss.dara

@@ -0,0 +1,6 @@
+typedef HttpRequest
+type @vid=HttpRequest
+
+init(test: HttpRequest){
+  @vid = test;
+}

package/tests/fixtures/typedef/main.dara

@@ -0,0 +1,38 @@
+import OSS
+
+typedef HttpResponse;
+typedef HttpHeader;
+typedef TeaModel;
+// useless
+typedef TeaException;
+
+type @vid=OSS.HttpRequest;
+type @model=TeaModel;
+
+init(request: OSS.HttpRequest, model: TeaModel){
+  @vid = request;
+  @model = model;
+}
+
+model M {
+    a?: OSS.HttpRequest,
+    b?: TeaModel
+}
+
+async function main(test1: OSS.HttpRequest, test2: TeaModel) : void {
+    var oss = new OSS(test1);
+    var m = new M {
+        a = test1,
+        b = test2
+    };
+    @vid = test1;
+    @model = test2;
+}
+
+async function testHttpRequest(req: OSS.HttpRequest): HttpResponse {
+    return testHttpRequestWith("test", req);
+}
+
+static function testHttpRequestWith(method: string, req: OSS.HttpRequest): HttpResponse
+
+static function testHttpHeader(method: string, headers: HttpHeader): HttpResponse

package/tests/python2.tests.js

@@ -228,4 +228,46 @@ describe('Python Generator', function () {
       }
     });
   });
+  it('typedef should ok', function () {
+    check('typedef', [
+      'tea_python_tests/client.py',
+      'tea_python_tests/models.py'
+    ],
+    {
+      python2: {
+        package: 'tea_python_tests',
+        clientName: 'client',
+        packageInfo: {
+          name: 'tea_python_tests',
+          desc: 'Generate setup.py',
+          github: 'https://github.com/',
+          author: 'Alibaba',
+          email: 'sdk-team@alibabacloud.com'
+        },
+        typedef: {
+          HttpResponse: {
+            import: 'requests',
+            type: 'Response',
+            package: 'requests:2.21.0'
+          },
+          HttpHeader: {
+            import: null,
+            type: 'Dict[str, Any]',
+            package: null
+          },
+          TeaModel: {
+            import: 'Tea.model',
+            type: 'TeaModel',
+            package: 'alibabacloud-tea-py2:0.0.4'
+          },
+          TeaException: {
+            import: 'Tea.exceptions',
+            type: 'TeaException',
+            package: 'alibabacloud-tea-py2:0.0.4'
+          }
+        }
+      }
+
+    });
+  });
 });

package/tests/python3.tests.js

@@ -228,4 +228,46 @@ describe('Python Generator', function () {
       }
     });
   });
+
+  it('typedef should ok', function () {
+    check('typedef', [
+      'tea_python_tests/client.py',
+      'tea_python_tests/models.py'
+    ],
+    {
+      python: {
+        package: 'tea_python_tests',
+        clientName: 'client',
+        packageInfo: {
+          name: 'tea_python_tests',
+          desc: 'Generate setup.py',
+          github: 'https://github.com/',
+          author: 'Alibaba',
+          email: 'sdk-team@alibabacloud.com'
+        },
+        typedef: {
+          HttpResponse: {
+            import: 'requests',
+            type: 'Response',
+            package: 'requests:2.21.0'
+          },
+          HttpHeader: {
+            import: null,
+            type: 'Dict[str, Any]',
+            package: null
+          },
+          TeaModel: {
+            import: 'Tea.model',
+            type: 'TeaModel',
+            package: 'alibabacloud-tea:0.2.9'
+          },
+          TeaException: {
+            import: 'Tea.exceptions',
+            type: 'TeaException',
+            package: 'alibabacloud-tea:0.2.9'
+          }
+        }
+      }
+    });
+  });
 });

package/.travis.yml

@@ -1,9 +0,0 @@
-language: node_js
-
-node_js:
-  - 10
-  - 12
-  - 14
-
-script:
-  - npm run ci