Merge branch 'main' into feat/mcp-crd

Author: sicoyle

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

@@ -52,11 +52,7 @@ jobs:
       run: uv run mypy
     - name: Run unit-tests
       run: |
-        uv run coverage run -m unittest discover -v ./tests
-        for dir in ext/*/tests; do
-            uv run coverage run -a -m unittest discover -v "./$dir"
-        done
-        uv run coverage run -a -m pytest -m "not e2e" ./ext/dapr-ext-workflow/tests/durabletask/
+        uv run coverage run -m pytest tests ext -m "not e2e" --ignore=tests/integration --ignore=tests/examples --import-mode=importlib
         uv run coverage xml
     - name: Upload test coverage
       uses: codecov/codecov-action@v6

.github/workflows/build-tag.yaml

@@ -52,11 +52,7 @@ jobs:
       run: uv run mypy
     - name: Run unit-tests
       run: |
-        uv run coverage run -m unittest discover -v ./tests
-        for dir in ext/*/tests; do
-            uv run coverage run -a -m unittest discover -v "./$dir"
-        done
-        uv run coverage run -a -m pytest -m "not e2e" ./ext/dapr-ext-workflow/tests/durabletask/
+        uv run coverage run -m pytest tests ext -m "not e2e" --ignore=tests/integration --ignore=tests/examples --import-mode=importlib
         uv run coverage xml
     - name: Upload test coverage
       uses: codecov/codecov-action@v6

.github/workflows/build.yaml

@@ -58,11 +58,7 @@ jobs:
       run: uv run mypy
     - name: Run unit-tests
       run: |
