Rename a few fields in FunctionInfo struct and in the dispatcher code.

Author: 1st1

azure/worker/dispatcher.py

@@ -230,37 +230,38 @@ async def _handle__invocation_request(self, req):
         current_task.set_azure_invocation_id(invocation_id)
 
         try:
-            fi: functions.FunctionInfo = self._functions.get(function_id)
+            fi: functions.FunctionInfo = self._functions.get_function(
+                function_id)
 
-            params = {}
+            args = {}
             for pb in invoc_request.input_data:
-                pb_type = fi.input_types[pb.name]
+                pb_type = fi.input_binding_types[pb.name]
                 if bindings.is_trigger_binding(pb_type):
                     trigger_metadata = invoc_request.trigger_metadata
                 else:
                     trigger_metadata = None
-                params[pb.name] = bindings.from_incoming_proto(
+                args[pb.name] = bindings.from_incoming_proto(
                     pb_type, pb.data, trigger_metadata)
 
             if fi.requires_context:
-                params['context'] = bindings.Context(
+                args['context'] = bindings.Context(
                     fi.name, fi.directory, invocation_id)
 
-            if fi.output_types:
-                for name in fi.output_types:
-                    params[name] = bindings.Out()
+            if fi.output_binding_types:
+                for name in fi.output_binding_types:
+                    args[name] = bindings.Out()
 
             if fi.is_async:
-                call_result = await fi.func(**params)
+                call_result = await fi.func(**args)
             else:
                 call_result = await self._loop.run_in_executor(
                     self._sync_call_tp,
-                    self.__run_sync_func, invocation_id, fi.func, params)
+                    self.__run_sync_func, invocation_id, fi.func, args)
 
             output_data = []
-            if fi.output_types:
-                for out_name, out_type in fi.output_types.items():
-                    val = params[name].get()
+            if fi.output_binding_types:
+                for out_name, out_type in fi.output_binding_types.items():
+                    val = args[name].get()
                     if val is None:
                         # TODO: is the "Out" parameter optional?
                         # Can "None" be marshaled into protos.TypedData?
@@ -275,9 +276,9 @@ async def _handle__invocation_request(self, req):
                             data=rpc_val))
 
             return_value = None
-            if fi.return_type is not None:
+            if fi.return_binding_type is not None:
                 return_value = bindings.to_outgoing_proto(
-                    fi.return_type, call_result)
+                    fi.return_binding_type, call_result)
 
             return protos.StreamingMessage(
                 request_id=self.request_id,

azure/worker/functions.py

@@ -16,9 +16,9 @@ class FunctionInfo(typing.NamedTuple):
     requires_context: bool
     is_async: bool
 
-    input_types: typing.Mapping[str, str]
-    output_types: typing.Mapping[str, str]
-    return_type: typing.Optional[str]
+    input_binding_types: typing.Mapping[str, str]
+    output_binding_types: typing.Mapping[str, str]
+    return_binding_type: typing.Optional[str]
 
 
 class FunctionLoadError(RuntimeError):
@@ -35,7 +35,7 @@ class Registry:
     def __init__(self):
         self._functions = {}
 
-    def get(self, function_id: str):
+    def get_function(self, function_id: str):
         try:
             return self._functions[function_id]
         except KeyError:
@@ -179,8 +179,8 @@ def add_function(self, function_id: str,
             func=func,
             name=func_name,
             directory=metadata.directory,
-            input_types=input_types,
-            output_types=output_types,
             requires_context=requires_context,
             is_async=inspect.iscoroutinefunction(func),
-            return_type=return_type)
+            input_binding_types=input_types,
+            output_binding_types=output_types,
+            return_binding_type=return_type)