Merge branch 'main' into fix/pubsub_re_sub

Author: mingsing

README.md

@@ -53,7 +53,7 @@ pip3 install dapr-ext-fastapi
 
 ```sh
 # Install Dapr client sdk
-pip3 install dapr-dev
+pip3 install dapr
 
 # Install Dapr gRPC AppCallback service extension
 pip3 install dapr-ext-grpc-dev

dapr/aio/clients/grpc/client.py

@@ -153,7 +153,7 @@ def __init__(
             max_grpc_message_length (int, optional): The maximum grpc send and receive
                 message length in bytes.
         """
-        DaprHealth.wait_until_ready()
+        DaprHealth.wait_for_sidecar()
         self.retry_policy = retry_policy or RetryPolicy()
 
         useragent = f'dapr-sdk-python/{__version__}'

dapr/clients/grpc/client.py

@@ -145,7 +145,7 @@ def __init__(
                 message length in bytes.
             retry_policy (RetryPolicy optional): Specifies retry behaviour
         """
-        DaprHealth.wait_until_ready()
+        DaprHealth.wait_for_sidecar()
         self.retry_policy = retry_policy or RetryPolicy()
 
         useragent = f'dapr-sdk-python/{__version__}'

dapr/clients/grpc/subscription.py

@@ -65,7 +65,7 @@ def outgoing_request_iterator():
 
     def reconnect_stream(self):
         self.close()
-        DaprHealth.wait_until_ready()
+        DaprHealth.wait_for_sidecar()
         print('Attempting to reconnect...')
         self.start()
 

dapr/clients/health.py

@@ -15,6 +15,7 @@
 import urllib.request
 import urllib.error
 import time
+from warnings import warn
 
 from dapr.clients.http.conf import DAPR_API_TOKEN_HEADER, USER_AGENT_HEADER, DAPR_USER_AGENT
 from dapr.clients.http.helpers import get_api_url
@@ -24,6 +25,15 @@
 class DaprHealth:
     @staticmethod
     def wait_until_ready():
+        warn(
+            'This method is deprecated. Use DaprHealth.wait_for_sidecar instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        DaprHealth.wait_for_sidecar()
+
+    @staticmethod
+    def wait_for_sidecar():
         health_url = f'{get_api_url()}/healthz/outbound'
         headers = {USER_AGENT_HEADER: DAPR_USER_AGENT}
         if settings.DAPR_API_TOKEN is not None:

dapr/clients/http/client.py

@@ -51,7 +51,7 @@ def __init__(
             timeout (int, optional): Timeout in seconds, defaults to 60.
             headers_callback (lambda: Dict[str, str]], optional): Generates header for each request.
         """
-        DaprHealth.wait_until_ready()
+        DaprHealth.wait_for_sidecar()
 
         self._timeout = aiohttp.ClientTimeout(total=timeout)
         self._serializer = message_serializer

dapr/version/version.py

@@ -13,4 +13,4 @@
 limitations under the License.
 """
 
-__version__ = '1.15.0.dev'
+__version__ = '1.16.1rc1'

dev-requirements.txt

@@ -15,7 +15,7 @@ Flask>=1.1
 # needed for auto fix
 ruff===0.2.2
 # needed for dapr-ext-workflow
-durabletask-dapr >= 0.2.0a7
+durabletask-dapr >= 0.2.0a9
 # needed for .env file loading in examples
 python-dotenv>=1.0.0
 # needed for enhanced schema generation from function features

examples/demo_actor/demo_actor/requirements.txt

@@ -1 +1 @@
-dapr-ext-fastapi-dev>=1.15.0.dev
+dapr-ext-fastapi>=1.16.1rc1

examples/demo_workflow/demo_workflow/requirements.txt

@@ -1 +1 @@
-dapr-ext-workflow-dev>=1.15.0.dev
+dapr-ext-workflow>=1.16.1rc1