Merge branch 'dev' into gaaguiar/sql_fix

Author: gavin-aguiar

azure/functions/_abc.py

@@ -47,11 +47,6 @@ def message(self) -> str:
         pass
 
 
-class WarmUpContext(abc.ABC):
-    """Warmup context object."""
-    pass
-
-
 class TraceContext(abc.ABC):
     """Trace context object."""
 
@@ -131,12 +126,6 @@ def retry_context(self) -> RetryContext:
         """Context for retries to the function."""
         pass
 
-    @property
-    @abc.abstractmethod
-    def warmup_context(self) -> WarmUpContext:
-        """Context for warmup to the function."""
-        pass
-
 
 class HttpRequest(abc.ABC):
     """HTTP request object."""

azure/functions/_http_asgi.py

@@ -164,7 +164,7 @@ async def main(req, context):
         """
         warn("handle() is deprecated. Please await .handle_async() instead.",
              DeprecationWarning, stacklevel=2)
-        self._logger.debug(f"Handling {req.url} as an ASGI request.")
+        self._logger.debug("Handling %s as an ASGI request.", req.url)
         self._logger.warning(
             "handle() is deprecated. Please `await .handle_async()` instead.")
         return self._handle(req, context)
@@ -194,7 +194,7 @@ async def main(req, context):
                 return await func.AsgiMiddleware(app).handle_async(req,
                                                                    context)
         """
-        self._logger.debug(f"Awaiting {req.url} as an ASGI request.")
+        self._logger.debug("Awaiting %s as an ASGI request.", req.url)
         return await self._handle_async(req, context)
 
     async def _handle_async(self, req, context):

azure/functions/decorators/function_app.py

@@ -3,7 +3,8 @@
 import json
 import logging
 from abc import ABC
-from typing import Callable, Dict, List, Optional, Union, Iterable
+from typing import Any, Callable, Dict, List, Optional, Union, \
+    Iterable
 
 from azure.functions.decorators.blob import BlobTrigger, BlobInput, BlobOutput
 from azure.functions.decorators.core import Binding, Trigger, DataType, \
@@ -35,7 +36,7 @@ class Function(object):
     function indexing model. Ref: https://aka.ms/azure-function-ref
     """
 
-    def __init__(self, func: Callable, script_file: str):
+    def __init__(self, func: Callable[..., Any], script_file: str):
         """Constructor of :class:`FunctionBuilder` object.
 
         :param func: User defined python function instance.
@@ -133,7 +134,7 @@ def get_dict_repr(self) -> Dict:
         stub_f_json.update(self.get_bindings_dict())  # NoQA
         return stub_f_json
 
-    def get_user_function(self) -> Callable:
+    def get_user_function(self) -> Callable[..., Any]:
         """Get the python function customer defined.
 
         :return: The python function customer defined.
@@ -249,7 +250,9 @@ def app_script_file(self) -> str:
         """
         return self._app_script_file
 
-    def _validate_type(self, func: Union[Callable, FunctionBuilder]) \
+    def _validate_type(self,
+                       func: Union[Callable[..., Any],
+                                   FunctionBuilder]) \
             -> FunctionBuilder:
         """Validate the type of the function object and return the created
         :class:`FunctionBuilder` object.
@@ -270,7 +273,7 @@ def _validate_type(self, func: Union[Callable, FunctionBuilder]) \
                 "Unsupported type for function app decorator found.")
         return fb
 
-    def _configure_function_builder(self, wrap) -> Callable:
+    def _configure_function_builder(self, wrap) -> Callable[..., Any]:
         """Decorator function on user defined function to create and return
          :class:`FunctionBuilder` object from :class:`Callable` func.
         """
@@ -282,7 +285,7 @@ def decorator(func):
 
         return decorator
 
-    def function_name(self, name: str) -> Callable:
+    def function_name(self, name: str) -> Callable[..., Any]:
         """Set name of the :class:`Function` object.
 
         :param name: Name of the function.
@@ -299,8 +302,8 @@ def decorator():
 
         return wrap
 
-    def http_type(self, http_type: str) -> Callable:
-        """Set http  type of the :class:`Function` object.
+    def http_type(self, http_type: str) -> Callable[..., Any]:
+        """Set http type of the :class:`Function` object.
 
         :param http_type: Http type of the function.
         :return: Decorator function.
