Merge branch 'dev' into gaaguiar/init_refactoring

Author: gavin-aguiar

.github/workflows/ci_docker_con_workflow.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
+        python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ]
     permissions: read-all
     env:
         CONSUMPTION_DOCKER_TEST: "true"

azure_functions_worker/_thirdparty/typing_inspect.py

@@ -12,19 +12,10 @@
 # NOTE: This module must support Python 2.7 in addition to Python 3.x
 
 import sys
-NEW_TYPING = sys.version_info[:3] >= (3, 7, 0)  # PEP 560
-if NEW_TYPING:
-    import collections.abc
-
-if NEW_TYPING:
-    from typing import (
-        Generic, Callable, Union, TypeVar, ClassVar, Tuple, _GenericAlias
-    )
-else:
-    from typing import (
-        Callable, CallableMeta, Union, _Union, TupleMeta, TypeVar,
-        _ClassVar, GenericMeta,
-    )
+import collections.abc
+from typing import (
+    Generic, Callable, Union, TypeVar, ClassVar, Tuple, _GenericAlias
+)
 
 NEW_39_TYPING = sys.version_info[:3] >= (3, 9, 0)  # PEP 560
 if NEW_39_TYPING:
@@ -33,17 +24,6 @@
 
 # from mypy_extensions import _TypedDictMeta
 
-
-def _gorg(cls):
-    """This function exists for compatibility with old typing versions."""
-    assert isinstance(cls, GenericMeta)
-    if hasattr(cls, '_gorg'):
-        return cls._gorg
-    while cls.__origin__ is not None:
-        cls = cls.__origin__
-    return cls
-
-
 def is_generic_type(tp):
     """Test if the given type is a generic type. This includes Generic itself,
      but excludes special typing constructs such as Union, Tuple, Callable,
@@ -66,13 +46,10 @@ def is_generic_type(tp):
         return (isinstance(tp, type) and issubclass(tp, Generic)
                 or ((isinstance(tp, _GenericAlias) or isinstance(tp, _SpecialGenericAlias))  # NoQA E501
                 and tp.__origin__ not in (Union, tuple, ClassVar, collections.abc.Callable)))  # NoQA E501
-    if NEW_TYPING:
-        return (isinstance(tp, type)
-                and issubclass(tp, Generic)
-                or isinstance(tp, _GenericAlias)
-                and tp.__origin__ not in (Union, tuple, ClassVar, collections.abc.Callable))  # NoQA E501
-    return (isinstance(tp, GenericMeta) and not
-            isinstance(tp, (CallableMeta, TupleMeta)))
+    return (isinstance(tp, type)
+            and issubclass(tp, Generic)
+            or isinstance(tp, _GenericAlias)
+            and tp.__origin__ not in (Union, tuple, ClassVar, collections.abc.Callable))  # NoQA E501
 
 
 def is_callable_type(tp):
@@ -94,12 +71,10 @@ class MyClass(Callable[[int], int]):
 
         get_origin(tp) is collections.abc.Callable  # Callable prior to Python 3.7  # NoQA E501
     """
-    if NEW_TYPING:
-        return (tp is Callable or isinstance(tp, _GenericAlias) and
-                tp.__origin__ is collections.abc.Callable or
-                isinstance(tp, type) and issubclass(tp, Generic) and
-                issubclass(tp, collections.abc.Callable))
-    return type(tp) is CallableMeta
+    return (tp is Callable or isinstance(tp, _GenericAlias) and
+            tp.__origin__ is collections.abc.Callable or
+            isinstance(tp, type) and issubclass(tp, Generic) and
+            issubclass(tp, collections.abc.Callable))
 
 
 def is_tuple_type(tp):
@@ -120,12 +95,10 @@ class MyClass(Tuple[str, int]):
 
         get_origin(tp) is tuple  # Tuple prior to Python 3.7
     """
-    if NEW_TYPING:
-        return (tp is Tuple or isinstance(tp, _GenericAlias) and
-                tp.__origin__ is tuple or
-                isinstance(tp, type) and issubclass(tp, Generic) and
-                issubclass(tp, tuple))
-    return type(tp) is TupleMeta
+    return (tp is Tuple or isinstance(tp, _GenericAlias) and
+            tp.__origin__ is tuple or
+            isinstance(tp, type) and issubclass(tp, Generic) and
+            issubclass(tp, tuple))
 
 
 def is_union_type(tp):
@@ -136,10 +109,8 @@ def is_union_type(tp):
         is_union_type(Union[int, int]) == False
         is_union_type(Union[T, int]) == True
     """
-    if NEW_TYPING:
-        return (tp is Union or
-                isinstance(tp, _GenericAlias) and tp.__origin__ is Union)
-    return type(tp) is _Union
+    return (tp is Union or
+            isinstance(tp, _GenericAlias) and tp.__origin__ is Union)
 
 
 def is_typevar(tp):
