Python-exp clean up model classnames (#7054)

* Adds lazy_import, removes python-exp java class renaming code, partial removal of getPythonClassName call sites Fixes PythonClientExperimentalTest.java Python-exp smaples regeneration Revers makefile Reverst pom.xml Fixes model imports in models.__init__ Updates docstring, omits lazy import in additional properties if we dont need it Improves additional_properties_type assignment if None Removes getPythonClassName Fixes python-exp tests * Removes unused makefiles
2025-12-22 01:47:08 +00:00 · 2020-07-27 18:35:41 -07:00
parent 2743242ef4
commit ee0686e13f
419 changed files with 2491 additions and 2229 deletions
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesAnyType.md
@@ -1,4 +1,4 @@
-# additional_properties_any_type.AdditionalPropertiesAnyType
+# AdditionalPropertiesAnyType

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesArray.md
@@ -1,4 +1,4 @@
-# additional_properties_array.AdditionalPropertiesArray
+# AdditionalPropertiesArray

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesBoolean.md
@@ -1,4 +1,4 @@
-# additional_properties_boolean.AdditionalPropertiesBoolean
+# AdditionalPropertiesBoolean

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,4 @@
-# additional_properties_class.AdditionalPropertiesClass
+# AdditionalPropertiesClass

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesInteger.md
@@ -1,4 +1,4 @@
-# additional_properties_integer.AdditionalPropertiesInteger
+# AdditionalPropertiesInteger

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesNumber.md
@@ -1,4 +1,4 @@
-# additional_properties_number.AdditionalPropertiesNumber
+# AdditionalPropertiesNumber

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesObject.md
@@ -1,4 +1,4 @@
-# additional_properties_object.AdditionalPropertiesObject
+# AdditionalPropertiesObject

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/python-experimental/docs/AdditionalPropertiesString.md
@@ -1,4 +1,4 @@
-# additional_properties_string.AdditionalPropertiesString
+# AdditionalPropertiesString

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Animal.md
+++ b/samples/client/petstore/python-experimental/docs/Animal.md
@@ -1,4 +1,4 @@
-# animal.Animal
+# Animal

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/AnimalFarm.md
+++ b/samples/client/petstore/python-experimental/docs/AnimalFarm.md
@@ -1,9 +1,9 @@
-# animal_farm.AnimalFarm
+# AnimalFarm

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**value** | [**[animal.Animal]**](Animal.md) |  | 
+**value** | [**[Animal]**](Animal.md) |  | 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/python-experimental/docs/AnotherFakeApi.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description


 # **call_123_test_special_tags**
-> client.Client call_123_test_special_tags(body)
+> Client call_123_test_special_tags(body)

 To test special tags

@@ -20,7 +20,7 @@ To test special tags and operation ID starting with number
 import time
 import petstore_api
 from petstore_api.api import another_fake_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -33,7 +33,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = another_fake_api.AnotherFakeApi(api_client)
-    body = client.Client() # client.Client | client model
+    body = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
@@ -48,11 +48,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**client.Client**](Client.md)| client model |
+ **body** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/client/petstore/python-experimental/docs/ApiResponse.md
+++ b/samples/client/petstore/python-experimental/docs/ApiResponse.md
@@ -1,4 +1,4 @@
-# api_response.ApiResponse
+# ApiResponse

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-experimental/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,4 @@
-# array_of_array_of_number_only.ArrayOfArrayOfNumberOnly
+# ArrayOfArrayOfNumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-experimental/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,4 @@
-# array_of_number_only.ArrayOfNumberOnly
+# ArrayOfNumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ArrayTest.md
+++ b/samples/client/petstore/python-experimental/docs/ArrayTest.md
@@ -1,11 +1,11 @@
-# array_test.ArrayTest
+# ArrayTest

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **array_of_string** | **[str]** |  | [optional] 
 **array_array_of_integer** | **[[int]]** |  | [optional] 
