Skip to content

Commit

Permalink
fix(faas): Fix http response handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
tjholm committed Oct 27, 2021
1 parent 3b3e8b3 commit adab42c
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions nitric/faas.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
ClientMessage,
TriggerRequest,
TriggerResponse,
HeaderValue,
HttpResponseContext,
TopicResponseContext,
)
Expand Down Expand Up @@ -70,12 +71,13 @@ def _grpc_response_from_ctx(ctx: TriggerContext) -> TriggerResponse:
"""
if ctx.http():
ctx = ctx.http()
headers = {k: HeaderValue(value=v) for (k, v) in ctx.res.headers.items()}
headers_old = {k: v[0] for (k, v) in ctx.res.headers.items()}
data = ctx.res.body if ctx.res.body else bytes()

return TriggerResponse(
data=ctx.res.body,
http=HttpResponseContext(
status=ctx.res.status,
headers=ctx.res.headers,
),
data=data,
http=HttpResponseContext(status=ctx.res.status, headers=headers, headers_old=headers_old),
)
elif ctx.event():
ctx = ctx.event()
Expand Down Expand Up @@ -115,7 +117,18 @@ def __init__(self, status: int = 200, headers: Record = None, body: bytes = None
"""Construct a new HttpResponse."""
self.status = status
self.headers = headers if headers else {}
self.body = body if body else bytes()
self._body = body if body else bytes()

@property
def body(self):
return self._body

@body.setter
def body(self, value: Union[str, bytes]):
if isinstance(value, str):
self._body = value.encode("utf-8")
else:
self._body = value


class HttpContext(TriggerContext):
Expand All @@ -135,7 +148,7 @@ def http(self) -> HttpContext:
def from_grpc_trigger_request(trigger_request: TriggerRequest) -> HttpContext:
"""Construct a new HttpContext from an Http trigger from the Nitric Membrane."""
if len(trigger_request.http.headers.keys()) > 0:
headers = {k: v[0].value for (k, v) in trigger_request.http.headers.items()}
headers = {k: v.value for (k, v) in trigger_request.http.headers.items()}
else:
headers = trigger_request.http.headers_old

Expand Down Expand Up @@ -334,6 +347,7 @@ async def _run(self):
else:
func = self._any_handler
response_ctx = (await func(ctx)) if asyncio.iscoroutinefunction(func) else func(ctx)

# Send function response back to server
await request_channel.send(
ClientMessage(
Expand Down

0 comments on commit adab42c

Please sign in to comment.