@darabonba/python-generator 1.2.18 → 2.0.0

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

@@ -197,6 +197,8 @@ class MyModel(TeaModel):
         map_model: Dict[str, M] = None,
         submodel_map: Dict[str, MyModelSubmodel] = None,
         sub_model_model: MyModelSubModelModel = None,
+        map_array_map: Dict[str, List[Dict[str, str]]] = None,
+        map_array_model: Dict[str, List[M]] = None,
     ):
         self.stringfield = stringfield
         self.bytesfield = bytesfield
@@ -227,6 +229,8 @@ class MyModel(TeaModel):
         self.map_model = map_model
         self.submodel_map = submodel_map
         self.sub_model_model = sub_model_model
+        self.map_array_map = map_array_map
+        self.map_array_model = map_array_model
 
     def validate(self):
         self.validate_required(self.stringfield, 'stringfield')
@@ -278,6 +282,11 @@ class MyModel(TeaModel):
         self.validate_required(self.sub_model_model, 'sub_model_model')
         if self.sub_model_model:
             self.sub_model_model.validate()
+        if self.map_array_model:
+            for v in self.map_array_model.values():
+                for k1 in v:
+                    if k1:
+                        k1.validate()
 
     def to_map(self):
         _map = super().to_map()
@@ -296,13 +305,13 @@ class MyModel(TeaModel):
         if self.name is not None:
             result['realName'] = self.name
         if self.submodel is not None:
-            result['submodel'] = self.submodel.to_map()
-        result['subarray'] = []
+            result['SubModel'] = self.submodel.to_map()
+        result['SubArray'] = []
         if self.subarray is not None:
             for k in self.subarray:
-                result['subarray'].append(k.to_map() if k else None)
+                result['SubArray'].append(k.to_map() if k else None)
         if self.maparray is not None:
-            result['maparray'] = self.maparray
+            result['MapArray'] = self.maparray
         if self.object is not None:
             result['object'] = self.object
         if self.numberfield is not None:
@@ -323,30 +332,39 @@ class MyModel(TeaModel):
             result['minimum'] = self.minimum
         if self.test_3 is not None:
             result['test3'] = self.test_3
-        result['arrayArrayModel'] = []
+        result['ArrayArrayModel'] = []
         if self.array_array_model is not None:
             for k in self.array_array_model:
                 l1 = []
                 for k1 in k:
                     l1.append(k1.to_map() if k1 else None)
-                result['arrayArrayModel'].append(l1)
-        result['arrayMapModel'] = []
+                result['ArrayArrayModel'].append(l1)
+        result['ArrayMapModel'] = []
         if self.array_map_model is not None:
             for k in self.array_map_model:
                 d1 = {}
                 for k1 ,v1 in k.items():
                     d1[k1] = v1.to_map()
-                result['arrayMapModel'].append(d1)
-        result['mapModel'] = {}
+                result['ArrayMapModel'].append(d1)
+        result['MapModel'] = {}
         if self.map_model is not None:
             for k, v in self.map_model.items():
-                result['mapModel'][k] = v.to_map()
-        result['submodelMap'] = {}
+                result['MapModel'][k] = v.to_map()
+        result['SubmodelMap'] = {}
         if self.submodel_map is not None:
             for k, v in self.submodel_map.items():
-                result['submodelMap'][k] = v.to_map()
+                result['SubmodelMap'][k] = v.to_map()
         if self.sub_model_model is not None:
-            result['subModelModel'] = self.sub_model_model.to_map()
+            result['SubModelModel'] = self.sub_model_model.to_map()
+        if self.map_array_map is not None:
+            result['MapArrayMap'] = self.map_array_map
+        result['MapArrayModel'] = {}
+        if self.map_array_model is not None:
+            for k, v in self.map_array_model.items():
+                l1 = []
+                for k1 in v:
+                    l1.append(k1.to_map() if k1 else None)
+                result['MapArrayModel'][k] = l1
         return result
 
     def from_map(self, m: dict = None):
@@ -361,16 +379,16 @@ class MyModel(TeaModel):
             self.mapfield = m.get('mapfield')
         if m.get('realName') is not None:
             self.name = m.get('realName')
