Merge branch 'dev' into hallvictoria/e2e-test-fix

Author: hallvictoria

azure_functions_worker/bindings/datumdef.py

@@ -199,6 +199,8 @@ def datum_as_proto(datum: Datum) -> protos.TypedData:
             enable_content_negotiation=False,
             body=datum_as_proto(datum.value['body']),
         ))
+    elif datum.type is None:
+        return None
     else:
         raise NotImplementedError(
             'unexpected Datum type: {!r}'.format(datum.type)

azure_functions_worker/bindings/generic.py

@@ -28,12 +28,17 @@ def encode(cls, obj: Any, *,
 
         elif isinstance(obj, (bytes, bytearray)):
             return datumdef.Datum(type='bytes', value=bytes(obj))
-
+        elif obj is None:
+            return datumdef.Datum(type=None, value=obj)
         else:
             raise NotImplementedError
 
     @classmethod
     def decode(cls, data: datumdef.Datum, *, trigger_metadata) -> typing.Any:
+        # Enabling support for Dapr bindings
+        # https://github.com/Azure/azure-functions-python-worker/issues/1316
+        if data is None:
+            return None
         data_type = data.type
 
         if data_type == 'string':
@@ -42,6 +47,8 @@ def decode(cls, data: datumdef.Datum, *, trigger_metadata) -> typing.Any:
             result = data.value
         elif data_type == 'json':
             result = data.value
+        elif data_type is None:
+            result = None
         else:
             raise ValueError(
                 f'unexpected type of data received for the "generic" binding '

azure_functions_worker/bindings/meta.py

@@ -270,9 +270,8 @@ def to_outgoing_param_binding(binding: str, obj: typing.Any, *,
             rpc_shared_memory=shared_mem_value)
     else:
         # If not, send it as part of the response message over RPC
+        # rpc_val can be None here as we now support a None return type
         rpc_val = datumdef.datum_as_proto(datum)
-        if rpc_val is None:
-            raise TypeError('Cannot convert datum to rpc_val')
         return protos.ParameterBinding(
             name=out_name,
             data=rpc_val)

azure_functions_worker/constants.py

@@ -80,3 +80,6 @@
 
 # Base extension supported Python minor version
 BASE_EXT_SUPPORTED_PY_MINOR_VERSION = 8
+
+PYTHON_ENABLE_OPENTELEMETRY = "PYTHON_ENABLE_OPENTELEMETRY"
+PYTHON_ENABLE_OPENTELEMETRY_DEFAULT = True

azure_functions_worker/dispatcher.py

@@ -30,7 +30,9 @@
                         PYTHON_SCRIPT_FILE_NAME,
                         PYTHON_SCRIPT_FILE_NAME_DEFAULT,
                         PYTHON_LANGUAGE_RUNTIME, PYTHON_ENABLE_INIT_INDEXING,
-                        METADATA_PROPERTIES_WORKER_INDEXED)
+                        METADATA_PROPERTIES_WORKER_INDEXED,
+                        PYTHON_ENABLE_OPENTELEMETRY,
+                        PYTHON_ENABLE_OPENTELEMETRY_DEFAULT)
 from .extension import ExtensionManager
 from .http_v2 import http_coordinator, initialize_http_server, HttpV2Registry, \
     sync_http_request, HttpServerInitError
@@ -318,10 +320,12 @@ async def _handle__worker_init_request(self, request):
             constants.SHARED_MEMORY_DATA_TRANSFER: _TRUE,
         }
 
-        self.update_opentelemetry_status()
+        if get_app_setting(setting=PYTHON_ENABLE_OPENTELEMETRY,
+                           default_value=PYTHON_ENABLE_OPENTELEMETRY_DEFAULT):
+            self.update_opentelemetry_status()
 
-        if self._otel_libs_available:
-            capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = _TRUE
+            if self._otel_libs_available:
+                capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = _TRUE
 
         if DependencyManager.should_load_cx_dependencies():
             DependencyManager.prioritize_customer_dependencies()
@@ -383,8 +387,10 @@ def load_function_metadata(self, function_app_directory, caller_info):
         function_path = os.path.join(function_app_directory,
                                      script_file_name)
 
+        # For V1, the function path will not exist and
+        # return None.
         self._function_metadata_result = (
-            self.index_functions(function_path)) \
+            self.index_functions(function_path, function_app_directory)) \
             if os.path.exists(function_path) else None
 
     async def _handle__functions_metadata_request(self, request):
