[python-experimental] Enhance octet-stream deserialize (#13402)

* [python-experimental] Enhance octet-stream deserialization When the headers didn't provide the filename, use the url of response to extract filename. * [python-experimental] Remove todo comment. * [python-experimental] Fix test code. * Update samples * [python-experimental] Refined the method and the test + Early return when the url is empty or `None`. + Removed unused f-string prefix. * [python-experimental] Comapre url is None explicitly. * Update samples.
2022-09-13 03:04:14 +08:00 · 2022-09-13 03:04:14 +08:00 · 8e66294bfe
commit 8e66294bfe
parent 194d421d83
62 changed files with 151 additions and 67 deletions
--- a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
@ -15,7 +15,7 @@ import tempfile
 import typing
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase

 {{#if tornado}}
@ -832,6 +832,19 @@ class OpenApiResponse(JSONDetector):
        # python must be >= 3.9 so we can pass in bytes into json.loads
        return json.loads(response.data)

+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
    @classmethod
    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
        if content_disposition is None:
@ -851,13 +864,16 @@ class OpenApiResponse(JSONDetector):
            a file will be written and returned
        """
        if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )

            if file_name is None:
                _fd, path = tempfile.mkstemp()
            else:
                path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
            with open(path, 'wb') as new_file:
                chunk_size = 1024
                while True:
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.AnotherFake do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.Default do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.Fake do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.FakeClassnameTags123 do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.Pet do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.Store do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Api.User do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Connection do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Deserializer do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.FooGetDefaultResponse do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.SpecialModelName do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.AdditionalPropertiesClass do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.AllOfWithSingleRef do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Animal do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ApiResponse do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ArrayOfArrayOfNumberOnly do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ArrayOfNumberOnly do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ArrayTest do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Capitalization do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Cat do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.CatAllOf do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Category do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ClassModel do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Client do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.DeprecatedObject do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Dog do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.DogAllOf do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.EnumArrays do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.EnumClass do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.EnumTest do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.File do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.FileSchemaTestClass do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Foo do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.FormatTest do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.HasOnlyReadOnly do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.HealthCheckResult do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.List do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.MapTest do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Model200Response do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Name do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.NullableClass do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.NumberOnly do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Order do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterComposite do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterEnum do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterEnumDefaultValue do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterEnumInteger do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterEnumIntegerDefaultValue do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Pet do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.ReadOnlyFirst do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Return do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.SingleRefType do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.Tag do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.Model.User do
--- a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex
@ -1,4 +1,4 @@
-# NOTE: This file is auto generated by OpenAPI Generator 6.1.0-SNAPSHOT (https://openapi-generator.tech).
+# NOTE: This file is auto generated by OpenAPI Generator 6.1.1-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.

 defmodule OpenapiPetstore.RequestBuilder do
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
@ -22,7 +22,7 @@ import tempfile
 import typing
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase

 import frozendict
@ -836,6 +836,19 @@ class OpenApiResponse(JSONDetector):
        # python must be >= 3.9 so we can pass in bytes into json.loads
        return json.loads(response.data)

+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
    @classmethod
    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
        if content_disposition is None:
@ -855,13 +868,16 @@ class OpenApiResponse(JSONDetector):
            a file will be written and returned
        """
        if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )

            if file_name is None:
                _fd, path = tempfile.mkstemp()
            else:
                path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
            with open(path, 'wb') as new_file:
                chunk_size = 1024
                while True:
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
@ -22,7 +22,7 @@ import tempfile
 import typing
 import urllib3
 from urllib3._collections import HTTPHeaderDict
-from urllib.parse import quote
+from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase

 import frozendict
@ -836,6 +836,19 @@ class OpenApiResponse(JSONDetector):
        # python must be >= 3.9 so we can pass in bytes into json.loads
        return json.loads(response.data)

+    @staticmethod
+    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
+        if response_url is None:
+            return None
+        url_path = urlparse(response_url).path
+        if url_path:
+            path_basename = os.path.basename(url_path)
+            if path_basename:
+                _filename, ext = os.path.splitext(path_basename)
+                if ext:
+                    return path_basename
+        return None
+
    @classmethod
    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
        if content_disposition is None:
@ -855,13 +868,16 @@ class OpenApiResponse(JSONDetector):
            a file will be written and returned
        """
        if response.supports_chunked_reads():
-            file_name = self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+            file_name = (
+                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
+                or self.__file_name_from_response_url(response.geturl())
+            )

            if file_name is None:
                _fd, path = tempfile.mkstemp()
            else:
                path = os.path.join(tempfile.gettempdir(), file_name)
-            # TODO get file_name from the filename at the end of the url if it exists
+
            with open(path, 'wb') as new_file:
                chunk_size = 1024
                while True:
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py
@ -400,6 +400,42 @@ class TestFakeApi(ApiTestMixin):
        api_response.body.close()
        os.unlink(api_response.body.name)

+        """
+        when streaming is used and the response contains the content disposition header without a filename
+        the url of response is used to extract the filename.
+        """
+        file1 = open(file_path1, "rb")
+        streamable_body = StreamableBody(file1)
+        expected_filename = "the_file.ext"
+
+        no_filename_mock_response = self.response(
+            streamable_body,
+            content_type='application/octet-stream',
+            headers={'content-disposition': 'attachment'},
+            preload_content=False
+        )
+
+        with patch.object(RESTClientObject, 'request') as mock_request:
+            no_filename_mock_response.geturl = lambda: f'http://foo.bar/{expected_filename}'
+            mock_request.return_value = no_filename_mock_response
+            api_response = self.api.upload_download_file(body=file_bytes, stream=True)
+            self.assert_request_called_with(
+                mock_request,
+                'http://petstore.swagger.io:80/v2/fake/uploadDownloadFile',
+                body=file_bytes,
+                content_type='application/octet-stream',
+                accept_content_type='application/octet-stream',
+                stream=True
+            )
+        self.assertTrue(file1.closed)
+        self.assertTrue(isinstance(api_response.body, schemas.BinarySchema))
+        self.assertTrue(isinstance(api_response.body, schemas.FileSchema))
+        self.assertTrue(isinstance(api_response.body, schemas.FileIO))
+        self.assertTrue(api_response.body.name.endswith(expected_filename))
+        self.assertEqual(api_response.body.read(), file_bytes)
+        api_response.body.close()
+        os.unlink(api_response.body.name)
+
    def test_upload_file(self):
        """Test case for upload_file
        uploads a file using multipart/form-data  # noqa: E501