-        if m.get('submodel') is not None:
+        if m.get('SubModel') is not None:
             temp_model = MyModelSubmodel()
-            self.submodel = temp_model.from_map(m['submodel'])
+            self.submodel = temp_model.from_map(m['SubModel'])
         self.subarray = []
-        if m.get('subarray') is not None:
-            for k in m.get('subarray'):
+        if m.get('SubArray') is not None:
+            for k in m.get('SubArray'):
                 temp_model = M()
                 self.subarray.append(temp_model.from_map(k))
-        if m.get('maparray') is not None:
-            self.maparray = m.get('maparray')
+        if m.get('MapArray') is not None:
+            self.maparray = m.get('MapArray')
         if m.get('object') is not None:
             self.object = m.get('object')
         if m.get('numberfield') is not None:
@@ -393,34 +411,44 @@ class MyModel(TeaModel):
         if m.get('test3') is not None:
             self.test_3 = m.get('test3')
         self.array_array_model = []
-        if m.get('arrayArrayModel') is not None:
-            for k in m.get('arrayArrayModel'):
+        if m.get('ArrayArrayModel') is not None:
+            for k in m.get('ArrayArrayModel'):
                 l1 = []
                 for k1 in k:
                     temp_model = M()
                     l1.append(temp_model.from_map(k1))
                 self.array_array_model.append(l1)
         self.array_map_model = []
-        if m.get('arrayMapModel') is not None:
-            for k in m.get('arrayMapModel'):
+        if m.get('ArrayMapModel') is not None:
+            for k in m.get('ArrayMapModel'):
                 d1 = {}
                 for k1, v1 in k.items():
                     temp_model = M()
                     d1[k1] = temp_model.from_map(v1)
                 self.array_map_model.append(d1)
         self.map_model = {}
-        if m.get('mapModel') is not None:
-            for k, v in m.get('mapModel').items():
+        if m.get('MapModel') is not None:
+            for k, v in m.get('MapModel').items():
                 temp_model = M()
                 self.map_model[k] = temp_model.from_map(v)
         self.submodel_map = {}
-        if m.get('submodelMap') is not None:
-            for k, v in m.get('submodelMap').items():
+        if m.get('SubmodelMap') is not None:
+            for k, v in m.get('SubmodelMap').items():
                 temp_model = MyModelSubmodel()
                 self.submodel_map[k] = temp_model.from_map(v)
-        if m.get('subModelModel') is not None:
+        if m.get('SubModelModel') is not None:
             temp_model = MyModelSubModelModel()
-            self.sub_model_model = temp_model.from_map(m['subModelModel'])
+            self.sub_model_model = temp_model.from_map(m['SubModelModel'])
+        if m.get('MapArrayMap') is not None:
+            self.map_array_map = m.get('MapArrayMap')
+        self.map_array_model = {}
+        if m.get('MapArrayModel') is not None:
+            for k, v in m.get('MapArrayModel').items():
+                l1 = []
+                for k1 in v:
+                    temp_model = M()
+                    l1.append(temp_model.from_map(k1))
+                self.map_array_model['k'] = l1
         return self
 
 

package/tests/expected/statements/tea_python_tests/__init__.py

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

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

@@ -0,0 +1,86 @@
+# -*- 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 DaraException 
+
+
+class Client:
+    def __init__(self):
+        pass
+
+    def hello(self) -> None:
+        _request = DaraRequest()
+        _request.method = 'GET'
+        _request.pathname = '/'
+        _request.headers = {
+            'host': 'www.test.com'
+        }
+        if True:
+            _request.headers["host"] = 'www.test2.com'
+        _last_request = _request
+        _response = DaraCore.do_action(_request)
+        if True:
+            raise DaraException(_request, _response)
+        else:
+            True
+
+        self.hello_if()
+                not False
+        a = None
+        a = 'string'
+        return
+
+    async def hello_async(self) -> None:
+        _request = DaraRequest()
+        _request.method = 'GET'
+        _request.pathname = '/'
+        _request.headers = {
+            'host': 'www.test.com'
+        }
+        if True:
+            _request.headers["host"] = 'www.test2.com'
+        _last_request = _request
+        _response = await DaraCore.async_do_action(_request)
+        if True:
+            raise DaraException(_request, _response)
+        else:
+            True
+
+        self.hello_if()
+                not False
+        a = None
+        a = 'string'
+        return
+
+    @staticmethod
+    def hello_if() -> None:
+        if True:
+            pass
+        if True:
+            pass
+        elif True:
+            pass
+        else:
+            pass
+
+    @staticmethod
+    def hello_throw() -> None:
+        raise DaraException({})
+
+    @staticmethod
+    def hello_for_break() -> None:
+        for item in [ ]:
+            break
+
+    @staticmethod
+    def hello_while() -> None:
+        while True:
+            break
+
+    @staticmethod
+    def hello_declare() -> None:
+        hello = 'world'
+        hello_null = None
+        hello = 'hehe'

