add registry none check

Author: hallvictoria

azure_functions_worker/bindings/meta.py

@@ -43,20 +43,15 @@ def load_binding_registry() -> None:
 
 
 def get_binding(bind_name: str, pytype: typing.Optional[type] = None) -> object:
-    try:
-        # Check if binding is deferred binding
-        binding = get_deferred_binding(bind_name=bind_name, pytype=pytype)
-        # Binding is not deferred binding type
-        if binding is None:
-            binding = BINDING_REGISTRY.get(bind_name)
-        # Binding is generic
-        if binding is None:
-            binding = generic.GenericBinding
-        return binding
-    except AttributeError:
-        # If BINDING_REGISTRY is None, azure-functions hasn't been loaded
-        # in correctly.
-        raise AttributeError("BINDING_REGISTRY is None.")
+    # Check if binding is deferred binding
+    binding = get_deferred_binding(bind_name=bind_name, pytype=pytype)
+    # Binding is not deferred binding type
+    if binding is None:
+        binding = BINDING_REGISTRY.get(bind_name)
+    # Binding is generic
+    if binding is None:
+        binding = generic.GenericBinding
+    return binding
 
 
 def is_trigger_binding(bind_name: str) -> bool:
@@ -219,22 +214,16 @@ def to_outgoing_param_binding(binding: str, obj: typing.Any, *,
 
 def get_deferred_binding(bind_name: str,
                          pytype: typing.Optional[type] = None) -> object:
-    try:
-        binding = None
-
-        # Checks if pytype is a supported sdk type
-        if DEFERRED_BINDINGS_REGISTRY.check_supported_type(pytype):
-            # Returns deferred binding converter
-            binding = DEFERRED_BINDINGS_REGISTRY.get(bind_name)
-
-        # This will return None if not a supported type
-        return binding
-    except AttributeError:
-        # This will catch if DEFERRED_BINDINGS_REGISTRY is None
-        # It will be None if the library isn't imported
-        # Ensure that the flag is set to False in this case
-        global DEFERRED_BINDINGS_ENABLED
-        DEFERRED_BINDINGS_ENABLED = False
+    binding = None
+
+    # Checks if pytype is a supported sdk type
+    if (DEFERRED_BINDINGS_REGISTRY is not None
+            and DEFERRED_BINDINGS_REGISTRY.check_supported_type(pytype)):
+        # Returns deferred binding converter
+        binding = DEFERRED_BINDINGS_REGISTRY.get(bind_name)
+
+    # This will return None if not a supported type
+    return binding
 
 
 def deferred_bindings_decode(binding: typing.Any,

azure_functions_worker/dispatcher.py

@@ -300,6 +300,10 @@ async def _handle__worker_init_request(self, request):
         # loading bindings registry and saving results to a static
         # dictionary which will be later used in the invocation request
         bindings.load_binding_registry()
+        if bindings.meta.BINDING_REGISTRY is None:
+            # If BINDING_REGISTRY is None, azure-functions hasn't been loaded
+            # in correctly.
+            raise AttributeError("BINDING_REGISTRY is None.")
 
         if is_envvar_true(PYTHON_ENABLE_INIT_INDEXING):
             try:
@@ -637,6 +641,10 @@ async def _handle__function_environment_reload_request(self, request):
             # calling load_binding_registry again since the
             # reload_customer_libraries call clears the registry
             bindings.load_binding_registry()
+            if bindings.meta.BINDING_REGISTRY is None:
+                # If BINDING_REGISTRY is None, azure-functions hasn't been loaded
+                # in correctly.
+                raise AttributeError("BINDING_REGISTRY is None.")
 
             if is_envvar_true(PYTHON_ENABLE_INIT_INDEXING):
                 try: