@autorest/python 6.0.1 → 6.1.2

package/autorest/codegen/models/parameter.py

@@ -306,6 +306,10 @@ class Parameter(_ParameterBase):
     def xml_serialization_ctxt(self) -> str:
         return self.type.xml_serialization_ctxt or ""
 
+    @property
+    def is_content_type(self) -> bool:
+        return bool(self.rest_api_name) and self.rest_api_name.lower() == "content-type"
+
     @property
     def method_location(self) -> ParameterMethodLocation:
         if not self.in_method_signature:
@@ -314,7 +318,7 @@ class Parameter(_ParameterBase):
             return ParameterMethodLocation.POSITIONAL
         if self.constant:
             return ParameterMethodLocation.KWARG
-        if self.rest_api_name == "Content-Type":
+        if self.is_content_type:
             if self.in_overload:
                 return ParameterMethodLocation.KEYWORD_ONLY
             return ParameterMethodLocation.KWARG

package/autorest/codegen/models/property.py

@@ -110,14 +110,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         from .model_type import ModelType
 
         if isinstance(self.type, ModelType):
-            is_polymorphic_subtype = (
-                self.type.discriminator_value and not self.type.discriminated_subtypes
-            )
-            if (
-                self.type.name not in (m.name for m in polymorphic_subtypes)
-                and is_polymorphic_subtype
-            ):
-                polymorphic_subtypes.append(self.type)
+            self.type.get_polymorphic_subtypes(polymorphic_subtypes)
 
     @property
     def validation(self) -> Optional[Dict[str, Any]]:

package/autorest/codegen/models/request_builder_parameter.py

@@ -95,7 +95,7 @@ class RequestBuilderParameter(Parameter):
     ) -> None:
         super().__init__(yaml_data, code_model, type)
         # we don't want any default content type behavior in request builder
-        if self.rest_api_name == "Content-Type":
+        if self.is_content_type:
             self.client_default_value = None
         if self.grouped_by and self.client_name[0] == "_":
             # we don't want hidden parameters for grouped by in request builders

package/autorest/codegen/models/response.py

@@ -55,6 +55,10 @@ class Response(BaseModel):
         self.type = type
         self.nullable = yaml_data.get("nullable")
 
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+        if self.type:
+            self.type.get_polymorphic_subtypes(polymorphic_subtypes)
+
     def get_json_template_representation(self) -> Any:
         if not self.type:
             return None
@@ -137,6 +141,9 @@ class PagingResponse(Response):
         super().__init__(*args, **kwargs)
         self.item_type = self.code_model.lookup_type(id(self.yaml_data["itemType"]))
 
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+        return self.item_type.get_polymorphic_subtypes(polymorphic_subtypes)
+
     def get_json_template_representation(self) -> Any:
         return self.item_type.get_json_template_representation()
 

package/autorest/codegen/models/utils.py

@@ -3,11 +3,8 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-import re
 from typing import TypeVar, Dict
 
-JSON_REGEXP = re.compile(r"^(application|text)/(.+\+)?json$")
-
 T = TypeVar("T")
 OrderedSet = Dict[T, None]
 

package/autorest/codegen/serializers/__init__.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Dict, List, Optional, Any, Union
+from typing import Dict, List, Optional, Any, Union, cast
 from pathlib import Path
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
 from autorest.codegen.models.operation_group import OperationGroup
@@ -40,8 +40,10 @@ _REGENERATE_FILES = {"setup.py", "MANIFEST.in"}
 
 
 class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
-    def __init__(self, code_model: CodeModel, **kwargs: Any) -> None:
-        super().__init__(**kwargs)
+    def __init__(
+        self, code_model: CodeModel, *, output_folder: Union[str, Path], **kwargs: Any
+    ) -> None:
+        super().__init__(output_folder=output_folder, **kwargs)
         self.code_model = code_model
 
     @property
@@ -133,7 +135,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             if self.read_file(namespace_path / Path("models.py")):
                 self.write_file(
                     namespace_path / Path("models.py"),
-                    self.read_file(namespace_path / Path("models.py")),
+                    cast(str, self.read_file(namespace_path / Path("models.py"))),
                 )
 
         if self.code_model.options["package_mode"]:
@@ -150,7 +152,9 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
                     self.write_file(output_name, render_result)
 
         def _prepare_params() -> Dict[Any, Any]:
-            package_parts = package_name.split("-")[:-1]
+            package_parts = (self.code_model.options["package_name"] or "").split("-")[
+                :-1
+            ]
             token_cred = isinstance(
                 getattr(self.code_model.credential, "type", None), TokenCredentialType
             )
@@ -177,14 +181,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             params.update(self.code_model.package_dependency)
             return params
 
-        package_name = (
-            self.code_model.options["package_name"]
-            or self.code_model.client.name.lower()
-        )
-        count = package_name.count("-") + 1
-        for _ in range(count):
-            out_path = out_path / Path("..")
-
+        out_path = out_path / Path("../" * (self.code_model.namespace.count(".") + 1))
         if self.code_model.options["package_mode"] in ("dataplane", "mgmtplane"):
             env = Environment(
                 loader=PackageLoader("autorest.codegen", "templates"),
@@ -484,5 +481,13 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
 
 
 class JinjaSerializerAutorest(JinjaSerializer, ReaderAndWriterAutorest):
-    def __init__(self, autorestapi: AutorestAPI, code_model: CodeModel) -> None:
-        super().__init__(autorestapi=autorestapi, code_model=code_model)
+    def __init__(
+        self,
+        autorestapi: AutorestAPI,
+        code_model: CodeModel,
+        *,
+        output_folder: Union[str, Path],
+    ) -> None:
+        super().__init__(
+            autorestapi=autorestapi, code_model=code_model, output_folder=output_folder
+        )

package/autorest/codegen/serializers/builder_serializer.py

@@ -79,9 +79,7 @@ def _improve_json_string(template_representation: str) -> Any:
 
 def _json_dumps_template(template_representation: Any) -> Any:
     # only for template use, since it wraps everything in strings
-    return _improve_json_string(
-        json.dumps(template_representation, sort_keys=True, indent=4)
-    )
+    return _improve_json_string(json.dumps(template_representation, indent=4))
 
 
 def _get_polymorphic_subtype_template(polymorphic_subtype: ModelType) -> List[str]:
@@ -533,7 +531,7 @@ class _OperationSerializer(
             polymorphic_subtypes: List[ModelType] = []
             if not response.type:
                 continue
-            response.type.get_polymorphic_subtypes(polymorphic_subtypes)
+            response.get_polymorphic_subtypes(polymorphic_subtypes)
             if polymorphic_subtypes:
                 # we just assume one kind of polymorphic body for input
                 discriminator_name = cast(
@@ -693,7 +691,9 @@ class _OperationSerializer(
             if (
                 not body_param.default_content_type
                 and not next(
-                    p for p in builder.parameters if p.rest_api_name == "Content-Type"
+                    p
+                    for p in builder.parameters
+                    if p.rest_api_name.lower() == "content-type"
                 ).optional
             ):
                 content_types = "'" + "', '".join(body_param.content_types) + "'"

package/autorest/codegen/templates/README.md.jinja2

@@ -2,7 +2,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft {{package_pprint_name}} Client Library.
-This package has been tested with Python 3.6+.
+This package has been tested with Python 3.7+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 # Usage
@@ -17,7 +17,7 @@ Additional code samples for different Azure services are available at [Samples R
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project. 
+section of the project.
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2F{{package_name}}%2FREADME.png)
@@ -35,7 +35,7 @@ python -m pip install {{ package_name }}
 
 #### Prequisites
 
-- Python 3.6 or later is required to use this package.
+- Python 3.7 or later is required to use this package.
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 

package/autorest/codegen/templates/setup.py.jinja2

@@ -54,7 +54,6 @@ setup(
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -94,7 +93,7 @@ setup(
         {% endif %}
     ],
     {% if package_mode %}
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     {% else %}
     long_description="""\
     {{ code_model.client.description }}

package/autorest/jsonrpc/server.py

@@ -26,6 +26,7 @@ def GetPluginNames():
         "black",
         "multiapiscript",
         "postprocess",
+        "multiclientscript",
     ]
 
 
@@ -56,11 +57,16 @@ def Process(plugin_name: str, session_id: str) -> bool:
             from ..black import BlackScriptPluginAutorest as PluginToLoad  # type: ignore
         elif plugin_name == "multiapiscript":
             from ..multiapi import MultiApiScriptPluginAutorest as PluginToLoad  # type: ignore
+        elif plugin_name == "multiclientscript":
+            from ..multiclient import MultiClientPluginAutorest as PluginToLoad  # type: ignore
         else:
             _LOGGER.fatal("Unknown plugin name %s", plugin_name)
             raise RuntimeError(f"Unknown plugin name {plugin_name}")
 
-        plugin = PluginToLoad(autorestapi=stdstream_connection)
+        plugin = PluginToLoad(
+            autorestapi=stdstream_connection,
+            output_folder=stdstream_connection.get_value("output-folder"),
+        )
 
         try:
             _LOGGER.debug("Starting plugin %s", PluginToLoad.__name__)

package/autorest/m2r/__init__.py

@@ -8,20 +8,21 @@
 import logging
 from typing import Any, Dict, Set
 
-import m2r
+import m2r2
 
 from .. import YamlUpdatePluginAutorest, YamlUpdatePlugin
+from .._utils import parse_args
 
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class AutorestRender(m2r.RestRenderer):
+class AutorestRender(m2r2.RestRenderer):
     """Redefine the concept of inline HTML in the renderer, we don't want to define a new format
     in the description/summary.
     """
 
-    def inline_html(self, html: str) -> str:
+    def inline_html(self, html: str) -> str:  # pylint: disable=no-self-use
         """Do not render inline HTML with a role definition."""
         return f":code:`{html}`"
 
@@ -55,7 +56,7 @@ class M2R(YamlUpdatePlugin):  # pylint: disable=abstract-method
     def convert_to_rst(string_to_convert: str) -> str:
         """Convert that string from MD to RST."""
         try:
-            return m2r.convert(string_to_convert, renderer=AutorestRender()).strip()
+            return m2r2.convert(string_to_convert, renderer=AutorestRender()).strip()
         except Exception:  # pylint: disable=broad-except
             return string_to_convert
 
@@ -63,3 +64,9 @@ class M2R(YamlUpdatePlugin):  # pylint: disable=abstract-method
 class M2RAutorest(YamlUpdatePluginAutorest, M2R):
     def get_options(self) -> Dict[str, Any]:
         return {}
+
+
+if __name__ == "__main__":
+    # CADL pipeline will call this
+    args = parse_args()
+    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file).process()

package/autorest/m4reformatter/__init__.py

@@ -6,27 +6,25 @@
 # --------------------------------------------------------------------------
 """The modelerfour reformatter autorest plugin.
 """
-import re
 import copy
 import logging
 from typing import Callable, Dict, Any, Iterable, List, Optional, Set
 
+from .._utils import (
+    to_snake_case,
+    KNOWN_TYPES,
+    get_body_type_for_description,
+    JSON_REGEXP,
+)
 from .. import YamlUpdatePluginAutorest
 
-JSON_REGEXP = re.compile(r"^(application|text)/(.+\+)?json$")
+
 ORIGINAL_ID_TO_UPDATED_TYPE: Dict[int, Dict[str, Any]] = {}
 OAUTH_TYPE = "OAuth2"
 KEY_TYPE = "Key"
 
 _LOGGER = logging.getLogger(__name__)
 
-# used if we want to get a string / binary type etc
-KNOWN_TYPES: Dict[str, Dict[str, Any]] = {
-    "string": {"type": "string"},
-    "binary": {"type": "binary"},
-    "anydict": {"type": "dict", "elementType": {"type": "any"}},
-}
-
 
 def is_body(yaml_data: Dict[str, Any]) -> bool:
     """Return true if passed in parameter is a body param"""
@@ -328,14 +326,6 @@ def get_all_body_types(yaml_data: Dict[str, Any]) -> List[Dict[str, Any]]:
     return list(seen_body_types.values())
 
 
-def get_body_type_for_description(body_parameter: Dict[str, Any]) -> str:
-    if body_parameter["type"]["type"] == "binary":
-        return "binary"
-    if body_parameter["type"]["type"] == "string":
-        return "string"
-    return "JSON"
-
-
 def add_lro_information(operation: Dict[str, Any], yaml_data: Dict[str, Any]) -> None:
     operation["discriminator"] = "lro"
     extensions = yaml_data["extensions"]
@@ -478,7 +468,7 @@ class M4Reformatter(
                 group_name, yaml_data, body_type, content_types=content_types
             )
             for parameter in overload["parameters"]:
-                if parameter["restApiName"] == "Content-Type":
+                if parameter["restApiName"].lower() == "content-type":
                     parameter["clientDefaultValue"] = overload["bodyParameter"][
                         "defaultContentType"
                     ]
@@ -556,23 +546,6 @@ class M4Reformatter(
             else None
         )
         content_types = None
-        if (  # pylint: disable=too-many-boolean-expressions
-            body_parameter
-            and body_parameter["type"]["type"] != "combined"
-            and yaml_data.get("requestMediaTypes")
-            and any(
-                ct for ct in yaml_data["requestMediaTypes"] if JSON_REGEXP.match(ct)
-            )
-            and body_parameter["type"]["type"] in ("model", "dict", "list")
-            and not body_parameter["type"]["xmlMetadata"]
-            and not body_parameter.get("flattened")
-            and not body_parameter.get("groupedBy")
-        ):
-            combined_type = update_types(
-                [body_parameter["type"], KNOWN_TYPES["binary"]]
-            )
-            body_parameter["type"] = combined_type
-            content_types = body_parameter["contentTypes"]
         operation = self._update_operation_helper(group_name, yaml_data, body_parameter)
         operation["overloads"] = self.update_overloads(
             group_name, yaml_data, body_parameter, content_types=content_types
@@ -842,7 +815,10 @@ class M4Reformatter(
                 continue
             if is_body(param):
                 continue
-            if param["language"]["default"].get("serializedName") == "Content-Type":
+            if (
+                param["language"]["default"].get("serializedName").lower()
+                == "content-type"
+            ):
                 param = self._update_content_type_parameter(
                     param,
                     body_parameter,
@@ -1100,7 +1076,7 @@ class M4Reformatter(
             if yaml_data.get("globalParameters")
             else "",
             "namespace": self._autorestapi.get_value("namespace")
-            or yaml_data["language"]["default"]["name"],
+            or to_snake_case(yaml_data["info"]["title"].replace(" ", "")),
         }
 
     def update_yaml(self, yaml_data: Dict[str, Any]) -> None:

package/autorest/multiapi/__init__.py

@@ -41,7 +41,7 @@ class MultiApiScriptPluginAutorest(MultiApiScriptPlugin, PluginAutorest):
         return MultiAPIAutorest(
             autorestapi=self._autorestapi,
             input_package_name=self.options.get("package-name"),
-            output_folder=self.options["output-folder"],
+            output_folder=self.output_folder,
             user_specified_default_api=self.options.get("default-api"),
             no_async=self.options.get("no-async", False),
         )
@@ -49,7 +49,6 @@ class MultiApiScriptPluginAutorest(MultiApiScriptPlugin, PluginAutorest):
     def get_options(self) -> Dict[str, Any]:
         options = {
             "package-name": self._autorestapi.get_value("package-name"),
-            "output-folder": self._autorestapi.get_value("output-folder"),
             "default-api": self._autorestapi.get_value("default-api"),
             "no-async": self._autorestapi.get_value("no-async"),
         }
@@ -66,15 +65,13 @@ class MultiAPI(ReaderAndWriter):  # pylint: disable=abstract-method
         user_specified_default_api: Optional[str] = None,
         **kwargs: Any,
     ) -> None:
-        super().__init__(**kwargs)
+        super().__init__(output_folder=Path(output_folder).resolve(), **kwargs)
         if input_package_name is None:
             raise ValueError(
                 "package-name is required, either provide it as args or check your readme configuration"
             )
         self.input_package_name = input_package_name
         _LOGGER.debug("Received package name %s", input_package_name)
-
-        self.output_folder = Path(output_folder).resolve()
         _LOGGER.debug("Received output-folder %s", output_folder)
         self.output_package_name: str = ""
         self.no_async = no_async
@@ -194,4 +191,6 @@ class MultiAPIAutorest(MultiAPI, ReaderAndWriterAutorest):
 
     @property
     def serializer(self) -> MultiAPISerializer:
-        return MultiAPISerializerAutorest(self._autorestapi)
+        return MultiAPISerializerAutorest(
+            self._autorestapi, output_folder=self.output_folder
+        )

package/autorest/multiapi/serializers/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Optional, Union
 from jinja2 import PackageLoader, Environment
 
 from .import_serializer import FileImportSerializer
@@ -122,5 +122,7 @@ class MultiAPISerializer(ReaderAndWriter):  # pylint: disable=abstract-method
 
 
 class MultiAPISerializerAutorest(MultiAPISerializer, ReaderAndWriterAutorest):
-    def __init__(self, autorestapi: AutorestAPI) -> None:
-        super().__init__(autorestapi=autorestapi)
+    def __init__(
+        self, autorestapi: AutorestAPI, *, output_folder: Union[str, Path]
+    ) -> None:
+        super().__init__(autorestapi=autorestapi, output_folder=output_folder)

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

@@ -15,4 +15,8 @@ try:
     patch_sdk()
 except ImportError:
     pass
+
+from ._version import VERSION
+
+__version__ = VERSION
 {% endif %}

package/autorest/multiclient/__init__.py

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import logging
+from typing import Any, Dict
+from pathlib import Path
+from jinja2 import Environment, PackageLoader
+from .. import Plugin, PluginAutorest
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class MultiClientPlugin(Plugin):  # pylint: disable=abstract-method
+    def process(self) -> bool:
+        _LOGGER.info("Generating files for multi client")
+
+        env = Environment(
+            loader=PackageLoader("autorest.multiclient", "templates"),
+            keep_trailing_newline=True,
+            line_statement_prefix="##",
+            line_comment_prefix="###",
+            trim_blocks=True,
+            lstrip_blocks=True,
+        )
+
+        # __init__.py
+        template = env.get_template("init.py.jinja2")
+        self.write_file(Path("__init__.py"), template.render())
+
+        # _version.py
+        template = env.get_template("version.py.jinja2")
+        self.write_file(
+            Path("_version.py"),
+            template.render(
+                package_version=self.options.get("package-version") or "1.0.0b1"
+            ),
+        )
+
+        # py.typed
+        self.write_file(Path("py.typed"), "# Marker file for PEP 561.")
+
+        _LOGGER.info("Generating Done for multi client!")
+        return True
+
+
+class MultiClientPluginAutorest(MultiClientPlugin, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        return {"package-version": self._autorestapi.get_value("package-version")}

package/autorest/multiclient/templates/init.py.jinja2

@@ -0,0 +1,8 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from ._version import VERSION
+__version__ = VERSION

package/autorest/multiclient/templates/version.py.jinja2

@@ -0,0 +1,8 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+VERSION = "{{ package_version }}"

package/autorest/postprocess/__init__.py

@@ -66,7 +66,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             init_file = next(d for d in dir.iterdir() if d.name == "__init__.py")
             # we don't care about pkgutil inits, we skip over them
             file_content = self.read_file(init_file.relative_to(self.output_folder))
-            if not "pkgutil" in file_content:
+            if "pkgutil" not in file_content:
                 return dir, namespace
         except StopIteration:
             pass