package/tests/expected/super/tea_python_tests/__init__.py

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

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

@@ -0,0 +1,16 @@
+# -*- 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 
+
+
+
+
+class Client(SourceClient):
+
+    def __init__(
+        self,
+        config: source_models.Config,
+    ):
+        super().__init__(config)

package/tests/expected/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",
+    "darabonba-core>=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/typedef/tea_python_tests/__init__.py

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

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

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from requests import Request 
+from Tea.model import TeaModel 
+from Source.source_client import SourceClient 
+from tea_python_tests import models as main_models 
+from requests import Response 
+from typing import Dict, Any
+
+
+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/typedef/tea_python_tests/models.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+from requests import Request 
+from Tea.model import TeaModel 
+
+
+
+
+class M(DaraModel):
+    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/alias/Darafile

@@ -9,5 +9,16 @@
     "Alias" : "alibabacloud:Alias:*",
     "AliasSource" : "alibabacloud:AliasSource:*",
     "Alias-Symbol": "alibabacloud:Alias-Symbol:*"
+  },
+  "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"
+    }
   }
 }

package/tests/fixtures/alias/libraries/Alias/Darafile

@@ -3,6 +3,17 @@
   "name": "alias",
   "version": "0.0.1",
   "main": "./alias.dara",
+  "releases": {
+		"go": "github.com/alibabacloud-go/tea-utils/v2/service:v2.0.4",
+		"ts": "@alicloud/tea-util:^1.4.7",
+		"csharp": "AlibabaCloud.TeaUtil:0.1.17",
+		"java": "com.aliyun:tea-util:0.2.21",
+		"php": "alibabacloud/tea-utils:^0.2.19",
+		"python": "alibabacloud_tea_util:0.3.11",
+		"python2": "alibabacloud_tea_util_py2:0.0.9",
+		"swift": "alibabacloud-sdk-swift/tea-utils:1.0.3",
+		"cpp": "alibabacloud-sdk-cpp/dara-util:master"
+	},
   "python": {
     "package": "Alias",
     "clientName": "alias_client",

package/tests/fixtures/alias/libraries/Alias-Symbol/Darafile

@@ -3,6 +3,17 @@
   "name": "Alias-Symbol",
   "version": "0.0.1",
   "main": "./main.dara",
+  "releases": {
+		"go": "github.com/alibabacloud-go/tea-utils/v2/service:v2.0.4",
+		"ts": "@alicloud/tea-util:^1.4.7",
+		"csharp": "AlibabaCloud.TeaUtil:0.1.17",
+		"java": "com.aliyun:tea-util:0.2.21",
+		"php": "alibabacloud/tea-utils:^0.2.19",
+		"python": "alibabacloud_tea_util:0.3.11",
+		"python2": "alibabacloud_tea_util_py2:0.0.9",
+		"swift": "alibabacloud-sdk-swift/tea-utils:1.0.3",
+		"cpp": "alibabacloud-sdk-cpp/dara-util:master"
+	},
   "python": {
     "package": "alias_symbol",
     "clientName": "client",

package/tests/fixtures/builtin/Darafile

@@ -0,0 +1,6 @@
+{
+  "scope": "alibabacloud",
+  "name": "main",
+  "version": "0.0.1",
+  "main": "./main.dara"
+}