update python templates

Author: marceljk

templates/python/README_onlypackage.mustache

@@ -26,15 +26,21 @@ This python library package is generated without supporting files like setup.py
 
 To be able to use it, you will need these dependencies in your own package that uses this library:
 
-* urllib3 >= 1.25.3
-* python-dateutil
+* urllib3 >= 2.1.0, < 3.0.0
+* python-dateutil >= 2.8.2
 {{#asyncio}}
-* aiohttp
+* aiohttp >= 3.8.4
+* aiohttp-retry >= 2.8.3
 {{/asyncio}}
 {{#tornado}}
-* tornado>=4.2,<5
+* tornado >= 4.2, < 5
 {{/tornado}}
-* pydantic
+{{#hasHttpSignatureMethods}}
+* pem >= 19.3.0
+* pycryptodome >= 3.9.0
+{{/hasHttpSignatureMethods}}
+* pydantic >= 2
+* typing-extensions >= 4.7.1
 
 ## Getting Started
 

templates/python/__init__.mustache

@@ -103,7 +103,9 @@ class {{classname}}:
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -167,6 +169,9 @@ class {{classname}}:
             if isinstance({{paramName}}, str):
                 with open({{paramName}}, "rb") as _fp:
                     _body_params = _fp.read()
+            elif isinstance({{paramName}}, tuple):
+                # drop the filename from the tuple
+                _body_params = {{paramName}}[1]
             else:
                 _body_params = {{paramName}}
             {{/isBinary}}

templates/python/__init__api.mustache

@@ -32,7 +32,6 @@ from {{packageName}}.exceptions import (
 
 RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
-
 class ApiClient:
     """Generic API client for OpenAPI client library builds.
 
@@ -394,12 +393,12 @@ class ApiClient:
                 data = json.loads(response_text)
             except ValueError:
                 data = response_text
-        elif content_type.startswith("application/json"):
+        elif re.match(r'^application/(json|[\w!#$&.+-^_]+\+json)\s*(;|$)', content_type, re.IGNORECASE):
             if response_text == "":
                 data = ""
             else:
                 data = json.loads(response_text)
-        elif content_type.startswith("text/plain"):
+        elif re.match(r'^text\/[a-z.+-]+\s*(;|$)', content_type, re.IGNORECASE):
             data = response_text
         else:
             raise ApiException(
@@ -507,7 +506,7 @@ class ApiClient:
             if k in collection_formats:
                 collection_format = collection_formats[k]
                 if collection_format == 'multi':
-                    new_params.extend((k, str(value)) for value in v)
+                    new_params.extend((k, quote(str(value))) for value in v)
                 else:
                     if collection_format == 'ssv':
                         delimiter = ' '
@@ -525,7 +524,10 @@ class ApiClient:
 
         return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+    def files_parameters(
+        self,
+        files: Dict[str, Union[str, bytes, List[str], List[bytes], Tuple[str, bytes]]],
+    ):
         """Builds form parameters.
 
         :param files: File parameters.
@@ -540,6 +542,12 @@ class ApiClient:
             elif isinstance(v, bytes):
                 filename = k
                 filedata = v
+            elif isinstance(v, tuple):
+                filename, filedata = v
+            elif isinstance(v, list):
+                for file_param in v:
+                    params.extend(self.files_parameters({k: file_param}))
+                continue
             else:
                 raise ValueError("Unsupported file value")
             mimetype = (

templates/python/__init__model.mustache

@@ -13,10 +13,14 @@ Method | HTTP request | Description
 # **{{{operationId}}}**
 > {{#returnType}}{{{.}}} {{/returnType}}{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{/required}}{{^required}}{{{paramName}}}={{{paramName}}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}})
 
-{{{summary}}}{{#notes}}
+{{#summary}}
+{{{summary}}}
 
-{{{.}}}{{/notes}}
+{{/summary}}
+{{#unescapedNotes}}
+{{{.}}}
 
+{{/unescapedNotes}}
 ### Example
 
 {{#hasAuthMethods}}

templates/python/api.mustache

@@ -7,17 +7,31 @@ import unittest
 from {{apiPackage}}.{{classFilename}} import {{classname}}
 
 
-class {{#operations}}Test{{classname}}(unittest.TestCase):
+class {{#operations}}Test{{classname}}(unittest.{{#asyncio}}IsolatedAsyncio{{/asyncio}}TestCase):
     """{{classname}} unit test stubs"""
 
+    {{#asyncio}}
+    async def asyncSetUp(self) -> None:
+        self.api = {{classname}}()
+
+    async def asyncTearDown(self) -> None:
+        await self.api.api_client.close()
+    {{/asyncio}}
+    {{^asyncio}}
     def setUp(self) -> None:
         self.api = {{classname}}()
 
     def tearDown(self) -> None:
         pass
+    {{/asyncio}}
 
-   {{#operation}}
+    {{#operation}}
+    {{#asyncio}}
+    async def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
+    {{^asyncio}}
     def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
         """Test case for {{{operationId}}}
 
 {{#summary}}