@autorest/python 6.11.1 → 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/model_type.py

@@ -6,7 +6,7 @@
 from collections import OrderedDict
 from typing import Any, Dict, List, Optional, TYPE_CHECKING, cast
 import sys
-from autorest.codegen.models.utils import add_to_pylint_disable
+from autorest.codegen.models.utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
 from .base import BaseType
 from .constant_type import ConstantType
 from .property import Property
@@ -237,6 +237,8 @@ class ModelType(  # pylint: disable=abstract-method
         retval: str = ""
         if len(self.properties) > 10:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 
     @property

package/autorest/codegen/models/operation.py

@@ -589,7 +589,12 @@ class Operation(OperationBase[Response]):
                     file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
                     file_import.add_submodule_import(
                         f"{relative_path}_vendor",
-                        "multipart_form_data_file",
+                        "multipart_file",
+                        ImportType.LOCAL,
+                    )
+                    file_import.add_submodule_import(
+                        f"{relative_path}_vendor",
+                        "multipart_data",
                         ImportType.LOCAL,
                     )
                     file_import.add_submodule_import(

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/serializers/builder_serializer.py

@@ -768,8 +768,8 @@ class _OperationSerializer(
                 f"    _body = handle_multipart_form_data_model({body_param.client_name})",
                 "else:",
                 f"    _body = {body_param.client_name}",
-                "_files = {k: multipart_form_data_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}",
-                "_data = {k: v for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}",
+                "_files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}",
+                "_data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}",
             ]
         retval: List[str] = []
         body_kwarg_name = builder.request_builder.parameters.body_parameter.client_name

package/autorest/codegen/serializers/general_serializer.py

@@ -136,8 +136,12 @@ class GeneralSerializer(BaseSerializer):
             file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
             file_import.add_submodule_import("io", "BytesIO", ImportType.STDLIB)
             file_import.add_import("uuid", ImportType.STDLIB)
+            file_import.add_import("json", ImportType.STDLIB)
             file_import.add_mutable_mapping_import()
             file_import.add_submodule_import("._model_base", "Model", ImportType.LOCAL)
+            file_import.add_submodule_import(
+                "._model_base", "SdkJSONEncoder", ImportType.LOCAL
+            )
 
         return template.render(
             code_model=self.code_model,

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

@@ -3,7 +3,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft {{package_pprint_name}} Client Library.
-This package has been tested with Python 3.7+.
+This package has been tested with Python 3.8+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 # Usage
@@ -36,7 +36,7 @@ python -m pip install {{ package_name }}
 
 #### Prequisites
 
-- Python 3.7 or later is required to use this package.
+- Python 3.8 or later is required to use this package.
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 

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

@@ -56,11 +56,11 @@ setup(
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: MIT License",
     ],
     zip_safe=False,
@@ -101,7 +101,7 @@ setup(
         {% endif %}
     ],
     {% if package_mode %}
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     {% else %}
     long_description="""\
     {{ code_model.description }}

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

@@ -71,11 +71,16 @@ class NamedBytesIO(BytesIO):
         super().__init__(*args, **kwargs)
         self.name = name
 
-def multipart_form_data_file(file: Union[IOBase, bytes]) -> IOBase:
+def multipart_file(file: Union[IOBase, bytes]) -> IOBase:
     if isinstance(file, IOBase):
         return file
     return NamedBytesIO("auto-name-" + str(uuid.uuid4()), file)
 
+def multipart_data(data: Any) -> Any:
+    if isinstance(data, (list, tuple, dict, Model)):
+        return json.dumps(data, cls=SdkJSONEncoder, exclude_readonly=True)
+    return data
+
 def handle_multipart_form_data_model(body: Model) -> MutableMapping[str, Any]:  # pylint: disable=unsubscriptable-object
     """handle first layer of model. 
     If its value is bytes or IO, replace it with raw value instead of serialized value.

package/autorest/preprocess/__init__.py

@@ -237,8 +237,10 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             return name
 
         if self.is_cadl:
-            reserved_words = copy.copy(CADL_RESERVED_WORDS)
-            reserved_words.update(RESERVED_WORDS)
+            reserved_words = {
+                k: (v + CADL_RESERVED_WORDS.get(k, []))
+                for k, v in RESERVED_WORDS.items()
+            }
         else:
             reserved_words = RESERVED_WORDS
         name = pad_special_chars(name)

package/autorest/preprocess/python_mappings.py

@@ -96,6 +96,18 @@ _always_reserved = [
     "int",
 ]
 
+RESERVED_MODEL_PROPERTIES = [
+    "keys",
+    "items",
+    "values",
+    "popitem",
+    "clear",
+    "update",
+    "setdefault",
+    "pop",
+    "get",
+]
+
 RESERVED_WORDS = {
     PadType.METHOD: [*_always_reserved],
     PadType.PARAMETER: [
@@ -169,7 +181,10 @@ RESERVED_WORDS = {
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 
-CADL_RESERVED_WORDS = {PadType.PARAMETER: ["stream"]}
+CADL_RESERVED_WORDS = {
+    PadType.PARAMETER: ["stream"],
+    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+}
 
 REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores
     "id",

package/install.py

@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 import sys
 if not sys.version_info >= (3, 7, 0):
-    raise Exception("Autorest for Python extension requires Python 3.7 at least")
+    raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 try:
     import pip
@@ -20,7 +20,7 @@ except ImportError:
     raise Exception("Your Python installation doesn't have venv available")
 
 
-# Now we have pip and Py >= 3.7, go to work
+# Now we have pip and Py >= 3.8, go to work
 
 import subprocess
 from pathlib import Path

package/package.json

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

package/prepare.py

@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 import sys
 if not sys.version_info >= (3, 7, 0):
-    raise Exception("Autorest for Python extension requires Python 3.7 at least")
+    raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path
 import venv

package/requirements.txt

@@ -10,4 +10,4 @@ pathspec==0.11.1
 platformdirs==3.2.0
 PyYAML==6.0.1
 tomli==2.0.1
-setuptools==58.3.0
+setuptools==65.5.1

package/run-python3.js

@@ -10,7 +10,7 @@ const cp = require("child_process");
 const extension = require("@autorest/system-requirements");
 
 async function runPython3(scriptName, ...args) {
-  const command = await extension.patchPythonPath(["python", scriptName, ...args], { version: ">=3.7", environmentVariable: "AUTOREST_PYTHON_EXE" });
+  const command = await extension.patchPythonPath(["python", scriptName, ...args], { version: ">=3.8", environmentVariable: "AUTOREST_PYTHON_EXE" });
   cp.execSync(command.join(" "), {
     stdio: [0, 1, 2]
   });

package/setup.py

@@ -36,11 +36,11 @@ setup(
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'License :: OSI Approved :: MIT License',
     ],
     packages=find_packages(exclude=[

package/start.py

@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 import sys
 if not sys.version_info >= (3, 7, 0):
-    raise Exception("Autorest for Python extension requires Python 3.7 at least")
+    raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path
 import venv