@@ -439,8 +445,9 @@ async def _handle__function_load_request(self, request):
 
         logger.info(
             'Received WorkerLoadRequest, request ID %s, function_id: %s,'
-            'function_name: %s',
-            self.request_id, function_id, function_name)
+            'function_name: %s, function_app_directory : %s',
+            self.request_id, function_id, function_name,
+            function_app_directory)
 
         programming_model = "V2"
         try:
@@ -705,9 +712,14 @@ async def _handle__function_environment_reload_request(self, request):
             bindings.load_binding_registry()
 
             capabilities = {}
-            self.update_opentelemetry_status()
-            if self._otel_libs_available:
-                capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = _TRUE
+            if get_app_setting(
+                    setting=PYTHON_ENABLE_OPENTELEMETRY,
+                    default_value=PYTHON_ENABLE_OPENTELEMETRY_DEFAULT):
+                self.update_opentelemetry_status()
+
+                if self._otel_libs_available:
+                    capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = (
+                        _TRUE)
 
             if is_envvar_true(PYTHON_ENABLE_INIT_INDEXING):
                 try:
@@ -749,7 +761,7 @@ async def _handle__function_environment_reload_request(self, request):
                 request_id=self.request_id,
                 function_environment_reload_response=failure_response)
 
-    def index_functions(self, function_path: str):
+    def index_functions(self, function_path: str, function_dir: str):
         indexed_functions = loader.index_function_app(function_path)
         logger.info(
             "Indexed function app and found %s functions",
@@ -760,7 +772,8 @@ def index_functions(self, function_path: str):
             fx_metadata_results, fx_bindings_logs = (
                 loader.process_indexed_function(
                     self._functions,
-                    indexed_functions))
+                    indexed_functions,
+                    function_dir))
 
             indexed_function_logs: List[str] = []
             indexed_function_bindings_logs = []

azure_functions_worker/loader.py

