@autorest/python 6.3.1 → 6.4.0

package/autorest/black/__init__.py

@@ -13,7 +13,7 @@ from black.report import NothingChanged
 from .. import Plugin, PluginAutorest
 from .._utils import parse_args
 
-logging.getLogger("blib2to3").setLevel(logging.ERROR)
+_LOGGER = logging.getLogger("blib2to3")
 
 _BLACK_MODE = black.Mode()  # pyright: ignore [reportPrivateImportUsage]
 _BLACK_MODE.line_length = 120
@@ -40,8 +40,16 @@ class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
         return True
 
     def format_file(self, file: Path) -> None:
-        file_content = self.read_file(file)
-        if not file.suffix == ".py":
+        try:
+            file_content = self.read_file(file)
+        except Exception as e:  # pylint: disable=broad-except
+            if file.suffix != ".py":
+                _LOGGER.warning(
+                    "Can not read file %s, not blacking this file", file.name
+                )
+                return
+            raise e  # still want to raise if we fail reading a py file
+        if file.suffix != ".py":
             self.write_file(file, file_content)
             return
         try:

package/autorest/codegen/__init__.py

@@ -164,6 +164,7 @@ class CodeGenerator(Plugin):
                 low_level_client or version_tolerant,
             ),
             "generate_sample": self.options.get("generate-sample", False),
+            "default_api_version": self.options.get("default-api-version"),
         }
 
         if options["builders_visibility"] is None:
@@ -276,6 +277,7 @@ class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
                 "default-optional-constants-to-none"
             ),
             "generate-sample": self._autorestapi.get_boolean_value("generate-sample"),
+            "default-api-version": self._autorestapi.get_value("default-api-version"),
         }
         return {k: v for k, v in options.items() if v is not None}
 

package/autorest/codegen/serializers/__init__.py

@@ -125,7 +125,6 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             self.code_model.options["show_operations"]
             and self.code_model.has_operations
             and self.code_model.options["generate_sample"]
-            and not self.code_model.options["multiapi"]
         ):
             self._serialize_and_write_sample(env, namespace_path)
 
@@ -549,6 +548,12 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
+                    if (
+                        self.code_model.options["multiapi"]
+                        and operation.api_versions[0]
+                        != self.code_model.options["default_api_version"]
+                    ):
+                        continue
                     samples = operation.yaml_data["samples"]
                     if not samples or operation.name.startswith("_"):
                         continue

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

@@ -473,7 +473,7 @@ class Model(_MyMutableMapping):
 
 
 def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-return-statements, too-many-statements
-        annotation: typing.Any, module: typing.Optional[str], rf: "_RestField" = None
+        annotation: typing.Any, module: typing.Optional[str], rf: typing.Optional["_RestField"] = None
     ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
         if not annotation or annotation in [int, float]:
             return None
@@ -624,8 +624,8 @@ def _deserialize_with_callable(deserializer: typing.Optional[typing.Callable[[ty
                 # for unknown value, return raw value
                 return value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
-            return deserializer._deserialize(value)  # type: ignore
-        return deserializer(value)
+            return deserializer._deserialize(value)
+        return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
     except Exception as e:
         raise DeserializationError() from e
 

package/autorest/preprocess/__init__.py

@@ -178,9 +178,9 @@ def update_parameter(yaml_data: Dict[str, Any]) -> None:
     if yaml_data.get("propertyToParameterName"):
         # need to create a new one with padded keys and values
         yaml_data["propertyToParameterName"] = {
-            pad_reserved_words(prop, PadType.PROPERTY): pad_reserved_words(
-                param_name, PadType.PARAMETER
-            )
+            pad_reserved_words(prop, PadType.PROPERTY)
+            .lower(): pad_reserved_words(param_name, PadType.PARAMETER)
+            .lower()
             for prop, param_name in yaml_data["propertyToParameterName"].items()
         }
 

package/package.json

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

package/requirements.txt

@@ -6,8 +6,7 @@ json-rpc==1.14.0
 m2r2==0.3.3
 MarkupSafe==2.1.2
 mistune==0.8.4
-mypy-extensions==0.4.3
-pathspec==0.10.3
+pathspec==0.11.0
 platformdirs==2.6.2
 PyYAML==6.0
 tomli==2.0.1