@autorest/python 6.12.0 → 6.12.2

package/autorest/codegen/models/client.py

@@ -304,6 +304,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         """Whether there is abstract operation in any operation group."""
         return any(og.has_abstract_operations for og in self.operation_groups)
 
+    @property
+    def has_non_abstract_operations(self) -> bool:
+        """Whether there is non-abstract operation in any operation group."""
+        return any(og.has_non_abstract_operations for og in self.operation_groups)
+
     def imports(self, async_mode: bool) -> FileImport:
         file_import = self._imports_shared(async_mode)
         if async_mode:

package/autorest/codegen/models/code_model.py

@@ -79,12 +79,11 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
     @property
     def has_form_data(self) -> bool:
-        for client in self.clients:
-            for operation_group in client.operation_groups:
-                for operation in operation_group.operations:
-                    if operation.has_form_data_body:
-                        return True
-        return False
+        return any(
+            og.has_form_data_body
+            for client in self.clients
+            for og in client.operation_groups
+        )
 
     @property
     def has_etag(self) -> bool:
@@ -103,18 +102,12 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
     @property
     def has_non_abstract_operations(self) -> bool:
-        for client in self.clients:
-            for operation_group in client.operation_groups:
-                for operation in operation_group.operations:
-                    if not operation.abstract:
-                        return True
-        for clients in self.subnamespace_to_clients.values():
-            for client in clients:
-                for operation_group in client.operation_groups:
-                    for operation in operation_group.operations:
-                        if not operation.abstract:
-                            return True
-        return False
+        return any(c for c in self.clients if c.has_non_abstract_operations) or any(
+            c
+            for cs in self.subnamespace_to_clients.values()
+            for c in cs
+            if c.has_non_abstract_operations
+        )
 
     def lookup_request_builder(
         self, request_builder_id: int

package/autorest/codegen/models/constant_type.py

@@ -6,7 +6,7 @@
 import logging
 from typing import Dict, Any, Optional, TYPE_CHECKING
 from .base import BaseType
-from .imports import FileImport
+from .imports import FileImport, ImportType, TypingSection
 from .primitive_types import IntegerType, BinaryType, StringType, BooleanType
 from .utils import add_to_description
 
@@ -134,7 +134,9 @@ class ConstantType(BaseType):
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = self._imports_shared(**kwargs)
         if self._is_literal:
-            file_import.add_literal_import()
+            file_import.add_submodule_import(
+                "typing", "Literal", ImportType.STDLIB, TypingSection.REGULAR
+            )
         return file_import
 
     @property

package/autorest/codegen/models/enum_type.py

@@ -78,7 +78,9 @@ class EnumValue(BaseType):
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.merge(self.value_type.imports(**kwargs))
-        file_import.add_literal_import()
+        file_import.add_submodule_import(
+            "typing", "Literal", ImportType.STDLIB, TypingSection.REGULAR
+        )
         file_import.add_submodule_import(
             "._enums", self.enum_type.name, ImportType.LOCAL, TypingSection.REGULAR
         )

package/autorest/codegen/models/imports.py

@@ -204,23 +204,6 @@ class FileImport:
         )
         self.add_submodule_import("typing", "Any", ImportType.STDLIB)
 
-    def add_literal_import(self) -> None:
-        self.add_import("sys", ImportType.STDLIB)
-        self.add_submodule_import(
-            "typing_extensions",
-            "Literal",
-            ImportType.BYVERSION,
-            TypingSection.REGULAR,
-            None,
-            (
-                (
-                    (3, 8),
-                    "typing",
-                    "pylint: disable=no-name-in-module, ungrouped-imports",
-                ),
-            ),
-        )
-
     def to_dict(
         self,
     ) -> Dict[

package/autorest/codegen/models/operation_group.py

@@ -48,7 +48,17 @@ class OperationGroup(BaseModel):
 
     @property
     def has_abstract_operations(self) -> bool:
-        return any(o for o in self.operations if o.abstract)
+        return any(o for o in self.operations if o.abstract) or any(
+            operation_group.has_abstract_operations
+            for operation_group in self.operation_groups
+        )
+
+    @property
+    def has_non_abstract_operations(self) -> bool:
+        return any(o for o in self.operations if not o.abstract) or any(
+            operation_group.has_non_abstract_operations
+            for operation_group in self.operation_groups
+        )
 
     @property
     def base_class(self) -> str:
@@ -183,6 +193,13 @@ class OperationGroup(BaseModel):
             operation_group.has_operations for operation_group in self.operation_groups
         ) or bool(self.operations)
 
+    @property
+    def has_form_data_body(self) -> bool:
+        operations = self.operations + [
+            o for og in self.operation_groups for o in og.operations
+        ]
+        return any(operation.has_form_data_body for operation in operations)
+
     @classmethod
     def from_yaml(
         cls,

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

@@ -8,6 +8,6 @@ class {{ enum.name }}({{ enum.value_type.type_annotation(is_operation_file=False
     {% for value in enum.values %}
     {{ value.name }} = {{ enum.value_type.get_declaration(value.value) }}
     {% if value.description(is_operation_file=False) %}
-    """{{ value.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    #: ') }}"""
+    """{{ value.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}"""
     {% endif %}
     {% endfor %}

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

@@ -625,14 +625,7 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
 
     # is it a literal?
     try:
-        if sys.version_info >= (3, 8):
-            from typing import (
-                Literal,
-            )  # pylint: disable=no-name-in-module, ungrouped-imports
-        else:
-            from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
-        if annotation.__origin__ == Literal:
+        if annotation.__origin__ == typing.Literal:
             return None
     except AttributeError:
         pass

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

@@ -96,9 +96,6 @@ setup(
         {% else %}
         "azure-core<2.0.0,>=1.29.5",
         {% endif %}
-        {% if code_model.need_typing_extensions %}
-        "typing-extensions>=4.3.0; python_version<'3.8.0'",
-        {% endif %}
     ],
     {% if package_mode %}
     python_requires=">=3.8",

package/package.json

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