@@ -121,7 +121,7 @@ def build_variable_interval_retry(retry, max_retry_count, retry_strategy):
 
 
 def process_indexed_function(functions_registry: functions.Registry,
-                             indexed_functions):
+                             indexed_functions, function_dir):
     """
     fx_metadata_results is a list of the RpcFunctionMetadata for
     all the functions in the particular app.
@@ -150,7 +150,7 @@ def process_indexed_function(functions_registry: functions.Registry,
             name=function_info.name,
             function_id=function_info.function_id,
             managed_dependency_enabled=False,  # only enabled for PowerShell
-            directory=function_info.directory,
+            directory=function_dir,
             script_file=indexed_function.function_script_file,
             entry_point=function_info.name,
             is_proxy=False,  # not supported in V4

tests/endtoend/blueprint_functions/functions_in_blueprint_only/blueprint.py

@@ -1,4 +1,6 @@
 import logging
+import time
+from datetime import datetime
 
 import azure.functions as func
 
@@ -29,3 +31,11 @@ def default_template(req: func.HttpRequest) -> func.HttpResponse:
             " personalized response.",
             status_code=200
         )
+
+
+@bp.route(route="http_func")
+def http_func(req: func.HttpRequest) -> func.HttpResponse:
+    time.sleep(1)
+
+    current_time = datetime.now().strftime("%H:%M:%S")
+    return func.HttpResponse(f"{current_time}")

tests/endtoend/generic_functions/generic_functions_stein/function_app.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 import azure.functions as func
+import logging
 
 app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS)
 
@@ -29,3 +30,16 @@ def return_processed_last(req: func.HttpRequest, testEntity):
     table_name="EventHubBatchTest")
 def return_not_processed_last(req: func.HttpRequest, testEntities):
     return func.HttpResponse(status_code=200)
+
+
+@app.function_name(name="mytimer")
+@app.schedule(schedule="*/1 * * * * *", arg_name="mytimer",
+              run_on_startup=False,
+              use_monitor=False)
+@app.generic_input_binding(
+    arg_name="testEntity",
+    type="table",
+    connection="AzureWebJobsStorage",
+    table_name="EventHubBatchTest")
+def mytimer(mytimer: func.TimerRequest, testEntity) -> None:
+    logging.info("This timer trigger function executed successfully")

tests/endtoend/generic_functions/return_none/function.json

@@ -0,0 +1,21 @@
+{
+  "scriptFile": "main.py",
+  "bindings": [
+    {
+      "name": "mytimer",
+      "type": "timerTrigger",
+      "direction": "in",
+      "schedule": "*/1 * * * * *",
+      "runOnStartup": false
+    },
+    {
+      "direction": "in",
+      "type": "table",
+      "name": "testEntity",
+      "partitionKey": "test",
+      "rowKey": "WillBePopulatedWithGuid",
+      "tableName": "BindingTestTable",
+      "connection": "AzureWebJobsStorage"
+    }
+  ]
+}

tests/endtoend/generic_functions/return_none/main.py

@@ -0,0 +1,10 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import logging
+
+import azure.functions as func
+
+
+def main(mytimer: func.TimerRequest, testEntity) -> None:
+    logging.info("This timer trigger function executed successfully")

tests/endtoend/test_generic_functions.py

@@ -2,6 +2,9 @@
 # Licensed under the MIT License.
 from unittest import skipIf
 
+import time
+import typing
+
 from azure_functions_worker.utils.common import is_envvar_true
 from tests.utils import testutils
 from tests.utils.constants import DEDICATED_DOCKER_TEST, CONSUMPTION_DOCKER_TEST
@@ -41,6 +44,17 @@ def test_return_not_processed_last(self):
         r = self.webhost.request('GET', 'return_not_processed_last')
         self.assertEqual(r.status_code, 200)
 
+    def test_return_none(self):
+        time.sleep(1)
+        # Checking webhost status.
+        r = self.webhost.request('GET', '', no_prefix=True,
+                                 timeout=5)
+        self.assertTrue(r.ok)
+
+    def check_log_timer(self, host_out: typing.List[str]):
+        self.assertEqual(host_out.count("This timer trigger function executed "
+                                        "successfully"), 1)
+
 
 @skipIf(is_envvar_true(DEDICATED_DOCKER_TEST)
         or is_envvar_true(CONSUMPTION_DOCKER_TEST),

tests/endtoend/test_worker_process_count_functions.py

@@ -71,3 +71,11 @@ class TestWorkerProcessCountStein(TestWorkerProcessCount):
     def get_script_dir(cls):
         return testutils.E2E_TESTS_FOLDER / 'http_functions' /\
                                             'http_functions_stein'
+
+
+class TestWorkerProcessCountWithBlueprintStein(TestWorkerProcessCount):
+
+    @classmethod
+    def get_script_dir(cls):
+        return testutils.E2E_TESTS_FOLDER / 'blueprint_functions' /\
+                                            'functions_in_blueprint_only'

tests/unittests/generic_functions/foobar_nil_data/function.json

@@ -0,0 +1,11 @@
+{
+    "scriptFile": "main.py",
+    "bindings": [
+      {
+        "type": "generic",
+        "name": "input",
+        "direction": "in"
+      }
+    ]
+  }
+  

tests/unittests/generic_functions/foobar_nil_data/main.py

@@ -0,0 +1,7 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+import logging
+
+
+def main(input) -> None:
+    logging.info("Hello World")

tests/unittests/test_dispatcher.py

@@ -21,7 +21,6 @@
 from tests.utils import testutils
 from tests.utils.testutils import UNIT_TESTS_ROOT
 
-
 SysVersionInfo = col.namedtuple("VersionInfo", ["major", "minor", "micro",
                                                 "releaselevel", "serial"])
 DISPATCHER_FUNCTIONS_DIR = testutils.UNIT_TESTS_FOLDER / 'dispatcher_functions'

tests/unittests/test_mock_generic_functions.py

@@ -144,6 +144,9 @@ async def test_mock_generic_should_support_implicit_output(self):
             # implicitly
             self.assertEqual(r.response.result.status,
                              protos.StatusResult.Success)
+            self.assertEqual(
+                r.response.return_value,
+                protos.TypedData(bytes=b'\x00\x01'))
 
     async def test_mock_generic_should_support_without_datatype(self):
         async with testutils.start_mockhost(
@@ -195,3 +198,28 @@ async def test_mock_generic_implicit_output_exemption(self):
             # For the Durable Functions durableClient case
             self.assertEqual(r.response.result.status,
                              protos.StatusResult.Failure)
+
+    async def test_mock_generic_as_nil_data(self):
+        async with testutils.start_mockhost(
+                script_root=self.generic_funcs_dir) as host:
+
+            await host.init_worker("4.17.1")
+            func_id, r = await host.load_function('foobar_nil_data')
+
+            self.assertEqual(r.response.function_id, func_id)
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+
+            _, r = await host.invoke_function(
+                'foobar_nil_data', [
+                    protos.ParameterBinding(
+                        name='input',
+                        data=protos.TypedData()
+                    )
+                ]
+            )
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+            self.assertEqual(
+                r.response.return_value,
+                protos.TypedData())