Merge branch 'dev' into evanroman/add-thread-local-context

Author: gavin-aguiar

README.md

@@ -14,10 +14,10 @@ Here is the current status of Python in Azure Functions:
 
 _What are the supported Python versions?_
 
-| Azure Functions Runtime | Python 3.6 | Python 3.7 | Python 3.8 | Python 3.9 |
-|-------------------------|------------|------------|------------|------------|
-| Azure Functions 3.0     | ✓          | ✓          | ✓          | ✓          |
-| Azure Functions 4.0     | ✓          | ✓          | ✓          | ✓          |
+| Azure Functions Runtime | Python 3.6 | Python 3.7 | Python 3.8 | Python 3.9 | Python 3.10  | Python 3.11 |
+|-------------------------|--------|-------|-------|--------|--------------|-------------|
+| Azure Functions 3.0     | [EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4)|[EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4)|[EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4)| [EOL](https://learn.microsoft.com/azure/azure-functions/migrate-version-3-version-4)| -       |-        |
+| Azure Functions 4.0     | ✓ | ✓ | ✓ | ✓ | ✓    | coming soon |
 
 _What's available?_
 - Build, test, debug and publish using Azure Functions Core Tools (CLI) or Visual Studio Code

azure/functions/_http.py

@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 
 import collections.abc
+import http
 import io
 import json
 import types
@@ -52,6 +53,7 @@ class HttpResponse(_abc.HttpResponse):
 
     :param int status_code:
         Response status code.  If not specified, defaults to 200.
+        You can use an int status code or an http.HTTPStatus value
 
     :param dict headers:
         An optional mapping containing response HTTP headers.
@@ -67,12 +69,16 @@ class HttpResponse(_abc.HttpResponse):
 
     def __init__(self,
                  body: typing.Optional[typing.Union[str, bytes]] = None, *,
-                 status_code: typing.Optional[int] = None,
+                 status_code: typing.Optional[typing.Union[
+                     http.HTTPStatus, int
+                 ]] = None,
                  headers: typing.Optional[typing.Mapping[str, str]] = None,
                  mimetype: typing.Optional[str] = None,
                  charset: typing.Optional[str] = None) -> None:
         if status_code is None:
             status_code = 200
+        if isinstance(status_code, http.HTTPStatus):
+            status_code = status_code.value
         self.__status_code = status_code
 
         if mimetype is None:

azure/functions/decorators/function_app.py

@@ -399,14 +399,14 @@ def decorator():
 
         return wrap
 
-    def schedule(self,
-                 arg_name: str,
-                 schedule: str,
-                 run_on_startup: Optional[bool] = None,
-                 use_monitor: Optional[bool] = None,
-                 data_type: Optional[Union[DataType, str]] = None,
-                 **kwargs: Any) -> Callable[..., Any]:
-        """The schedule decorator adds :class:`TimerTrigger` to the
+    def timer_trigger(self,
+                      arg_name: str,
+                      schedule: str,
+                      run_on_startup: Optional[bool] = None,
+                      use_monitor: Optional[bool] = None,
+                      data_type: Optional[Union[DataType, str]] = None,
+                      **kwargs: Any) -> Callable[..., Any]:
+        """The schedule or timer decorator adds :class:`TimerTrigger` to the
         :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
         indexing model. This is equivalent to defining TimerTrigger
@@ -448,6 +448,8 @@ def decorator():
 
         return wrap
 
+    schedule = timer_trigger
+
     def service_bus_queue_trigger(
             self,
             arg_name: str,

tests/decorators/test_decorators.py

@@ -65,7 +65,7 @@ def dummy_func():
         self.assertTrue(isinstance(func.get_trigger(), HttpTrigger))
         self.assertTrue(func.get_trigger().route, "dummy")
 
-    def test_timer_trigger_default_args(self):
+    def test_schedule_trigger_default_args(self):
         app = self.func_app
 
         @app.schedule(arg_name="req", schedule="dummy_schedule")
@@ -86,7 +86,7 @@ def dummy_func():
             ]
         })
 
-    def test_timer_trigger_full_args(self):
+    def test_schedule_trigger_full_args(self):
         app = self.func_app
 
         @app.schedule(arg_name="req", schedule="dummy_schedule",
@@ -112,6 +112,53 @@ def dummy():
             ]
         })
 
+    def test_timer_trigger_default_args(self):
+        app = self.func_app
+
+        @app.timer_trigger(arg_name="req", schedule="dummy_schedule")
+        def dummy_func():
+            pass
+
+        func = self._get_user_function(app)
+        self.assertEqual(func.get_function_name(), "dummy_func")
+        assert_json(self, func, {
+            "scriptFile": "function_app.py",
+            "bindings": [
+                {
+                    "name": "req",
+                    "type": TIMER_TRIGGER,
+                    "direction": BindingDirection.IN,
+                    "schedule": "dummy_schedule"
+                }
+            ]
+        })
+
+    def test_timer_trigger_full_args(self):
+        app = self.func_app
+
+        @app.timer_trigger(arg_name="req", schedule="dummy_schedule",
+                           run_on_startup=False, use_monitor=False,
+                           data_type=DataType.STRING, dummy_field='dummy')
+        def dummy():
+            pass
+
+        func = self._get_user_function(app)
+        assert_json(self, func, {
+            "scriptFile": "function_app.py",
+            "bindings": [
+                {
+                    "name": "req",
+                    "type": TIMER_TRIGGER,
+                    "dataType": DataType.STRING,
+                    "direction": BindingDirection.IN,
+                    'dummyField': 'dummy',
+                    "schedule": "dummy_schedule",
+                    "runOnStartup": False,
+                    "useMonitor": False
+                }
+            ]
+        })
+
     def test_route_default_args(self):
         app = self.func_app
 

tests/test_http.py

@@ -1,13 +1,14 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 import sys
+import types
 import unittest
+from http import HTTPStatus
 from unittest import skipIf
-import types
+
 import azure.functions as func
 import azure.functions.http as http
-from azure.functions._http import HttpResponseHeaders, HttpRequestHeaders
-
+from azure.functions._http import HttpRequestHeaders, HttpResponseHeaders
 from azure.functions.meta import Datum
 
 
@@ -178,6 +179,12 @@ def test_http_response_does_not_have_explicit_output(self):
             getattr(http.HttpResponseConverter, 'has_implicit_output', None)
         )
 
+    def test_http_response_accepts_http_enums(self):
+        response = func.HttpResponse(status_code=404)
+        self.assertEquals(response.status_code, 404)
+        response = func.HttpResponse(status_code=HTTPStatus.ACCEPTED)
+        self.assertEquals(response.status_code, 202)
+
     def test_http_request_converter_decode(self):
         data = {
             "method": Datum("POST", "string"),