@autorest/python 6.13.4 → 6.13.6

package/autorest/codegen/models/primitive_types.py

@@ -33,7 +33,7 @@ class PrimitiveType(BaseType):  # pylint: disable=abstract-method
         return self.docstring_type(**kwargs)
 
     def docstring_text(self, **kwargs: Any) -> str:
-        return self.docstring_type()
+        return self.docstring_type(**kwargs)
 
     def get_json_template_representation(
         self,
@@ -125,35 +125,36 @@ class BinaryType(PrimitiveType):
 
 
 class BinaryIteratorType(PrimitiveType):
-    """Type returned by response if response is a streamed response"""
+    def _iterator_name(self, **kwargs: Any) -> str:
+        return "AsyncIterator" if kwargs.pop("async_mode") else "Iterator"
 
     @property
     def serialization_type(self) -> str:
         return "IO"
 
     def docstring_type(self, **kwargs: Any) -> str:
-        return "AsyncIterator[bytes]" if kwargs.get("async_mode") else "Iterator[bytes]"
+        return f"{self._iterator_name(**kwargs)}[bytes]"
 
     def type_annotation(self, **kwargs: Any) -> str:
-        return self.docstring_type(**kwargs)
+        return f"{self._iterator_name(**kwargs)}[bytes]"
 
     def docstring_text(self, **kwargs: Any) -> str:
-        iterator = "Async iterator" if kwargs.get("async_mode") else "Iterator"
-        return f"{iterator} of the response bytes"
+        return f"{self._iterator_name(**kwargs)}[bytes]"
 
     @property
     def default_template_representation_declaration(self) -> str:
-        return self.get_declaration("Iterator[bytes]")
+        return self.get_declaration(b"bytes")
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
-        iterator = "AsyncIterator" if kwargs.get("async_mode") else "Iterator"
-        file_import.add_submodule_import("typing", iterator, ImportType.STDLIB)
+        file_import.add_submodule_import(
+            "typing", self._iterator_name(**kwargs), ImportType.STDLIB
+        )
         return file_import
 
     @property
     def instance_check_template(self) -> str:
-        return "isinstance({}, Iterator)"
+        return "getattr({}, '__aiter__', None) is not None or getattr({}, '__iter__', None) is not None"
 
 
 class AnyType(PrimitiveType):

package/autorest/codegen/models/response.py

@@ -155,7 +155,11 @@ class Response(BaseModel):
             else None
         )
         # use ByteIteratorType if we are returning a binary type
-        if isinstance(type, BinaryType):
+        default_content_type = yaml_data.get("defaultContentType", "application/json")
+        if isinstance(type, BinaryType) or (
+            isinstance(type, ByteArraySchema)
+            and default_content_type != "application/json"
+        ):
             type = BinaryIteratorType(type.yaml_data, type.code_model)
         return cls(
             yaml_data=yaml_data,

package/autorest/codegen/serializers/builder_serializer.py

@@ -361,7 +361,9 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
                     "\n"
                 )
             )
-            docstring_type = param.docstring_type(async_mode=self.async_mode)
+            docstring_type = param.docstring_type(
+                async_mode=self.async_mode,
+            )
             description_list.append(
                 f":{param.docstring_type_keyword} {param.client_name}: {docstring_type}"
             )
