Skip to content

Commit 905a63d

Browse files
committed
Rename a few fields in FunctionInfo struct and in the dispatcher code.
1 parent beb333c commit 905a63d

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

azure/worker/dispatcher.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,37 +230,38 @@ async def _handle__invocation_request(self, req):
230230
current_task.set_azure_invocation_id(invocation_id)
231231

232232
try:
233-
fi: functions.FunctionInfo = self._functions.get(function_id)
233+
fi: functions.FunctionInfo = self._functions.get_function(
234+
function_id)
234235

235-
params = {}
236+
args = {}
236237
for pb in invoc_request.input_data:
237-
pb_type = fi.input_types[pb.name]
238+
pb_type = fi.input_binding_types[pb.name]
238239
if bindings.is_trigger_binding(pb_type):
239240
trigger_metadata = invoc_request.trigger_metadata
240241
else:
241242
trigger_metadata = None
242-
params[pb.name] = bindings.from_incoming_proto(
243+
args[pb.name] = bindings.from_incoming_proto(
243244
pb_type, pb.data, trigger_metadata)
244245

245246
if fi.requires_context:
246-
params['context'] = bindings.Context(
247+
args['context'] = bindings.Context(
247248
fi.name, fi.directory, invocation_id)
248249

249-
if fi.output_types:
250-
for name in fi.output_types:
251-
params[name] = bindings.Out()
250+
if fi.output_binding_types:
251+
for name in fi.output_binding_types:
252+
args[name] = bindings.Out()
252253

253254
if fi.is_async:
254-
call_result = await fi.func(**params)
255+
call_result = await fi.func(**args)
255256
else:
256257
call_result = await self._loop.run_in_executor(
257258
self._sync_call_tp,
258-
self.__run_sync_func, invocation_id, fi.func, params)
259+
self.__run_sync_func, invocation_id, fi.func, args)
259260

260261
output_data = []
261-
if fi.output_types:
262-
for out_name, out_type in fi.output_types.items():
263-
val = params[name].get()
262+
if fi.output_binding_types:
263+
for out_name, out_type in fi.output_binding_types.items():
264+
val = args[name].get()
264265
if val is None:
265266
# TODO: is the "Out" parameter optional?
266267
# Can "None" be marshaled into protos.TypedData?
@@ -275,9 +276,9 @@ async def _handle__invocation_request(self, req):
275276
data=rpc_val))
276277

277278
return_value = None
278-
if fi.return_type is not None:
279+
if fi.return_binding_type is not None:
279280
return_value = bindings.to_outgoing_proto(
280-
fi.return_type, call_result)
281+
fi.return_binding_type, call_result)
281282

282283
return protos.StreamingMessage(
283284
request_id=self.request_id,

azure/worker/functions.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class FunctionInfo(typing.NamedTuple):
1616
requires_context: bool
1717
is_async: bool
1818

19-
input_types: typing.Mapping[str, str]
20-
output_types: typing.Mapping[str, str]
21-
return_type: typing.Optional[str]
19+
input_binding_types: typing.Mapping[str, str]
20+
output_binding_types: typing.Mapping[str, str]
21+
return_binding_type: typing.Optional[str]
2222

2323

2424
class FunctionLoadError(RuntimeError):
@@ -35,7 +35,7 @@ class Registry:
3535
def __init__(self):
3636
self._functions = {}
3737

38-
def get(self, function_id: str):
38+
def get_function(self, function_id: str):
3939
try:
4040
return self._functions[function_id]
4141
except KeyError:
@@ -179,8 +179,8 @@ def add_function(self, function_id: str,
179179
func=func,
180180
name=func_name,
181181
directory=metadata.directory,
182-
input_types=input_types,
183-
output_types=output_types,
184182
requires_context=requires_context,
185183
is_async=inspect.iscoroutinefunction(func),
186-
return_type=return_type)
184+
input_binding_types=input_types,
185+
output_binding_types=output_types,
186+
return_binding_type=return_type)

0 commit comments

Comments
 (0)