@autorest/python 6.2.12 → 6.2.15

package/autorest/multiapi/serializers/__init__.py

@@ -4,13 +4,13 @@
 # license information.
 # --------------------------------------------------------------------------
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any, Optional, Union, List
 from jinja2 import PackageLoader, Environment
 
 from .import_serializer import FileImportSerializer
 
 from ...jsonrpc import AutorestAPI
-from ..models import CodeModel
+from ..models import CodeModel, GlobalParameter
 from ... import ReaderAndWriter, ReaderAndWriterAutorest
 
 __all__ = [
@@ -26,6 +26,15 @@ _FILE_TO_TEMPLATE = {
 }
 
 
+def _method_signature_helper(
+    parameters: List[GlobalParameter], async_mode: bool
+) -> List[str]:
+    return [
+        p.signature(async_mode)
+        for p in sorted(parameters, key=lambda p: p.required, reverse=True)
+    ]
+
+
 def _get_file_path(filename: str, async_mode: bool) -> Path:
     filename += ".py"
     if async_mode:
@@ -48,8 +57,26 @@ class MultiAPISerializer(ReaderAndWriter):  # pylint: disable=abstract-method
     def _serialize_helper(self, code_model: CodeModel, async_mode: bool) -> None:
         def _render_template(file: str, **kwargs: Any) -> str:
             template = self.env.get_template(_FILE_TO_TEMPLATE[file])
+            all_params = (
+                code_model.global_parameters.parameters
+                + code_model.global_parameters.service_client_specific_global_parameters
+            )
+            positional_params = [
+                p for p in all_params if p.method_location == "positional"
+            ]
+            keyword_only_params = [
+                p for p in all_params if p.method_location == "keywordOnly"
+            ]
             return template.render(
-                code_model=code_model, async_mode=async_mode, **kwargs
+                code_model=code_model,
+                async_mode=async_mode,
+                positional_params=_method_signature_helper(
+                    positional_params, async_mode
+                ),
+                keyword_only_params=_method_signature_helper(
+                    keyword_only_params, async_mode
+                ),
+                **kwargs
             )
 
         # serialize init file

package/autorest/multiapi/templates/multiapi_service_client.py.jinja2

@@ -1,18 +1,14 @@
 {% macro method_signature() %}
 def __init__(
     self,
-    {% for parameter in code_model.global_parameters.parameters %}
-        {% if parameter.required %}
-    {{ parameter.signature(async_mode) }}
-        {% endif %}
-    {% endfor %}
-    {% for parameter in code_model.global_parameters.parameters %}
-        {% if not parameter.required %}
-    {{ parameter.signature(async_mode) }}
-        {% endif %}
+    {% for pos in positional_params %}
+    {{ pos }}
     {% endfor %}
-    {% for parameter in code_model.global_parameters.service_client_specific_global_parameters %}
-    {{ parameter.signature(async_mode) }}
+    {% if keyword_only_params %}
+    *,
+    {% endif %}
+    {% for ko in keyword_only_params %}
+    {{ ko }}
     {% endfor %}
     **kwargs: Any
 ){{" -> None" if async_mode else "" }}:{% endmacro %}
@@ -92,7 +88,7 @@ class {{ code_model.client.name }}({% if code_model.operation_mixin_group.mixin_
             raise ValueError("API version {} is not available".format(api_version))
         {% endif %}
         self._config = {{ code_model.client.name }}Configuration({{ code_model.global_parameters.call }}{{ ", " if code_model.global_parameters.call }}**kwargs)
-        self._client = {{ async_prefix }}{{ code_model.client.pipeline_client }}(base_url=base_url, config=self._config, **kwargs)
+        self._client = {{ async_prefix }}{{ code_model.client.pipeline_client }}(base_url={{ code_model.host_variable_name }}, config=self._config, **kwargs)
         super({{ code_model.client.name }}, self).__init__(
             api_version=api_version,
             profile=profile

package/autorest/postprocess/get_all.py

@@ -15,5 +15,7 @@ def main(namespace):
 if __name__ == "__main__":
     patched = ",".join(main(sys.argv[1]))
     output_folder = sys.argv[2]
-    with open(f"{output_folder}/.temp_folder/patched.txt", "w") as f:
+    with open(
+        f"{output_folder}/.temp_folder/patched.txt", "w", encoding="utf-8-sig"
+    ) as f:
         f.write(patched)

package/autorest/postprocess/venvtools.py

@@ -48,7 +48,7 @@ def create(
 
 
 def python_run(  # pylint: disable=inconsistent-return-statements
-    venv_context, module, command, directory=_ROOT_DIR, *, error_ok=False
+    venv_context, module, command, directory=_ROOT_DIR
 ) -> Optional[str]:
     try:
         cmd_line = [
@@ -64,10 +64,11 @@ def python_run(  # pylint: disable=inconsistent-return-statements
             stdout=False,
         )
         if module == "get_all":
-            with open(f"{command[1]}/.temp_folder/patched.txt", "r") as f:
+            with open(
+                f"{command[1]}/.temp_folder/patched.txt", "r", encoding="utf-8-sig"
+            ) as f:
                 return f.read()
     except subprocess.CalledProcessError as err:
         print(err)
-        if not error_ok:
-            sys.exit(1)
+        sys.exit(1)
     return None

package/autorest/preprocess/__init__.py

@@ -60,13 +60,21 @@ def update_overload_section(
                     overload_h["type"] = original_h["type"]
 
 
-def add_overload(yaml_data: Dict[str, Any], body_type: Dict[str, Any]):
+def add_overload(
+    yaml_data: Dict[str, Any], body_type: Dict[str, Any], for_flatten_params=False
+):
     overload = copy.deepcopy(yaml_data)
     overload["isOverload"] = True
     overload["bodyParameter"]["type"] = body_type
 
     overload["overloads"] = []
 
+    if for_flatten_params:
+        overload["bodyParameter"]["flattened"] = True
+    else:
+        overload["parameters"] = [
+            p for p in overload["parameters"] if not p.get("inFlattenedBody")
+        ]
     # for yaml sync, we need to make sure all of the responses, parameters, and exceptions' types have the same yaml id
     for overload_p, original_p in zip(overload["parameters"], yaml_data["parameters"]):
         overload_p["type"] = original_p["type"]
@@ -107,6 +115,10 @@ def add_overloads_for_body_param(yaml_data: Dict[str, Any]) -> None:
         ):
             continue
         yaml_data["overloads"].append(add_overload(yaml_data, body_type))
+        if body_type.get("type") == "model" and body_type.get("base") == "json":
+            yaml_data["overloads"].append(
+                add_overload(yaml_data, body_type, for_flatten_params=True)
+            )
     content_type_param = next(
         p for p in yaml_data["parameters"] if p["restApiName"].lower() == "content-type"
     )
@@ -162,9 +174,9 @@ def update_parameter(yaml_data: Dict[str, Any]) -> None:
     if yaml_data.get("propertyToParameterName"):
         # need to create a new one with padded keys and values
         yaml_data["propertyToParameterName"] = {
-            pad_reserved_words(prop, PadType.PROPERTY)
-            .lower(): pad_reserved_words(param_name, PadType.PARAMETER)
-            .lower()
+            pad_reserved_words(prop, PadType.PROPERTY): pad_reserved_words(
+                param_name, PadType.PARAMETER
+            )
             for prop, param_name in yaml_data["propertyToParameterName"].items()
         }
 

package/autorest/preprocess/python_mappings.py

@@ -173,6 +173,7 @@ REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores
     "min",
     "max",
     "filter",
+    "property",
 ]
 
 BUILTIN_PACKAGES = [

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@autorest/python",
-  "version": "6.2.12",
+  "version": "6.2.15",
   "description": "The Python extension for generators in AutoRest.",
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/autorest.python/tree/autorestv3"

package/requirements.txt

@@ -1,13 +1,13 @@
-black==22.6.0
+black==22.12.0
 click==8.1.3
-docutils==0.18
+docutils==0.19
 Jinja2==3.1.2
-json-rpc==1.13.0
-m2r2==0.3.2
+json-rpc==1.14.0
+m2r2==0.3.3
 MarkupSafe==2.1.1
 mistune==0.8.4
 mypy-extensions==0.4.3
-pathspec==0.9.0
-platformdirs==2.5.2
+pathspec==0.10.3
+platformdirs==2.6.2
 PyYAML==6.0
 tomli==2.0.1

package/setup.py

@@ -52,6 +52,5 @@ setup(
         "pyyaml",
         "m2r2",
         "black",
-        "docutils<0.19", # m2r2 fails with docutils 0.19
     ],
 )

package/venvtools.py

@@ -56,7 +56,7 @@ def create_venv_with_package(packages):
             subprocess.check_call(pip_call + packages)
         yield myenv
 
-def python_run(venv_context, module, command=None, *, additional_dir=".", error_ok=False):
+def python_run(venv_context, module, command=None, *, additional_dir="."):
     try:
         cmd_line= [
             venv_context.env_exe,
@@ -70,5 +70,4 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_
         )
     except subprocess.CalledProcessError as err:
         print(err)
-        if not error_ok:
-            sys.exit(1)
+        sys.exit(1)