feedback

Author: YunchuWang

azure_functions_worker/dispatcher.py

@@ -32,7 +32,8 @@
                         PYTHON_LANGUAGE_RUNTIME, PYTHON_ENABLE_INIT_INDEXING,
                         METADATA_PROPERTIES_WORKER_INDEXED)
 from .extension import ExtensionManager
-from .http_v2 import http_coordinator, initialize_http_server, HttpV2Registry
+from .http_v2 import http_coordinator, initialize_http_server, HttpV2Registry, \
+    sync_http_request
 from .logging import disable_console_logging, enable_console_logging
 from .logging import (logger, error_logger, is_system_log_category,
                       CONSOLE_LOG_PREFIX, format_exception)
@@ -549,13 +550,7 @@ async def _handle__invocation_request(self, request):
                 http_request = await http_coordinator.get_http_request_async(
                     invocation_id)
 
-                route_params = {key: item.string for key, item
-                                in invoc_request.trigger_metadata.items()
-                                if key not in ['Headers', 'Query']}
-
-                (HttpV2Registry.ext_base().RequestTrackerMeta
-                 .get_synchronizer()
-                 .sync_route_params(http_request, route_params))
+                await sync_http_request(http_request, invoc_request)
                 args[fi.trigger_metadata.get('param_name')] = http_request
 
             fi_context = self._get_context(invoc_request, fi.name,

azure_functions_worker/functions.py

@@ -302,11 +302,7 @@ def add_func_to_registry_and_return_funcinfo(self, function,
                                                      str, ParamTypeInfo],
                                                  return_type: str):
 
-        http_trigger_param_name = next(
-            (input_type for input_type, type_info in input_types.items()
-             if type_info.binding_name == HTTP_TRIGGER),
-            None
-        )
+        http_trigger_param_name = self._get_http_trigger_param_name(input_types)
 
         trigger_metadata = None
         is_http_func = False
@@ -335,6 +331,14 @@ def add_func_to_registry_and_return_funcinfo(self, function,
 
         return function_info
 
+    def _get_http_trigger_param_name(self, input_types):
+        http_trigger_param_name = next(
+            (input_type for input_type, type_info in input_types.items()
+             if type_info.binding_name == HTTP_TRIGGER),
+            None
+        )
+        return http_trigger_param_name
+
     def add_function(self, function_id: str,
                      func: typing.Callable,
                      metadata: protos.RpcFunctionMetadata):

azure_functions_worker/http_v2.py

@@ -208,6 +208,16 @@ async def catch_all(request: request_type):  # type: ignore
     return web_server_address
 
 
+async def sync_http_request(http_request, invoc_request):
+    # Sync http request route params from invoc_request to http_request
+    route_params = {key: item.string for key, item
+                    in invoc_request.trigger_metadata.items()
+                    if key not in ['Headers', 'Query']}
+    (HttpV2Registry.ext_base().RequestTrackerMeta
+     .get_synchronizer()
+     .sync_route_params(http_request, route_params))
+
+
 class HttpV2Registry:
     _http_v2_enabled = False
     _ext_base = None