@autorest/python 6.7.8 → 6.8.1

package/autorest/codegen/__init__.py

@@ -13,7 +13,7 @@ from .. import Plugin, PluginAutorest
 from .._utils import parse_args
 from .models.code_model import CodeModel
 from .serializers import JinjaSerializer, JinjaSerializerAutorest
-from ._utils import DEFAULT_HEADER_TEXT
+from ._utils import DEFAULT_HEADER_TEXT, VALID_PACKAGE_MODE, TYPESPEC_PACKAGE_MODE
 
 
 def _default_pprint(package_name: str) -> str:
@@ -55,11 +55,17 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
 
     if options["package_mode"]:
         if (
-            options["package_mode"] not in ("mgmtplane", "dataplane")
-            and not Path(options["package_mode"]).exists()
-        ):
+            (
+                options["package_mode"] not in TYPESPEC_PACKAGE_MODE
+                and options["from_typespec"]
+            )
+            or (
+                options["package_mode"] not in VALID_PACKAGE_MODE
+                and not options["from_typespec"]
+            )
+        ) and not Path(options["package_mode"]).exists():
             raise ValueError(
-                "--package-mode can only be 'mgmtplane' or 'dataplane' or directory which contains template files"
+                f"--package-mode can only be {' or '.join(TYPESPEC_PACKAGE_MODE)} or directory which contains template files"  # pylint: disable=line-too-long
             )
 
     if options["multiapi"] and options["version_tolerant"]:
@@ -170,6 +176,7 @@ class CodeGenerator(Plugin):
             ),
             "generate_sample": self.options.get("generate-sample", False),
             "default_api_version": self.options.get("default-api-version"),
+            "from_typespec": self.options.get("from-typespec", False),
         }
 
         if options["builders_visibility"] is None:

package/autorest/codegen/_utils.py

@@ -10,3 +10,7 @@ DEFAULT_HEADER_TEXT = (
     "Code generated by Microsoft (R) Python Code Generator.\n"
     "Changes may cause incorrect behavior and will be lost if the code is regenerated."
 )
+
+SWAGGER_PACKAGE_MODE = ["mgmtplane", "dataplane"]  # for backward compatibility
+TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
+VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE

package/autorest/codegen/models/combined_type.py

@@ -43,7 +43,9 @@ class CombinedType(BaseType):
         If list: '[str]'
         If dict: '{str}'
         """
-        raise ValueError("Shouldn't get serialization type of a combinedtype")
+        if not all(t for t in self.types if t.type == "constant"):
+            raise ValueError("Shouldn't get serialization type of a combinedtype")
+        return self.types[0].serialization_type
 
     @property
     def client_default_value(self) -> Any:

package/autorest/codegen/models/paging_operation.py

@@ -15,6 +15,7 @@ from .request_builder import (
 from .imports import ImportType, FileImport, TypingSection
 from .parameter_list import ParameterList
 from .model_type import ModelType
+from .list_type import ListType
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -63,11 +64,17 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         self.pager_async: str = yaml_data["pagerAsync"]
 
     def _get_attr_name(self, wire_name: str) -> str:
-        response = self.responses[0]
+        response_type = self.responses[0].type
+        if not response_type:
+            raise ValueError(
+                f"Can't find a matching property in response for {wire_name}"
+            )
+        if response_type.type == "list":
+            response_type = cast(ListType, response_type).element_type
         try:
             return next(
                 p.client_name
-                for p in cast(ModelType, response.type).properties
+                for p in cast(ModelType, response_type).properties
                 if p.wire_name == wire_name
             )
         except StopIteration as exc:

package/autorest/codegen/models/parameter.py

@@ -92,6 +92,10 @@ class _ParameterBase(
         )
         self.hide_in_method: bool = self.yaml_data.get("hideInMethod", False)
 
+    @property
+    def hide_in_operation_signature(self) -> bool:
+        return False
+
     @property
     def constant(self) -> bool:
         """Returns whether a parameter is a constant or not.
@@ -341,6 +345,15 @@ class Parameter(_ParameterBase):
         self.delimiter: Optional[ParameterDelimeter] = self.yaml_data.get("delimiter")
         self._default_to_unset_sentinel: bool = False
 
+    @property
+    def hide_in_operation_signature(self) -> bool:
+        if (
+            self.code_model.options["version_tolerant"]
+            and self.client_name == "maxpagesize"
+        ):
+            return True
+        return False
+
     @property
     def in_method_signature(self) -> bool:
         return not (self.wire_name == "Accept" or self.grouped_by or self.flattened)

package/autorest/codegen/models/parameter_list.py

