Merge branch 'dev'

Author: elprans

.ci/appveyor_setup_worker.py

@@ -7,9 +7,9 @@
 
 
 def main():
-    worker_dir = pathlib.Path(tempfile.mkdtemp()) / 'python'
+    worker_dir = pathlib.Path(tempfile.mkdtemp())
     os.makedirs(worker_dir)
-    worker_src = pathlib.Path(__file__).parent.parent / 'python' / 'worker.py'
+    worker_src = pathlib.Path(__file__).parent.parent / 'worker.py'
 
     shutil.copyfile(worker_src, worker_dir / 'worker.py')
     with open(worker_dir / 'worker.config.json', 'w') as f:

.gitignore

@@ -103,4 +103,3 @@ ENV/
 
 .testconfig
 .pytest_cache
-tests/*_functions/bin/

.travis.yml

@@ -1,7 +1,7 @@
 dist: trusty
 
 env:
-    - DOTNET_CLI_TELEMETRY_OPTOUT=1 DOTNET_VERSION=2.1.300
+    - DOTNET_CLI_TELEMETRY_OPTOUT=1 DOTNET_VERSION=2.1.402
 
 branches:
     only:

ISSUE_TEMPLATE.md

@@ -1,22 +1,15 @@
 
 <!-- 
-Please provide a succinct description of the issue. Please make an effort to fill in the all the sections below or we may close your issue for being low quality. 
+Please describe your issue or feature request below.
 -->
 
 #### Investigative information
 
 Please provide the following:
 
 - Timestamp:
-- Function App version (1.0 or 2.0-beta):
 - Function App name:
 - Function name(s) (as appropriate):
-- Invocation ID:
-- Region:
-
-<!-- 
-If you don't want to share your Function App name or Functions names on GitHub, please be sure to provide your Invocation ID, Timestamp, and Region - we can use this to look up your Function App/Function. Provide an invocation id per Function. See the [wiki](https://github.com/Azure/azure-webjobs-sdk-script/wiki/Sharing-Your-Function-App-name-privately) for more details. 
--->
 
 #### Repro steps
 
@@ -27,6 +20,7 @@ Example:
 
 1. Step A
 2. Step B
+
 -->
 
 #### Expected behavior
@@ -63,33 +57,31 @@ Example:
 
 Provide any related information 
 
-* Programming language used 
 * Links to source
 * Bindings used
+* Dependencies
+
 <!-- Uncomment this if you want to include your source (wrap it in details to make browsing easier)
 <details>
 <summary>Source</summary>
 
-```csharp
-public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.AuthLevelValue, "get", "post", Route = null)]HttpRequestMessage req, TraceWriter log)
-{
-    log.Info("C# HTTP trigger function processed a request.");
-
-    // parse query parameter
-    string name = req.GetQueryNameValuePairs()
-        .FirstOrDefault(q => string.Compare(q.Key, "name", true) == 0)
-        .Value;
+```python
+# __init__.py
 
-    // Get request body
-    dynamic data = await req.Content.ReadAsAsync<object>();
+def main(req: func.HttpRequest) -> func.HttpResponse:
+    logging.info('Python HTTP trigger function processed a request.')
 
-    // Set name to query string or body data
-    name = name ?? data?.name;
+    return "Done"
+```
 
-    return name == null
-        ? req.CreateResponse(HttpStatusCode.BadRequest, "Please pass a name on the query string or in the request body")
-        : req.CreateResponse(HttpStatusCode.OK, "Hello " + name);
-}
+```txt
+azure-functions==1.0.0a4
+azure-functions-worker==1.0.0a4
+grpcio==1.14.2
+grpcio-tools==1.14.2
+protobuf==3.6.1
+six==1.11.0
 ```
+
 </details>
 -->

README.md

@@ -7,28 +7,27 @@ This repository will host the Python language worker implementation for Azure Fu
 
 # Overview
 
-Python support for Functions is based on [Python3.6](https://www.python.org/downloads/release/python-360/), [Functions on Linux](https://blogs.msdn.microsoft.com/appserviceteam/2017/11/15/functions-on-linux-preview/) and the [V2 Runtime](https://docs.microsoft.com/en-us/azure/azure-functions/functions-versions).
+Python support for Azure Functions is based on Python3.6, serverless hosting on Linux and the Functions 2.0 runtime.
 
 Here is the current status of Python in Azure Functions:
 
 What's available?
 
-- Develop using Functions Core Tools (CLI)
-- Publish your Python functions using an App Service Plan on Linux
-- Triggers / Bindings : HTTP/Webhook, Blob, Queue, Timer, Cosmos DB, Event Grid, Event Hubs and Service Bus
-- Publish a custom image to Azure
+- Develop using the Azure Functions Core Tools (CLI)
+- Triggers / Bindings : HTTP, Blob, Queue, Timer, Cosmos DB, Event Grid, Event Hubs and Service Bus
+- Publish your functions to a [serverless linux app in Azure](https://aka.ms/functions-consumptionlinux-preview)
+- Build, test, debug and publish using Visual Studio Code
 
 What's coming?
 
-- Publish your Python functions using the consumption (serverless) plan
-- Build, test, debug and publish using Visual Studio Code
 - Triggers / Bindings : IoT Hub
 
 # Get Started
 
-- [Build and publish using the Functions Core Tools](https://github.com/Azure/azure-functions-python-worker/wiki/Create-Function-(CLI))
-- [Python developer guide](https://pythondeveloperguide.azurewebsites.net/)
+- [Create your first Python function](https://github.com/Azure/azure-functions-python-worker/wiki/Create-your-first-Python-function)
+- [Developer guide](https://github.com/Azure/azure-functions-python-worker/wiki/Developer-Guide)
 - [Binding API reference](https://pythondeveloperguide.azurewebsites.net/api.html#azure-functions-reference)
+- [Develop using VS Code](https://github.com/Azure/azure-functions-python-worker/wiki/Develop-using-VS-Code)
 
 # Give Feedback
 

appveyor.yml

@@ -12,12 +12,17 @@ environment:
     PIP_NO_WARN_SCRIPT_LOCATION: 0
     PIP_DISABLE_PIP_VERSION_CHECK: 1
     DOTNET_CLI_TELEMETRY_OPTOUT: 1
-    DOTNET_VERSION: 2.1.300
+    DOTNET_VERSION: 2.1.402
 
     matrix:
         - PYTHON_VERSION: 3.6
         - PYTHON_VERSION: 3.7
 
+# We must run tests sequentially as most integration tests
+# depend on the functino app state, which would get mangled
+# with multiple test jobs being run in parallel.
+max_jobs: 1
+
 for:
 -
     matrix:

azure/functions_worker/bindings/http.py

@@ -15,15 +15,17 @@ class HttpRequest(azf_abc.HttpRequest):
     __body_bytes: typing.Optional[bytes]
     __body_str: typing.Optional[str]
 
-    def __init__(self, method: str, url: str,
+    def __init__(self, method: str, url: str, *,
                  headers: typing.Mapping[str, str],
                  params: typing.Mapping[str, str],
+                 route_params: typing.Mapping[str, str],
                  body_type: meta.TypedDataKind,
                  body: typing.Union[str, bytes]) -> None:
         self.__method = method
         self.__url = url
         self.__headers = azf_http.HttpRequestHeaders(headers)
         self.__params = types.MappingProxyType(params)
+        self.__route_params = types.MappingProxyType(route_params)
         self.__body_type = body_type
 
         if isinstance(body, str):
@@ -52,6 +54,10 @@ def headers(self):
     def params(self):
         return self.__params
 
+    @property
+    def route_params(self):
+        return self.__route_params
+
     def get_body(self) -> bytes:
         if self.__body_bytes is None:
             assert self.__body_str is not None
@@ -147,5 +153,6 @@ def from_proto(cls, data: protos.TypedData, *,
             url=data.http.url,
             headers=data.http.headers,
             params=data.http.query,
+            route_params=data.http.params,
             body_type=body_type,
             body=body)

azure/functions_worker/bindings/meta.py

@@ -1,10 +1,12 @@
 import abc
+import collections.abc
 import datetime
 import enum
 import json
 import typing
 
 from .. import protos
+from .. import typing_inspect
 
 
 class TypedDataKind(enum.Enum):
@@ -211,6 +213,28 @@ def to_proto(cls, obj: typing.Any, *,
         pass
 
 
+def is_iterable_type_annotation(annotation: object, pytype: object) -> bool:
+    is_iterable_anno = (
+        typing_inspect.is_generic_type(annotation) and
+        issubclass(typing_inspect.get_origin(annotation),
+                   collections.abc.Iterable)
+    )
+
+    if not is_iterable_anno:
+        return False
+
+    args = typing_inspect.get_args(annotation)
+    if not args:
+        return False
+
+    if isinstance(pytype, tuple):
+        return any(isinstance(t, type) and issubclass(t, arg)
+                   for t in pytype for arg in args)
+    else:
+        return any(isinstance(pytype, type) and issubclass(pytype, arg)
+                   for arg in args)
+
+
 def is_binding(bind_name: str) -> bool:
     return bind_name in _ConverterMeta._binding_types
 

azure/functions_worker/bindings/queue.py

@@ -1,3 +1,4 @@
+import collections.abc
 import datetime
 import json
 import typing
@@ -99,7 +100,11 @@ class QueueMessageOutConverter(meta.OutConverter, binding='queue'):
 
     @classmethod
     def check_output_type_annotation(cls, pytype: type) -> bool:
-        return issubclass(pytype, (azf_abc.QueueMessage, str, bytes))
+        valid_types = (azf_abc.QueueMessage, str, bytes)
+        return (
+            meta.is_iterable_type_annotation(pytype, valid_types) or
+            (isinstance(pytype, type) and issubclass(pytype, valid_types))
+        )
 
     @classmethod
     def to_proto(cls, obj: typing.Any, *,
@@ -118,6 +123,25 @@ def to_proto(cls, obj: typing.Any, *,
                 })
             )
 
+        elif isinstance(obj, collections.abc.Iterable):
+            msgs = []
+            for item in obj:
+                if isinstance(item, str):
+                    msgs.append(item)
+                elif isinstance(item, azf_queue.QueueMessage):
+                    msgs.append({
+                        'id': item.id,
+                        'body': item.get_body().decode('utf-8')
+                    })
+                else:
+                    raise NotImplementedError(
+                        'invalid data type in output '
+                        'queue message list: {}'.format(type(item)))
+
+            return protos.TypedData(
+                json=json.dumps(msgs)
+            )
+
         raise NotImplementedError
 
     @classmethod

azure/functions_worker/dispatcher.py

@@ -199,7 +199,8 @@ async def _handle__function_load_request(self, req):
             func = loader.load_function(
                 func_request.metadata.name,
                 func_request.metadata.directory,
-                func_request.metadata.script_file)
+                func_request.metadata.script_file,
+                func_request.metadata.entry_point)
 
             self._functions.add_function(
                 function_id, func, func_request.metadata)