Merge branch 'main' into olitomlinson-patch-1

Author: acroca

.github/workflows/build-push-to-main.yaml

@@ -113,3 +113,10 @@ jobs:
         cd ext/dapr-ext-langgraph
         python setup.py sdist bdist_wheel
         twine upload dist/*
+    - name: Build and publish dapr-ext-strands
+      env:
+        TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
+      run: |
+        cd ext/dapr-ext-strands
+        python setup.py sdist bdist_wheel
+        twine upload dist/*

.github/workflows/build-tag.yaml

@@ -8,6 +8,8 @@ on:
       - grpc-v*
       - flask-v*
       - fastapi-v*
+      - langgraph-v*
+      - strands-v*
   workflow_dispatch:
 
 jobs:
@@ -123,3 +125,11 @@ jobs:
         cd ext/dapr-ext-langgraph
         python setup.py sdist bdist_wheel
         twine upload dist/*
+    - name: Build and publish dapr-ext-strands
+      if: startsWith(github.ref_name, 'strands-v')
+      env:
+        TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
+      run: |
+        cd ext/dapr-ext-strands
+        python setup.py sdist bdist_wheel
+        twine upload dist/*

.github/workflows/fossa.yaml

@@ -26,6 +26,8 @@ on:
       - grpc-v*
       - flask-v*
       - fastapi-v*
+      - langgraph-v*
+      - strands-v*
   pull_request:
     branches:
       - main

.github/workflows/validate_examples.yaml

@@ -11,6 +11,8 @@ on:
       - grpc-v*
       - fastapi-v*
       - flask-v*
+      - langgraph-v*
+      - strands-v*
   pull_request:
     branches:
       - main

README.md

@@ -87,6 +87,7 @@ pip3 install -e ./ext/dapr-ext-grpc/
 pip3 install -e ./ext/dapr-ext-fastapi/
 pip3 install -e ./ext/dapr-ext-workflow/
 pip3 install -e ./ext/dapr-ext-langgraph/
+pip3 install -e ./ext/dapr-ext-strands/
 ```
 
 3. Install required packages

dapr/aio/clients/grpc/client.py

@@ -96,7 +96,6 @@
 from dapr.conf import settings
 from dapr.conf.helpers import GrpcEndpoint
 from dapr.proto import api_service_v1, api_v1, common_v1
-from dapr.proto.runtime.v1.dapr_pb2 import UnsubscribeConfigurationResponse
 from dapr.version import __version__
 
 
@@ -1206,7 +1205,9 @@ async def unsubscribe_configuration(self, store_name: str, id: str) -> bool:
             bool: True if unsubscribed successfully, False otherwise
         """
         req = api_v1.UnsubscribeConfigurationRequest(store_name=store_name, id=id)
-        response: UnsubscribeConfigurationResponse = await self._stub.UnsubscribeConfiguration(req)
+        response: api_v1.UnsubscribeConfigurationResponse = (
+            await self._stub.UnsubscribeConfiguration(req)
+        )
         return response.ok
 
     async def try_lock(

dapr/clients/grpc/_jobs.py

@@ -119,7 +119,7 @@ def _get_proto(self):
         """
         from google.protobuf.any_pb2 import Any as GrpcAny
 
-        from dapr.proto.runtime.v1 import dapr_pb2 as api_v1
+        from dapr.proto import api_v1
 
         # Build the job proto
         job_proto = api_v1.Job(name=self.name)

dapr/clients/grpc/client.py

@@ -89,7 +89,6 @@
 from dapr.conf import settings
 from dapr.conf.helpers import GrpcEndpoint
 from dapr.proto import api_service_v1, api_v1, common_v1
-from dapr.proto.runtime.v1.dapr_pb2 import UnsubscribeConfigurationResponse
 from dapr.version import __version__
 
 
@@ -501,9 +500,6 @@ def subscribe(
             topic (str): The name of the topic.
             metadata (Optional[MetadataTuple]): Additional metadata for the subscription.
             dead_letter_topic (Optional[str]): Name of the dead-letter topic.
-            timeout (Optional[int]): The time in seconds to wait for a message before returning None
-                                     If not set, the `next_message` method will block indefinitely
-                                     until a message is received.
 
         Returns:
             Subscription: The Subscription object managing the stream.
@@ -529,9 +525,6 @@ def subscribe_with_handler(
             handler_fn (Callable[..., TopicEventResponse]): The function to call when a message is received.
             metadata (Optional[MetadataTuple]): Additional metadata for the subscription.
             dead_letter_topic (Optional[str]): Name of the dead-letter topic.
-            timeout (Optional[int]): The time in seconds to wait for a message before returning None
-                                     If not set, the `next_message` method will block indefinitely
-                                     until a message is received.
         """
         subscription = self.subscribe(pubsub_name, topic, metadata, dead_letter_topic)
 
@@ -1215,7 +1208,7 @@ def unsubscribe_configuration(self, store_name: str, id: str) -> bool:
             bool: True if unsubscribed successfully, False otherwise
         """
         req = api_v1.UnsubscribeConfigurationRequest(store_name=store_name, id=id)
-        response: UnsubscribeConfigurationResponse = self._stub.UnsubscribeConfiguration(req)
+        response: api_v1.UnsubscribeConfigurationResponse = self._stub.UnsubscribeConfiguration(req)
         return response.ok
 
     def try_lock(

dapr/proto/__init__.py

@@ -21,8 +21,9 @@
 from dapr.conf import settings
 
 from dapr.proto.common.v1 import common_pb2 as common_v1
-from dapr.proto.runtime.v1 import dapr_pb2 as api_v1
+import dapr.proto.runtime.v1 as api_v1
 from dapr.proto.runtime.v1 import dapr_pb2_grpc as api_service_v1
+
 from dapr.proto.runtime.v1 import appcallback_pb2 as appcallback_v1
 from dapr.proto.runtime.v1 import appcallback_pb2_grpc as appcallback_service_v1