@@ -1112,12 +1114,12 @@ class _OperationSerializer(
         if response.headers:
             retval.append("")
         deserialize_code: List[str] = []
-        no_stream_logic = False
+        stream_logic = True
         if builder.has_stream_response:
             if isinstance(response.type, ByteArraySchema):
                 deserialized = f"{'await ' if self.async_mode else ''}response.read()"
             else:
-                no_stream_logic = True
+                stream_logic = False
                 if self.code_model.options["version_tolerant"]:
                     deserialized = "response.iter_bytes()"
                 else:
@@ -1171,7 +1173,7 @@ class _OperationSerializer(
                 deserialize_code.append("else:")
                 deserialize_code.append("    deserialized = None")
         if len(deserialize_code) > 0:
-            if builder.expose_stream_keyword and not no_stream_logic:
+            if builder.expose_stream_keyword and stream_logic:
                 retval.append("if _stream:")
                 retval.append("    deserialized = response.iter_bytes()")
                 retval.append("else:")

package/autorest/postprocess/__init__.py

@@ -52,7 +52,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             env_builder = EnvBuilder(with_pip=True)
             self.venv_context = env_builder.ensure_directories(venv_path)
         else:
-            env_builder = ExtendedEnvBuilder(with_pip=True)
+            env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
             env_builder.create(venv_path)
             self.venv_context = env_builder.context
             python_run(

package/autorest/postprocess/venvtools.py

@@ -20,7 +20,10 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
     def __init__(self, *args, **kwargs):
         self.context = None
-        super(ExtendedEnvBuilder, self).__init__(*args, **kwargs)
+        if sys.version_info < (3, 9, 0):
+            # Not supported on Python 3.8, and we don't need it
+            kwargs.pop("upgrade_deps", None)
+        super().__init__(*args, **kwargs)
 
     def ensure_directories(self, env_dir):
         self.context = super(ExtendedEnvBuilder, self).ensure_directories(env_dir)
@@ -34,6 +37,7 @@ def create(
     symlinks=False,
     with_pip=False,
     prompt=None,
+    upgrade_deps=False,
 ):
     """Create a virtual environment in a directory."""
     builder = ExtendedEnvBuilder(
@@ -42,6 +46,7 @@ def create(
         symlinks=symlinks,
         with_pip=with_pip,
         prompt=prompt,
+        upgrade_deps=upgrade_deps,
     )
     builder.create(env_dir)
     return builder.context

package/install.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 try:
@@ -32,13 +32,12 @@ _ROOT_DIR = Path(__file__).parent
 
 def main():
     venv_path = _ROOT_DIR / "venv"
-    venv_prexists = venv_path.exists()
 
-    if venv_prexists:
+    if venv_path.exists():
         env_builder = venv.EnvBuilder(with_pip=True)
         venv_context = env_builder.ensure_directories(venv_path)
     else:
-        env_builder = ExtendedEnvBuilder(with_pip=True)
+        env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
         env_builder.create(venv_path)
         venv_context = env_builder.context
 

package/package.json

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

package/start.py

@@ -23,7 +23,7 @@ def main():
 
     assert venv_prexists  # Otherwise install was not done
 
-    env_builder = venv.EnvBuilder(with_pip=True)
+    env_builder = venv.EnvBuilder(with_pip=True, upgrade_deps=True)
     venv_context = env_builder.ensure_directories(venv_path)
     python_run(venv_context, "autorest.jsonrpc.server", command=sys.argv[1:])
 

package/venvtools.py

@@ -21,6 +21,9 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
     def __init__(self, *args, **kwargs):
         self.context = None
+        if sys.version_info < (3, 9, 0):
+            # Not supported on Python 3.8, and we don't need it
+            kwargs.pop("upgrade_deps", None)
         super().__init__(*args, **kwargs)
 
     def ensure_directories(self, env_dir):
@@ -29,11 +32,11 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
 
 def create(env_dir, system_site_packages=False, clear=False,
-                    symlinks=False, with_pip=False, prompt=None):
+                    symlinks=False, with_pip=False, prompt=None, upgrade_deps=False):
     """Create a virtual environment in a directory."""
     builder = ExtendedEnvBuilder(system_site_packages=system_site_packages,
                                  clear=clear, symlinks=symlinks, with_pip=with_pip,
-                                 prompt=prompt)
+                                 prompt=prompt, upgrade_deps=upgrade_deps)
     builder.create(env_dir)
     return builder.context
 
@@ -44,7 +47,7 @@ def create_venv_with_package(packages):
     packages should be an iterable of pip version instructio (e.g. package~=1.2.3)
     """
     with tempfile.TemporaryDirectory() as tempdir:
-        myenv = create(tempdir, with_pip=True)
+        myenv = create(tempdir, with_pip=True, upgrade_deps=True)
         pip_call = [
             myenv.env_exe,
             "-m",