@darabonba/python-generator 1.2.15 → 1.2.17

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

package/.github/workflows/ci.yml

@@ -16,8 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [12.x, 14.x, 16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,4 +26,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install
     - run: npm run ci
-    - run: npm run test
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3

package/ChangeLog.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## 1.2.17 - 2023-12-27
+* Fix: correct model name when first letter is capitalized && and some keywords
+
+## 1.2.16 - 2023-09-13
+* Feat: support importing additional package
+
 ## 1.2.15 - 2022-12-26
 * Fix: array assign and access with variables name
 

package/README-CN.md

@@ -2,17 +2,15 @@
 
 # Darabonba Python 生成器
 
-[![NPM version][npm-image]][npm-url]
+[![CI](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml/badge.svg)](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml)
 [![codecov][cov-image]][cov-url]
-[![David deps][david-image]][david-url]
+[![NPM version][npm-image]][npm-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
 [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
-[david-url]: https://david-dm.org/aliyun/darabonba-python-generator
 [download-image]: https://img.shields.io/npm/dm/@darabonba/python-generator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/@darabonba/python-generator
 

package/README.md

@@ -2,17 +2,15 @@ English | [简体中文](/README-CN.md)
 
 # Darabonba Python Generator
 
-[![NPM version][npm-image]][npm-url]
+[![CI](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml/badge.svg)](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml)
 [![codecov][cov-image]][cov-url]
-[![David deps][david-image]][david-url]
+[![NPM version][npm-image]][npm-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
 [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
-[david-url]: https://david-dm.org/aliyun/darabonba-python-generator
 [download-image]: https://img.shields.io/npm/dm/@darabonba/python-generator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/@darabonba/python-generator
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "The darabonba generator for Python",
   "main": "src/generator.js",
   "directories": {
@@ -8,9 +8,9 @@
   },
   "scripts": {
     "lint": "eslint --fix src/",
-    "test": "mocha --reporter spec --timeout 3000 tests/*.tests.js",
-    "test-cov": "nyc -r=lcov -r=html -r=text -r=json mocha -t 3000 -R spec tests/*.tests.js",
-    "ci": "npm run lint && npm run test-cov && codecov"
+    "test": "mocha -R spec -t 3000 tests/*.tests.js",
+    "test-cov": "nyc -r=lcov -r=html -r=text -r=json npm run test",
+    "ci": "npm run lint && npm run test-cov"
   },
   "repository": {
     "type": "git",
@@ -18,12 +18,11 @@
   },
   "devDependencies": {
     "chai": "^4.2.0",
-    "codecov": "^3.8.1",
-    "eslint": "^7.14.0",
+    "eslint": "^8.55.0",
     "expect.js": "^0.3.1",
-    "has-flag": "^4.0.0",
+    "has-flag": "^5.0.1",
     "mm": "^3.2.0",
-    "mocha": "^8.2.1",
+    "mocha": "^10.2.0",
     "mocha-sinon": "^2.1.2",
     "nyc": "^15.1.0",
     "sinon": "^9.2.1"

package/src/generator.js

@@ -15,12 +15,14 @@ class Generator {
     }
     this.lang = lang;
     this.typedef = meta[lang] && meta[lang].typedef ? meta[lang].typedef : {};
+    this.additionalPackage = meta[lang] && meta[lang].additionalPackage ? meta[lang].additionalPackage : [];
     this.initConfig(meta);
   }
 
   visit(ast) {
     this.imports = this.resolveImports(ast);
     this.imports.typedef = this.typedef;
+    this.imports.additionalPackage = this.additionalPackage;
     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);

package/src/langs/common/combinator.js

@@ -38,6 +38,7 @@ class BaseCombinator {
     this.thirdPackageModel = imports.thirdPackageModel;
     this.typedef = imports.typedef;
     this.importsTypedef = imports.importsTypedef;
+    this.additionalPackage = imports.additionalPackage;
 
     _config(this.config);
   }

package/src/langs/common/config.js

@@ -4,7 +4,12 @@ module.exports = {
   indent: '    ',
   ext: '.tea',
   resolvePathByPackage: false,
-  keywords: [],
+  keywords: {
+    general: [],
+    function: [],
+    class: [],
+    param_variables: []
+  },
   typeMap: {},
   symbolMap: {},
   modifyOrder: [],

package/src/langs/python/combinator.js

@@ -31,7 +31,9 @@ const {
   _toSnakeCase,
   _toCamelCase,
   _avoidKeywords,
-  _isKeywords,
+  _avoidFuncKeywords,
+  _avoidClassKeywords,
+  _avoidVarKeywords,
   _exception,
   _symbol,
   _deepClone,
@@ -46,6 +48,14 @@ function _name(name) {
   return _avoidKeywords(_toSnakeCase(name));
 }
 
+function _varName(name){
+  return _avoidVarKeywords(_toSnakeCase(name));
+}
+
+function _funcName(name){
+  return _avoidFuncKeywords(_toSnakeCase(name));
+}
+
 function _type(type) {
   const config = _config();
   let t = type instanceof Object ? type.lexeme : type;
@@ -446,10 +456,7 @@ class Combinator extends CombinatorBase {
     } else {
       className = name.split('.').map(item => _upperFirst(item)).join('');
     }
-    if (_isKeywords(className)) {
-      className = _avoidKeywords(className);
-    }
-    return _toCamelCase(className);
+    return _toCamelCase(_avoidClassKeywords(className));
   }
 
   emitClass(emitter, object) {
@@ -502,7 +509,7 @@ class Combinator extends CombinatorBase {
               } else if (p instanceof PropItem) {
                 const type = this.getTypeHints(p.type);
                 if (type) {
-                  emitter.emitln(`${_name(p.name)}: ${type} = None`, this.level);
+                  emitter.emitln(`${_varName(p.name)}: ${type} = None`, this.level);
                 }
               }
             });
@@ -670,7 +677,7 @@ class Combinator extends CombinatorBase {
             type: type.itemType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.itemType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'].append(k.to_map() if k else None)`, this.level);
@@ -714,7 +721,7 @@ class Combinator extends CombinatorBase {
             type: type.valType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.valType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'][k] = v.to_map()`, this.level);
@@ -956,9 +963,9 @@ class Combinator extends CombinatorBase {
       construct.params.forEach(param => {
         const typeHints = this.getTypeHints(param.type);
         if (param.value !== null && param.value !== 'null') {
-          constructParams.push(`${_name(param.key)}: ${typeHints} = ${param.value},`);
+          constructParams.push(`${_varName(param.key)}: ${typeHints} = ${param.value},`);
         } else {
-          constructParams.push(`${_name(param.key)}: ${typeHints},`);
+          constructParams.push(`${_varName(param.key)}: ${typeHints},`);
         }
       });
       emitter.emitln('def __init__(', this.level);
@@ -978,9 +985,9 @@ class Combinator extends CombinatorBase {
           if (prop instanceof PropItem) {
             const typeHints = this.getTypeHints(prop.type);
             if (typeHints === this.className) {
-              emitter.emitln(`${_name(prop.name)}: '${typeHints}' = None,`, this.level);
+              emitter.emitln(`${_varName(prop.name)}: '${typeHints}' = None,`, this.level);
             } else {
-              emitter.emitln(`${_name(prop.name)}: ${typeHints} = None,`, this.level);
+              emitter.emitln(`${_varName(prop.name)}: ${typeHints} = None,`, this.level);
             }
 
           }
@@ -1016,7 +1023,7 @@ class Combinator extends CombinatorBase {
           emitter.emitln(`# ${d}`, this.level);
         });
       }
-      emitter.emitln(`self.${_name(prop.name)} = ${_name(prop.name)}`, this.level);
+      emitter.emitln(`self.${_name(prop.name)} = ${_varName(prop.name)}`, this.level);
     });
     if (construct.body.length > 0) {
       construct.body.forEach(gram => {
@@ -1115,19 +1122,19 @@ class Combinator extends CombinatorBase {
     let selfVar = this.func_static ? '' : 'self';
 
     if (func.params.length > 0) {
-      emitter.emitln(`def ${_name(func.name)}_async(`);
+      emitter.emitln(`def ${_funcName(func.name)}_async(`);
       this.levelUp();
       if (selfVar) {
         emitter.emitln(`${selfVar},`, this.level);
       }
       func.params.forEach(p => {
         const type = this.getTypeHints(p.type);
-        emitter.emitln(`${_name(p.key)}: ${type},`, this.level);
+        emitter.emitln(`${_varName(p.key)}: ${type},`, this.level);
       });
       this.levelDown();
       emitter.emitln(`) -> ${rtype}:`, this.level);
     } else {
-      emitter.emit(`def ${_name(func.name)}_async(`);
+      emitter.emit(`def ${_funcName(func.name)}_async(`);
       if (selfVar) {
         emitter.emit(`${selfVar}`);
       }
@@ -1158,19 +1165,19 @@ class Combinator extends CombinatorBase {
     let selfVar = this.func_static ? '' : 'self';
 
     if (func.params.length > 0) {
-      emitter.emitln(`def ${_name(func.name)}(`);
+      emitter.emitln(`def ${_funcName(func.name)}(`);
       this.levelUp();
       if (selfVar) {
         emitter.emitln(`${selfVar},`, this.level);
       }
       func.params.forEach(p => {
         const type = this.getTypeHints(p.type);
-        emitter.emitln(`${_name(p.key)}: ${type},`, this.level);
+        emitter.emitln(`${_varName(p.key)}: ${type},`, this.level);
       });
       this.levelDown();
       emitter.emitln(`) -> ${rtype}:`, this.level);
     } else {
-      emitter.emit(`def ${_name(func.name)}(`);
+      emitter.emit(`def ${_funcName(func.name)}(`);
       if (selfVar) {
         emitter.emit(`${selfVar}`);
       }
@@ -1234,7 +1241,8 @@ class Combinator extends CombinatorBase {
     let list = this.includeList.filter(node => node.from && !node.alias);
 
     let from = {};
-    let fromList = [];
+    let fromList =  [];
+    fromList = fromList.concat(this.additionalPackage);
 
     list.forEach(item => {
       if (!from[item.from]) {
@@ -1348,12 +1356,12 @@ class Combinator extends CombinatorBase {
             pre += `.${_name(path.name)}`;
           }
         } else if (path.type === 'object') {
-          pre += `${_name(_convertStaticParam(pathName))}`;
+          pre += `${_varName(_convertStaticParam(pathName))}`;
         } else if (path.type === 'object_async') {
           if (this.aioMode) {
-            pre += `await ${_name(_convertStaticParam(pathName))}`;
+            pre += `await ${_varName(_convertStaticParam(pathName))}`;
           } else {
-            pre += `${_name(_convertStaticParam(pathName))}`;
+            pre += `${_varName(_convertStaticParam(pathName))}`;
           }
         } else if (path.type === 'object_static') {
           pre += `${_convertStaticParam(pathName)}`;
@@ -1364,24 +1372,24 @@ class Combinator extends CombinatorBase {
             pre += `${_convertStaticParam(pathName)}`;
           }
         } else if (path.type === 'call' || path.type === 'call_static') {
-          pre += `.${_name(pathName)}(${params})`;
+          pre += `.${_funcName(pathName)}(${params})`;
         } else if (path.type === 'call_async' || path.type === 'call_static_async') {
           if (this.aioMode) {
-            pre += `.${_name(pathName)}_async(${params})`;
+            pre += `.${_funcName(pathName)}_async(${params})`;
           } else {
-            pre += `.${_name(pathName)}(${params})`;
+            pre += `.${_funcName(pathName)}(${params})`;
           }
         } else if (path.type === 'prop') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'prop_static') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'map') {
-          pre += path.isVar ? `.get(${_name(pathName)})` : `.get('${pathName}')`;
+          pre += path.isVar ? `.get(${_varName(pathName)})` : `.get('${pathName}')`;
         } else if (path.type === 'map_set') {
           const quote = this._adaptedQuotes(pathName, emitter);
           pre += `[${quote}${pathName}${quote}]`;
         } else if (path.type === 'list') {
-          pre += path.isVar ? `[${_name(pathName)}]` : `[${pathName}]`;
+          pre += path.isVar ? `[${_varName(pathName)}]` : `[${pathName}]`;
         } else {
           debug.stack(gram);
         }
@@ -1410,7 +1418,7 @@ class Combinator extends CombinatorBase {
       emitter.emit(`${name}()`);
     } else if (gram.varType === 'var' || gram.varType === 'const') {
       const name = gram.name ? gram.name : gram.key;
-      emitter.emit(`${_convertStaticParam(_name(name))}`);
+      emitter.emit(`${_convertStaticParam(_varName(name))}`);
     } else {
       debug.stack(gram);
     }
@@ -1422,7 +1430,7 @@ class Combinator extends CombinatorBase {
         const quote = this._adaptedQuotes(gram.key, emitter);
         emitter.emit(`${quote}${gram.key}${quote}: `);
       } else {
-        emitter.emit(`${_name(gram.key)}=`, this.level);
+        emitter.emit(`${_varName(gram.key)}=`, this.level);
       }
     }
     if (gram instanceof GrammerCall) {
@@ -1538,7 +1546,7 @@ class Combinator extends CombinatorBase {
       const quote = this._adaptedQuotes(gram.value, emitter);
       emitter.emit(`${quote}${gram.value}${quote}`);
     } else if (gram.type === 'param') {
-      emitter.emit(`${_convertStaticParam(_name(gram.value))}`);
+      emitter.emit(`${_convertStaticParam(_varName(gram.value))}`);
     } else if (gram.type === 'call') {
       this.grammerCall(emitter, gram.value);
     } else if (gram.type === 'number') {
@@ -1758,7 +1766,7 @@ class Combinator extends CombinatorBase {
         gram.params.forEach(p => {
           let emit = new Emitter();
           if (p.key) {
-            emit.emit(`${_name(p.key)}`);
+            emit.emit(`${_varName(p.key)}`);
             emit.emit('=');
           }
           if (typeof (p.value) === 'string') {
@@ -1788,7 +1796,7 @@ class Combinator extends CombinatorBase {
     this.grammerCall(emit, behavior.call);
 
     if (behavior.isVar) {
-      emitter.emit(`${emit.output}[${_name(behavior.key)}] = `, this.level);
+      emitter.emit(`${emit.output}[${_varName(behavior.key)}] = `, this.level);
     } else {
       const quote = this._adaptedQuotes(behavior.key, emitter);
       emitter.emit(`${emit.output}[${quote}${behavior.key}${quote}] = `, this.level);

package/src/langs/python/config.js

@@ -6,44 +6,50 @@ module.exports = {
   ...defaultConfig,
   indent: '    ',
   ext: '.py',
-  keywords: [
-    'self',
-    'async',
-    'await',
-    'and',
-    'as',
-    'assert',
-    'break',
-    'class',
-    'continue',
-    'def',
-    'del',
-    'elif',
-    'else',
-    'except',
-    'finally',
-    'for',
-    'from',
-    'False',
-    'global',
-    'if',
-    'import',
-    'in',
-    'is',
-    'lambda',
-    'nonlocal',
-    'not',
-    'None',
-    'or',
-    'pass',
-    'raise',
-    'return',
-    'try',
-    'True',
-    'while',
-    'with',
-    'yield'
-  ],
+  keywords: {
+    general: [
+      'async',
+      'await',
+      'and',
+      'as',
+      'assert',
+      'break',
+      'class',
+      'continue',
+      'def',
+      'del',
+      'elif',
+      'else',
+      'except',
+      'finally',
+      'for',
+      'from',
+      'False',
+      'global',
+      'if',
+      'import',
+      'in',
+      'is',
+      'lambda',
+      'nonlocal',
+      'not',
+      'None',
+      'or',
+      'pass',
+      'raise',
+      'return',
+      'try',
+      'True',
+      'while',
+      'with',
+      'yield'
+    ],
+    function: [],
+    class: [],
+    param_variables: [
+      'self'
+    ]
+  },
   symbolMap: {
     'ASSIGN': '=',
     'EQ': '==',

package/src/langs/python2/combinator.js

@@ -31,7 +31,9 @@ const {
   _toSnakeCase,
   _toCamelCase,
   _avoidKeywords,
-  _isKeywords,
+  _avoidFuncKeywords,
+  _avoidClassKeywords,
+  _avoidVarKeywords,
   _exception,
   _symbol,
   _deepClone,
@@ -43,6 +45,14 @@ function _name(name) {
   return _avoidKeywords(_toSnakeCase(name));
 }
 
+function _varName(name){
+  return _avoidVarKeywords(_toSnakeCase(name));
+}
+
+function _funcName(name){
+  return _avoidFuncKeywords(_toSnakeCase(name));
+}
+
 function _type(type) {
   const config = _config();
   let t = type instanceof Object ? type.lexeme : type;
@@ -387,10 +397,7 @@ class Combinator extends CombinatorBase {
     } else {
       className = name.split('.').map(item => _upperFirst(item)).join('');
     }
-    if (_isKeywords(className)) {
-      className = _avoidKeywords(className);
-    }
-    return _toCamelCase(className);
+    return _toCamelCase(_avoidClassKeywords(className));
   }
 
   emitClass(emitter, object) {
@@ -444,7 +451,7 @@ class Combinator extends CombinatorBase {
               } else if (p instanceof PropItem) {
                 const type = this.typeHint(p.type);
                 if (type) {
-                  emitter.emitln(`${_name(p.name)} = None  # type: ${type}`, this.level);
+                  emitter.emitln(`${_varName(p.name)} = None  # type: ${type}`, this.level);
                 }
               }
             });
@@ -611,7 +618,7 @@ class Combinator extends CombinatorBase {
             type: type.itemType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.itemType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'].append(k.to_map() if k else None)`, this.level);
@@ -655,7 +662,7 @@ class Combinator extends CombinatorBase {
             type: type.valType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.valType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'][k] = v.to_map()`, this.level);
@@ -896,9 +903,9 @@ class Combinator extends CombinatorBase {
       let constructParams = [];
       construct.params.forEach(param => {
         if (param.value !== null && param.value !== 'null') {
-          constructParams.push(`${_name(param.key)}=${param.value}`);
+          constructParams.push(`${_varName(param.key)}=${param.value}`);
         } else {
-          constructParams.push(`${_name(param.key)}`);
+          constructParams.push(`${_varName(param.key)}`);
         }
       });
       emitter.emit('def __init__(self', this.level);
@@ -914,7 +921,7 @@ class Combinator extends CombinatorBase {
         let curr_length = 0;
         props.forEach((prop) => {
           if (prop instanceof PropItem) {
-            let str = ` ${_name(prop.name)}=None`;
+            let str = ` ${_varName(prop.name)}=None`;
             if(curr_length+str.length>=max_length){
               str =  emitter.eol + emitter.indent(this.level + 3) + str;
               curr_length = 0;
@@ -958,7 +965,7 @@ class Combinator extends CombinatorBase {
       }
 
       const fieldType = this.typeHint(prop.type);
-      emitter.emitln(`self.${_name(prop.name)} = ${_name(prop.name)}  # type: ${fieldType}`, this.level);
+      emitter.emitln(`self.${_name(prop.name)} = ${_varName(prop.name)}  # type: ${fieldType}`, this.level);
     });
     if (construct.body.length > 0) {
       construct.body.forEach(gram => {
@@ -1014,17 +1021,17 @@ class Combinator extends CombinatorBase {
     }
     if (func.params.length > 0) {
       let selfVar = this.func_static ? '' : 'self, ';
-      emitter.emit(`def ${_name(func.name)}(${selfVar}`, this.level);
+      emitter.emit(`def ${_funcName(func.name)}(${selfVar}`, this.level);
       if (func.params.length > 0) {
         let params = [];
         func.params.forEach(p => {
-          params.push(`${_name(p.key)}`);
+          params.push(`${_varName(p.key)}`);
         });
         emitter.emit(params.join(', '));
       }
     } else {
       let selfVar = this.func_static ? '' : 'self';
-      emitter.emit(`def ${_name(func.name)}(${selfVar}`, this.level);
+      emitter.emit(`def ${_funcName(func.name)}(${selfVar}`, this.level);
     }
     emitter.emitln('):');
     this.levelUp();
@@ -1216,24 +1223,24 @@ class Combinator extends CombinatorBase {
             pre += `.${_name(path.name)}`;
           }
         } else if (path.type === 'object' || path.type === 'object_async') {
-          pre += `${_name(_convertStaticParam(pathName))}`;
+          pre += `${_varName(_convertStaticParam(pathName))}`;
         } else if (path.type === 'object_static' || path.type === 'object_static_async') {
           pre += `${_convertStaticParam(pathName)}`;
         } else if (path.type === 'call' || path.type === 'call_static') {
-          pre += `.${_name(pathName)}(${params})`;
+          pre += `.${_funcName(pathName)}(${params})`;
         } else if (path.type === 'call_async' || path.type === 'call_static_async') {
-          pre += `.${_name(pathName)}(${params})`;
+          pre += `.${_funcName(pathName)}(${params})`;
         } else if (path.type === 'prop') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'prop_static') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'map') {
-          pre += path.isVar ? `.get(${_name(pathName)})` : `.get('${pathName}')`;
+          pre += path.isVar ? `.get(${_varName(pathName)})` : `.get('${pathName}')`;
         } else if (path.type === 'map_set') {
           const quote = this._adaptedQuotes(pathName, emitter);
           pre += `[${quote}${pathName}${quote}]`;
         } else if (path.type === 'list') {
-          pre += path.isVar ? `[${_name(pathName)}]` : `[${pathName}]`;
+          pre += path.isVar ? `[${_varName(pathName)}]` : `[${pathName}]`;
         } else {
           debug.stack(gram);
         }
@@ -1276,7 +1283,7 @@ class Combinator extends CombinatorBase {
       emitter.emit(`${name}()`);
     } else if (gram.varType === 'var' || gram.varType === 'const') {
       const name = gram.name ? gram.name : gram.key;
-      emitter.emit(`${_convertStaticParam(_name(name))}`);
+      emitter.emit(`${_convertStaticParam(_varName(name))}`);
     } else {
       debug.stack(gram);
     }
@@ -1288,7 +1295,7 @@ class Combinator extends CombinatorBase {
         const quote = this._adaptedQuotes(gram.key, emitter);
         emitter.emit(`${quote}${gram.key}${quote}: `);
       } else {
-        emitter.emit(`${_name(gram.key)}=`, this.level);
+        emitter.emit(`${_varName(gram.key)}=`, this.level);
       }
     }
     if (gram instanceof GrammerCall) {
@@ -1404,7 +1411,7 @@ class Combinator extends CombinatorBase {
       const quote = this._adaptedQuotes(gram.value, emitter);
       emitter.emit(`${quote}${gram.value}${quote}`);
     } else if (gram.type === 'param') {
-      emitter.emit(`${_convertStaticParam(_name(gram.value))}`);
+      emitter.emit(`${_convertStaticParam(_varName(gram.value))}`);
     } else if (gram.type === 'call') {
       this.grammerCall(emitter, gram.value);
     } else if (gram.type === 'number') {
@@ -1618,7 +1625,7 @@ class Combinator extends CombinatorBase {
         gram.params.forEach(p => {
           let emit = new Emitter();
           if (p.key) {
-            emit.emit(`${_name(p.key)}`);
+            emit.emit(`${_varName(p.key)}`);
             emit.emit('=');
           }
           if (typeof (p.value) === 'string') {
@@ -1648,7 +1655,7 @@ class Combinator extends CombinatorBase {
     this.grammerCall(emit, behavior.call);
 
     if (behavior.isVar) {
-      emitter.emit(`${emit.output}[${_name(behavior.key)}] = `, this.level);
+      emitter.emit(`${emit.output}[${_varName(behavior.key)}] = `, this.level);
     } else {
       const quote = this._adaptedQuotes(behavior.key, emitter);
       emitter.emit(`${emit.output}[${quote}${behavior.key}${quote}] = `, this.level);

package/src/langs/python2/config.js

@@ -6,40 +6,49 @@ module.exports = {
   ...defaultConfig,
   indent: '    ',
   ext: '.py',
-  keywords: [
-    'and',
-    'as',
-    'assert',
-    'break',
-    'class',
-    'continue',
-    'def',
-    'del',
-    'elif',
-    'else',
-    'except',
-    'finally',
-    'for',
-    'from',
-    'False',
-    'global',
-    'if',
-    'import',
-    'in',
-    'is',
-    'lambda',
-    'not',
-    'None',
-    'or',
-    'pass',
-    'raise',
-    'return',
-    'try',
-    'True',
-    'while',
-    'with',
-    'yield'
-  ],
+  keywords: {
+    general: [
+      'and',
+      'as',
+      'assert',
+      'break',
+      'class',
+      'continue',
+      'def',
+      'del',
+      'elif',
+      'else',
+      'except',
+      'finally',
+      'for',
+      'from',
+      'False',
+      'global',
+      'if',
+      'import',
+      'in',
+      'is',
+      'lambda',
+      'not',
+      'None',
+      'or',
+      'pass',
+      'raise',
+      'return',
+      'try',
+      'True',
+      'while',
+      'with',
+      'yield'
+    ],
+    function: [],
+    class: [],
+    param_variables: [
+      'exec',
+      'print',
+      'self'
+    ]
+  },
   symbolMap: {
     'ASSIGN': '=',
     'EQ': '==',

package/src/lib/helper.js

@@ -53,7 +53,31 @@ function _deepClone(obj) {
 }
 
 function _avoidKeywords(str) {
-  if (config.keywords.indexOf(str.toLowerCase()) > -1) {
+  if (config.keywords.general.indexOf(str.toLowerCase()) > -1) {
+    return str + '_';
+  }
+  return str;
+}
+
+function _avoidFuncKeywords(str) {
+  if (config.keywords.general.indexOf(str.toLowerCase()) > -1
+    || config.keywords.function.indexOf(str.toLowerCase()) > -1) {
+    return str + '_';
+  }
+  return str;
+}
+
+function _avoidClassKeywords(str) {
+  if (config.keywords.general.indexOf(str.toLowerCase()) > -1
+    || config.keywords.class.indexOf(str.toLowerCase()) > -1) {
+    return str + '_';
+  }
+  return str;
+}
+
+function _avoidVarKeywords(str) {
+  if (config.keywords.general.indexOf(str.toLowerCase()) > -1
+    || config.keywords.param_variables.indexOf(str.toLowerCase()) > -1) {
     return str + '_';
   }
   return str;
@@ -69,7 +93,7 @@ function _convertStaticParam(param) {
 }
 
 function _isKeywords(str) {
-  return config.keywords.indexOf(str.toLowerCase()) > -1;
+  return config.keywords.general.indexOf(str.toLowerCase()) > -1;
 }
 
 function _modify(modify) {
@@ -159,6 +183,9 @@ module.exports = {
   _isBasicType,
   _deepClone,
   _avoidKeywords,
+  _avoidFuncKeywords,
+  _avoidClassKeywords,
+  _avoidVarKeywords,
   _convertStaticParam,
   _isKeywords,
   _modify,

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

@@ -118,9 +118,33 @@ class ComplexRequestComplexList(TeaModel):
         return self
 
 
+class ComplexRequestComplexList2(TeaModel):
+    def __init__(self, any=None):
+        self.any = any  # type: any
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super(ComplexRequestComplexList2, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.any is not None:
+            result['Name'] = self.any
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.any = m.get('Name')
+        return self
+
+
 class ComplexRequest(TeaModel):
     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, from_=None):
+                 complex_list=None, complex_list_1=None, complex_list_2=None, from_=None, self_=None, print_=None, exec_=None):
         self.access_key = access_key  # type: str
         # Body
         self.body = body  # type: READABLE
@@ -134,8 +158,15 @@ class ComplexRequest(TeaModel):
         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]]]
+        self.complex_list_2 = complex_list_2  # type: list[list[list[ComplexRequestComplexList2]]]
         # test keywords
         self.from_ = from_  # type: str
+        # test keywords
+        self.self = self_  # type: str
+        # test keywords
+        self.print = print_  # type: str
+        # test keywords
+        self.exec = exec_  # type: str
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -160,7 +191,17 @@ class ComplexRequest(TeaModel):
                         if k2:
                             k2.validate()
         self.validate_required(self.complex_list_1, 'complex_list_1')
+        self.validate_required(self.complex_list_2, 'complex_list_2')
+        if self.complex_list_2:
+            for k in self.complex_list_2:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
         self.validate_required(self.from_, 'from_')
+        self.validate_required(self.self, 'self')
+        self.validate_required(self.print, 'print')
+        self.validate_required(self.exec, 'exec')
 
     def to_map(self):
         _map = super(ComplexRequest, self).to_map()
@@ -196,8 +237,24 @@ class ComplexRequest(TeaModel):
                 result['complexList'].append(l1)
         if self.complex_list_1 is not None:
             result['complexList1'] = self.complex_list_1
+        result['ComplexList2'] = []
+        if self.complex_list_2 is not None:
+            for k in self.complex_list_2:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['ComplexList2'].append(l1)
         if self.from_ is not None:
             result['from'] = self.from_
+        if self.self is not None:
+            result['self'] = self.self
+        if self.print is not None:
+            result['print'] = self.print
+        if self.exec is not None:
+            result['exec'] = self.exec
         return result
 
     def from_map(self, m=None):
@@ -234,8 +291,25 @@ class ComplexRequest(TeaModel):
                 self.complex_list.append(l1)
         if m.get('complexList1') is not None:
             self.complex_list_1 = m.get('complexList1')
+        self.complex_list_2 = []
+        if m.get('ComplexList2') is not None:
+            for k in m.get('ComplexList2'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList2()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list_2.append(l1)
         if m.get('from') is not None:
             self.from_ = m.get('from')
+        if m.get('self') is not None:
+            self.self = m.get('self')
+        if m.get('print') is not None:
+            self.print = m.get('print')
+        if m.get('exec') is not None:
+            self.exec = m.get('exec')
         return self
 
 

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

@@ -25,7 +25,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 24/12/2022
+Created on *
 
 @author: Alibaba
 """

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from Tea.model import TeaModel
-from typing import List, Dict, BinaryIO
+from typing import List, Dict, Any, BinaryIO
 
 
 class ComplexRequestHeader(TeaModel):
@@ -134,6 +134,33 @@ class ComplexRequestComplexList(TeaModel):
         return self
 
 
+class ComplexRequestComplexList2(TeaModel):
+    def __init__(
+        self,
+        any: Any = None,
+    ):
+        self.any = any
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.any is not None:
+            result['Name'] = self.any
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.any = m.get('Name')
+        return self
+
+
 class ComplexRequest(TeaModel):
     def __init__(
         self,
@@ -146,7 +173,11 @@ class ComplexRequest(TeaModel):
         part: List[ComplexRequestPart] = None,
         complex_list: List[List[List[ComplexRequestComplexList]]] = None,
         complex_list_1: List[List[Dict[str, str]]] = None,
+        complex_list_2: List[List[List[ComplexRequestComplexList2]]] = None,
         from_: str = None,
+        self_: str = None,
+        print: str = None,
+        exec: str = None,
     ):
         self.access_key = access_key
         # Body
@@ -161,8 +192,15 @@ class ComplexRequest(TeaModel):
         self.part = part
         self.complex_list = complex_list
         self.complex_list_1 = complex_list_1
+        self.complex_list_2 = complex_list_2
         # test keywords
         self.from_ = from_
+        # test keywords
+        self.self = self_
+        # test keywords
+        self.print = print
+        # test keywords
+        self.exec = exec
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -187,7 +225,17 @@ class ComplexRequest(TeaModel):
                         if k2:
                             k2.validate()
         self.validate_required(self.complex_list_1, 'complex_list_1')
+        self.validate_required(self.complex_list_2, 'complex_list_2')
+        if self.complex_list_2:
+            for k in self.complex_list_2:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
         self.validate_required(self.from_, 'from_')
+        self.validate_required(self.self, 'self')
+        self.validate_required(self.print, 'print')
+        self.validate_required(self.exec, 'exec')
 
     def to_map(self):
         _map = super().to_map()
@@ -223,8 +271,24 @@ class ComplexRequest(TeaModel):
                 result['complexList'].append(l1)
         if self.complex_list_1 is not None:
             result['complexList1'] = self.complex_list_1
+        result['ComplexList2'] = []
+        if self.complex_list_2 is not None:
+            for k in self.complex_list_2:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['ComplexList2'].append(l1)
         if self.from_ is not None:
             result['from'] = self.from_
+        if self.self is not None:
+            result['self'] = self.self
+        if self.print is not None:
+            result['print'] = self.print
+        if self.exec is not None:
+            result['exec'] = self.exec
         return result
 
     def from_map(self, m: dict = None):
@@ -261,8 +325,25 @@ class ComplexRequest(TeaModel):
                 self.complex_list.append(l1)
         if m.get('complexList1') is not None:
             self.complex_list_1 = m.get('complexList1')
+        self.complex_list_2 = []
+        if m.get('ComplexList2') is not None:
+            for k in m.get('ComplexList2'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList2()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list_2.append(l1)
         if m.get('from') is not None:
             self.from_ = m.get('from')
+        if m.get('self') is not None:
+            self.self = m.get('self')
+        if m.get('print') is not None:
+            self.print = m.get('print')
+        if m.get('exec') is not None:
+            self.exec = m.get('exec')
         return self
 
 

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

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 24/12/2022
+Created on *
 
 @author: Alibaba
 """

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
 from Source.source_client import SourceClient
 from typing import List
 

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

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

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
 from Tea.model import TeaModel
 from typing import List, Dict, Any, BinaryIO
 

package/tests/fixtures/complex/main.dara

@@ -36,7 +36,15 @@ model ComplexRequest = {
     }
   ]]](name='complexList'),
   complexList1: [[map[string]string]],
-  from: string(name='from', description='test keywords')
+  complexList2: [[[ 
+    {
+      any?: any(name='Name'),
+    }
+  ]]](name='ComplexList2'),
+  from: string(name='from', description='test keywords'),
+  self: string(name='self', description='test keywords'),
+  print: string(name='print', description='test keywords'),
+  exec: string(name='exec', description='test keywords'),
 }
 
 async function hello(request: object, strs: [ string ]): [ string ] {

package/tests/lib.tests.js

@@ -14,6 +14,9 @@ const {
   _upperFirst,
   _config,
   _avoidKeywords,
+  _avoidFuncKeywords,
+  _avoidClassKeywords,
+  _avoidVarKeywords,
   _modify,
   _symbol,
   _toSnakeCase,
@@ -193,8 +196,21 @@ describe('helper tests', function () {
   });
 
   it('_avoidKeywords should be ok', function () {
-    _config({ keywords: ['key'] });
+    _config({
+      keywords: {
+        general: 'key',
+        function: ['function'],
+        class: ['class'],
+        param_variables: ['var']
+      }
+    });
     expect(_avoidKeywords('key')).to.be.eql('key_');
+    expect(_avoidFuncKeywords('key')).to.be.eql('key_');
+    expect(_avoidFuncKeywords('function')).to.be.eql('function_');
+    expect(_avoidClassKeywords('key')).to.be.eql('key_');
+    expect(_avoidClassKeywords('class')).to.be.eql('class_');
+    expect(_avoidVarKeywords('key')).to.be.eql('key_');
+    expect(_avoidVarKeywords('var')).to.be.eql('var_');
   });
 
   it('_modify should be ok', function () {
@@ -220,7 +236,7 @@ describe('helper tests', function () {
     expect(_symbol('ASSIGN')).to.be.eql('=');
   });
 
-  it('_isSnakeCase should be ok', function() {
+  it('_isSnakeCase should be ok', function () {
     expect(_isSnakeCase('tea_rpc')).to.be.eql(true);
     expect(_isSnakeCase('tea')).to.be.eql(true);
     expect(_isSnakeCase('tearpc')).to.be.eql(true);

package/tests/python2.tests.js

@@ -157,8 +157,7 @@ describe('Python Generator', function () {
 
   it('import should ok', function () {
     check('import', [
-      'tea_python_tests/client.py',
-      'setup.py'
+      'tea_python_tests/client.py'
     ],
     {
       python2: {
@@ -173,6 +172,9 @@ describe('Python Generator', function () {
         }
       }
     });
+    const expected = fs.readFileSync(path.join(expectedDir, 'import', 'setup.py'), 'utf8');
+    const output = fs.readFileSync(path.join(outputDir, 'import', 'setup.py'), 'utf8');
+    assert.deepStrictEqual(output.replace(new RegExp('\\d{2}\\/\\d{2}\\/\\d{4}'), '*'), expected);
   });
 
   it('map should ok', function () {

package/tests/python3.tests.js

@@ -157,8 +157,7 @@ describe('Python Generator', function () {
 
   it('import should ok', function () {
     check('import', [
-      'tea_python_tests/client.py',
-      'setup.py'
+      'tea_python_tests/client.py'
     ],
     {
       python: {
@@ -170,9 +169,18 @@ describe('Python Generator', function () {
           github: 'https://github.com/',
           author: 'Alibaba',
           email: 'sdk-team@alibabacloud.com'
-        }
+        },
+        additionalPackage: [
+          {
+            from: '__future__',
+            import: 'annotations'
+          }
+        ]
       }
     });
+    const expected = fs.readFileSync(path.join(expectedDir, 'import', 'setup.py'), 'utf8');
+    const output = fs.readFileSync(path.join(outputDir, 'import', 'setup.py'), 'utf8');
+    assert.deepStrictEqual(output.replace(new RegExp('\\d{2}\\/\\d{2}\\/\\d{4}'), '*'), expected);
   });
 
   it('map should ok', function () {
@@ -195,7 +203,13 @@ describe('Python Generator', function () {
     {
       python: {
         package: 'tea_python_tests',
-        clientName: 'client'
+        clientName: 'client',
+        additionalPackage: [
+          {
+            from: '__future__',
+            import: 'annotations'
+          }
+        ]
       }
     });
   });

package/tests/resolver.tests.js

@@ -28,8 +28,8 @@ describe('client resolver should be ok', function () {
   it('resolve should be ok', function () {
     const combinator = new Combinator(Object.assign(_deepClone(config), {
       package: 'test', model: { dir: 'Models' }
-    }), { });
-    const code = new ClientResolver({moduleBody: { nodes: [] }}, combinator, {});
+    }), {});
+    const code = new ClientResolver({ moduleBody: { nodes: [] } }, combinator, {});
     mm(code, 'initAnnotation', function () { return; });
     mm(code, 'resolveProps', function () { return; });
     mm(code.combinator, 'addInclude', function (className) { return className; });
@@ -83,7 +83,7 @@ describe('client resolver should be ok', function () {
     }), {});
     const code = new ClientResolver({}, combinator, {});
     const funcItem = new FuncItem();
-    
+
     mm(code.combinator, 'addInclude', function (className) {
       return className;
     });