@@ -348,7 +351,7 @@ def route(self,
               auth_level: Optional[Union[AuthLevel, str]] = None,
               trigger_extra_fields: Dict = {},
               binding_extra_fields: Dict = {}
-              ) -> Callable:
+              ) -> Callable[..., Any]:
         """The route decorator adds :class:`HttpTrigger` and
         :class:`HttpOutput` binding to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -402,7 +405,7 @@ def schedule(self,
                  run_on_startup: Optional[bool] = None,
                  use_monitor: Optional[bool] = None,
                  data_type: Optional[Union[DataType, str]] = None,
-                 **kwargs) -> Callable:
+                 **kwargs) -> Callable[..., Any]:
         """The schedule decorator adds :class:`TimerTrigger` to the
         :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -454,7 +457,7 @@ def service_bus_queue_trigger(
             access_rights: Optional[Union[AccessRights, str]] = None,
             is_sessions_enabled: Optional[bool] = None,
             cardinality: Optional[Union[Cardinality, str]] = None,
-            **kwargs) -> Callable:
+            **kwargs) -> Callable[..., Any]:
         """The on_service_bus_queue_change decorator adds
         :class:`ServiceBusQueueTrigger` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -513,7 +516,7 @@ def service_bus_topic_trigger(
             access_rights: Optional[Union[AccessRights, str]] = None,
             is_sessions_enabled: Optional[bool] = None,
             cardinality: Optional[Union[Cardinality, str]] = None,
-            **kwargs) -> Callable:
+            **kwargs) -> Callable[..., Any]:
         """The on_service_bus_topic_change decorator adds
         :class:`ServiceBusTopicTrigger` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -569,7 +572,7 @@ def queue_trigger(self,
                       queue_name: str,
                       connection: str,
                       data_type: Optional[DataType] = None,
-                      **kwargs) -> Callable:
+                      **kwargs) -> Callable[..., Any]:
         """The queue_trigger decorator adds :class:`QueueTrigger` to the
         :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -621,7 +624,7 @@ def event_hub_message_trigger(self,
                                       Union[Cardinality, str]] = None,
                                   consumer_group: Optional[
                                       str] = None,
-                                  **kwargs) -> Callable:
+                                  **kwargs) -> Callable[..., Any]:
         """The event_hub_message_trigger decorator adds
         :class:`EventHubTrigger`
         to the :class:`FunctionBuilder` object
@@ -695,7 +698,7 @@ def cosmos_db_trigger(self,
                           data_type: Optional[
                               Union[DataType, str]] = None,
                           **kwargs) -> \
-            Callable:
+            Callable[..., Any]:
         """The cosmos_db_trigger decorator adds :class:`CosmosDBTrigger`
         to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -799,7 +802,7 @@ def blob_trigger(self,
                      path: str,
                      connection: str,
                      data_type: Optional[DataType] = None,
-                     **kwargs) -> Callable:
+                     **kwargs) -> Callable[..., Any]:
         """
         The blob_change_trigger decorator adds :class:`BlobTrigger` to the
         :class:`FunctionBuilder` object
@@ -844,7 +847,7 @@ def event_grid_trigger(self,
                            arg_name: str,
                            data_type: Optional[
                                Union[DataType, str]] = None,
-                           **kwargs) -> Callable:
+                           **kwargs) -> Callable[..., Any]:
         """
         The event_grid_trigger decorator adds
         :class:`EventGridTrigger`
@@ -885,7 +888,7 @@ def generic_trigger(self,
                         type: str,
                         data_type: Optional[Union[DataType, str]] = None,
                         **kwargs
-                        ) -> Callable:
+                        ) -> Callable[..., Any]:
         """
         The generic_trigger decorator adds :class:`GenericTrigger`
         to the :class:`FunctionBuilder` object for building :class:`Function`
@@ -937,7 +940,7 @@ def service_bus_queue_output(self,
                                  access_rights: Optional[Union[
                                      AccessRights, str]] = None,
                                  **kwargs) -> \
-            Callable:
+            Callable[..., Any]:
         """The service_bus_queue_output decorator adds
         :class:`ServiceBusQueueOutput` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -989,7 +992,7 @@ def service_bus_topic_output(self,
                                  access_rights: Optional[Union[
                                      AccessRights, str]] = None,
                                  **kwargs) -> \
-            Callable:
+            Callable[..., Any]:
         """The service_bus_topic_output decorator adds
         :class:`ServiceBusTopicOutput` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -1039,7 +1042,7 @@ def queue_output(self,
                      queue_name: str,
                      connection: str,
                      data_type: Optional[DataType] = None,
-                     **kwargs) -> Callable:
+                     **kwargs) -> Callable[..., Any]:
         """The queue_output decorator adds :class:`QueueOutput` to the
         :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -1087,7 +1090,7 @@ def event_hub_output(self,
                          data_type: Optional[
                              Union[DataType, str]] = None,
                          **kwargs) -> \
-            Callable:
+            Callable[..., Any]:
         """The event_hub_output decorator adds
         :class:`EventHubOutput` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -1143,7 +1146,7 @@ def cosmos_db_output(self,
                          data_type: Optional[
                              Union[DataType, str]] = None,
                          **kwargs) \
