diff --git a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
index d838a28059c..96fe2849057 100644
--- 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:
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex
index a6e58d1b07b..3666cf09976 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex
index 2093a71f982..b7a907503a2 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
index 8be82a4bde0..69bc522f47b 100644
--- 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
diff --git 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
index 941b1ab0b16..7d82c8ee474 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex
index 700c6253c00..1f144a394c2 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
index 5acf6cfa892..4cb0b96e736 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex
index 8a73fe23507..b9bc897509c 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex
index b5ed1a8bac5..87ef889d886 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex
index 5f936c0b87e..6a8d7820762 100644
--- 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
diff --git 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
index f186cbe2a7f..dd26a09e9e8 100644
--- 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
diff --git 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
index 9b93c10b783..f5cebd6d0ef 100644
--- 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
diff --git 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
index 22fee7ce158..b8c781e355c 100644
--- 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
diff --git 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
index ba71da5d837..31f0068e9e6 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex
index 1791a9282b3..bbc4da7ed5c 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex
index 8148918b994..3bb419c838e 100644
--- 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
diff --git 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
index 6d0d358646c..b95fcbb7a60 100644
--- 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
diff --git 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
index c00729e3510..611d9f45978 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex
index d78d568befb..addbb446215 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex
index b80cca4553d..a679417fc0f 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex
index 5ad36e3d53a..a5fd74d6053 100644
--- 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
diff --git 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
index f7074447b73..7377c1bf841 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex
index c73610ee8df..d9ac889bb26 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex
index 9e081c31c0f..d1eba49b3d3 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex
index 1969a602662..c31b3fbc7bb 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex
index e214eed74e9..2f54131d501 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex
index 4306585c8c9..ca6ce9e95e4 100644
--- 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
diff --git 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
index f459cac8cb3..7b3112369b4 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex
index 2cc1054eb28..52b213cf919 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex
index c979757a00f..84644d6856c 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex
index bb3126dc992..20bd217535e 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex
index cbd8b13aa5f..a9e84d98f6a 100644
--- 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
diff --git 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
index dec0f5786b4..d79060b26d9 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex
index 2e53dc83367..37f87ecc2a2 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex
index f87e35c3d4b..af6d8e35a32 100644
--- 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
diff --git 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
index def6458b25d..1b290fb32d9 100644
--- 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
diff --git 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
index 82f2db2fa2a..6546f67b68a 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex
index 7ea571733b1..624dd5e5d2b 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex
index b0503ebc251..64f64b6179f 100644
--- 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
diff --git 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
index 9527792cfc5..51456bde4dc 100644
--- 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
diff --git 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
index e68e7729ac7..3e971a3f97a 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex
index bdf258674f4..d29fd6fa617 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex
index a4dfb5182e2..96ed9f50e37 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex
index d1a50d43eb7..f6ee0190c48 100644
--- 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
diff --git 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
index 70b97c24e64..fda0c971a2b 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex
index 7e3b45a2b8f..db2d6cad69b 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex
index f1032a35666..d1593bc66b2 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex
index f8fe24d03c9..5892bc99343 100644
--- 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
diff --git 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
index 3a63d0de013..15179f661ac 100644
--- 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
diff --git 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
index f7c6139452b..9557528cbbc 100644
--- 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
diff --git 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
index 40da8a07a03..d51bc748f80 100644
--- 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
diff --git 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
index 885ce63df97..291df0f0550 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex
index a97c69d0f56..0779f45b68c 100644
--- 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
diff --git 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
index 05a59cb92e4..b0c1e6ea146 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex
index 44f2ddd6be0..5e47946ac82 100644
--- 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
diff --git 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
index f69d46d4c55..d03d06eed59 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex
index b2209758f3f..94fd2d0e3d7 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex
index eea7eb439f0..bf27e073957 100644
--- 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
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex
index 18b26737404..ab49fb42892 100644
--- 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
diff --git 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
index 2e927d6172c..22431807bde 100644
--- 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:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
index adb1288514e..36996d1ead4 100644
--- 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:
diff --git 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
index 8042169dd87..4c2132ae3d8 100644
--- 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