@darabonba/python-generator 2.0.12 → 2.0.14

package/tests/fixtures/complex/libraries/import.dara

@@ -30,6 +30,7 @@ static function parse(c: class): void;
 static async function asyncFunc(): void;
 
 model Request = {
+  CORSRules: string,
   accesskey?: string(name='accesskey', description='accesskey'),
   region?: string(name='region', description='region'),
   instance: {

package/tests/fixtures/complex/main.dara

@@ -300,6 +300,7 @@ api Complex3(request: ComplexRequest, name: string): ComplexRequest {
   }
   var resp = __response;
   var req = new Source.Request{
+    CORSRules = "test",
     accesskey = request.accessKey,
     region = resp.statusMessage
   };

package/tests/fixtures/function/Darafile

@@ -2,5 +2,11 @@
   "scope": "alibabacloud",
   "name": "main",
   "version": "0.0.1",
-  "main": "./main.dara"
+  "main": "./main.dara",
+  "python": {
+    "keywords": [
+      "JWT",
+      "OAuth2"
+    ]
+  }
 }

package/tests/fixtures/function/main.dara

@@ -34,4 +34,12 @@ static async function helloInterface(): void;
 
 async function aParams(): void {
   helloParams("a", "b");
+}
+
+async function testJWTWithOption(): void {
+  helloParams("a", "b");
+}
+
+async function testOAuth2forOption(): void {
+  helloParams("a", "b");
 }

package/tests/fixtures/model/Darafile

@@ -5,5 +5,13 @@
   "main": "./main.dara",
   "libraries": {
     "Source": "darabonba:Import:*"
+  },
+  "python": {
+    "keywords": [
+      "CORS",
+      "XML",
+      "HTTP",
+      "OAuth2"
+    ]
   }
 }

package/tests/fixtures/model/main.dara

@@ -28,6 +28,10 @@ model MyModel = {
       str: string
     },
   },
+  CORSRules: string,
+  CORSRulesCORSR: string,
+  XMLParserHTTPMessage: string,
+  TestOAuth2Name: string,
   stringfield: string,
   bytesfield: bytes,
   stringarrayfield: [ string ],

package/tests/fixtures/websocket/.libraries.json

@@ -0,0 +1,3 @@
+{
+  "alibabacloud:OpenApiV2:*": "libraries/alibabacloud_OpenApiV2_0.1.27"
+}

package/tests/fixtures/websocket/Darafile

@@ -0,0 +1,9 @@
+{
+  "scope": "darabonba",
+  "name": "websocket",
+  "version": "0.0.1",
+  "main": "./main.dara",
+  "libraries": {
+    "OpenApi": "alibabacloud:OpenApiV2:*"
+  }
+}

package/tests/fixtures/websocket/libraries/alibabacloud_OpenApiV2_0.1.27/Teafile

@@ -0,0 +1,21 @@
+{
+  "scope": "alibabacloud",
+  "name": "OpenApiV2",
+  "version": "0.1.27",
+  "main": "./main.tea",
+  "exports": {
+    "OpenApiUtil": "./utils.dara",
+    "WebSocketUtils": "./websocketUtils.dara"
+  },
+  "releases": {
+    "python": "alibabacloud_tea_openapi:0.4.4"
+  },
+  "python": {
+    "package": "alibabacloud_tea_openapi",
+    "clientName": "client",
+    "exports": {
+      "OpenApiUtil": "Utils",
+      "WebSocketUtils": "Client"
+    }
+  }
+}

package/tests/fixtures/websocket/libraries/alibabacloud_OpenApiV2_0.1.27/main.tea

@@ -0,0 +1 @@
+// stub main for library

package/tests/fixtures/websocket/libraries/alibabacloud_OpenApiV2_0.1.27/utils.dara

@@ -0,0 +1 @@
+// stub utils for library

package/tests/fixtures/websocket/libraries/alibabacloud_OpenApiV2_0.1.27/websocketUtils.dara

@@ -0,0 +1,9 @@
+@clientName("WebSocketClient")
+@overwrite(false)
+
+model WebSocketClient {
+}
+
+static function createWebSocketClient(client: any): WebSocketClient {
+  return client;
+}

package/tests/fixtures/websocket/main.dara

@@ -0,0 +1,8 @@
+import OpenApi.WebSocketUtils;
+
+init() {
+}
+
+static function wrapWebSocketClient(client: any): WebSocketUtils.WebSocketClient {
+  return WebSocketUtils.createWebSocketClient(client);
+}

package/tests/main.tests.js

@@ -330,4 +330,14 @@ describe('Python Generator', function () {
         }
       });
   });
+
+  it('websocket inner module import should use snake_case', function () {
+    check('websocket', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
+  });
 });

package/tests/output/alias/setup.py

