Merge branch 'dev'

Author: davidmrdavid

README.md

@@ -15,7 +15,7 @@ You can find more information at the following links:
 
 * [Azure Functions overview](https://docs.microsoft.com/en-us/azure/azure-functions/functions-overview)
 * [Azure Functions Python developers guide](https://docs.microsoft.com/en-us/azure/azure-functions/functions-reference-python)
-* [Durable Functions overview](https://docs.microsoft.com/en-us/azure/azure-functions/durable/durable-functions-overview)
+* [Durable Functions overview](https://docs.microsoft.com/en-us/azure/azure-functions/durable/durable-functions-overview?tabs=python)
 
 A durable function, or _orchestration_, is a solution made up of different types of Azure Functions:
 
@@ -27,27 +27,22 @@ Durable Functions' function types and features are documented in-depth [here.](h
 
 ## Current limitations
 
-We're actively working on Python support for Durable Functions and we expect a Public Preview announcement in Q2 CY2020. The following are the current known limitations.
+Python support for Durable Functions is currently in public preview. The following are the current known limitations.
 
 ### Functionality
 
-* `DurableOrchestrationContext.create_timer()` is not yet supported (coming soon [#35](https://github.com/Azure/azure-functions-durable-python/issues/35))
 * Sub-orchestrations are not yet supported (planned [#62](https://github.com/Azure/azure-functions-durable-python/issues/62))
 * Durable Entities are not yet supported (not yet planned [#96](https://github.com/Azure/azure-functions-durable-python/issues/96))
 
 ### Tooling
 
-* Python Durable Functions requires updated versions of Azure Functions Core Tools that includes Python worker [1.1.0](https://github.com/Azure/azure-functions-python-worker/releases/tag/1.1.0), templates ([bundle-1.2.0](https://github.com/Azure/azure-functions-templates/releases/tag/bundle-1.2.0)), and extension bundles ([1.2.0](https://github.com/Azure/azure-functions-extension-bundles/releases/tag/1.2.0)) that are not yet released (ETA May 2020). Use the VS Code dev container in the [Getting Started](#getting-started) section to access a development environment with the required versions of the tools installed.
-
-### Deployment
-
-* Python Durable Functions requires an updated version of the Azure Functions Python language worker ([1.1.0](https://github.com/Azure/azure-functions-python-worker/releases/tag/1.1.0)) that is not yet available in Azure. Deploy your Python Durable Functions apps in containers (requires Premium or App Service plans). (Linux consumption plan support ETA May 2020)
+* Python Durable Functions requires [Azure Functions Core Tools](https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local) version 3.0.2630 or higher.
 
 ## Getting Started
 
 Follow these instructions to get started with Durable Functions in Python:
 
-**🚀 [Python Durable Functions quickstart](https://aka.ms/pythondurable)**
+**🚀 [Python Durable Functions quickstart](https://docs.microsoft.com/azure/azure-functions/durable/quickstart-python-vscode)**
 
 ## Samples
 

azure/durable_functions/models/DurableHttpRequest.py

@@ -1,19 +1,20 @@
-from typing import Dict, Any
+from typing import Dict, Union, Optional
 
-from azure.durable_functions.models import TokenSource
+from azure.durable_functions.models.TokenSource import TokenSource
 from azure.durable_functions.models.utils.json_utils import add_attrib, add_json_attrib
 
 
 class DurableHttpRequest:
     """Data structure representing a durable HTTP request."""
 
-    def __init__(self, method: str, uri: str, content: str = None, headers: Dict[str, str] = None,
-                 token_source: TokenSource = None):
+    def __init__(self, method: str, uri: str, content: Optional[str] = None,
+                 headers: Optional[Dict[str, str]] = None,
+                 token_source: Optional[TokenSource] = None):
         self._method: str = method
         self._uri: str = uri
-        self._content: str = content
-        self._headers: Dict[str, str] = headers
-        self._token_source: TokenSource = token_source
+        self._content: Optional[str] = content
+        self._headers: Optional[Dict[str, str]] = headers
+        self._token_source: Optional[TokenSource] = token_source
 
     @property
     def method(self) -> str:
@@ -26,29 +27,29 @@ def uri(self) -> str:
         return self._uri
 
     @property
-    def content(self) -> str:
+    def content(self) -> Optional[str]:
         """Get the HTTP request content."""
         return self._content
 
     @property
-    def headers(self) -> Dict[str, str]:
+    def headers(self) -> Optional[Dict[str, str]]:
         """Get the HTTP request headers."""
         return self._headers
 
     @property
-    def token_source(self) -> TokenSource:
+    def token_source(self) -> Optional[TokenSource]:
         """Get the source of OAuth token to add to the request."""
         return self._token_source
 
-    def to_json(self) -> Dict[str, Any]:
+    def to_json(self) -> Dict[str, Union[str, int]]:
         """Convert object into a json dictionary.
 
         Returns
         -------
-        Dict[str, Any]
+        Dict[str, Union[str, int]]
             The instance of the class converted into a json dictionary
         """
-        json_dict = {}
+        json_dict: Dict[str, Union[str, int]] = {}
         add_attrib(json_dict, self, 'method')
         add_attrib(json_dict, self, 'uri')
         add_attrib(json_dict, self, 'content')

azure/durable_functions/models/DurableOrchestrationBindings.py

@@ -1,5 +1,5 @@
 import json
-from typing import Dict
+from typing import Dict, Optional
 
 from azure.durable_functions.models.FunctionContext import FunctionContext
 
@@ -13,11 +13,13 @@ class DurableOrchestrationBindings:
 
     # parameter names are as defined by JSON schema and do not conform to PEP8 naming conventions
     def __init__(self, taskHubName: str, creationUrls: Dict[str, str],
-                 managementUrls: Dict[str, str], rpcBaseUrl: str = None, **kwargs):
+                 managementUrls: Dict[str, str], rpcBaseUrl: Optional[str] = None, **kwargs):
         self._task_hub_name: str = taskHubName
         self._creation_urls: Dict[str, str] = creationUrls
         self._management_urls: Dict[str, str] = managementUrls
-        self._rpc_base_url: str = rpcBaseUrl
+        # TODO: we can remove the Optional once we drop support for 1.x,
+        # this is always provided in 2.x
+        self._rpc_base_url: Optional[str] = rpcBaseUrl
         self._client_data = FunctionContext(**kwargs)
 
     @property
@@ -36,7 +38,7 @@ def management_urls(self) -> Dict[str, str]:
         return self._management_urls
 
     @property
-    def rpc_base_url(self) -> str:
+    def rpc_base_url(self) -> Optional[str]:
         """Get the base url communication between out of proc workers and the function host."""
         return self._rpc_base_url