Add generic binding decorators/Modify existing decorators to enable decorator extensibility under new programming model

azure/functions/decorators/blob.py

@@ -12,7 +12,8 @@ def __init__(self,
                  name: str,
                  path: str,
                  connection: str,
-                 data_type: Optional[DataType] = None):
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
         self.path = path
         self.connection = connection
         super().__init__(name=name, data_type=data_type)
@@ -27,7 +28,8 @@ def __init__(self,
                  name: str,
                  path: str,
                  connection: str,
-                 data_type: Optional[DataType] = None):
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
         self.path = path
         self.connection = connection
         super().__init__(name=name, data_type=data_type)
@@ -42,7 +44,8 @@ def __init__(self,
                  name: str,
                  path: str,
                  connection: str,
-                 data_type: Optional[DataType] = None):
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
         self.path = path
         self.connection = connection
         super().__init__(name=name, data_type=data_type)

azure/functions/decorators/core.py

@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 from abc import ABC, abstractmethod
-from typing import Dict, Optional
+from typing import Dict, Optional, Type
 
-from azure.functions.decorators.utils import to_camel_case, \
+from .utils import to_camel_case, \
     ABCBuildDictMeta, StringifyEnum
 
 SCRIPT_FILE_NAME = "function_app.py"
@@ -73,17 +73,22 @@ class Binding(ABC):
     attribute in function.json when new binding classes are created.
     Ref: https://aka.ms/azure-function-binding-http """
 
+    EXCLUDED_INIT_PARAMS = {'self', 'kwargs', 'type', 'data_type', 'direction'}
+
     @staticmethod
     @abstractmethod
     def get_binding_name() -> str:
         pass
 
     def __init__(self, name: str,
                  direction: BindingDirection,
-                 is_trigger: bool,
-                 data_type: Optional[DataType] = None):
-        self.type = self.get_binding_name()
-        self.is_trigger = is_trigger
+                 data_type: Optional[DataType] = None,
+                 type: Optional[str] = None):  # NoQa
+        # For natively supported bindings, get_binding_name is always
+        # implemented, and for generic bindings, type is a required argument
+        # in decorator functions.
+        self.type = self.get_binding_name() \
+            if self.get_binding_name() is not None else type
         self.name = name
         self._direction = direction
         self._data_type = data_type
@@ -111,7 +116,7 @@ def get_dict_repr(self) -> Dict:
         :return: Dictionary representation of the binding.
         """
         for p in getattr(self, 'init_params', []):
-            if p not in ['data_type', 'self']:
+            if p not in Binding.EXCLUDED_INIT_PARAMS:
                 self._dict[to_camel_case(p)] = getattr(self, p, None)
 
         return self._dict
@@ -121,24 +126,37 @@ class Trigger(Binding, ABC, metaclass=ABCBuildDictMeta):
     """Class representation of Azure Function Trigger. \n
     Ref: https://aka.ms/functions-triggers-bindings-overview
     """
-    def __init__(self, name, data_type) -> None:
+
+    @staticmethod
+    def is_supported_trigger_type(trigger_instance: 'Trigger',
+                                  trigger_type: Type['Trigger']):
+        return isinstance(trigger_instance,
+                          trigger_type) or trigger_instance.type == \
+            trigger_type.get_binding_name()
+
+    def __init__(self, name: str, data_type: Optional[DataType] = None,
+                 type: Optional[str] = None) -> None:
         super().__init__(direction=BindingDirection.IN,
-                         name=name, data_type=data_type, is_trigger=True)
+                         name=name, data_type=data_type, type=type)
 
 
 class InputBinding(Binding, ABC, metaclass=ABCBuildDictMeta):
     """Class representation of Azure Function Input Binding. \n
     Ref: https://aka.ms/functions-triggers-bindings-overview
     """
-    def __init__(self, name, data_type) -> None:
+
+    def __init__(self, name: str, data_type: Optional[DataType] = None,
+                 type: Optional[str] = None) -> None:
         super().__init__(direction=BindingDirection.IN,
-                         name=name, data_type=data_type, is_trigger=False)
+                         name=name, data_type=data_type, type=type)
 
 
 class OutputBinding(Binding, ABC, metaclass=ABCBuildDictMeta):
     """Class representation of Azure Function Output Binding. \n
     Ref: https://aka.ms/functions-triggers-bindings-overview
     """
-    def __init__(self, name, data_type) -> None:
+
+    def __init__(self, name: str, data_type: Optional[DataType] = None,
+                 type: Optional[str] = None) -> None:
         super().__init__(direction=BindingDirection.OUT,
-                         name=name, data_type=data_type, is_trigger=False)
+                         name=name, data_type=data_type, type=type)

azure/functions/decorators/cosmosdb.py

@@ -20,7 +20,8 @@ def __init__(self,
                  data_type: Optional[DataType] = None,
                  id: Optional[str] = None,
                  sql_query: Optional[str] = None,
-                 partition_key: Optional[str] = None):
+                 partition_key: Optional[str] = None,
+                 **kwargs):
         self.database_name = database_name
         self.collection_name = collection_name
         self.connection_string_setting = connection_string_setting
@@ -45,7 +46,8 @@ def __init__(self,
                  use_multiple_write_locations: Optional[bool] = None,
                  preferred_locations: Optional[str] = None,
                  partition_key: Optional[str] = None,
-                 data_type: Optional[DataType] = None):
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
         self.database_name = database_name
         self.collection_name = collection_name
         self.connection_string_setting = connection_string_setting
@@ -83,7 +85,7 @@ def __init__(self,
                  lease_connection_string_setting: Optional[str] = None,
                  lease_database_name: Optional[str] = None,
                  lease_collection_prefix: Optional[str] = None,
-                 ):
+                 **kwargs):
         self.lease_collection_name = lease_collection_name
         self.lease_connection_string_setting = lease_connection_string_setting
         self.lease_database_name = lease_database_name

azure/functions/decorators/eventhub.py

@@ -19,7 +19,8 @@ def __init__(self,
                  event_hub_name: str,
                  data_type: Optional[DataType] = None,
                  cardinality: Optional[Cardinality] = None,
-                 consumer_group: Optional[str] = None):
+                 consumer_group: Optional[str] = None,
+                 **kwargs):
         self.connection = connection
         self.event_hub_name = event_hub_name
         self.cardinality = cardinality
@@ -37,7 +38,8 @@ def __init__(self,
                  name: str,
                  connection: str,
                  event_hub_name: str,
-                 data_type: Optional[DataType] = None):
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
         self.connection = connection
         self.event_hub_name = event_hub_name
         super().__init__(name=name, data_type=data_type)