@@ -1,83 +0,0 @@
-# -*- 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 13/08/2025
-
-@author: AlibabaCloud SDK Team
-"""
-
-PACKAGE = "tea_python_tests"
-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 = [
-    "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 = ''
-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.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.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/output/alias/tea_python_tests/client.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is auto-generated, don't edit it. Thanks.
-from __future__ import annotations
-
-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
-
-
-
-class Client:
-
-    def __init__(self):
-        pass
-
-    @staticmethod
-    def empty_model() -> None:
-        ImportClient.test()
-        SourceClient.test()
-        AliasClient.test()
-        AliasSourceSourceClient.test()
-        AliasSymbolClient.test()
-        model = alias_symbol_models.TestModel()
-
-    @staticmethod
-    async def empty_model_async() -> None:
-        ImportClient.test()
-        await SourceClient.test_async()
-        AliasClient.test()
-        AliasSourceSourceClient.test()
-        AliasSymbolClient.test()
-        model = alias_symbol_models.TestModel()

package/tests/output/annotation/setup.py

@@ -1,79 +0,0 @@
-# -*- 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 13/08/2025
-
-@author: Alibaba
-"""
-
-PACKAGE = "tea_python_tests"
-NAME = "tea_python_tests"
-DESCRIPTION = ""
-AUTHOR = "Alibaba"
-AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
-URL = "https://github.com/"
-VERSION = __import__(PACKAGE).__version__
-REQUIRES = [
-    "darabonba-core>=1.0.0, <2.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.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.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/output/annotation/tea_python_tests/__init__.py

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

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

@@ -1,93 +0,0 @@
-# -*- 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
-
-"""
- * @remarks
- * top annotation
-"""
-class Client:
-    _a: str = None
-    def __init__(self):
-        pass
-
-    """
-     * @remarks
-     * testAPI
-    """
-    def test_api(self) -> None:
-        _runtime = {
-        }
-        _last_request = None
-        _last_response = None
-        _retries_attempted = 0
-        _context = RetryPolicyContext(
-            retries_attempted= _retries_attempted
-        )
-        while DaraCore.should_retry(_runtime.get('retryOptions'), _context):
-            if _retries_attempted > 0:
-                _backoff_time = DaraCore.get_backoff_time(_runtime.get('retryOptions'), _context)
-                if _backoff_time > 0:
-                    DaraCore.sleep(_backoff_time)
-            _retries_attempted = _retries_attempted + 1
-            try:
-                _request = DaraRequest()
-                pass
-                _last_request = _request
-                _response = DaraCore.do_action(_request, _runtime)
-                _last_response = _response
-                return
-            except Exception as e:
-                _context = RetryPolicyContext(
-                    retries_attempted= _retries_attempted,
-                    http_request = _last_request,
-                    http_response = _last_response,
-                    exception = e
-                )
-                continue
-        raise UnretryableException(_context)
-
-    async def test_api_async(self) -> None:
-        _runtime = {
-        }
-        _last_request = None
-        _last_response = None
-        _retries_attempted = 0
-        _context = RetryPolicyContext(
-            retries_attempted= _retries_attempted
-        )
-        while DaraCore.should_retry(_runtime.get('retryOptions'), _context):
-            if _retries_attempted > 0:
-                _backoff_time = DaraCore.get_backoff_time(_runtime.get('retryOptions'), _context)
-                if _backoff_time > 0:
-                    DaraCore.sleep(_backoff_time)
-            _retries_attempted = _retries_attempted + 1
-            try:
-                _request = DaraRequest()
-                pass
-                _last_request = _request
-                _response = await DaraCore.async_do_action(_request, _runtime)
-                _last_response = _response
-                return
-            except Exception as e:
-                _context = RetryPolicyContext(
-                    retries_attempted= _retries_attempted,
-                    http_request = _last_request,
-                    http_response = _last_response,
-                    exception = e
-                )
-                continue
-        raise UnretryableException(_context)
-
-    @staticmethod
-    def test_func() -> None:
-        pass
-
-    @staticmethod
-    async def test_func_async() -> None:
-        pass

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

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is auto-generated, don't edit it. Thanks.
-from __future__ import annotations
-
-from ._test import Test
-
-__all__ = [
-    Test
-]

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

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is auto-generated, don't edit it. Thanks.
-from __future__ import annotations
-
-from darabonba.model import DaraModel
-
-"""
- * @remarks
- * TestModel
-"""
-class Test(DaraModel):
-    def __init__(
-        self,
-        test: str = None,
-    ):
-        # Alichange app id
-        self.test = test
-
-    def validate(self):
-        self.validate_required(self.test, 'test')
-
-    def to_map(self):
-        result = dict()
-        _map = super().to_map()
-        if _map is not None:
-            result = _map
-        if self.test is not None:
-            result['test'] = self.test
-
-        return result
-
-    def from_map(self, m: dict = None):
-        m = m or dict()
-        if m.get('test') is not None:
-            self.test = m.get('test')
-
-        return self
-

package/tests/output/api/setup.py

@@ -1,79 +0,0 @@
-# -*- 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 13/08/2025
-
-@author: Alibaba
-"""
-
-PACKAGE = "tea_python_tests"
-NAME = "tea_python_tests"
-DESCRIPTION = ""
-AUTHOR = "Alibaba"
-AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
-URL = "https://github.com/"
-VERSION = __import__(PACKAGE).__version__
-REQUIRES = [
-    "darabonba-core>=1.0.0, <2.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.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.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/output/api/tea_python_tests/__init__.py

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