@autorest/python 6.9.5 → 6.9.7

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

@@ -24,7 +24,7 @@ with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
 
 if not version:
     raise RuntimeError("Cannot find version information")
-{% set description = "\"" + company_name + " {} Client Library for Python\".format(PACKAGE_PPRINT_NAME)" %}
+{% set description = "\"" + code_model.options["company_name"] + " {} Client Library for Python\".format(PACKAGE_PPRINT_NAME)" %}
 {% set author_email = "azpysdkhelp@microsoft.com" %}
 {% set url = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" %}
 {% else %}
@@ -43,10 +43,10 @@ setup(
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",
     license="MIT License",
-    author="{{ company_name }} Corporation",
+    author="{{ code_model.options["company_name"] }} Corporation",
     {% endif %}
-    author_email="{{ author_email }}",
     {% if not unbranded %}
+    author_email="{{ author_email }}",
     url="{{ url }}",
     keywords="azure, azure sdk",
     {% endif %}
@@ -77,7 +77,7 @@ setup(
     ),
     include_package_data=True,
     package_data={
-        'pytyped': ['py.typed'],
+        '{{ code_model.namespace }}': ['py.typed'],
     },
     {% else %}
     packages=find_packages(),

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

@@ -1,5 +1,5 @@
 # ------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) {{ code_model.options["company_name"] }} Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
 """Customize generated code here.

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

@@ -1,6 +1,6 @@
 # --------------------------------------------------------------------------
 #
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) {{ code_model.options["company_name"] }} Corporation. All rights reserved.
 #
 # The MIT License (MIT)
 #
@@ -63,8 +63,8 @@ import xml.etree.ElementTree as ET
 
 import isodate  # type: ignore
 
-from {{ import_core_exceptions }} import DeserializationError, SerializationError
-from {{ import_core_serialization }} import NULL as AzureCoreNull
+from {{ code_model.core_library }}.exceptions import DeserializationError, SerializationError
+from {{ code_model.core_library }}.serialization import NULL as CoreNull
 
 _BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
 
@@ -732,7 +732,6 @@ class Serializer(object):
 
             if kwargs.get("skip_quote") is True:
                 output = str(output)
-                # https://github.com/Azure/autorest.python/issues/2063
                 output = output.replace("{", quote("{")).replace("}", quote("}"))
             else:
                 output = quote(str(output), safe="")
@@ -808,7 +807,7 @@ class Serializer(object):
             raise ValueError("No value for given attribute")
 
         try:
-            if data is AzureCoreNull:
+            if data is CoreNull:
                 return None
             if data_type in self.basic_types.values():
                 return self.serialize_basic(data, data_type, **kwargs)
@@ -1217,7 +1216,6 @@ def rest_key_extractor(attr, attr_desc, data):
         if working_data is None:
             # If at any point while following flatten JSON path see None, it means
             # that all properties under are None as well
-            # https://github.com/Azure/msrest-for-python/issues/197
             return None
         key = ".".join(dict_keys[1:])
 
@@ -1238,7 +1236,6 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data):
         if working_data is None:
             # If at any point while following flatten JSON path see None, it means
             # that all properties under are None as well
-            # https://github.com/Azure/msrest-for-python/issues/197
             return None
         key = ".".join(dict_keys[1:])
 

package/autorest/multiapi/models/code_model.py

@@ -45,6 +45,8 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes
             default_version_metadata["global_parameters"]
         )
         self.user_specified_default_api = user_specified_default_api
+        self.options: Dict[str, Any] = {"unbranded": False, "company_name": "Microsoft"}
+        self.core_library = "azure.core"
 
     @property
     def operation_groups(self) -> List[OperationGroup]:

package/autorest/multiapi/serializers/__init__.py

@@ -150,8 +150,7 @@ class MultiAPISerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             self.write_file(
                 Path("_serialization.py"),
                 codegen_env.get_template("serialization.py.jinja2").render(
-                    import_core_exceptions="azure.core.exceptions",
-                    import_core_serialization="azure.core.serialization",
+                    code_model=code_model,
                 ),
             )
 

package/autorest/preprocess/__init__.py

@@ -20,30 +20,6 @@ from .. import YamlUpdatePlugin, YamlUpdatePluginAutorest
 from .._utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES
 
 
-def add_body_param_type(
-    code_model: Dict[str, Any],
-    body_parameter: Dict[str, Any],
-):
-    if (
-        body_parameter
-        and body_parameter["type"]["type"] in ("model", "dict", "list")
-        and any(
-            ct for ct in body_parameter.get("contentTypes", []) if JSON_REGEXP.match(ct)
-        )
-        and not body_parameter["type"].get("xmlMetadata")
-        and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
-    ):
-        origin_type = body_parameter["type"]["type"]
-        is_dpg_model = body_parameter["type"].get("base") == "dpg"
-        body_parameter["type"] = {
-            "type": "combined",
-            "types": [body_parameter["type"], KNOWN_TYPES["binary"]],
-        }
-        if origin_type == "model" and is_dpg_model:
-            body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
-        code_model["types"].append(body_parameter["type"])
-
-
 def update_overload_section(
     overload: Dict[str, Any],
     yaml_data: Dict[str, Any],
@@ -216,6 +192,32 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
     def is_cadl(self) -> bool:
         return self.options.get("cadl_file", False)
 
+    def add_body_param_type(
+        self,
+        code_model: Dict[str, Any],
+        body_parameter: Dict[str, Any],
+    ):
+        if (
+            body_parameter
+            and body_parameter["type"]["type"] in ("model", "dict", "list")
+            and any(
+                ct
+                for ct in body_parameter.get("contentTypes", [])
+                if JSON_REGEXP.match(ct)
+            )
+            and not body_parameter["type"].get("xmlMetadata")
+            and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
+        ):
+            origin_type = body_parameter["type"]["type"]
+            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            body_parameter["type"] = {
+                "type": "combined",
+                "types": [body_parameter["type"], KNOWN_TYPES["binary"]],
+            }
+            if origin_type == "model" and is_dpg_model and self.models_mode == "dpg":
+                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            code_model["types"].append(body_parameter["type"])
+
     def pad_reserved_words(self, name: str, pad_type: PadType):
         # we want to pad hidden variables as well
         if not name:
@@ -413,7 +415,7 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             response["discriminator"] = "operation"
         if body_parameter and not is_overload:
             # if we have a JSON body, we add a binary overload
-            add_body_param_type(code_model, body_parameter)
+            self.add_body_param_type(code_model, body_parameter)
             add_overloads_for_body_param(yaml_data)
 
     def _update_lro_operation_helper(self, yaml_data: Dict[str, Any]) -> None:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.9.5",
+  "version": "6.9.7",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {