clean up

Author: padznich

modules/openapi-generator/src/main/resources/python/model_generic.mustache

@@ -16,9 +16,9 @@ from pydantic import Field
 {{! If this model is a super class, importlib is used. So import the necessary modules for the type here. }}
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-{{#mappedModels}}
-from {{packageName}}.models.{{model.classFilename}} import {{modelName}}
-{{/mappedModels}}
+    {{#mappedModels}}
+    from {{packageName}}.models.{{model.classFilename}} import {{modelName}}
+    {{/mappedModels}}
 
 {{/discriminator}}
 {{/hasChildren}}
@@ -166,7 +166,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py

@@ -49,7 +49,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py

@@ -49,7 +49,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py

@@ -52,7 +52,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py

@@ -70,7 +70,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py

@@ -51,7 +51,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py

@@ -68,7 +68,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py

@@ -63,7 +63,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py

@@ -49,7 +49,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_form_object_multipart_request_marker.py

@@ -48,7 +48,7 @@ def from_json(cls, json_str: str) -> Self:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""
-        return self.model_dump_json(by_alias=True)
+        return json.dumps(self.model_dump(by_alias=True))
 
     def to_dict(self) -> Dict[str, Any]:
         """Returns the dict representation of the actual instance"""