@@ -161,10 +132,8 @@ def is_classvar(tp):
         is_classvar(ClassVar[int]) == True
         is_classvar(ClassVar[List[T]]) == True
     """
-    if NEW_TYPING:
-        return (tp is ClassVar or
-                isinstance(tp, _GenericAlias) and tp.__origin__ is ClassVar)
-    return type(tp) is _ClassVar
+    return (tp is ClassVar or
+            isinstance(tp, _GenericAlias) and tp.__origin__ is ClassVar)
 
 
 def get_last_origin(tp):
@@ -179,16 +148,8 @@ def get_last_origin(tp):
         get_last_origin(List[Tuple[T, T]][int]) == List[Tuple[T, T]]
         get_last_origin(List) == List
     """
-    if NEW_TYPING:
-        raise ValueError('This function is only supported in Python 3.6,'
-                         ' use get_origin instead')
-    sentinel = object()
-    origin = getattr(tp, '__origin__', sentinel)
-    if origin is sentinel:
-        return None
-    if origin is None:
-        return tp
-    return origin
+    raise ValueError('This function is only supported in Python 3.6,'
+                     ' use get_origin instead')
 
 
 def get_origin(tp):
@@ -202,17 +163,10 @@ def get_origin(tp):
         get_origin(Union[T, int]) == Union
         get_origin(List[Tuple[T, T]][int]) == list  # List prior to Python 3.7
     """
-    if NEW_TYPING:
-        if isinstance(tp, _GenericAlias):
-            return tp.__origin__ if tp.__origin__ is not ClassVar else None
-        if tp is Generic:
-            return Generic
-        return None
-    if isinstance(tp, GenericMeta):
-        return _gorg(tp)
-    if is_union_type(tp):
-        return Union
-
+    if isinstance(tp, _GenericAlias):
+        return tp.__origin__ if tp.__origin__ is not ClassVar else None
+    if tp is Generic:
+        return Generic
     return None
 
 
@@ -231,16 +185,9 @@ def get_parameters(tp):
         get_parameters(Union[S_co, Tuple[T, T]][int, U]) == (U,)
         get_parameters(Mapping[T, Tuple[S_co, T]]) == (T, S_co)
     """
-    if NEW_TYPING:
-        if (isinstance(tp, _GenericAlias) or isinstance(tp, type) and
-            issubclass(tp, Generic) and tp is not Generic):   # NoQA E129
-            return tp.__parameters__
-        return ()
-    if (
-        is_generic_type(tp) or is_union_type(tp) or
-        is_callable_type(tp) or is_tuple_type(tp)
-    ):
-        return tp.__parameters__ if tp.__parameters__ is not None else ()
+    if (isinstance(tp, _GenericAlias) or isinstance(tp, type) and
+        issubclass(tp, Generic) and tp is not Generic):   # NoQA E129
+        return tp.__parameters__
     return ()
 
 
@@ -256,17 +203,8 @@ def get_last_args(tp):
         get_last_args(Callable[[T], int]) == (T, int)
         get_last_args(Callable[[], int]) == (int,)
     """
-    if NEW_TYPING:
-        raise ValueError('This function is only supported in Python 3.6,'
-                         ' use get_args instead')
-    if is_classvar(tp):
-        return (tp.__type__,) if tp.__type__ is not None else ()
-    if (
-        is_generic_type(tp) or is_union_type(tp) or
-        is_callable_type(tp) or is_tuple_type(tp)
-    ):
-        return tp.__args__ if tp.__args__ is not None else ()
-    return ()
+    raise ValueError('This function is only supported in Python 3.6,'
+                     ' use get_args instead')
 
 
 def _eval_args(args):
@@ -307,29 +245,13 @@ def get_args(tp, evaluate=None):
                  (int, Tuple[Optional[int], Optional[int]])
         get_args(Callable[[], T][int], evaluate=True) == ([], int,)
     """
-    if NEW_TYPING:
-        if evaluate is not None and not evaluate:
-            raise ValueError('evaluate can only be True in Python 3.7')
-        if isinstance(tp, _GenericAlias):
-            res = tp.__args__
-            if get_origin(tp) is collections.abc.Callable and res[0] is not Ellipsis:    # NoQA E501
-                res = (list(res[:-1]), res[-1])
-            return res
-        return ()
-    if is_classvar(tp):
-        return (tp.__type__,)
-    if (
-        is_generic_type(tp) or is_union_type(tp) or
-        is_callable_type(tp) or is_tuple_type(tp)
-    ):
-        tree = tp._subs_tree()
-        if isinstance(tree, tuple) and len(tree) > 1:
-            if not evaluate:
-                return tree[1:]
-            res = _eval_args(tree[1:])
-            if get_origin(tp) is Callable and res[0] is not Ellipsis:
-                res = (list(res[:-1]), res[-1])
-            return res
+    if evaluate is not None and not evaluate:
+        raise ValueError('evaluate can only be True in Python 3.7')
+    if isinstance(tp, _GenericAlias):
+        res = tp.__args__
+        if get_origin(tp) is collections.abc.Callable and res[0] is not Ellipsis:    # NoQA E501
+            res = (list(res[:-1]), res[-1])
+        return res
     return ()
 
 

