@autorest/python 6.12.0 → 6.12.1

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

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