@@ -248,11 +248,12 @@ class _ParameterListBase(
 
     def method_signature_keyword_only(self, async_mode: bool) -> List[str]:
         """Signature for keyword only parameters"""
-        if not self.keyword_only:
-            return []
-        return ["*,"] + [
-            parameter.method_signature(async_mode) for parameter in self.keyword_only
+        result = [
+            parameter.method_signature(async_mode)
+            for parameter in self.keyword_only
+            if not parameter.hide_in_operation_signature
         ]
+        return ["*,"] + result if result else []
 
     @property
     def method_signature_kwargs(self) -> List[str]:
@@ -409,16 +410,6 @@ class RequestBuilderParameterList(_RequestBuilderParameterList):
 class OverloadedRequestBuilderParameterList(_RequestBuilderParameterList):
     """Parameter list for OverloadedRequestBuilder"""
 
-    def method_signature_keyword_only(self, async_mode: bool) -> List[str]:
-        """Signature for keyword only parameters"""
-        if not self.keyword_only:
-            return []
-        return ["*,"] + [
-            parameter.method_signature(async_mode)
-            for parameter in self.keyword_only
-            if parameter.location != ParameterLocation.BODY
-        ]
-
 
 class _ClientGlobalParameterList(  # pylint: disable=abstract-method
     _ParameterListBase[ParameterType, BodyParameter]

package/autorest/codegen/models/request_builder_parameter.py

@@ -110,6 +110,10 @@ class RequestBuilderParameter(Parameter):
             # we don't want hidden parameters for grouped by in request builders
             self.client_name = self.client_name[1:]
 
+    @property
+    def hide_in_operation_signature(self) -> bool:
+        return False
+
     @property
     def in_method_signature(self) -> bool:
         if self.grouped_by and not self.in_flattened_body:

package/autorest/codegen/serializers/__init__.py

@@ -29,6 +29,7 @@ from .patch_serializer import PatchSerializer
 from .sample_serializer import SampleSerializer
 from .types_serializer import TypesSerializer
 from ..._utils import to_snake_case
+from .._utils import VALID_PACKAGE_MODE
 from .utils import (
     extract_sample_name,
     get_namespace_from_package_name,
@@ -216,7 +217,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
 
     def _serialize_and_write_package_files(self, namespace_path: Path) -> None:
         root_of_sdk = self._package_root_folder(namespace_path)
-        if self.code_model.options["package_mode"] in ("dataplane", "mgmtplane"):
+        if self.code_model.options["package_mode"] in VALID_PACKAGE_MODE:
             env = Environment(
                 loader=PackageLoader(
                     "autorest.codegen", "templates/packaging_templates"

package/autorest/codegen/serializers/builder_serializer.py

@@ -333,7 +333,7 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
     def param_description(self, builder: BuilderType) -> List[str]:
         description_list: List[str] = []
         for param in builder.parameters.method:
-            if not param.in_docstring:
+            if not param.in_docstring or param.hide_in_operation_signature:
                 continue
             description_list.extend(
                 f":{param.description_keyword} {param.client_name}: {param.description}".replace(
@@ -701,6 +701,9 @@ class _OperationSerializer(
             check_client_input=not self.code_model.options["multiapi"],
             operation_name=f"('{builder.name}')" if builder.group_name == "" else "",
         )
+        for p in builder.parameters.parameters:
+            if p.hide_in_operation_signature:
+                kwargs.append(f'{p.client_name} = kwargs.pop("{p.client_name}", None)')
         cls_annotation = builder.cls_type_annotation(async_mode=self.async_mode)
         pylint_disable = ""
         if any(x.startswith("_") for x in cls_annotation.split(".")):

package/autorest/preprocess/__init__.py

@@ -137,16 +137,6 @@ def add_overloads_for_body_param(yaml_data: Dict[str, Any]) -> None:
     content_type_param["optional"] = True
 
 
-def _remove_paging_maxpagesize(yaml_data: Dict[str, Any]) -> None:
-    # we don't expose maxpagesize for version tolerant generation
-    # users should be passing this into `by_page`
-    yaml_data["parameters"] = [
-        p
-        for p in yaml_data.get("parameters", [])
-        if p["wireName"].lower() not in ["maxpagesize", "$maxpagesize"]
-    ]
-
-
 def update_description(
     description: Optional[str], default_description: str = ""
 ) -> str:
@@ -494,13 +484,8 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             yaml_data["pagerSync"] = "azure.core.paging.ItemPaged"
         if not yaml_data.get("pagerAsync"):
             yaml_data["pagerAsync"] = "azure.core.async_paging.AsyncItemPaged"
-        if self.version_tolerant:
-            # if we're in version tolerant, hide the paging model
-            _remove_paging_maxpagesize(yaml_data)
         item_type = item_type or yaml_data["itemType"]["elementType"]
         if yaml_data.get("nextOperation"):
-            if self.version_tolerant:
-                _remove_paging_maxpagesize(yaml_data["nextOperation"])
             yaml_data["nextOperation"]["groupName"] = self.pad_reserved_words(
                 yaml_data["nextOperation"]["groupName"], PadType.OPERATION_GROUP
             )

package/package.json

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