-        uv run coverage run -m unittest discover -v ./tests
-        for dir in ext/*/tests; do
-            uv run coverage run -a -m unittest discover -v "./$dir"
-        done
-        uv run coverage run -a -m pytest -m "not e2e" ./ext/dapr-ext-workflow/tests/durabletask/
+        uv run coverage run -m pytest tests ext -m "not e2e" --ignore=tests/integration --ignore=tests/examples --import-mode=importlib
         uv run coverage xml
     - name: Upload test coverage
       uses: codecov/codecov-action@v6

.github/workflows/run-tests.yaml

@@ -1,4 +1,4 @@
-name: validate-examples
+name: run-tests
 
 on:
   push:
@@ -86,7 +86,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v7
       - name: Install dependencies
-        run: uv sync --frozen --all-packages --group examples
+        run: uv sync --frozen --all-packages --group tests
       - name: Set up Dapr CLI
         uses: dapr/.github/.github/actions/setup-dapr-cli@main
         with:
@@ -103,9 +103,9 @@ jobs:
           nohup ollama serve &
           sleep 10
           ollama pull llama3.2:latest
-      - name: Check examples
-        run: |
-          uv run pytest tests/examples/
       - name: Run integration tests
         run: |
           uv run pytest tests/integration/
+      - name: Validate examples
+        run: |
+          uv run pytest tests/examples/

.gitignore

@@ -136,3 +136,9 @@ coverage.lcov
 
 # macOS specific files
 .DS_Store
+
+# Integration test scratch dirs
+tests/integration/.binding-data/
+
+# Crypto test material generated at test time (see tests/crypto_utils.py)
+tests/integration/keys/

CLAUDE.md

@@ -1,14 +1,20 @@
 @AGENTS.md
 
-Use pathlib instead of os.path.
-Use httpx instead of urllib.
-subprocess(`shell=True`) is used only when it makes the code more readable. Use either shlex or args lists.
-subprocess calls should have a reasonable timeout.
-Use modern Python (3.10+) features.
 Make all code strongly typed.
 Keep conditional nesting to a minimum, and use guard clauses when possible.
-Aim for medium "visual complexity": use intermediate variables to store results of nested/complex function calls, but don't create a new variable for everything.
-Avoid comments unless there is a gotcha, a complex algorithm or anything an experienced code reviewer needs to be aware of. Focus on making better Google-style docstrings instead.
+Aim for medium visual complexity: use intermediate variables to store results of nested/complex function calls. A complex function call could be:
+- `f(Object(a=1, b=2, c=3))`, the inner object has more than 2 meaningful args
+- `f(Object((a, b)))`, 2 levels of nesting or anything with a long chain of closing parens
+- `small_transformation(ImportantObject())`, the object itself is the main subject of the function but the transformation steals the focus
+Use descriptive, self-documenting names for these intermediate variables.
+Closely related variable names should share a root and use different suffixes. For example, `request_original` and `request_clean`, but not `clean_request`.
+Avoid comments unless there is a gotcha, a complex algorithm or anything an experienced code reviewer needs to be aware of. Focus on making short but descriptive Google-style docstrings instead.
 
-The user is not always right. Be skeptical and do not blindly comply if something doesn't make sense.
+Use modern Python (3.10+) features.
+Use pathlib instead of os.path.
+Use httpx instead of urllib.
+`subprocess(shell=True)` is used only when it makes the code more readable. Use either shlex or args lists.
+Anything that can have an explicit timeout should have one.
 Code should be cross-platform and production ready.
+
+The user is not always right. Be skeptical and do not blindly comply if something doesn't make sense.

dapr/actor/runtime/config.py

@@ -117,7 +117,7 @@ def __init__(
         self,
         actor_idle_timeout: Optional[timedelta] = timedelta(hours=1),
         actor_scan_interval: Optional[timedelta] = timedelta(seconds=30),
-        drain_ongoing_call_timeout: Optional[timedelta] = timedelta(minutes=1),
+        drain_ongoing_call_timeout: Optional[timedelta] = None,
         drain_rebalanced_actors: Optional[bool] = True,
         reentrancy: Optional[ActorReentrancyConfig] = None,
         reminders_storage_partitions: Optional[int] = None,
@@ -130,9 +130,13 @@ def __init__(
             actor_scan_interval (datetime.timedelta): The duration which specifies how often to scan
                 for actors to deactivate idle actors. Actors that have been idle longer than
                 actor_idle_timeout will be deactivated.
-            drain_ongoing_call_timeout (datetime.timedelta): The duration which specifies the
-                timeout for the current active actor method to finish before actor deactivation.
-                If there is no current actor method call, this is ignored.
+            drain_ongoing_call_timeout (Optional[datetime.timedelta]): The duration which
+                specifies the timeout for the current active actor method to finish before
+                actor deactivation. If there is no current actor method call, this is
+                ignored. Defaults to None, which omits the field from the configuration
+                sent to daprd so the runtime applies its own default. An explicit value
+                must be shorter than the daprd placement dissemination timeout, otherwise
+                daprd will clamp it.
             drain_rebalanced_actors (bool): If true, Dapr will wait for drain_ongoing_call_timeout
                 to allow a current actor call to complete before trying to deactivate an actor.
             reentrancy (ActorReentrancyConfig): Configure the reentrancy behavior for an actor.
@@ -175,10 +179,12 @@ def as_dict(self) -> Dict[str, Any]:
         configDict: Dict[str, Any] = {
             'actorIdleTimeout': self._actor_idle_timeout,
             'actorScanInterval': self._actor_scan_interval,
-            'drainOngoingCallTimeout': self._drain_ongoing_call_timeout,
             'drainRebalancedActors': self._drain_rebalanced_actors,
         }
 
+        if self._drain_ongoing_call_timeout is not None:
+            configDict['drainOngoingCallTimeout'] = self._drain_ongoing_call_timeout
+
         if self._reentrancy:
             configDict.update({'reentrancy': self._reentrancy.as_dict()})
 

examples/pubsub-streaming-async/publisher.py

@@ -44,7 +44,7 @@ async def publish_events():
             )
 
             # Print the request
-            print(req_data, flush=True)
+            print(req_data)
 
             await asyncio.sleep(1)
 

examples/pubsub-streaming-async/subscriber.py

@@ -19,7 +19,7 @@ def process_message(message):
     global counter
     counter += 1
     # Process the message here
-    print(f'Processing message: {message.data()} from {message.topic()}...', flush=True)
+    print(f'Processing message: {message.data()} from {message.topic()}...')
     return 'success'
 
 

pyproject.toml

@@ -66,22 +66,25 @@ dev = [
     "types-grpcio-status~=1.0.0",
     "coverage~=7.13.4",
     "wheel~=0.46.3",
-    "opentelemetry-sdk~=1.40.0",
+    "opentelemetry-sdk>=1.40,<1.42",
     "opentelemetry-instrumentation-grpc~=0.61b0",
     "opentelemetry-exporter-zipkin~=1.11.1",
     "httpx~=0.28.1",
     "pyOpenSSL~=26.0.0",
+    "cryptography>=42.0.0",
+    "redis>=7.4.0",
     "Flask~=3.1.3",
     "pytest~=9.0.2",
+    "pytest-asyncio>=0.23",
     "ruff==0.14.1",
     "python-dotenv~=1.2.2",
     "pydantic~=2.13.3",
     "PyYAML~=6.0.3",
 ]
-examples = [
+tests = [
     {include-group = "dev"},
     "mechanical-markdown~=0.8.0",
-    "langchain-ollama~=1.0.1",
+    "langchain-ollama>=1.0.1,<1.2.0",
 ]
 
 [tool.ruff]
@@ -142,3 +145,4 @@ markers = [
     'example_dir(name): set the example directory for the dapr fixture',
 ]
 pythonpath = ["."]
+asyncio_mode = "auto"