Move implicit output bindings serialization logic to Python library

.ci/linux_devops_build.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
 set -e -x
-
+
+# Install the latest Azure Functions Python Worker from test.pypi.org
 python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple -U -e .[dev]
-python setup.py webhost
+
+# Install the latest Azure Functions Python Library from test.pypi.org
+python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple -U azure-functions --pre
+
+# Download Azure Functions Host
+python setup.py webhost

azure_functions_worker/functions.py

@@ -63,7 +63,8 @@ def add_function(self, function_id: str,
         return_pytype: typing.Optional[type] = None
 
         requires_context = False
-        has_return = False
+        has_explicit_return = False
+        has_implicit_return = False
 
         bound_params = {}
         for name, desc in metadata.bindings.items():
@@ -78,16 +79,16 @@ def add_function(self, function_id: str,
                         func_name,
                         f'"$return" binding must have direction set to "out"')
 
+                has_explicit_return = True
                 return_binding_name = desc.type
                 assert return_binding_name is not None
 
-                has_return = True
             elif bindings.has_implicit_output(desc.type):
                 # If the binding specify implicit output binding
                 # (e.g. orchestrationTrigger, activityTrigger)
                 # we should enable output even if $return is not specified
-                has_return = True
-                return_binding_name = f'{desc.type}_ret'
+                has_implicit_return = True
+                return_binding_name = desc.type
                 bound_params[name] = desc
             else:
                 bound_params[name] = desc
@@ -224,7 +225,7 @@ def add_function(self, function_id: str,
                 input_types[param.name] = param_type_info
 
         return_pytype = None
-        if return_binding_name is not None and 'return' in annotations:
+        if has_explicit_return and 'return' in annotations:
             return_anno = annotations.get('return')
             if (typing_inspect.is_generic_type(return_anno)
                and typing_inspect.get_origin(return_anno).__name__ == 'Out'):
@@ -249,8 +250,11 @@ def add_function(self, function_id: str,
                     f'Python return annotation "{return_pytype.__name__}" '
                     f'does not match binding type "{return_binding_name}"')
 
+        if has_implicit_return and 'return' in annotations:
+            return_pytype = annotations.get('return')
+
         return_type = None
-        if return_binding_name is not None:
+        if has_explicit_return or has_implicit_return:
             return_type = ParamTypeInfo(return_binding_name, return_pytype)
 
         self._functions[function_id] = FunctionInfo(
@@ -259,7 +263,7 @@ def add_function(self, function_id: str,
             directory=metadata.directory,
             requires_context=requires_context,
             is_async=inspect.iscoroutinefunction(func),
-            has_return=has_return,
+            has_return=has_explicit_return or has_implicit_return,
             input_types=input_types,
             output_types=output_types,
             return_type=return_type)

tests/unittests/durable_functions/activity_trigger_dict/function.json

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

tests/unittests/durable_functions/activity_trigger_dict/main.py

@@ -0,0 +1,9 @@
+from typing import Dict
+
+
+def main(input: Dict[str, str]) -> Dict[str, str]:
+    result = input.copy()
+    if result.get('bird'):
+        result['bird'] = result['bird'][::-1]
+
+    return result

tests/unittests/durable_functions/activity_trigger_int_to_float/function.json

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

tests/unittests/durable_functions/activity_trigger_int_to_float/main.py

@@ -0,0 +1,2 @@
+def main(input: int) -> float:
+    return float(input) * (-1.1)

tests/unittests/test_mock_durable_functions.py

@@ -17,10 +17,12 @@ async def test_mock_activity_trigger(self):
 
             _, r = await host.invoke_function(
                 'activity_trigger', [
+                    # According to Durable Python
+                    # Activity Trigger's input must be json serializable
                     protos.ParameterBinding(
                         name='input',
                         data=protos.TypedData(
-                            string='test'
+                            string='test single_word'
                         )
                     )
                 ]
@@ -29,7 +31,7 @@ async def test_mock_activity_trigger(self):
                              protos.StatusResult.Success)
             self.assertEqual(
                 r.response.return_value,
-                protos.TypedData(string='test')
+                protos.TypedData(json='"test single_word"')
             )
 
     async def test_mock_activity_trigger_no_anno(self):
@@ -44,10 +46,12 @@ async def test_mock_activity_trigger_no_anno(self):
 
             _, r = await host.invoke_function(
                 'activity_trigger_no_anno', [
+                    # According to Durable Python
+                    # Activity Trigger's input must be json serializable
                     protos.ParameterBinding(
                         name='input',
                         data=protos.TypedData(
-                            bytes=b'\x34\x93\x04\x70'
+                            string='test multiple words'
                         )
                     )
                 ]
@@ -56,7 +60,66 @@ async def test_mock_activity_trigger_no_anno(self):
                              protos.StatusResult.Success)
             self.assertEqual(
                 r.response.return_value,
-                protos.TypedData(bytes=b'\x34\x93\x04\x70')
+                protos.TypedData(json='"test multiple words"')
+            )
+
+    async def test_mock_activity_trigger_dict(self):
+        async with testutils.start_mockhost(
+                script_root=self.durable_functions_dir) as host:
+
+            func_id, r = await host.load_function('activity_trigger_dict')
+
+            self.assertEqual(r.response.function_id, func_id)
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+
+            _, r = await host.invoke_function(
+                'activity_trigger_dict', [
+                    # According to Durable Python
+                    # Activity Trigger's input must be json serializable
+                    protos.ParameterBinding(
+                        name='input',
+                        data=protos.TypedData(
+                            json='{"bird": "Crane"}'
+                        )
+                    )
+                ]
+            )
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+            self.assertEqual(
+                r.response.return_value,
+                protos.TypedData(json='{"bird": "enarC"}')
+            )
+
+    async def test_mock_activity_trigger_int_to_float(self):
+        async with testutils.start_mockhost(
+                script_root=self.durable_functions_dir) as host:
+
+            func_id, r = await host.load_function(
+                'activity_trigger_int_to_float')
+
+            self.assertEqual(r.response.function_id, func_id)
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+
+            _, r = await host.invoke_function(
+                'activity_trigger_int_to_float', [
+                    # According to Durable Python
+                    # Activity Trigger's input must be json serializable
+                    protos.ParameterBinding(
+                        name='input',
+                        data=protos.TypedData(
+                            json=str(int(10))
+                        )
+                    )
+                ]
+            )
+            self.assertEqual(r.response.result.status,
+                             protos.StatusResult.Success)
+            self.assertEqual(
+                r.response.return_value,
+                protos.TypedData(json='-11.0')
             )
 
     async def test_mock_orchestration_trigger(self):
@@ -83,5 +146,5 @@ async def test_mock_orchestration_trigger(self):
                              protos.StatusResult.Success)
             self.assertEqual(
                 r.response.return_value,
-                protos.TypedData(string='Durable functions coming soon :)')
+                protos.TypedData(json='Durable functions coming soon :)')
             )