@autorest/python 6.9.6 → 6.9.8

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

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) {{ code_model.options["company_name"] }} Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
@@ -19,10 +19,10 @@ import email
 from datetime import datetime, date, time, timedelta, timezone
 from json import JSONEncoder
 import isodate
-from {{ file_import.import_core_exceptions }} import DeserializationError
-from {{ file_import.import_core_case_insensitive_enum }} import CaseInsensitiveEnumMeta
-from {{ file_import.import_core_pipeline }} import PipelineResponse
-from {{ file_import.import_core_serialization }} import _Null
+from {{ code_model.core_library }}.exceptions import DeserializationError
+from {{ code_model.core_library }}{{ ".utils" if code_model.options["unbranded"] else "" }} import CaseInsensitiveEnumMeta
+from {{ code_model.core_library }}.{{ "runtime." if code_model.options["unbranded"] else "" }}pipeline import PipelineResponse
+from {{ code_model.core_library }}.serialization import _Null
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -31,7 +31,7 @@ else:
 
 _LOGGER = logging.getLogger(__name__)
 
-__all__ = ["AzureJSONEncoder", "Model", "rest_field", "rest_discriminator"]
+__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 TZ_UTC = timezone.utc
 
@@ -125,7 +125,7 @@ def _is_readonly(p):
         return False
 
 
-class AzureJSONEncoder(JSONEncoder):
+class SdkJSONEncoder(JSONEncoder):
     """A JSON encoder that's capable of serializing datetime objects and bytes."""
 
     def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs):
@@ -140,7 +140,7 @@ class AzureJSONEncoder(JSONEncoder):
                 return {k: v for k, v in o.items() if k not in readonly_props}
             return dict(o.items())
         try:
-            return super(AzureJSONEncoder, self).default(o)
+            return super(SdkJSONEncoder, self).default(o)
         except TypeError:
             if isinstance(o, _Null):
                 return None
@@ -157,7 +157,7 @@ class AzureJSONEncoder(JSONEncoder):
             except AttributeError:
                 # This will be raised when it hits value.total_seconds in the method above
                 pass
-            return super(AzureJSONEncoder, self).default(o)
+            return super(SdkJSONEncoder, self).default(o)
 
 
 _VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
@@ -754,9 +754,12 @@ def _deserialize(
     value: typing.Any,
     module: typing.Optional[str] = None,
     rf: typing.Optional["_RestField"] = None,
+    format: typing.Optional[str] = None,
 ) -> typing.Any:
     if isinstance(value, PipelineResponse):
         value = value.http_response.json()
+    if rf is None and format:
+        rf = _RestField(format=format)
     deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf)
     return _deserialize_with_callable(deserializer, value)
 

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

@@ -14,7 +14,7 @@
     {% endif %}
     {% if (model.properties | selectattr('optional', "equalto", false) | first) is defined %}
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
     {% endif %}
 
     {% if model.properties != None %}

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

@@ -15,7 +15,7 @@
     {% endif %}
     {% if (model.properties | selectattr('optional', "equalto", false) | first) is defined %}
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
     {% endif %}
 
     {% if model.properties != None %}

package/autorest/codegen/templates/packaging_templates/LICENSE.jinja2

@@ -1,4 +1,4 @@
-Copyright (c) {{ company_name }} Corporation.
+Copyright (c) {{ code_model.options["company_name"] }} Corporation.
 
 MIT License
 

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

@@ -67,7 +67,7 @@ Use the returned token credential to authenticate the client:
 ```python
 >>> from {{ namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
->>> from {{ file_import.import_core_exceptions }} import HttpResponseError
+>>> from {{ code_model.core_library }}.exceptions import HttpResponseError
 
 >>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
 >>> try:

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 %}
@@ -90,7 +90,7 @@ setup(
         "isodate<1.0.0,>=0.6.1",
         {% endif %}
         {% if unbranded %}
-        "corehttp",
+        "corehttp[requests]",
         {% elif azure_arm %}
         "azure-mgmt-core<2.0.0,>=1.3.2",
         {% else %}

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/package.json

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