@darabonba/python-generator 2.0.3 → 2.0.5

package/tests/expected/modelConfig/tea_python_tests/models/_my_model_submodel.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+from tea_python_tests import models as main_models 
+
+
+class MyModelSubmodel(DaraModel):
+    def __init__(
+        self, *,
+        stringfield: str = None,
+        model: main_models.MyModelSubmodelModel = None,
+    ):
+        self.stringfield = stringfield
+        self.model = model
+
+    def validate(self):
+        self.validate_required(self.stringfield, 'stringfield')
+        self.validate_required(self.model, 'model')
+        if self.model:
+            self.model.validate()
+
+    def to_map(self):
+        result = dict()
+        _map = super().to_map()
+        if _map is not None:
+            result = _map
+        if self.stringfield is not None:
+            result['stringfield'] = self.stringfield
+
+        if self.model is not None:
+            result['model'] = self.model.to_map()
+
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('stringfield') is not None:
+            self.stringfield = m.get('stringfield')
+
+        if m.get('model') is not None:
+            temp_model = main_models.MyModelSubmodelModel()
+            self.model = temp_model.from_map(m.get('model'))
+
+        return self
+

package/tests/expected/modelConfig/tea_python_tests/models/_my_model_submodel_model.py

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

package/tests/expected/multi/tea_python_tests/api_models/_test_model_dir_2.py

@@ -8,7 +8,7 @@ from darabonba.model import DaraModel
 
 class TestModelDir2(DaraModel):
     def __init__(
-        self, *,
+        self,
         test: int = None,
     ):
         self.test = test
@@ -17,18 +17,19 @@ class TestModelDir2(DaraModel):
         self.validate_required(self.test, 'test')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            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/expected/multi/tea_python_tests/exceptions/_err.py

@@ -6,7 +6,7 @@ from darabonba.exceptions import DaraException
 
 class ERRException(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,
@@ -22,7 +22,7 @@ class ERRException(DaraException):
 
 class ErrException(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,

package/tests/expected/multi/tea_python_tests/model/user_exceptions/_err.py

@@ -6,7 +6,7 @@ from darabonba.exceptions import DaraException
 
 class ErrException(DaraException):
     def __init__(
-        self, *,
+        self,
         message: str = None,
         code: str = None,
         stack: str = None,

package/tests/expected/multi/tea_python_tests/model/user_exceptions/_err_1.py

@@ -6,7 +6,7 @@ from tea_python_tests import user_exceptions as main_exceptions
 
 class Err1Exception(main_exceptions.BaseInfoException):
     def __init__(
-        self, *,
+        self,
         max_attemp: int = None,
         autoretry: bool = None,
         ignore_ssl: bool = None,

package/tests/expected/multi/tea_python_tests/model/user_exceptions/_err_2.py

@@ -6,7 +6,7 @@ from tea_python_tests import user_exceptions as main_exceptions
 
 class Err2Exception(main_exceptions.ErrException):
     def __init__(
-        self, *,
+        self,
         msg: str = None,
         msg_2: str = None,
     ):

package/tests/expected/multi/tea_python_tests/model/user_models/_base_info.py

@@ -8,7 +8,7 @@ from alibabacloud_tea_util import models as darautil_models
 
 class BaseInfo(darautil_models.RuntimeOptions):
     def __init__(
-        self, *,
+        self,
         autoretry: bool = None,
         ignore_ssl: bool = None,
         key: str = None,
@@ -55,18 +55,19 @@ class BaseInfo(darautil_models.RuntimeOptions):
         self.validate_required(self.max_attemp, 'max_attemp')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.max_attemp is not None:
             result['maxAttemp'] = self.max_attemp
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('maxAttemp') is not None:
             self.max_attemp = m.get('maxAttemp')
+
         return self
 

package/tests/expected/multi/tea_python_tests/model/user_models/_info.py

@@ -6,7 +6,7 @@ from tea_python_tests import user_models as main_models
 
 class Info(main_models.BaseInfo):
     def __init__(
-        self, *,
+        self,
         max_attemp: int = None,
         autoretry: bool = None,
         ignore_ssl: bool = None,
@@ -58,22 +58,25 @@ class Info(main_models.BaseInfo):
         self.validate_required(self.age, 'age')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.name is not None:
             result['name'] = self.name
+
         if self.age is not None:
             result['age'] = self.age
+
         return result
 
     def from_map(self, m: dict = None):
         m = m or dict()
         if m.get('name') is not None:
             self.name = m.get('name')
+
         if m.get('age') is not None:
             self.age = m.get('age')
+
         return self
 

package/tests/expected/multi/tea_python_tests/models/_test_model_dir.py

@@ -8,7 +8,7 @@ from typing import Any
 
 class TestModelDIR(DaraModel):
     def __init__(
-        self, *,
+        self,
         test: str = None,
         a: Any = None,
     ):
@@ -20,30 +20,33 @@ class TestModelDIR(DaraModel):
         self.validate_required(self.a, 'a')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.test is not None:
             result['test'] = self.test
+
         if self.a is not None:
             result['a'] = self.a
+
         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')
+
         if m.get('a') is not None:
             self.a = m.get('a')
+
         return self
 
 
 
 class TestModelDir(DaraModel):
     def __init__(
-        self, *,
+        self,
         test: int = None,
         m: user_models.Info = None,
     ):
@@ -55,13 +58,13 @@ class TestModelDir(DaraModel):
         self.validate_required(self.m, 'm')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.test is not None:
             result['test'] = self.test
+
         if self.m is not None:
             result['m'] = self.m.to_map()
 
@@ -71,6 +74,7 @@ class TestModelDir(DaraModel):
         m = m or dict()
         if m.get('test') is not None:
             self.test = m.get('test')
+
         if m.get('m') is not None:
             temp_model = user_models.Info()
             self.m = temp_model.from_map(m.get('m'))

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

@@ -10,7 +10,7 @@ from Tea.model import TeaModel
 
 class M(DaraModel):
     def __init__(
-        self, *,
+        self,
         a: Request = None,
         b: TeaModel = None,
     ):
@@ -21,22 +21,25 @@ class M(DaraModel):
         pass
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         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/model/main.dara

@@ -45,10 +45,14 @@ model MyModel = {
   subarray: [ M ],
   ssubarray: [[ M ]],
   ssubmarray: [[ Source ]],
+  sssubmarray: [[ Source ]],
   ssubmmarray: [[ Source.Request ]],
+  sssubmmarray: [[[ Source.Request ]]],
   maparray: [ map[string]any ],
   mapsubmarray: [ map[string]Source ],
   moduleModelMap: map[string]Source.Request,
+  arrModuleModelMap: [ map[string]Source.Request ],
+  arrsModuleModelMap: [[ map[string]Source.Request ]],
   subModelMap: map[string]M.subM,
   modelMap: map[string]M,
   moduleMap: map[string]Source,

package/tests/fixtures/modelConfig/.libraries.json

@@ -0,0 +1,3 @@
+{
+  "darabonba:Import:*": "libraries"
+}

package/tests/fixtures/modelConfig/Darafile

@@ -0,0 +1,13 @@
+{
+  "scope": "darabonba",
+  "name": "main",
+  "version": "0.0.1",
+  "main": "./main.dara",
+  "libraries": {
+    "Source": "darabonba:Import:*"
+  },
+  "python": {
+    "noneEmpty": true,
+    "strictModel": true
+  }
+}

package/tests/fixtures/modelConfig/libraries/Darafile

@@ -0,0 +1,20 @@
+{
+  "scope": "darabonba",
+  "name": "import",
+  "version": "0.0.1",
+  "main": "./import.dara",
+  "java": {
+    "package": "com.import"
+  },
+  "csharp": {
+    "namespace": "Darabonba.import"
+  },
+  "python": {
+    "package": "Source",
+    "clientName": "client",
+    "modelDirName": "Models"
+  },
+  "releases": {
+    "php": "scope/name:1.0.0"
+  }
+}

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

@@ -0,0 +1,27 @@
+model RuntimeObject = {}
+
+static function array(request: object, str: string): [ any ];
+
+static function query(q: object): map[string]string;
+static function body(): readable;
+static function parse(c: class): void;
+static async function asyncFunc(): void;
+
+type @protocol = string
+type @pathname = string
+type @API = map[string]string
+
+init(config: Config);
+model Config = {}
+function print(runtime: object, str: string): void {
+  return;
+}
+
+async function printAsync(runtime: object, str: string): void {
+  return;
+}
+
+model Request = {
+  accesskey?: string(name='accesskey', description='accesskey'),
+  region?: string(name='region', description='region'),
+}

package/tests/fixtures/modelConfig/main.dara

@@ -0,0 +1,81 @@
+import Source;
+
+model M = {
+  subM: {}
+};
+
+model Class = {};
+
+model model = {
+  str: string
+}
+
+exception MainFile extends $Error {
+  size: number,
+  data: map[string]model,
+  model: {
+    str: string,
+    model: {
+      str: string
+    },
+  }
+}
+
+model MyModel = {
+  model: {
+    str: string,
+    model: {
+      str: string
+    },
+  },
+  stringfield: string,
+  bytesfield: bytes,
+  stringarrayfield: [ string ],
+  mapfield: map[string]string,
+  name: string(name='realName'),
+  submodel: {
+    stringfield: string,
+    model: {
+      str: string
+    },
+  },
+  submodelMap: map[string]MyModel.submodel,
+  mapModel: map[string]M,
+  subarraymodel: [ {} ],
+  subarray: [ M ],
+  ssubarray: [[ M ]],
+  ssubmarray: [[ Source ]],
+  sssubmarray: [[ Source ]],
+  ssubmmarray: [[ Source.Request ]],
+  sssubmmarray: [[[ Source.Request ]]],
+  maparray: [ map[string]any ],
+  mapsubmarray: [ map[string]Source ],
+  moduleModelMap: map[string]Source.Request,
+  arrModuleModelMap: [ map[string]Source.Request ],
+  arrsModuleModelMap: [[ map[string]Source.Request ]],
+  subModelMap: map[string]M.subM,
+  modelMap: map[string]M,
+  moduleMap: map[string]Source,
+  object: object,
+  readable: readable,
+  writable: writable,
+  existModel: M,
+  request: $Request,
+  complexList: [ [ string ] ],
+  numberfield: number,
+  integerField: integer,
+  floatField: float,
+  doubleField: double,
+  longField: long,
+  ulongField: ulong,
+  int8Field: int8,
+  int16Field: int16,
+  int32Field: int32,
+  int64Field: int64,
+  uint8Field: uint8,
+  uint16Field: uint16,
+  uint32Field: uint32,
+  uint64Field: uint64,
+  link?: string(name='link', example='http://*/*.png'),
+};
+

package/tests/main.tests.js

@@ -102,6 +102,24 @@ describe('Python Generator', function () {
       });
   });
 
+  it('model config should ok', function () {
+    check('modelConfig', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client',
+          noneEmpty: true,
+          strictModel: true,
+          additionalPackage: [
+            {
+              from: '__future__',
+              import: 'annotations'
+            }
+          ]
+        }
+      });
+  });
+
   it('map should ok', function () {
     check('map', 'tea_python_tests',
       {

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

@@ -10,7 +10,7 @@ from darabonba.model import DaraModel
 """
 class Test(DaraModel):
     def __init__(
-        self, *,
+        self,
         test: str = None,
     ):
         # Alichange app id
@@ -20,18 +20,19 @@ class Test(DaraModel):
         self.validate_required(self.test, 'test')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            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/builtin/tea_python_tests/client.py

@@ -16,7 +16,7 @@ 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 
-from typing import List, Any, BytesIO, StringIO
+from typing import List, Any
 
 
 class Client:
@@ -618,8 +618,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)
@@ -669,8 +669,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)

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

@@ -14,7 +14,7 @@ from typing import List
 """
 class Test1(DaraModel):
     def __init__(
-        self, *,
+        self,
         test: str = None,
     # odel的test back comment
         test_2: str = None,
@@ -50,42 +50,53 @@ class Test1(DaraModel):
         self.validate_required(self.a_sts, 'a_sts')
 
     def to_map(self):
+        result = dict()
         _map = super().to_map()
         if _map is not None:
-            return _map
-
-        result = dict()
+            result = _map
         if self.test is not None:
             result['test'] = self.test
+
     # odel的test back comment
         if self.test_2 is not None:
             result['test2'] = self.test_2
+
     # odel的test2 back comment
         if self.test_3 is not None:
             result['test3'] = self.test_3
+
         if self.test_5 is not None:
             result['test5'] = self.test_5
+
         if self.sts is not None:
             result['sts'] = self.sts
+
         if self.a_sts is not None:
             result['asts'] = self.a_sts
+
         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')
+
     # odel的test back comment
         if m.get('test2') is not None:
             self.test_2 = m.get('test2')
+
     # odel的test2 back comment
         if m.get('test3') is not None:
             self.test_3 = m.get('test3')
+
         if m.get('test5') is not None:
             self.test_5 = m.get('test5')
+
         if m.get('sts') is not None:
             self.sts = m.get('sts')
+
         if m.get('asts') is not None:
             self.a_sts = m.get('asts')
+
         return self