-**array_array_of_model** | [**[[read_only_first.ReadOnlyFirst]]**](ReadOnlyFirst.md) |  | [optional] 
+**array_array_of_model** | [**[[ReadOnlyFirst]]**](ReadOnlyFirst.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/Capitalization.md
+++ b/samples/client/petstore/python-experimental/docs/Capitalization.md
@@ -1,4 +1,4 @@
-# capitalization.Capitalization
+# Capitalization

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Cat.md
+++ b/samples/client/petstore/python-experimental/docs/Cat.md
@@ -1,4 +1,4 @@
-# cat.Cat
+# Cat

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/CatAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/CatAllOf.md
@@ -1,4 +1,4 @@
-# cat_all_of.CatAllOf
+# CatAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Category.md
+++ b/samples/client/petstore/python-experimental/docs/Category.md
@@ -1,4 +1,4 @@
-# category.Category
+# Category

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Child.md
+++ b/samples/client/petstore/python-experimental/docs/Child.md
@@ -1,4 +1,4 @@
-# child.Child
+# Child

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/ChildAllOf.md
@@ -1,4 +1,4 @@
-# child_all_of.ChildAllOf
+# ChildAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildCat.md
+++ b/samples/client/petstore/python-experimental/docs/ChildCat.md
@@ -1,4 +1,4 @@
-# child_cat.ChildCat
+# ChildCat

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/ChildCatAllOf.md
@@ -1,4 +1,4 @@
-# child_cat_all_of.ChildCatAllOf
+# ChildCatAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildDog.md
+++ b/samples/client/petstore/python-experimental/docs/ChildDog.md
@@ -1,4 +1,4 @@
-# child_dog.ChildDog
+# ChildDog

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildDogAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/ChildDogAllOf.md
@@ -1,4 +1,4 @@
-# child_dog_all_of.ChildDogAllOf
+# ChildDogAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildLizard.md
+++ b/samples/client/petstore/python-experimental/docs/ChildLizard.md
@@ -1,4 +1,4 @@
-# child_lizard.ChildLizard
+# ChildLizard

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ChildLizardAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/ChildLizardAllOf.md
@@ -1,4 +1,4 @@
-# child_lizard_all_of.ChildLizardAllOf
+# ChildLizardAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ClassModel.md
+++ b/samples/client/petstore/python-experimental/docs/ClassModel.md
@@ -1,4 +1,4 @@
-# class_model.ClassModel
+# ClassModel

 Model for testing model with \"_class\" property
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/Client.md
+++ b/samples/client/petstore/python-experimental/docs/Client.md
@@ -1,4 +1,4 @@
-# client.Client
+# Client

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Dog.md
+++ b/samples/client/petstore/python-experimental/docs/Dog.md
@@ -1,4 +1,4 @@
-# dog.Dog
+# Dog

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/DogAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/DogAllOf.md
@@ -1,4 +1,4 @@
-# dog_all_of.DogAllOf
+# DogAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/EnumArrays.md
+++ b/samples/client/petstore/python-experimental/docs/EnumArrays.md
@@ -1,4 +1,4 @@
-# enum_arrays.EnumArrays
+# EnumArrays

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/EnumClass.md
+++ b/samples/client/petstore/python-experimental/docs/EnumClass.md
@@ -1,4 +1,4 @@
-# enum_class.EnumClass
+# EnumClass

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/EnumTest.md
+++ b/samples/client/petstore/python-experimental/docs/EnumTest.md
@@ -1,4 +1,4 @@
-# enum_test.EnumTest
+# EnumTest

 ## Properties
 Name | Type | Description | Notes
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **enum_string** | **str** |  | [optional] 
 **enum_integer** | **int** |  | [optional] 
 **enum_number** | **float** |  | [optional] 
-**string_enum** | [**string_enum.StringEnum**](StringEnum.md) |  | [optional] 
+**string_enum** | [**StringEnum**](StringEnum.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/FakeApi.md
+++ b/samples/client/petstore/python-experimental/docs/FakeApi.md
@@ -23,7 +23,7 @@ Method | HTTP request | Description


 # **array_model**
-> animal_farm.AnimalFarm array_model()
+> AnimalFarm array_model()



@@ -35,7 +35,7 @@ Test serialization of ArrayModel
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import animal_farm
+from petstore_api.model.animal_farm import AnimalFarm
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -48,7 +48,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = animal_farm.AnimalFarm() # animal_farm.AnimalFarm | Input model (optional)
+    body = AnimalFarm() # AnimalFarm | Input model (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -63,11 +63,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**animal_farm.AnimalFarm**](AnimalFarm.md)| Input model | [optional]
+ **body** | [**AnimalFarm**](AnimalFarm.md)| Input model | [optional]

 ### Return type

-[**animal_farm.AnimalFarm**](AnimalFarm.md)
+[**AnimalFarm**](AnimalFarm.md)

 ### Authorization

@@ -160,7 +160,7 @@ this route creates an XmlItem
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import xml_item
+from petstore_api.model.xml_item import XmlItem
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -173,7 +173,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    xml_item = xml_item.XmlItem() # xml_item.XmlItem | XmlItem Body
+    xml_item = XmlItem() # XmlItem | XmlItem Body
    
    # example passing only required values which don't have defaults set
    try:
@@ -187,7 +187,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **xml_item** | [**xml_item.XmlItem**](XmlItem.md)| XmlItem Body |
+ **xml_item** | [**XmlItem**](XmlItem.md)| XmlItem Body |

 ### Return type

@@ -210,7 +210,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **number_with_validations**
-> number_with_validations.NumberWithValidations number_with_validations()
+> NumberWithValidations number_with_validations()



@@ -222,7 +222,7 @@ Test serialization of outer number types
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import number_with_validations
+from petstore_api.model.number_with_validations import NumberWithValidations
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -235,7 +235,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = number_with_validations.NumberWithValidations(3.4) # number_with_validations.NumberWithValidations | Input number as post body (optional)
+    body = NumberWithValidations(3.4) # NumberWithValidations | Input number as post body (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -250,11 +250,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**number_with_validations.NumberWithValidations**](NumberWithValidations.md)| Input number as post body | [optional]
+ **body** | [**NumberWithValidations**](NumberWithValidations.md)| Input number as post body | [optional]

 ### Return type

-[**number_with_validations.NumberWithValidations**](NumberWithValidations.md)
+[**NumberWithValidations**](NumberWithValidations.md)

 ### Authorization

@@ -273,7 +273,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **object_model_with_ref_props**
-> object_model_with_ref_props.ObjectModelWithRefProps object_model_with_ref_props()
+> ObjectModelWithRefProps object_model_with_ref_props()



@@ -285,7 +285,7 @@ Test serialization of object with $refed properties
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import object_model_with_ref_props
+from petstore_api.model.object_model_with_ref_props import ObjectModelWithRefProps
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -298,7 +298,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = object_model_with_ref_props.ObjectModelWithRefProps() # object_model_with_ref_props.ObjectModelWithRefProps | Input model (optional)
+    body = ObjectModelWithRefProps() # ObjectModelWithRefProps | Input model (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -313,11 +313,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**object_model_with_ref_props.ObjectModelWithRefProps**](ObjectModelWithRefProps.md)| Input model | [optional]
+ **body** | [**ObjectModelWithRefProps**](ObjectModelWithRefProps.md)| Input model | [optional]

 ### Return type

-[**object_model_with_ref_props.ObjectModelWithRefProps**](ObjectModelWithRefProps.md)
+[**ObjectModelWithRefProps**](ObjectModelWithRefProps.md)

 ### Authorization

@@ -398,7 +398,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **string_enum**
-> string_enum.StringEnum string_enum()
+> StringEnum string_enum()



@@ -410,7 +410,7 @@ Test serialization of outer enum
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import string_enum
+from petstore_api.model.string_enum import StringEnum
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -423,7 +423,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = string_enum.StringEnum("placed") # string_enum.StringEnum | Input enum (optional)
+    body = StringEnum("placed") # StringEnum | Input enum (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -438,11 +438,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**string_enum.StringEnum**](StringEnum.md)| Input enum | [optional]
+ **body** | [**StringEnum**](StringEnum.md)| Input enum | [optional]

 ### Return type

-[**string_enum.StringEnum**](StringEnum.md)
+[**StringEnum**](StringEnum.md)

 ### Authorization

@@ -473,7 +473,7 @@ For this test, the body for this request much reference a schema named `File`.
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import file_schema_test_class
+from petstore_api.model.file_schema_test_class import FileSchemaTestClass
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -486,7 +486,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = file_schema_test_class.FileSchemaTestClass() # file_schema_test_class.FileSchemaTestClass | 
+    body = FileSchemaTestClass() # FileSchemaTestClass | 
    
    # example passing only required values which don't have defaults set
    try:
@@ -499,7 +499,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**file_schema_test_class.FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+ **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |

 ### Return type

@@ -532,7 +532,7 @@ No authorization required
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -546,7 +546,7 @@ with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
    query = 'query_example' # str | 
-    body = user.User() # user.User | 
+    body = User() # User | 
    
    # example passing only required values which don't have defaults set
    try:
@@ -560,7 +560,7 @@ with petstore_api.ApiClient() as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **query** | **str**|  |
- **body** | [**user.User**](User.md)|  |
+ **body** | [**User**](User.md)|  |

 ### Return type

@@ -583,7 +583,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **test_client_model**
-> client.Client test_client_model(body)
+> Client test_client_model(body)

 To test \"client\" model

@@ -595,7 +595,7 @@ To test \"client\" model
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -608,7 +608,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = client.Client() # client.Client | client model
+    body = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
@@ -623,11 +623,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**client.Client**](Client.md)| client model |
+ **body** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description


 # **test_classname**
-> client.Client test_classname(body)
+> Client test_classname(body)

 To test class name in snake case

@@ -21,7 +21,7 @@ To test class name in snake case
 import time
 import petstore_api
 from petstore_api.api import fake_classname_tags_123_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -48,7 +48,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = fake_classname_tags_123_api.FakeClassnameTags123Api(api_client)
-    body = client.Client() # client.Client | client model
+    body = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
@@ -63,11 +63,11 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**client.Client**](Client.md)| client model |
+ **body** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/client/petstore/python-experimental/docs/File.md
+++ b/samples/client/petstore/python-experimental/docs/File.md
@@ -1,4 +1,4 @@
-# file.File
+# File

 Must be named `File` for test.
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/python-experimental/docs/FileSchemaTestClass.md
@@ -1,10 +1,10 @@
-# file_schema_test_class.FileSchemaTestClass
+# FileSchemaTestClass

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**file** | [**file.File**](File.md) |  | [optional] 
-**files** | [**[file.File]**](File.md) |  | [optional] 
+**file** | [**File**](File.md) |  | [optional] 
+**files** | [**[File]**](File.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/FormatTest.md
+++ b/samples/client/petstore/python-experimental/docs/FormatTest.md
@@ -1,4 +1,4 @@
-# format_test.FormatTest
+# FormatTest

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Grandparent.md
+++ b/samples/client/petstore/python-experimental/docs/Grandparent.md
@@ -1,4 +1,4 @@
-# grandparent.Grandparent
+# Grandparent

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/python-experimental/docs/GrandparentAnimal.md
@@ -1,4 +1,4 @@
-# grandparent_animal.GrandparentAnimal
+# GrandparentAnimal

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/python-experimental/docs/HasOnlyReadOnly.md
@@ -1,4 +1,4 @@
-# has_only_read_only.HasOnlyReadOnly
+# HasOnlyReadOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/List.md
+++ b/samples/client/petstore/python-experimental/docs/List.md
@@ -1,4 +1,4 @@
-# list.List
+# List

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/MapTest.md
+++ b/samples/client/petstore/python-experimental/docs/MapTest.md
@@ -1,4 +1,4 @@
-# map_test.MapTest
+# MapTest

 ## Properties
 Name | Type | Description | Notes
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **map_map_of_string** | **{str: ({str: (str,)},)}** |  | [optional] 
 **map_of_enum_string** | **{str: (str,)}** |  | [optional] 
 **direct_map** | **{str: (bool,)}** |  | [optional] 
-**indirect_map** | [**string_boolean_map.StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirect_map** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,11 +1,11 @@
-# mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass
+# MixedPropertiesAndAdditionalPropertiesClass

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **str** |  | [optional] 
 **date_time** | **datetime** |  | [optional] 
-**map** | [**{str: (animal.Animal,)}**](Animal.md) |  | [optional] 
+**map** | [**{str: (Animal,)}**](Animal.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/python-experimental/docs/Model200Response.md
+++ b/samples/client/petstore/python-experimental/docs/Model200Response.md
@@ -1,4 +1,4 @@
-# model200_response.Model200Response
+# Model200Response

 Model for testing model name starting with number
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/ModelReturn.md
+++ b/samples/client/petstore/python-experimental/docs/ModelReturn.md
@@ -1,4 +1,4 @@
-# model_return.ModelReturn
+# ModelReturn

 Model for testing reserved words
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/Name.md
+++ b/samples/client/petstore/python-experimental/docs/Name.md
@@ -1,4 +1,4 @@
-# name.Name
+# Name

 Model for testing model name same as property name
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/NumberOnly.md
+++ b/samples/client/petstore/python-experimental/docs/NumberOnly.md
@@ -1,4 +1,4 @@
-# number_only.NumberOnly
+# NumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/NumberWithValidations.md
+++ b/samples/client/petstore/python-experimental/docs/NumberWithValidations.md
@@ -1,4 +1,4 @@
-# number_with_validations.NumberWithValidations
+# NumberWithValidations

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ObjectModelWithRefProps.md
+++ b/samples/client/petstore/python-experimental/docs/ObjectModelWithRefProps.md
@@ -1,10 +1,10 @@
-# object_model_with_ref_props.ObjectModelWithRefProps
+# ObjectModelWithRefProps

 a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**my_number** | [**number_with_validations.NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
+**my_number** | [**NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
 **my_string** | **str** |  | [optional] 
 **my_boolean** | **bool** |  | [optional] 

--- a/samples/client/petstore/python-experimental/docs/Order.md
+++ b/samples/client/petstore/python-experimental/docs/Order.md
@@ -1,4 +1,4 @@
-# order.Order
+# Order

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Parent.md
+++ b/samples/client/petstore/python-experimental/docs/Parent.md
@@ -1,4 +1,4 @@
-# parent.Parent
+# Parent

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ParentAllOf.md
+++ b/samples/client/petstore/python-experimental/docs/ParentAllOf.md
@@ -1,4 +1,4 @@
-# parent_all_of.ParentAllOf
+# ParentAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ParentPet.md
+++ b/samples/client/petstore/python-experimental/docs/ParentPet.md
@@ -1,4 +1,4 @@
-# parent_pet.ParentPet
+# ParentPet

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Pet.md
+++ b/samples/client/petstore/python-experimental/docs/Pet.md
@@ -1,4 +1,4 @@
-# pet.Pet
+# Pet

 ## Properties
 Name | Type | Description | Notes
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **name** | **str** |  | 
 **photo_urls** | **[str]** |  | 
 **id** | **int** |  | [optional] 
-**category** | [**category.Category**](Category.md) |  | [optional] 
-**tags** | [**[tag.Tag]**](Tag.md) |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
 **status** | **str** | pet status in the store | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
--- a/samples/client/petstore/python-experimental/docs/PetApi.md
+++ b/samples/client/petstore/python-experimental/docs/PetApi.md
@@ -27,7 +27,7 @@ Add a new pet to the store
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -50,7 +50,7 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = pet_api.PetApi(api_client)
-    body = pet.Pet() # pet.Pet | Pet object that needs to be added to the store
+    body = Pet() # Pet | Pet object that needs to be added to the store
    
    # example passing only required values which don't have defaults set
    try:
@@ -64,7 +64,7 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**pet.Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -169,7 +169,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **find_pets_by_status**
-> [pet.Pet] find_pets_by_status(status)
+> [Pet] find_pets_by_status(status)

 Finds Pets by status

@@ -182,7 +182,7 @@ Multiple status values can be provided with comma separated strings
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -224,7 +224,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**[pet.Pet]**](Pet.md)
+[**[Pet]**](Pet.md)

 ### Authorization

@@ -244,7 +244,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **find_pets_by_tags**
-> [pet.Pet] find_pets_by_tags(tags)
+> [Pet] find_pets_by_tags(tags)

 Finds Pets by tags

@@ -257,7 +257,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -299,7 +299,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**[pet.Pet]**](Pet.md)
+[**[Pet]**](Pet.md)

 ### Authorization

@@ -319,7 +319,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_pet_by_id**
-> pet.Pet get_pet_by_id(pet_id)
+> Pet get_pet_by_id(pet_id)

 Find pet by ID

@@ -332,7 +332,7 @@ Returns a single pet
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -378,7 +378,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**pet.Pet**](Pet.md)
+[**Pet**](Pet.md)

 ### Authorization

@@ -410,7 +410,7 @@ Update an existing pet
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -433,7 +433,7 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = pet_api.PetApi(api_client)
-    body = pet.Pet() # pet.Pet | Pet object that needs to be added to the store
+    body = Pet() # Pet | Pet object that needs to be added to the store
    
    # example passing only required values which don't have defaults set
    try:
@@ -447,7 +447,7 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**pet.Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -555,7 +555,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **upload_file**
-> api_response.ApiResponse upload_file(pet_id)
+> ApiResponse upload_file(pet_id)

 uploads an image

@@ -566,7 +566,7 @@ uploads an image
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import api_response
+from petstore_api.model.api_response import ApiResponse
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -623,7 +623,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**api_response.ApiResponse**](ApiResponse.md)
+[**ApiResponse**](ApiResponse.md)

 ### Authorization

@@ -642,7 +642,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **upload_file_with_required_file**
-> api_response.ApiResponse upload_file_with_required_file(pet_id, required_file)
+> ApiResponse upload_file_with_required_file(pet_id, required_file)

 uploads an image (required)

@@ -653,7 +653,7 @@ uploads an image (required)
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import api_response
+from petstore_api.model.api_response import ApiResponse
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -708,7 +708,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**api_response.ApiResponse**](ApiResponse.md)
+[**ApiResponse**](ApiResponse.md)

 ### Authorization

