Merge branch 'dev' into pthummar/add_py311_tests

Author: pdthummar

azure_functions_worker/constants.py

@@ -30,9 +30,6 @@
 """
 UNIX_SHARED_MEMORY_DIRECTORIES = "FUNCTIONS_UNIX_SHARED_MEMORY_DIRECTORIES"
 
-# Flag to enable loading functions at init request
-PYTHON_LOAD_FUNCTIONS_INIT = "PYTHON_LOAD_FUNCTIONS_INIT"
-
 # Setting Defaults
 PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT = 1
 PYTHON_THREADPOOL_THREAD_COUNT_MIN = 1

azure_functions_worker/dispatcher.py

@@ -26,7 +26,7 @@
                         PYTHON_THREADPOOL_THREAD_COUNT_MAX_37,
                         PYTHON_THREADPOOL_THREAD_COUNT_MIN,
                         PYTHON_ENABLE_DEBUG_LOGGING, SCRIPT_FILE_NAME,
-                        PYTHON_LANGUAGE_RUNTIME, PYTHON_LOAD_FUNCTIONS_INIT)
+                        PYTHON_LANGUAGE_RUNTIME)
 from .extension import ExtensionManager
 from .logging import disable_console_logging, enable_console_logging
 from .logging import enable_debug_logging_recommendation
@@ -288,10 +288,9 @@ async def _handle__worker_init_request(self, request):
         if not DependencyManager.is_in_linux_consumption():
             DependencyManager.prioritize_customer_dependencies()
 
-        if DependencyManager.is_in_linux_consumption() \
-                and is_envvar_true(PYTHON_LOAD_FUNCTIONS_INIT):
+        if DependencyManager.is_in_linux_consumption():
             logger.info(
-                "PYTHON_LOAD_FUNCTIONS_INIT enabled. Importing azure functions")
+                "Importing azure functions in WorkerInitRequest")
             import azure.functions  # NoQA
 
         # loading bindings registry and saving results to a static
@@ -539,12 +538,6 @@ async def _handle__function_environment_reload_request(self, request):
             func_env_reload_request = \
                 request.function_environment_reload_request
 
-            if not is_envvar_true(PYTHON_LOAD_FUNCTIONS_INIT):
-                # Import before clearing path cache so that the default
-                # azure.functions modules is available in sys.modules for
-                # customer use
-                import azure.functions  # NoQA
-
             # Append function project root to module finding sys.path
             if func_env_reload_request.function_app_directory:
                 sys.path.append(func_env_reload_request.function_app_directory)

azure_functions_worker/functions.py

@@ -80,16 +80,6 @@ def get_return_binding(binding_name: str,
 
         return return_binding_name
 
-    @staticmethod
-    def validate_binding_route(func_name: str, binding: BindingInfo,
-                               func_type: str):
-        if hasattr(binding, 'route') and binding.route.startswith(
-                '/') and func_type == 'function':
-            raise FunctionLoadError(
-                func_name,
-                f'Invalid route name: {binding.route}. Route name cannot begin'
-                f' with a /')
-
     @staticmethod
     def validate_binding_direction(binding_name: str,
                                    binding_direction: str,
@@ -105,14 +95,6 @@ def validate_binding_direction(binding_name: str,
                 func_name,
                 '"$return" binding must have direction set to "out"')
 
-    def validate_binding(self, func_name: str, binding: BindingInfo,
-                         func_type: str):
-        self.validate_binding_route(func_name, binding, func_type)
-
-        self.validate_binding_direction(binding.name,
-                                        binding.direction,
-                                        func_name)
-
     @staticmethod
     def is_context_required(params, bound_params: dict,
                             annotations: dict,
@@ -377,7 +359,6 @@ def add_function(self, function_id: str,
     def add_indexed_function(self, function):
         func = function.get_user_function()
         func_name = function.get_function_name()
-        func_type = function.http_type
         function_id = str(uuid.uuid5(namespace=uuid.NAMESPACE_OID,
                                      name=func_name))
         return_binding_name: typing.Optional[str] = None
@@ -391,7 +372,9 @@ def add_indexed_function(self, function):
 
         bound_params = {}
         for binding in function.get_bindings():
-            self.validate_binding(func_name, binding, func_type)
+            self.validate_binding_direction(binding.name,
+                                            binding.direction,
+                                            func_name)
 
             has_explicit_return, has_implicit_return = \
                 self.get_explicit_and_implicit_return(

azure_functions_worker/version.py

@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-VERSION = '4.15.0'
+VERSION = '4.16.0'

setup.py

@@ -107,12 +107,18 @@
 
 INSTALL_REQUIRES = [
     "azure-functions==1.15.1b2",
-    "python-dateutil~=2.8.2",
-    "protobuf~=4.22.0",
-    "grpcio-tools~=1.54.2",
-    "grpcio~=1.54.2"
+    "python-dateutil~=2.8.2"
 ]
 
+if sys.version_info[:2] == (3, 7):
+    INSTALL_REQUIRES.extend(
+        ("protobuf~=3.19.3", "grpcio-tools~=1.43.0", "grpcio~=1.43.0")
+    )
+else:
+    INSTALL_REQUIRES.extend(
+        ("protobuf~=4.22.0", "grpcio-tools~=1.54.2", "grpcio~=1.54.2")
+    )
+
 EXTRA_REQUIRES = {
     "dev": [
         "azure-eventhub~=5.7.0",  # Used for EventHub E2E tests

tests/unittests/test_dispatcher.py

@@ -632,8 +632,6 @@ async def test_dispatcher_load_azfunc_in_init(self):
         """Test if the dispatcher's log can be flushed out during worker
         initialization
         """
-        os.environ.update({"CONTAINER_NAME": 'test',
-                           "PYTHON_LOAD_FUNCTIONS_INIT": "1"})
         async with self._ctrl as host:
             r = await host.init_worker('4.15.1')
             self.assertEqual(

tests/unittests/test_functions_registry.py

@@ -21,17 +21,6 @@ def dummy():
         self.func = Function(self.dummy, "test.py")
         self.function_registry = functions.Registry()
 
-    def test_add_indexed_function_invalid_route(self):
-        trigger1 = HttpTrigger(name="req1", route="/")
-        self.func.add_trigger(trigger=trigger1)
-
-        with self.assertRaises(FunctionLoadError) as ex:
-            self.function_registry.add_indexed_function(function=self.func)
-
-        self.assertEqual(str(ex.exception),
-                         'cannot load the dummy function: Invalid route name: '
-                         '/. Route name cannot begin with a /')
-
     def test_add_indexed_function_invalid_direction(self):
         trigger1 = HttpTrigger(name="req1", route="test")
         binding = BlobInput(name="$return", path="testpath",