azure_functions_worker/bindings/generic.py

@@ -51,5 +51,7 @@ def decode(cls, data: datumdef.Datum, *, trigger_metadata) -> typing.Any:
         return result
 
     @classmethod
-    def has_implicit_output(cls) -> bool:
-        return False
+    def has_implicit_output(cls, bind_name: Optional[str]) -> bool:
+        if bind_name == 'durableClient':
+            return False
+        return True

azure_functions_worker/bindings/meta.py

@@ -55,9 +55,15 @@ def check_output_type_annotation(bind_name: str, pytype: type) -> bool:
 def has_implicit_output(bind_name: str) -> bool:
     binding = get_binding(bind_name)
 
-    # If the binding does not have metaclass of meta.InConverter
-    # The implicit_output does not exist
-    return getattr(binding, 'has_implicit_output', lambda: False)()
+    # Need to pass in bind_name to exempt Durable Functions
+    if binding is generic.GenericBinding:
+        return (getattr(binding, 'has_implicit_output', lambda: False)
+                (bind_name))
+
+    else:
+        # If the binding does not have metaclass of meta.InConverter
+        # The implicit_output does not exist
+        return getattr(binding, 'has_implicit_output', lambda: False)()
 
 
 def from_incoming_proto(

azure_functions_worker/functions.py

@@ -71,14 +71,20 @@ def get_explicit_and_implicit_return(binding_name: str,
     @staticmethod
     def get_return_binding(binding_name: str,
                            binding_type: str,
-                           return_binding_name: str) -> str:
+                           return_binding_name: str,
+                           explicit_return_val_set: bool) \
+            -> typing.Tuple[str, bool]:
+        # prioritize explicit return value
+        if explicit_return_val_set:
+            return return_binding_name, explicit_return_val_set
         if binding_name == "$return":
             return_binding_name = binding_type
             assert return_binding_name is not None
+            explicit_return_val_set = True
         elif bindings_utils.has_implicit_output(binding_type):
             return_binding_name = binding_type
 
-        return return_binding_name
+        return return_binding_name, explicit_return_val_set
 
     @staticmethod
     def validate_binding_direction(binding_name: str,
@@ -314,6 +320,7 @@ def add_function(self, function_id: str,
         params = dict(sig.parameters)
         annotations = typing.get_type_hints(func)
         return_binding_name: typing.Optional[str] = None
+        explicit_return_val_set = False
         has_explicit_return = False
         has_implicit_return = False
 
@@ -327,9 +334,11 @@ def add_function(self, function_id: str,
                     binding_name, binding_info, has_explicit_return,
                     has_implicit_return, bound_params)
 
-            return_binding_name = self.get_return_binding(binding_name,
-                                                          binding_info.type,
-                                                          return_binding_name)
+            return_binding_name, explicit_return_val_set = \
+                self.get_return_binding(binding_name,
+                                        binding_info.type,
+                                        return_binding_name,
+                                        explicit_return_val_set)
 
         requires_context = self.is_context_required(params, bound_params,
                                                     annotations,
@@ -362,6 +371,7 @@ def add_indexed_function(self, function):
         function_id = str(uuid.uuid5(namespace=uuid.NAMESPACE_OID,
                                      name=func_name))
         return_binding_name: typing.Optional[str] = None
+        explicit_return_val_set = False
         has_explicit_return = False
         has_implicit_return = False
 
@@ -381,9 +391,11 @@ def add_indexed_function(self, function):
                     binding.name, binding, has_explicit_return,
                     has_implicit_return, bound_params)
 
-            return_binding_name = self.get_return_binding(binding.name,
-                                                          binding.type,
-                                                          return_binding_name)
+            return_binding_name, explicit_return_val_set = \
+                self.get_return_binding(binding.name,
+                                        binding.type,
+                                        return_binding_name,
+                                        explicit_return_val_set)
 
         requires_context = self.is_context_required(params, bound_params,
                                                     annotations,

azure_functions_worker/version.py

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

setup.py

@@ -71,7 +71,7 @@
     "azure_functions_worker._thirdparty",
 ]
 
-INSTALL_REQUIRES = ["azure-functions==1.19.0b2"]
+INSTALL_REQUIRES = ["azure-functions==1.19.0b3", "python-dateutil~=2.8.2"]
 
 if sys.version_info[:2] == (3, 7):
     INSTALL_REQUIRES.extend(
@@ -108,8 +108,7 @@
         "opencv-python",
         "pandas",
         "numpy",
-        "pre-commit",
-        "python-dateutil~=2.8.2"
+        "pre-commit"
     ]
 }