@darabonba/python-generator 2.0.9 → 2.0.10

package/lib/helper.js

@@ -11,6 +11,23 @@ const keywords = [
   'lambda', 'nonlocal', 'not', 'or', 'pass',
   'raise', 'return', 'try', 'while', 'with', 'yield'
 ];
+// 定义标准库模块列表（Python 3.x常用标准库）
+const standardLibraries = new Set([
+  '__future__', 'abc', 'argparse', 'ast', 'asyncio', 'base64', 'bisect',
+  'builtins', 'calendar', 'collections', 'concurrent', 'configparser',
+  'contextlib', 'copy', 'csv', 'datetime', 'decimal', 'difflib',
+  'email', 'enum', 'errno', 'faulthandler', 'fileinput', 'fnmatch',
+  'fractions', 'functools', 'gc', 'glob', 'gzip', 'hashlib', 'heapq',
+  'hmac', 'html', 'http', 'importlib', 'inspect', 'io', 'ipaddress',
+  'itertools', 'json', 'keyword', 'linecache', 'locale', 'logging',
+  'lzma', 'math', 'mimetypes', 'multiprocessing', 'numbers', 'operator',
+  'os', 'pathlib', 'pickle', 'platform', 'pprint', 'queue', 'random',
+  're', 'reprlib', 'secrets', 'shlex', 'shutil', 'signal', 'socket',
+  'sqlite3', 'ssl', 'statistics', 'string', 'subprocess', 'sys',
+  'tarfile', 'tempfile', 'textwrap', 'threading', 'time', 'timeit',
+  'traceback', 'types', 'typing', 'unittest', 'urllib', 'uuid',
+  'warnings', 'weakref', 'xml', 'zipfile', 'zlib'
+]);
 
 const builtinModels = [
   '$Request', '$Response', '$Error', '$SSEEvent', '$Model',
@@ -18,6 +35,8 @@ const builtinModels = [
   '$ResponseError', '$FileField'
 ];
 
+const words = ['SSE'];
+
 const CORE = 'Dara';
 const REQUEST = '_request';
 const RESPONSE = '_response';
@@ -192,7 +211,7 @@ function _camelCase(str, split = '_') {
     // 如果没有下划线，对整个字符串首字母大写
     str = _upperFirst(str);
   }
-  
+
   return str;
 }
 
@@ -202,6 +221,11 @@ function _snakeCase(str) {
   }
   let res = '';
   let tmp = '';
+  words.forEach(word => {
+    // 只匹配驼峰词前缀，不破坏开头
+    const regex = new RegExp(word + '(?=[A-Z0-9])', 'g');
+    str = str.replace(regex, _upperFirst(word.toLowerCase()));
+  });
   for (const c of str) {
     if (/[A-Z|0-9]/.test(c)) {
       tmp += c;
@@ -258,12 +282,12 @@ function _isBuiltinModel(name) {
 }
 
 function _isDefault(expr) {
-  if(expr.type !== 'call' || expr.left.type !== 'method_call') {
+  if (expr.type !== 'call' || expr.left.type !== 'method_call') {
     return false;
   }
   const name = _name(expr.left.id);
 
-  if(name !== '$default') {
+  if (name !== '$default') {
     return false;
   }
 
@@ -296,7 +320,7 @@ function _type(name) {
     return 'int';
   }
 
-  if(name === 'float'  || name === 'double') {
+  if (name === 'float' || name === 'double') {
     return 'float';
   }
 
@@ -395,7 +419,7 @@ function _escape(str) {
 }
 
 function _removeFilesInDirectory(directoryPath) {
-  if(!fs.existsSync(directoryPath)) {
+  if (!fs.existsSync(directoryPath)) {
     return;
   }
   const files = fs.readdirSync(directoryPath);
@@ -412,6 +436,212 @@ function _removeFilesInDirectory(directoryPath) {
   }
 }
 
+/**
+ * 按照Python PEP 8标准对imports进行排序
+ * @param {Array} imports - import对象数组
+ * @returns {Array} 排序后的imports数组
+ */
+function _sortImports(imports) {
+  function isStandardLibrary(packageName) {
+    if (!packageName) { return false; }
+
+    // 处理子模块，如 os.path -> os
+    const rootModule = packageName.split('.')[0];
+    return standardLibraries.has(rootModule);
+  }
+
+  function isThirdPartyLibrary(packageName) {
+    if (!packageName) { return false; }
+
+    // 不是标准库且不是相对导入（不以.开头）
+    return !isStandardLibrary(packageName) && !packageName.startsWith('.');
+  }
+
+  function isLocalImport(packageName) {
+    if (!packageName) { return false; }
+
+    // 以.开头的相对导入，或者看起来像本地模块的导入
+    return packageName.startsWith('.') ||
+      (!isStandardLibrary(packageName) && !isThirdPartyLibrary(packageName));
+  }
+
+  function getImportPriority(importObj) {
+    const { packageName, className } = importObj;
+
+    // 1. __future__ imports (最高优先级)
+    if (packageName === '__future__') {
+      return 1;
+    }
+
+    // 2. 标准库 import 语句
+    if (!packageName && isStandardLibrary(className)) {
+      return 2;
+    }
+
+    // 3. 标准库 from...import 语句
+    if (packageName && isStandardLibrary(packageName)) {
+      return 3;
+    }
+
+    // 4. 第三方库 import 语句
+    if (!packageName && isThirdPartyLibrary(className)) {
+      return 4;
+    }
+
+    // 5. 第三方库 from...import 语句
+    if (packageName && isThirdPartyLibrary(packageName)) {
+      return 5;
+    }
+
+    // 6. 本地/相对 import 语句
+    if (!packageName && isLocalImport(className)) {
+      return 6;
+    }
+
+    // 7. 本地/相对 from...import 语句
+    if (packageName && isLocalImport(packageName)) {
+      return 7;
+    }
+
+    // 8. 其他情况
+    return 8;
+  }
+
+
+  // 生成排序键
+  function getSortKey(importObj) {
+    const { packageName, className } = importObj;
+    const priority = getImportPriority(importObj);
+
+    // 构建排序键：优先级 + 包名 + 类名
+    const sortPackage = packageName || '';
+    const sortClass = className || '';
+
+    return `${priority.toString().padStart(2, '0')}_${sortPackage}_${sortClass}`;
+  }
+
+  //合并同一包的from imports
+  function mergeFromImportsByPackage(imports) {
+    const packageGroups = new Map();
+    const nonFromImports = [];
+
+    for (const importObj of imports) {
+      if (importObj.packageName) {
+        if (!packageGroups.has(importObj.packageName)) {
+          packageGroups.set(importObj.packageName, []);
+        }
+        packageGroups.get(importObj.packageName).push(importObj);
+      } else {
+        nonFromImports.push(importObj);
+      }
+    }
+
+    const mergedImports = [...nonFromImports];
+    for (const [packageName, packageImports] of packageGroups) {
+      if (packageImports.length === 1) {
+        mergedImports.push(packageImports[0]);
+      } else {
+        const canMerge = packageImports.every(imp => !imp.aliasName);
+
+        if (canMerge) {
+          const classNames = packageImports.map(imp => imp.className).sort();
+          mergedImports.push({
+            packageName: packageName,
+            className: classNames.join(', '),
+            aliasName: '',
+            _isMerged: true
+          });
+        } else {
+          mergedImports.push(...packageImports);
+        }
+      }
+    }
+
+    return mergedImports;
+  }
+
+
+  const importMap = new Map();
+  for (const importObj of imports) {
+    const key = `${importObj.packageName}|${importObj.className}|${importObj.aliasName}`;
+
+    if (importMap.has(key)) {
+      continue;
+    }
+    importMap.set(key, importObj);
+  }
+
+
+  const mergedImports = mergeFromImportsByPackage(Array.from(importMap.values()));
+
+  // 对imports进行排序
+  const sortedImports = [...mergedImports].sort((a, b) => {
+    const keyA = getSortKey(a);
+    const keyB = getSortKey(b);
+    return keyA.localeCompare(keyB);
+  });
+
+  return sortedImports;
+}
+
+// 辅助函数：将排序后的导入转换为Python代码字符串
+function _importsToString(sortedImports) {
+  const lines = [];
+  let lastPriority = -1;
+
+  // 内部函数需要访问外部的getImportPriority
+  function getImportPriority(importObj) {
+    const { packageName, className } = importObj;
+
+    function isStandardLibrary(packageName) {
+      if (!packageName) { return false; }
+      const rootModule = packageName.split('.')[0];
+      return standardLibraries.has(rootModule);
+    }
+
+    if (packageName === '__future__') { return 1; }
+    if (!packageName && isStandardLibrary(className)) { return 2; }
+    if (packageName && isStandardLibrary(packageName)) { return 3; }
+    if (!packageName && !isStandardLibrary(className)) { return 4; }
+    if (packageName && !isStandardLibrary(packageName)) { return 5; }
+    return 6;
+  }
+
+  sortedImports.forEach(importObj => {
+    const { packageName, className, aliasName } = importObj;
+    const currentPriority = getImportPriority(importObj);
+
+    // 在不同优先级组之间添加空行
+    if (lastPriority !== -1 && currentPriority !== lastPriority) {
+      lines.push('');
+    }
+
+    // 生成import语句
+    let importLine;
+    if (packageName) {
+      // from...import 语句
+      if (aliasName) {
+        importLine = `from ${packageName} import ${className} as ${aliasName}`;
+      } else {
+        importLine = `from ${packageName} import ${className}`;
+      }
+    } else {
+      // import 语句
+      if (aliasName) {
+        importLine = `import ${className} as ${aliasName}`;
+      } else {
+        importLine = `import ${className}`;
+      }
+    }
+
+    lines.push(importLine);
+    lastPriority = currentPriority;
+  });
+
+  return lines.join('\n');
+}
+
+
 module.exports = {
   _removeFilesInDirectory,
   _name,
@@ -433,6 +663,8 @@ module.exports = {
   _type,
   _getImport,
   _adaptedQuotes,
+  _sortImports,
+  _importsToString,
   CORE,
   REQUEST,
   RESPONSE,

package/package.json

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

package/tests/expected/alias/setup.py

@@ -22,25 +22,27 @@ import os
 from setuptools import setup, find_packages
 
 """
-setup module for tea_python_tests.
+setup module for tea-python-tests.
 
 Created on *
 
-@author: Alibaba
+@author: AlibabaCloud SDK Team
 """
 
 PACKAGE = "tea_python_tests"
-NAME = "tea_python_tests"
-DESCRIPTION = ""
-AUTHOR = "Alibaba"
-AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
-URL = "https://github.com/"
+NAME = "tea-python-tests"
+DESCRIPTION = "Generate setup.py"
+AUTHOR = "AlibabaCloud SDK Team"
+AUTHOR_EMAIL = "sdkteam@alibabacloud.com"
+URL = "https://github.com/dara"
 VERSION = __import__(PACKAGE).__version__
 REQUIRES = [
-     "alibabacloud-tea>=1.0.0",
-    "source==0.0.1",
-    "import==1.1.2",
-    "alibabacloud_tea_util==0.3.11"
+    "darabonba-core>=1.0.0, <2.0.0",
+    "source>=0.0.1, <1.0.0",
+    "import>=1.1.2, <2.0.0",
+    "alibabacloud_tea_util>=0.3.11, <1.0.0",
+    "xxx1>=0.0.1, <1.0.0",
+    "xxx2>=0.0.1, <1.0.0"
 ]
 
 LONG_DESCRIPTION = ''
@@ -63,17 +65,19 @@ setup(
     include_package_data=True,
     platforms="any",
     install_requires=REQUIRES,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     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",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Software Development"
     )
 )

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

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from Import.client import Client as ImportClient 
-from Source.client import Client as SourceClient 
-from Alias.alias_client import AliasClient 
-from alias_source.source_client import SourceClient as AliasSourceSourceClient 
-from alias_symbol.client import Client as AliasSymbolClient 
-from alias_symbol import models as alias_symbol_models 
 
+from alias_source.source_client import SourceClient as AliasSourceSourceClient
+from alias_symbol import models as alias_symbol_models
+from alias_symbol.client import Client as AliasSymbolClient
+from Alias.alias_client import AliasClient
+from Import.client import Client as ImportClient
+from Source.client import Client as SourceClient
 
 
 

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

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.core import DaraCore 
-from darabonba.exceptions import UnretryableException 
-from darabonba.policy.retry import RetryPolicyContext 
-from darabonba.request import DaraRequest 
 
+from darabonba.core import DaraCore
+from darabonba.exceptions import UnretryableException
+from darabonba.policy.retry import RetryPolicyContext
+from darabonba.request import DaraRequest
 
 """
  * @remarks

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

@@ -2,8 +2,6 @@
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
 
-
-
 from ._test import Test
 
 __all__ = [

package/tests/expected/annotation/tea_python_tests/models/_test.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.model import DaraModel 
 
+from darabonba.model import DaraModel
 
 """
  * @remarks

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

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.core import DaraCore 
-from darabonba.request import DaraRequest 
-from darabonba.exceptions import UnretryableException 
-from darabonba.policy.retry import RetryPolicyContext 
 
+from darabonba.core import DaraCore
+from darabonba.exceptions import UnretryableException
+from darabonba.policy.retry import RetryPolicyContext
+from darabonba.request import DaraRequest
 
 class Client:
     def __init__(self):

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

@@ -1,23 +1,25 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-import base64 
-from darabonba.utils.bytes import Bytes as DaraBytes 
-from darabonba.date import Date as DaraDate 
-import os 
-from darabonba.file import File as DaraFile 
-from darabonba.utils.form import Form as DaraForm 
-from darabonba.core import DaraCore as DaraCore 
-import json 
-import logging 
-import random 
-import math 
-from darabonba.utils.stream import Stream as DaraStream 
-from darabonba.url import Url as DaraURL 
-from darabonba.utils.xml import XML as DaraXML 
-import sys 
+
+import base64
+import json
+import logging
+import math
+import os
+import random
+import sys
+
 from typing import List, Any
 
+from darabonba.core import DaraCore as DaraCore
+from darabonba.date import Date as DaraDate
+from darabonba.file import File as DaraFile
+from darabonba.url import Url as DaraURL
+from darabonba.utils.bytes import Bytes as DaraBytes
+from darabonba.utils.form import Form as DaraForm
+from darabonba.utils.stream import Stream as DaraStream
+from darabonba.utils.xml import XML as DaraXML
 
 class Client:
 
@@ -675,7 +677,7 @@ class Client:
             if not DaraCore.is_null(data):
                 ws.write(data)
 
-        awiat DaraCore.sleep_async(a)
+        await DaraCore.sleep_async(a)
         default_val = args[0] or args[1]
         if default_val == b:
             return

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

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from tea_python_tests import models as main_models 
-from darabonba.core import DaraCore 
-from darabonba.exceptions import UnretryableException 
-from darabonba.policy.retry import RetryPolicyContext 
-from darabonba.request import DaraRequest 
+
 from typing import List, Dict, BinaryIO, Any
 
+from darabonba.core import DaraCore
+from darabonba.exceptions import UnretryableException
+from darabonba.policy.retry import RetryPolicyContext
+from darabonba.request import DaraRequest
+from tea_python_tests import models as main_models
 
 # top comment
 """

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

@@ -2,8 +2,6 @@
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
 
-
-
 from ._test_1 import Test1
 from ._test_2 import Test2
 from ._test_3 import Test3

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

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.model import DaraModel 
+
 from typing import List
 
+from darabonba.model import DaraModel
 
 # import comment
 

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

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.model import DaraModel 
 
+from darabonba.model import DaraModel
 
 """
  * @remarks

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

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.model import DaraModel 
 
+from darabonba.model import DaraModel
 
 """
  * @remarks

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

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from Source.source_client import SourceClient 
-from Source import models as source_models 
-from darabonba.core import DaraCore 
-from tea_python_tests import models as main_models 
-from darabonba.exceptions import UnretryableException 
-from darabonba.policy.retry import RetryPolicyContext 
-from darabonba.request import DaraRequest 
-import logging 
-from darabonba.response import DaraResponse 
-from darabonba.exceptions import DaraException 
-from tea_python_tests import exceptions as main_exceptions 
-from Source import exceptions as source_exceptions 
+
+import logging
+
 from typing import List, Dict, Any
 
+from darabonba.core import DaraCore
+from darabonba.exceptions import DaraException, UnretryableException
+from darabonba.policy.retry import RetryPolicyContext
+from darabonba.request import DaraRequest
+from darabonba.response import DaraResponse
+from Source import exceptions as source_exceptions
+from Source import models as source_models
+from Source.source_client import SourceClient
+from tea_python_tests import exceptions as main_exceptions
+from tea_python_tests import models as main_models
 
 class Client(SourceClient):
     _protocol: str = None
@@ -226,7 +227,7 @@ class Client(SourceClient):
                     return
                 elif SourceClient.judge_str('test') or False:
                     return source_models.RuntimeObject()
-                source_client.print_data(DaraCore.to_map(request), '1')
+                source_client.print_data_async(DaraCore.to_map(request), '1')
                 self.hello(DaraCore.to_map(request), [
                     '1',
                     '2'
@@ -441,7 +442,7 @@ class Client(SourceClient):
                     return
                 elif SourceClient.judge_str('test') or False:
                     return source_models.RuntimeObject()
-                source_client.print_data(DaraCore.to_map(request), '1')
+                await source_client.print_data_async_async(DaraCore.to_map(request), '1')
                 await self.hello_async(DaraCore.to_map(request), [
                     '1',
                     '2'
@@ -476,7 +477,7 @@ class Client(SourceClient):
         config_array = [
             config
         ]
-        source_client.print_data(DaraCore.to_map(request), '1')
+        source_client.print_data_sse(DaraCore.to_map(request), '1')
         _request.protocol = 'HTTP'
         _request.port = 80
         _request.method = 'GET'
@@ -503,7 +504,7 @@ class Client(SourceClient):
         config_array = [
             config
         ]
-        source_client.print_data(DaraCore.to_map(request), '1')
+        source_client.print_data_sse_async(DaraCore.to_map(request), '1')
         _request.protocol = 'HTTP'
         _request.port = 80
         _request.method = 'GET'

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

@@ -2,8 +2,6 @@
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
 
-
-
 from ._err_1 import Err1Exception
 from ._err_2 import Err2Exception
 

package/tests/expected/complex/tea_python_tests/exceptions/_err_1.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
-from darabonba.exceptions import DaraException 
+
 from typing import Dict
 
+from darabonba.exceptions import DaraException
 
 class Err1Exception(DaraException):
     def __init__(

package/tests/expected/complex/tea_python_tests/exceptions/_err_2.py

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

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

@@ -2,8 +2,6 @@
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
 
-
-
 from ._complex_request import ComplexRequest
 from ._response import Response
 from ._complex_request import ComplexRequestHeader