fixes for responses

docs/en/docs/release-notes.md

@@ -11,6 +11,11 @@ hide:
 
 - Allow passing extensions as string.
 
+### Fixed
+
+- OpenAPI responses.
+- Enum definitions.
+
 ## 3.6.0
 
 ### Added

docs/en/docs/responses.md

@@ -215,13 +215,13 @@ The wrappers, like Lilya, also accept the classic parameters such as `headers` a
 ## Response status codes
 
 You need to be mindful when it comes to return a specific status code when using
-[JSON](#json), [OrJSON](#orjson) and [UJSON](#ujson) wrappers.
+[JSON](#json), [ORJSON](#orjson) and [UJSON](#ujson) wrappers.
 
 Esmerald allows you to pass the status codes via [handler](./routing/handlers.md) and directly via
 return of that same response but the if the handler has a `status_code` declared, the returned
 `status_code` **takes precedence**.
 
-Let us use an example to be more clear. This example is applied to `JSON`, `UJSON` and `OrJSON`.
+Let us use an example to be more clear. This example is applied to `JSON`, `UJSON` and `ORJSON`.
 
 ### Status code without declaring in the handler
 

esmerald/enums.py

@@ -9,7 +9,7 @@ def __repr__(self) -> str:
         return str(self)
 
 
-class HttpMethod(StrEnum, Enum):
+class HttpMethod(StrEnum):
     GET = "GET"
     POST = "POST"
     PUT = "PUT"
@@ -20,7 +20,7 @@ class HttpMethod(StrEnum, Enum):
     TRACE = "TRACE"
 
 
-class MediaType(StrEnum, Enum):
+class MediaType(StrEnum):
     JSON = "application/json"
     HTML = "text/html"
     TEXT = "text/plain"
@@ -30,23 +30,23 @@ class MediaType(StrEnum, Enum):
     OCTET = "application/octet-stream"
 
 
-class OpenAPIMediaType(StrEnum, Enum):
+class OpenAPIMediaType(StrEnum):
     OPENAPI_YAML = "application/vnd.oai.openapi"
     OPENAPI_JSON = "application/vnd.oai.openapi+json"
 
 
-class EncodingType(StrEnum, Enum):
+class EncodingType(StrEnum):
     JSON = "application/json"
     MULTI_PART = "multipart/form-data"
     URL_ENCODED = "application/x-www-form-urlencoded"
 
 
-class ScopeType(StrEnum, Enum):
+class ScopeType(StrEnum):
     HTTP = "http"
     WEBSOCKET = "websocket"
 
 
-class ParamType(StrEnum, Enum):
+class ParamType(StrEnum):
     PATH = "path"
     QUERY = "query"
     COOKIE = "cookie"

esmerald/openapi/responses.py

@@ -15,7 +15,7 @@
 
 
 def create_internal_response(
-    handler: Union["HTTPHandler", Any]
+    handler: Union["HTTPHandler", Any],
 ) -> InternalResponse:  # pragma: no cover
     signature = Signature.from_callable(cast("AnyCallable", handler.fn))
     default_descriptions: Dict[Any, str] = {
@@ -43,20 +43,22 @@ def create_internal_response(
     }:
         if signature.return_annotation is Template:
             internal_response.return_annotation = str
-            internal_response.media_type = MediaType.HTML
+            internal_response.media_type = (
+                handler.content_media_type or handler.media_type or MediaType.HTML
+            )
         elif get_origin(signature.return_annotation) is EsmeraldResponse:
             internal_response.return_annotation = get_args(signature.return_annotation)[0] or Any
             internal_response.media_type = handler.content_media_type
         else:
-            internal_response.media_type = MediaType.JSON
+            internal_response.media_type = handler.content_media_type or MediaType.JSON
 
         internal_response.encoding = handler.content_encoding
 
     elif signature.return_annotation is Redirect:
         internal_response.media_type = MediaType.JSON
     elif signature.return_annotation in (File, Stream):
-        internal_response.media_type = handler.content_media_type
-        internal_response.encoding = handler.content_encoding or MediaType.OCTET
+        internal_response.media_type = handler.content_media_type or MediaType.OCTET
+        internal_response.encoding = handler.content_encoding
     else:
         internal_response.media_type = handler.content_media_type
         internal_response.encoding = handler.content_encoding