@autorest/python 6.4.7 → 6.4.9

package/autorest/codegen/__init__.py

@@ -16,6 +16,10 @@ from .serializers import JinjaSerializer, JinjaSerializerAutorest
 from ._utils import DEFAULT_HEADER_TEXT
 
 
+def _default_pprint(package_name: str) -> str:
+    return " ".join([i.capitalize() for i in package_name.split("-")])
+
+
 def _validate_code_model_options(options: Dict[str, Any]) -> None:
     if options["builders_visibility"] not in ["public", "hidden", "embedded"]:
         raise ValueError(
@@ -126,6 +130,7 @@ class CodeGenerator(Plugin):
         if self.options.get("cadl_file") is not None:
             models_mode_default = "dpg"
 
+        package_name = self.options.get("package-name")
         options: Dict[str, Any] = {
             "azure_arm": azure_arm,
             "head_as_boolean": self.options.get("head-as-boolean", True),
@@ -134,7 +139,7 @@ class CodeGenerator(Plugin):
             "no_async": self.options.get("no-async", False),
             "no_namespace_folders": self.options.get("no-namespace-folders", False),
             "basic_setup_py": self.options.get("basic-setup-py", False),
-            "package_name": self.options.get("package-name"),
+            "package_name": package_name,
             "package_version": self.options.get("package-version"),
             "client_side_validation": self.options.get("client-side-validation", False),
             "tracing": self.options.get("tracing", show_operations),
@@ -156,7 +161,8 @@ class CodeGenerator(Plugin):
                 "combine-operation-files", version_tolerant
             ),
             "package_mode": self.options.get("package-mode"),
-            "package_pprint_name": self.options.get("package-pprint-name"),
+            "package_pprint_name": self.options.get("package-pprint-name")
+            or _default_pprint(str(package_name)),
             "package_configuration": self.options.get("package-configuration"),
             "default_optional_constants_to_none": self.options.get(
                 "default-optional-constants-to-none",

package/autorest/codegen/models/client.py

@@ -146,6 +146,8 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         retval = add_to_pylint_disable("", "client-accepts-api-version-keyword")
         if len(self.operation_groups) > 6:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")
+        if len(self.name) > 40:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     @property
@@ -203,7 +205,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             if gp.method_location == ParameterMethodLocation.KWARG:
                 continue
             file_import.merge(
-                gp.imports(async_mode, relative_path=".." if async_mode else ".")
+                gp.imports(
+                    async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
+                )
             )
         file_import.add_submodule_import(
             "._configuration",
@@ -420,7 +426,9 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
                 continue
             file_import.merge(
                 gp.imports(
-                    async_mode=async_mode, relative_path=".." if async_mode else "."
+                    async_mode=async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
                 )
             )
         return file_import
@@ -436,7 +444,9 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
                 continue
             file_import.merge(
                 gp.imports_for_multiapi(
-                    async_mode=async_mode, relative_path=".." if async_mode else "."
+                    async_mode=async_mode,
+                    relative_path=".." if async_mode else ".",
+                    operation=True,
                 )
             )
         return file_import

package/autorest/codegen/models/enum_type.py

@@ -173,13 +173,13 @@ class EnumType(BaseType):
         )
 
     def imports(self, **kwargs: Any) -> FileImport:
-        is_operation_file = kwargs.pop("is_operation_file", False)
+        operation = kwargs.pop("operation", False)
         file_import = FileImport()
         if self.code_model.options["models_mode"]:
             file_import.add_submodule_import(
                 "typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL
             )
-            if not is_operation_file:
+            if not operation:
                 file_import.add_submodule_import(
                     "..",
                     "models",
@@ -187,9 +187,7 @@ class EnumType(BaseType):
                     TypingSection.TYPING,
                     alias="_models",
                 )
-        file_import.merge(
-            self.value_type.imports(is_operation_file=is_operation_file, **kwargs)
-        )
+        file_import.merge(self.value_type.imports(operation=operation, **kwargs))
         relative_path = kwargs.pop("relative_path", None)
         if self.code_model.options["models_mode"] and relative_path:
             # add import for enums in operations file

package/autorest/codegen/models/operation.py

@@ -130,6 +130,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         if self.response_type_annotation(async_mode=False) == "None":
             # doesn't matter if it's async or not
             retval = add_to_pylint_disable(retval, "inconsistent-return-statements")
+        if len(self.name) > 40:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     def cls_type_annotation(self, *, async_mode: bool) -> str:
@@ -221,7 +223,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         )
 
         response_types = [
-            r.type_annotation(async_mode=async_mode) for r in self.responses if r.type
+            r.type_annotation(async_mode=async_mode, operation=self)
+            for r in self.responses
+            if r.type
         ]
         if len(set(response_types)) > 1:
             file_import.add_submodule_import(
@@ -243,17 +247,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(
                 param.imports_for_multiapi(
                     async_mode,
+                    operation=self,
                     **kwargs,
                 )
             )
         for response in self.responses:
             file_import.merge(
-                response.imports_for_multiapi(async_mode=async_mode, **kwargs)
+                response.imports_for_multiapi(
+                    async_mode=async_mode, operation=self, **kwargs
+                )
             )
         if self.code_model.options["models_mode"]:
             for exception in self.exceptions:
                 file_import.merge(
-                    exception.imports_for_multiapi(async_mode=async_mode, **kwargs)
+                    exception.imports_for_multiapi(
+                        async_mode=async_mode, operation=self, **kwargs
+                    )
                 )
         return file_import
 
@@ -321,17 +330,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(
                 param.imports(
                     async_mode,
+                    operation=self,
                     **kwargs,
                 )
             )
         for response in self.responses:
-            file_import.merge(response.imports(async_mode=async_mode, **kwargs))
+            file_import.merge(
+                response.imports(async_mode=async_mode, operation=self, **kwargs)
+            )
         if self.code_model.options["models_mode"]:
             for exception in self.exceptions:
                 file_import.merge(exception.imports(async_mode=async_mode, **kwargs))
 
         if self.parameters.has_body and self.parameters.body_parameter.flattened:
-            file_import.merge(self.parameters.body_parameter.type.imports(**kwargs))
+            file_import.merge(
+                self.parameters.body_parameter.type.imports(operation=self, **kwargs)
+            )
 
         # Exceptions
         errors = [

package/autorest/codegen/models/parameter.py

@@ -182,11 +182,7 @@ class _ParameterBase(
         file_import = self._imports_shared(async_mode, **kwargs)
         # special logic for api-version parameter
         if not self.is_api_version:
-            file_import.merge(
-                self.type.imports(
-                    is_operation_file=True, async_mode=async_mode, **kwargs
-                )
-            )
+            file_import.merge(self.type.imports(async_mode=async_mode, **kwargs))
         if self.default_to_unset_sentinel:
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
             file_import.define_mypy_type(
@@ -198,9 +194,7 @@ class _ParameterBase(
     def imports_for_multiapi(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = self._imports_shared(async_mode, **kwargs)
         file_import.merge(
-            self.type.imports_for_multiapi(
-                is_operation_file=True, async_mode=async_mode, **kwargs
-            )
+            self.type.imports_for_multiapi(async_mode=async_mode, **kwargs)
         )
         return file_import
 

package/autorest/codegen/models/primitive_types.py

@@ -105,13 +105,23 @@ class BinaryType(PrimitiveType):
         return self.get_declaration(b"bytes")
 
     def imports(self, **kwargs: Any) -> FileImport:
+        from .combined_type import CombinedType
+        from .operation import OperationBase
+
         file_import = FileImport()
         file_import.add_submodule_import("typing", "IO", ImportType.STDLIB)
+        operation = kwargs.get("operation")
+        if (
+            isinstance(operation, OperationBase)
+            and operation.parameters.has_body
+            and isinstance(operation.parameters.body_parameter.type, CombinedType)
+        ):
+            file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
         return file_import
 
     @property
     def instance_check_template(self) -> str:
-        return "isinstance({}, (IO, bytes))"
+        return "isinstance({}, (IOBase, bytes))"
 
 
 class BinaryIteratorType(PrimitiveType):

package/autorest/codegen/models/property.py

@@ -130,9 +130,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         return retval or None
 
     def imports(self, **kwargs) -> FileImport:
-        file_import = self.type.imports(
-            **kwargs, is_operation_file=False, relative_path="..", model_typing=True
-        )
+        file_import = self.type.imports(**kwargs, relative_path="..", model_typing=True)
         if self.optional and self.client_default_value is None:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":

package/autorest/codegen/models/request_builder.py

@@ -16,6 +16,7 @@ from typing import (
 from abc import abstractmethod
 
 from .base_builder import BaseBuilder
+from .utils import add_to_pylint_disable
 from .parameter_list import (
     RequestBuilderParameterList,
     OverloadedRequestBuilderParameterList,
@@ -56,6 +57,12 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         self.method: str = yaml_data["method"]
         self.want_tracing = False
 
+    @property
+    def pylint_disable(self) -> str:
+        if len(self.name) > 40:
+            return add_to_pylint_disable("", "name-too-long")
+        return ""
+
     def response_type_annotation(self, **kwargs) -> str:
         return "HttpRequest"
 
@@ -81,7 +88,9 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             return file_import
         for parameter in self.parameters.method:
             file_import.merge(
-                parameter.imports(async_mode=False, relative_path=relative_path)
+                parameter.imports(
+                    async_mode=False, relative_path=relative_path, operation=self
+                )
             )
 
         file_import.add_submodule_import(

package/autorest/codegen/models/response.py

@@ -103,7 +103,7 @@ class Response(BaseModel):
     def _imports_shared(self, **kwargs: Any) -> FileImport:
         file_import = FileImport()
         if self.type:
-            file_import.merge(self.type.imports(is_operation_file=True, **kwargs))
+            file_import.merge(self.type.imports(**kwargs))
         if self.nullable:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if isinstance(self.type, CombinedType) and self.type.name:

package/autorest/codegen/serializers/builder_serializer.py

@@ -58,6 +58,14 @@ OperationType = TypeVar(
 )
 
 
+def _xml_config(send_xml: bool, content_types: List[str]) -> str:
+    if not (send_xml and "xml" in str(content_types)):
+        return ""
+    if len(content_types) == 1:
+        return ", is_xml=True"
+    return ", is_xml='xml' in str(content_type)"
+
+
 def _escape_str(input_str: str) -> str:
     replace = input_str.replace("'", "\\'")
     return f'"{replace}"'
@@ -741,7 +749,9 @@ class _OperationSerializer(
         if xml_serialization_ctxt and self.code_model.options["models_mode"]:
             retval.append(f'{ser_ctxt_name} = {{"xml": {{{xml_serialization_ctxt}}}}}')
         if self.code_model.options["models_mode"] == "msrest":
-            is_xml_cmd = ", is_xml=True" if send_xml else ""
+            is_xml_cmd = _xml_config(
+                send_xml, builder.parameters.body_parameter.content_types
+            )
             serialization_ctxt_cmd = (
                 f", {ser_ctxt_name}={ser_ctxt_name}" if xml_serialization_ctxt else ""
             )

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

@@ -24,12 +24,12 @@ 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 %s Client Library for Python"|format(package_pprint_name) %}
+{% set description = "\"Microsoft {} 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 %}
 version = "{{ package_version }}"
-{% set description = "%s"|format(package_name) %}
+{% set description = "\"%s\""|format(package_name) %}
 {% set long_description = code_model.description %}
 {% set author_email = "" %}
 {% set url = "" %}
@@ -38,7 +38,7 @@ version = "{{ package_version }}"
 setup(
     name=PACKAGE_NAME,
     version=version,
-    description="{{ description }}",
+    description={{ description }},
     {% if package_mode %}
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",

package/package.json

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