--- a/samples/client/petstore/python-experimental/docs/Player.md
+++ b/samples/client/petstore/python-experimental/docs/Player.md
@@ -1,4 +1,4 @@
-# player.Player
+# Player

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/python-experimental/docs/ReadOnlyFirst.md
@@ -1,4 +1,4 @@
-# read_only_first.ReadOnlyFirst
+# ReadOnlyFirst

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/SpecialModelName.md
+++ b/samples/client/petstore/python-experimental/docs/SpecialModelName.md
@@ -1,4 +1,4 @@
-# special_model_name.SpecialModelName
+# SpecialModelName

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/StoreApi.md
+++ b/samples/client/petstore/python-experimental/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_order_by_id**
-> order.Order get_order_by_id(order_id)
+> Order get_order_by_id(order_id)

 Find purchase order by ID

@@ -158,7 +158,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge
 import time
 import petstore_api
 from petstore_api.api import store_api
-from petstore_api.model import order
+from petstore_api.model.order import Order
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -190,7 +190,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**order.Order**](Order.md)
+[**Order**](Order.md)

 ### Authorization

@@ -211,7 +211,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **place_order**
-> order.Order place_order(body)
+> Order place_order(body)

 Place an order for a pet

@@ -221,7 +221,7 @@ Place an order for a pet
 import time
 import petstore_api
 from petstore_api.api import store_api
-from petstore_api.model import order
+from petstore_api.model.order import Order
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -234,7 +234,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = store_api.StoreApi(api_client)
-    body = order.Order() # order.Order | order placed for purchasing the pet
+    body = Order() # Order | order placed for purchasing the pet
    
    # example passing only required values which don't have defaults set
    try:
@@ -249,11 +249,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**order.Order**](Order.md)| order placed for purchasing the pet |
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet |

 ### Return type

-[**order.Order**](Order.md)
+[**Order**](Order.md)

 ### Authorization

--- a/samples/client/petstore/python-experimental/docs/StringBooleanMap.md
+++ b/samples/client/petstore/python-experimental/docs/StringBooleanMap.md
@@ -1,4 +1,4 @@
-# string_boolean_map.StringBooleanMap
+# StringBooleanMap

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/StringEnum.md
+++ b/samples/client/petstore/python-experimental/docs/StringEnum.md
@@ -1,4 +1,4 @@
-# string_enum.StringEnum
+# StringEnum

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/Tag.md
+++ b/samples/client/petstore/python-experimental/docs/Tag.md
@@ -1,4 +1,4 @@
-# tag.Tag
+# Tag

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/python-experimental/docs/TypeHolderDefault.md
@@ -1,4 +1,4 @@
-# type_holder_default.TypeHolderDefault
+# TypeHolderDefault

 a model to test optional properties with server defaults
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/TypeHolderExample.md
+++ b/samples/client/petstore/python-experimental/docs/TypeHolderExample.md
@@ -1,4 +1,4 @@
-# type_holder_example.TypeHolderExample
+# TypeHolderExample

 a model to test required properties with an example and length one enum
 ## Properties
--- a/samples/client/petstore/python-experimental/docs/User.md
+++ b/samples/client/petstore/python-experimental/docs/User.md
@@ -1,4 +1,4 @@
-# user.User
+# User

 ## Properties
 Name | Type | Description | Notes
--- a/samples/client/petstore/python-experimental/docs/UserApi.md
+++ b/samples/client/petstore/python-experimental/docs/UserApi.md
@@ -27,7 +27,7 @@ This can only be done by the logged in user.
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -40,7 +40,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    body = user.User() # user.User | Created user object
+    body = User() # User | Created user object
    
    # example passing only required values which don't have defaults set
    try:
@@ -54,7 +54,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**user.User**](User.md)| Created user object |
+ **body** | [**User**](User.md)| Created user object |

 ### Return type

@@ -87,7 +87,7 @@ Creates list of users with given input array
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -100,7 +100,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    body = [user.User()] # [user.User] | List of user object
+    body = [User()] # [User] | List of user object
    
    # example passing only required values which don't have defaults set
    try:
@@ -114,7 +114,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[user.User]**](User.md)| List of user object |
+ **body** | [**[User]**](User.md)| List of user object |

 ### Return type

@@ -147,7 +147,7 @@ Creates list of users with given input array
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -160,7 +160,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    body = [user.User()] # [user.User] | List of user object
+    body = [User()] # [User] | List of user object
    
    # example passing only required values which don't have defaults set
    try:
@@ -174,7 +174,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[user.User]**](User.md)| List of user object |
+ **body** | [**[User]**](User.md)| List of user object |

 ### Return type

@@ -259,7 +259,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_user_by_name**
-> user.User get_user_by_name(username)
+> User get_user_by_name(username)

 Get user by user name

@@ -269,7 +269,7 @@ Get user by user name
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -301,7 +301,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**user.User**](User.md)
+[**User**](User.md)

 ### Authorization

@@ -452,7 +452,7 @@ This can only be done by the logged in user.
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -466,7 +466,7 @@ with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
    username = 'username_example' # str | name that need to be deleted
-    body = user.User() # user.User | Updated user object
+    body = User() # User | Updated user object
    
    # example passing only required values which don't have defaults set
    try:
@@ -481,7 +481,7 @@ with petstore_api.ApiClient() as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **username** | **str**| name that need to be deleted |
- **body** | [**user.User**](User.md)| Updated user object |
+ **body** | [**User**](User.md)| Updated user object |

 ### Return type

--- a/samples/client/petstore/python-experimental/docs/XmlItem.md
+++ b/samples/client/petstore/python-experimental/docs/XmlItem.md
@@ -1,4 +1,4 @@
-# xml_item.XmlItem
+# XmlItem

 ## Properties
 Name | Type | Description | Notes