diff --git a/src/openapi_python_generator/language_converters/python/service_generator.py b/src/openapi_python_generator/language_converters/python/service_generator.py index f0dfe50..eb28e0a 100644 --- a/src/openapi_python_generator/language_converters/python/service_generator.py +++ b/src/openapi_python_generator/language_converters/python/service_generator.py @@ -36,7 +36,7 @@ def generate_body_param(operation: Operation) -> Union[str, None]: return None else: if isinstance(operation.requestBody, Reference): - return "data.dict()" + return "data.model_dump()" if operation.requestBody.content is None: return None # pragma: no cover @@ -50,7 +50,7 @@ def generate_body_param(operation: Operation) -> Union[str, None]: return None # pragma: no cover if isinstance(media_type.media_type_schema, Reference): - return "data.dict()" + return "data.model_dump()" elif isinstance(media_type.media_type_schema, Schema): schema = media_type.media_type_schema if schema.type == "array": diff --git a/src/openapi_python_generator/language_converters/python/templates/enum.jinja2 b/src/openapi_python_generator/language_converters/python/templates/enum.jinja2 index f88bdd6..bde758e 100644 --- a/src/openapi_python_generator/language_converters/python/templates/enum.jinja2 +++ b/src/openapi_python_generator/language_converters/python/templates/enum.jinja2 @@ -4,6 +4,6 @@ class {{ name }}(str, Enum): {% for enumItem in enum %} {% if enumItem is string %} - {{ enumItem.upper() }} = '{{ enumItem }}'{% else %} + {{ enumItem.upper().replace('-', '_') }} = '{{ enumItem }}'{% else %} value_{{ enumItem }} = {{ enumItem }}{% endif %} {% endfor %} diff --git a/src/openapi_python_generator/language_converters/python/templates/requests.jinja2 b/src/openapi_python_generator/language_converters/python/templates/requests.jinja2 index 3aaa5de..63781cb 100644 --- a/src/openapi_python_generator/language_converters/python/templates/requests.jinja2 +++ b/src/openapi_python_generator/language_converters/python/templates/requests.jinja2 @@ -17,7 +17,7 @@ def {{ operation_id }}({{ params }} api_config_override : Optional[APIConfig] = query_params = {key:value for (key,value) in query_params.items() if value is not None} - response = requests.request( + response = request( '{{ method }}', f'{base_path}{path}', headers=headers, diff --git a/src/openapi_python_generator/language_converters/python/templates/service.jinja2 b/src/openapi_python_generator/language_converters/python/templates/service.jinja2 index dab7263..6ee2eda 100644 --- a/src/openapi_python_generator/language_converters/python/templates/service.jinja2 +++ b/src/openapi_python_generator/language_converters/python/templates/service.jinja2 @@ -1,11 +1,11 @@ from typing import * -import {{ library_import }} import json {% if use_orjson %} import orjson {% endif %} from ..models import * +from ..requests import request from ..api_config import APIConfig, HTTPException {{ content | safe}}