-            -> Callable:
+            -> Callable[..., Any]:
         """The cosmos_db_output decorator adds
         :class:`CosmosDBOutput` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -1215,7 +1218,7 @@ def cosmos_db_input(self,
                         data_type: Optional[
                             Union[DataType, str]] = None,
                         **kwargs) \
-            -> Callable:
+            -> Callable[..., Any]:
         """The cosmos_db_input decorator adds
         :class:`CosmosDBInput` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -1272,7 +1275,7 @@ def blob_input(self,
                    path: str,
                    connection: str,
                    data_type: Optional[DataType] = None,
-                   **kwargs) -> Callable:
+                   **kwargs) -> Callable[..., Any]:
         """
         The blob_input decorator adds :class:`BlobInput` to the
         :class:`FunctionBuilder` object
@@ -1320,7 +1323,7 @@ def blob_output(self,
                     path: str,
                     connection: str,
                     data_type: Optional[DataType] = None,
-                    **kwargs) -> Callable:
+                    **kwargs) -> Callable[..., Any]:
         """
         The blob_output decorator adds :class:`BlobOutput` to the
         :class:`FunctionBuilder` object
@@ -1368,7 +1371,7 @@ def event_grid_output(self,
                           topic_key_setting: str,
                           data_type: Optional[
                               Union[DataType, str]] = None,
-                          **kwargs) -> Callable:
+                          **kwargs) -> Callable[..., Any]:
         """
         The event_grid_output decorator adds
         :class:`EventGridOutput`
@@ -1419,7 +1422,7 @@ def table_input(self,
                     take: Optional[int] = None,
                     filter: Optional[str] = None,
                     data_type: Optional[
-                        Union[DataType, str]] = None) -> Callable:
+                        Union[DataType, str]] = None) -> Callable[..., Any]:
         """
         The table_input decorator adds :class:`TableInput` to the
         :class:`FunctionBuilder` object
@@ -1474,7 +1477,7 @@ def table_output(self,
                      row_key: Optional[str] = None,
                      partition_key: Optional[str] = None,
                      data_type: Optional[
-                         Union[DataType, str]] = None) -> Callable:
+                         Union[DataType, str]] = None) -> Callable[..., Any]:
         """
         The table_output decorator adds :class:`TableOutput` to the
         :class:`FunctionBuilder` object
@@ -1522,7 +1525,7 @@ def generic_input_binding(self,
                               type: str,
                               data_type: Optional[Union[DataType, str]] = None,
                               **kwargs
-                              ) -> Callable:
+                              ) -> Callable[..., Any]:
         """
         The generic_input_binding decorator adds :class:`GenericInputBinding`
         to the :class:`FunctionBuilder` object for building :class:`Function`
@@ -1567,7 +1570,7 @@ def generic_output_binding(self,
                                data_type: Optional[
                                    Union[DataType, str]] = None,
                                **kwargs
-                               ) -> Callable:
+                               ) -> Callable[..., Any]:
         """
         The generic_output_binding decorator adds :class:`GenericOutputBinding`
         to the :class:`FunctionBuilder` object for building :class:`Function`

azure/functions/decorators/utils.py

@@ -5,7 +5,7 @@
 from abc import ABCMeta
 from enum import Enum
 from json import JSONEncoder
-from typing import TypeVar, Optional, Union, Iterable, Type, Callable
+from typing import Any, TypeVar, Optional, Union, Iterable, Type, Callable
 
 T = TypeVar("T", bound=Enum)
 SNAKE_CASE_RE = re.compile(r'^([a-zA-Z]+\d*_|_+[a-zA-Z\d])\w*$')
@@ -45,7 +45,7 @@ def wrapper(*args, **kw):
         return wrapper
 
     @staticmethod
-    def add_to_dict(func: Callable):
+    def add_to_dict(func: Callable[..., Any]):
         def wrapper(*args, **kwargs):
             if args is None or len(args) == 0:
                 raise ValueError(

tests/test_http_asgi.py

@@ -5,7 +5,7 @@
 import unittest
 
 import azure.functions as func
-from azure.functions._abc import TraceContext, RetryContext, WarmUpContext
+from azure.functions._abc import TraceContext, RetryContext
 from azure.functions._http_asgi import (
     AsgiMiddleware
 )
@@ -114,17 +114,15 @@ def _generate_func_context(
         function_name='httptrigger',
         function_directory='/home/roger/wwwroot/httptrigger',
         trace_context=TraceContext,
-        retry_context=RetryContext,
-        warmup_context=WarmUpContext
+        retry_context=RetryContext
     ) -> func.Context:
         class MockContext(func.Context):
-            def __init__(self, ii, fn, fd, tc, rc, wc):
+            def __init__(self, ii, fn, fd, tc, rc):
                 self._invocation_id = ii
                 self._function_name = fn
                 self._function_directory = fd
                 self._trace_context = tc
                 self._retry_context = rc
-                self._warmup_context = wc
 
             @property
             def invocation_id(self):
@@ -146,12 +144,8 @@ def trace_context(self):
             def retry_context(self):
                 return self._retry_context
 
-            @property
-            def warmup_context(self):
-                return self._warmup_context
-
         return MockContext(invocation_id, function_name, function_directory,
-                           trace_context, retry_context, warmup_context)
+                           trace_context, retry_context)
 
     def test_middleware_calls_app(self):
         app = MockAsgiApplication()