@autorest/python 6.9.4 → 6.9.5

package/autorest/codegen/serializers/model_serializer.py

@@ -6,10 +6,10 @@
 from typing import List
 from abc import ABC, abstractmethod
 
-from jinja2 import Environment
-from ..models import ModelType, CodeModel, Property, ConstantType, EnumValue
+from ..models import ModelType, Property, ConstantType, EnumValue
 from ..models.imports import FileImport, TypingSection, MsrestImportType, ImportType
 from .import_serializer import FileImportSerializer
+from .base_serializer import BaseSerializer
 
 
 def _documentation_string(
@@ -28,11 +28,7 @@ def _documentation_string(
     return retval
 
 
-class _ModelSerializer(ABC):
-    def __init__(self, code_model: CodeModel, env: Environment) -> None:
-        self.code_model = code_model
-        self.env = env
-
+class _ModelSerializer(BaseSerializer, ABC):
     @abstractmethod
     def imports(self) -> FileImport:
         ...
@@ -133,7 +129,7 @@ class _ModelSerializer(ABC):
 
 class MsrestModelSerializer(_ModelSerializer):
     def imports(self) -> FileImport:
-        file_import = FileImport(self.code_model)
+        file_import = self.init_file_import()
         file_import.add_msrest_import(
             relative_path="..",
             msrest_import_type=MsrestImportType.Module,
@@ -202,7 +198,7 @@ class MsrestModelSerializer(_ModelSerializer):
 
 class DpgModelSerializer(_ModelSerializer):
     def imports(self) -> FileImport:
-        file_import = FileImport(self.code_model)
+        file_import = self.init_file_import()
         file_import.add_submodule_import(
             "..",
             "_model_base",

package/autorest/codegen/serializers/operation_groups_serializer.py

@@ -10,7 +10,6 @@ from jinja2 import Environment
 from ..models import (
     CodeModel,
     OperationGroup,
-    FileImport,
     RequestBuilder,
     OverloadedRequestBuilder,
     Client,
@@ -20,9 +19,10 @@ from .builder_serializer import (
     get_operation_serializer,
     RequestBuilderSerializer,
 )
+from .base_serializer import BaseSerializer
 
 
-class OperationGroupsSerializer:
+class OperationGroupsSerializer(BaseSerializer):
     def __init__(
         self,
         code_model: CodeModel,
@@ -31,9 +31,8 @@ class OperationGroupsSerializer:
         async_mode: bool,
         operation_group: Optional[OperationGroup] = None,
     ):
+        super().__init__(code_model, env)
         self.clients = clients
-        self.code_model = code_model
-        self.env = env
         self.async_mode = async_mode
         self.operation_group = operation_group
 
@@ -57,7 +56,7 @@ class OperationGroupsSerializer:
             if self.operation_group
             else [og for client in self.clients for og in client.operation_groups]
         )
-        imports = FileImport(code_model=self.code_model)
+        imports = self.init_file_import()
         for operation_group in operation_groups:
             imports.merge(
                 operation_group.imports(

package/autorest/codegen/serializers/patch_serializer.py

@@ -3,19 +3,15 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from jinja2 import Environment
 from .import_serializer import FileImportSerializer
-from ..models import CodeModel, FileImport, ImportType
+from ..models import ImportType
+from .base_serializer import BaseSerializer
 
 
-class PatchSerializer:
-    def __init__(self, env: Environment, code_model: CodeModel) -> None:
-        self.env = env
-        self.code_model = code_model
-
+class PatchSerializer(BaseSerializer):
     def serialize(self) -> str:
         template = self.env.get_template("patch.py.jinja2")
-        imports = FileImport(code_model=self.code_model)
+        imports = self.init_file_import()
         imports.add_submodule_import("typing", "List", ImportType.STDLIB)
         return template.render(
             code_model=self.code_model,

package/autorest/codegen/serializers/request_builders_serializer.py

@@ -10,23 +10,23 @@ from ..models import FileImport
 from .import_serializer import FileImportSerializer
 from ..models import CodeModel, RequestBuilderType
 from .builder_serializer import RequestBuilderSerializer
+from .base_serializer import BaseSerializer
 
 
-class RequestBuildersSerializer:
+class RequestBuildersSerializer(BaseSerializer):
     def __init__(
         self,
         code_model: CodeModel,
         env: Environment,
         request_builders: List[RequestBuilderType],
     ) -> None:
-        self.code_model = code_model
-        self.env = env
+        super().__init__(code_model, env)
         self.request_builders = request_builders
         self.group_name = request_builders[0].group_name
 
     @property
     def imports(self) -> FileImport:
-        file_import = FileImport(code_model=self.code_model)
+        file_import = self.init_file_import()
         for request_builder in self.request_builders:
             if request_builder.group_name == self.group_name:
                 file_import.merge(request_builder.imports())

package/autorest/codegen/serializers/sample_serializer.py

@@ -8,13 +8,14 @@ import logging
 from typing import Dict, Any, Union, Tuple
 from jinja2 import Environment
 
-from autorest.codegen.models.credential_types import AzureKeyCredentialType
+from autorest.codegen.models.credential_types import KeyCredentialType
 from autorest.codegen.models.credential_types import TokenCredentialType
-from autorest.codegen.models.imports import FileImport, ImportType
+from autorest.codegen.models.imports import ImportType
 from autorest.codegen.models.operation import OperationBase
 from autorest.codegen.models.operation_group import OperationGroup
 from autorest.codegen.models.parameter import Parameter, BodyParameter
 from autorest.codegen.serializers.import_serializer import FileImportSerializer
+from autorest.codegen.serializers.base_serializer import BaseSerializer
 from ..models import CodeModel
 from .utils import get_namespace_config, get_namespace_from_package_name
 from ..._utils import to_snake_case
@@ -22,7 +23,7 @@ from ..._utils import to_snake_case
 _LOGGER = logging.getLogger(__name__)
 
 
-class SampleSerializer:
+class SampleSerializer(BaseSerializer):
     def __init__(
         self,
         code_model: CodeModel,
@@ -32,8 +33,7 @@ class SampleSerializer:
         sample: Dict[str, Any],
         file_name: str,
     ) -> None:
-        self.code_model = code_model
-        self.env = env
+        super().__init__(code_model, env)
         self.operation_group = operation_group
         self.operation = operation
         self.sample = sample
@@ -43,7 +43,7 @@ class SampleSerializer:
         }
 
     def _imports(self) -> FileImportSerializer:
-        imports = FileImport(self.code_model)
+        imports = self.init_file_import()
         namespace_from_package_name = get_namespace_from_package_name(
             self.code_model.options["package_name"]
         )
@@ -63,10 +63,12 @@ class SampleSerializer:
             imports.add_submodule_import(
                 "azure.identity", "DefaultAzureCredential", ImportType.THIRDPARTY
             )
-        elif isinstance(credential_type, AzureKeyCredentialType):
+        elif isinstance(credential_type, KeyCredentialType):
             imports.add_import("os", ImportType.STDLIB)
             imports.add_submodule_import(
-                "azure.core.credentials", "AzureKeyCredential", ImportType.THIRDPARTY
+                f"{imports.import_core}.credentials",
+                "AzureKeyCredential",
+                ImportType.THIRDPARTY,
             )
         for param in self.operation.parameters.positional:
             if (
@@ -83,7 +85,7 @@ class SampleSerializer:
         credential_type = getattr(self.code_model.clients[0].credential, "type", None)
         if isinstance(credential_type, TokenCredentialType):
             special_param.update({"credential": "DefaultAzureCredential()"})
-        elif isinstance(credential_type, AzureKeyCredentialType):
+        elif isinstance(credential_type, KeyCredentialType):
             special_param.update(
                 {"credential": 'AzureKeyCredential(key=os.getenv("AZURE_KEY"))'}
             )

package/autorest/codegen/serializers/types_serializer.py

@@ -3,19 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from jinja2 import Environment
-from ..models import CodeModel
 from ..models.imports import FileImport, ImportType
 from .import_serializer import FileImportSerializer
+from .base_serializer import BaseSerializer
 
 
-class TypesSerializer:
-    def __init__(self, code_model: CodeModel, env: Environment) -> None:
-        self.code_model = code_model
-        self.env = env
-
+class TypesSerializer(BaseSerializer):
     def imports(self) -> FileImport:
-        file_import = FileImport(code_model=self.code_model)
+        file_import = self.init_file_import()
         if self.code_model.named_unions:
             file_import.add_submodule_import(
                 "typing",

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

@@ -51,10 +51,12 @@ class {{ client.name }}Configuration:  {{ client.config.pylint_disable }}
         self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
         self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
         self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
+        {% if not code_model.options["unbranded"] %}
         self.http_logging_policy = kwargs.get('http_logging_policy') or {{ "ARM" if client.code_model.options['azure_arm'] else "policies." }}HttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get('retry_policy') or policies.{{ keywords.async_class }}RetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get('redirect_policy') or policies.{{ keywords.async_class }}RedirectPolicy(**kwargs)
+        {% endif %}
+        self.retry_policy = kwargs.get('retry_policy') or policies.{{ keywords.async_class }}RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get('authentication_policy')
         {% if client.credential and client.credential.type.policy is defined %}
             {# only adding this if credential_scopes is not passed during code generation #}

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

@@ -2,7 +2,7 @@
 {{ code_model.options['license_header'] }}
 
 from enum import Enum
-from azure.core import CaseInsensitiveEnumMeta
+from {{ file_import.import_core_case_insensitive_enum }} import CaseInsensitiveEnumMeta
 
 {% for enum in code_model.enums | sort %}
 {% include "enum.py.jinja2" %}

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

@@ -19,10 +19,10 @@ import email
 from datetime import datetime, date, time, timedelta, timezone
 from json import JSONEncoder
 import isodate
-from azure.core.exceptions import DeserializationError
-from azure.core import CaseInsensitiveEnumMeta
-from azure.core.pipeline import PipelineResponse
-from azure.core.serialization import _Null
+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
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

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

@@ -1,4 +1,4 @@
-Copyright (c) Microsoft Corporation.
+Copyright (c) {{ company_name }} Corporation.
 
 MIT License
 

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

@@ -1,3 +1,4 @@
+{% if not code_model.options["unbranded"] %}
 {% if package_mode == "mgmtplane" -%}
 # Microsoft Azure SDK for Python
 
@@ -66,7 +67,7 @@ Use the returned token credential to authenticate the client:
 ```python
 >>> from {{ namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
->>> from azure.core.exceptions import HttpResponseError
+>>> from {{ file_import.import_core_exceptions }} import HttpResponseError
 
 >>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
 >>> try:
@@ -103,3 +104,4 @@ additional questions or comments.
 [pip]: https://pypi.org/project/pip/
 [azure_sub]: https://azure.microsoft.com/free/
 {% endif %}
+{% endif %}

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 = "\"Microsoft {} Client Library for Python\".format(PACKAGE_PPRINT_NAME)" %}
+{% set description = "\"" + 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,11 +43,13 @@ setup(
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",
     license="MIT License",
-    author="Microsoft Corporation",
+    author="{{ company_name }} Corporation",
     {% endif %}
     author_email="{{ author_email }}",
+    {% if not unbranded %}
     url="{{ url }}",
     keywords="azure, azure sdk",
+    {% endif %}
     {% if package_mode %}
     classifiers=[
         "Development Status :: {{ dev_status }}",
@@ -87,7 +89,9 @@ setup(
         {% else %}
         "isodate<1.0.0,>=0.6.1",
         {% endif %}
-        {% if azure_arm %}
+        {% if unbranded %}
+        "corehttp",
+        {% elif azure_arm %}
         "azure-mgmt-core<2.0.0,>=1.3.2",
         {% else %}
         "azure-core<2.0.0,>=1.28.0",

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

@@ -63,8 +63,8 @@ import xml.etree.ElementTree as ET
 
 import isodate  # type: ignore
 
-from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback
-from azure.core.serialization import NULL as AzureCoreNull
+from {{ import_core_exceptions }} import DeserializationError, SerializationError
+from {{ import_core_serialization }} import NULL as AzureCoreNull
 
 _BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
 
@@ -124,7 +124,7 @@ class RawDeserializer:
                     pass
 
                 return ET.fromstring(data_as_str)  # nosec
-            except ET.ParseError:
+            except ET.ParseError as err:
                 # It might be because the server has an issue, and returned JSON with
                 # content-type XML....
                 # So let's try a JSON load, and if it's still broken
@@ -143,7 +143,7 @@ class RawDeserializer:
                 # The function hack is because Py2.7 messes up with exception
                 # context otherwise.
                 _LOGGER.critical("Wasn't XML not JSON, failing")
-                raise_with_traceback(DeserializationError, "XML is invalid")
+                raise DeserializationError("XML is invalid") from err
         raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
 
     @classmethod
@@ -340,7 +340,7 @@ class Model(object):
         return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None))
 
     def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON:
-        """Return the JSON that would be sent to azure from this model.
+        """Return the JSON that would be sent to server from this model.
 
         This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`.
 
@@ -670,7 +670,7 @@ class Serializer(object):
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
-            raise_with_traceback(SerializationError, msg, err)
+            raise SerializationError(msg) from err
         else:
             return serialized
 
@@ -712,7 +712,7 @@ class Serializer(object):
                     ]
                 data = deserializer._deserialize(data_type, data)
             except DeserializationError as err:
-                raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err)
+                raise SerializationError("Unable to build a model: " + str(err)) from err
 
         return self._serialize(data, data_type, **kwargs)
 
@@ -828,7 +828,7 @@ class Serializer(object):
 
         except (ValueError, TypeError) as err:
             msg = "Unable to serialize value: {!r} as type: {!r}."
-            raise_with_traceback(SerializationError, msg.format(data, data_type), err)
+            raise SerializationError(msg.format(data, data_type)) from err
         else:
             return self._serialize(data, **kwargs)
 
@@ -1178,10 +1178,10 @@ class Serializer(object):
             return date + microseconds + "Z"
         except (ValueError, OverflowError) as err:
             msg = "Unable to serialize datetime object."
-            raise_with_traceback(SerializationError, msg, err)
+            raise SerializationError(msg) from err
         except AttributeError as err:
             msg = "ISO-8601 object must be valid Datetime object."
-            raise_with_traceback(TypeError, msg, err)
+            raise TypeError(msg) from err
 
     @staticmethod
     def serialize_unix(attr, **kwargs):
@@ -1489,7 +1489,7 @@ class Deserializer(object):
                 d_attrs[attr] = value
         except (AttributeError, TypeError, KeyError) as err:
             msg = "Unable to deserialize to object: " + class_name  # type: ignore
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             additional_properties = self._build_additional_properties(attributes, data)
             return self._instantiate_model(response, d_attrs, additional_properties)
@@ -1660,7 +1660,7 @@ class Deserializer(object):
         except (ValueError, TypeError, AttributeError) as err:
             msg = "Unable to deserialize response data."
             msg += " Data: {}, {}".format(data, data_type)
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             return self._deserialize(obj_type, data)
 
@@ -1816,7 +1816,6 @@ class Deserializer(object):
             data = data.value
         if isinstance(data, int):
             # Workaround. We might consider remove it in the future.
-            # https://github.com/Azure/azure-rest-api-specs/issues/141
             try:
                 return list(enum_obj.__members__.values())[data]
             except IndexError:
@@ -1873,7 +1872,7 @@ class Deserializer(object):
             return decimal.Decimal(attr)  # type: ignore
         except decimal.DecimalException as err:
             msg = "Invalid decimal {}".format(attr)
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
 
     @staticmethod
     def deserialize_long(attr):
@@ -1901,7 +1900,7 @@ class Deserializer(object):
             duration = isodate.parse_duration(attr)
         except (ValueError, OverflowError, AttributeError) as err:
             msg = "Cannot deserialize duration object."
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             return duration
 
@@ -1953,7 +1952,7 @@ class Deserializer(object):
                 date_obj = date_obj.astimezone(tz=TZ_UTC)
         except ValueError as err:
             msg = "Cannot deserialize to rfc datetime object."
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             return date_obj
 
@@ -1990,7 +1989,7 @@ class Deserializer(object):
                 raise OverflowError("Hit max or min date")
         except (ValueError, OverflowError, AttributeError) as err:
             msg = "Cannot deserialize datetime object."
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             return date_obj
 
@@ -2009,6 +2008,6 @@ class Deserializer(object):
             date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
         except ValueError as err:
             msg = "Cannot deserialize to unix datetime object."
-            raise_with_traceback(DeserializationError, msg, err)
+            raise DeserializationError(msg) from err
         else:
             return date_obj

package/autorest/m4reformatter/__init__.py

@@ -41,7 +41,7 @@ def get_body_parameter(yaml_data: Dict[str, Any]) -> Dict[str, Any]:
 def get_azure_key_credential(key: str) -> Dict[str, Any]:
     retval = {
         "type": KEY_TYPE,
-        "policy": {"type": "AzureKeyCredentialPolicy", "key": key},
+        "policy": {"type": "KeyCredentialPolicy", "key": key},
     }
     update_type(retval)
     return retval

package/autorest/multiapi/models/imports.py

@@ -11,7 +11,7 @@ from ..utils import convert_list_to_tuple
 class ImportType(str, Enum):
     STDLIB = "stdlib"
     THIRDPARTY = "thirdparty"
-    AZURECORE = "azurecore"
+    SDKCORE = "sdkcore"
     LOCAL = "local"
     BYVERSION = "by_version"
 

package/autorest/multiapi/serializers/__init__.py

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

package/autorest/preprocess/__init__.py

@@ -160,10 +160,6 @@ def update_operation_group_class_name(
 
 def update_paging_response(yaml_data: Dict[str, Any]) -> None:
     yaml_data["discriminator"] = "paging"
-    yaml_data["pagerSync"] = yaml_data.get("pagerSync") or "azure.core.paging.ItemPaged"
-    yaml_data["pagerAsync"] = (
-        yaml_data.get("pagerAsync") or "azure.core.async_paging.AsyncItemPaged"
-    )
 
 
 HEADERS_HIDE_IN_METHOD = (
@@ -184,7 +180,7 @@ HEADERS_CONVERT_IN_METHOD = {
         "wireName": "match-condition",
         "description": "The match condition to use upon the etag.",
         "type": {
-            "type": "azurecore",
+            "type": "sdkcore",
             "name": "MatchConditions",
         },
     },
@@ -489,10 +485,6 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
         item_type: Optional[Dict[str, Any]] = None,
     ) -> None:
         self.update_operation(code_model, yaml_data, is_overload=is_overload)
-        if not yaml_data.get("pagerSync"):
-            yaml_data["pagerSync"] = "azure.core.paging.ItemPaged"
-        if not yaml_data.get("pagerAsync"):
-            yaml_data["pagerAsync"] = "azure.core.async_paging.AsyncItemPaged"
         item_type = item_type or yaml_data["itemType"]["elementType"]
         if yaml_data.get("nextOperation"):
             yaml_data["nextOperation"]["groupName"] = self.pad_reserved_words(

package/package.json

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