Merge branch 'main' into fix/pipeline-error-callback

Author: mramansayyad

.agents/skills/adk-sample-creator/SKILL.md

@@ -30,11 +30,6 @@ The `agent.py` should focus on demonstrating a specific feature or agent pattern
 > [!IMPORTANT]
 > **Model Selection**: Do not set the `model` parameter explicitly (e.g., `model="gemini-2.5-flash"`) on `Agent` instances in sample agents. Instead, let them default to the system-configured model, unless a specific model is explicitly requested by the user.
 
-> [!IMPORTANT]
-> **Context Usage**: Prefer using the unified `Context` class (imported from
-> `google.adk`) instead of the legacy `ToolContext` or `CallbackContext`
-> aliases in callbacks and tool definitions.
-
 Choose one of the following patterns:
 
 #### Pattern A: Workflows (for complex graphs)

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.2.0"
+  ".": "2.3.0"
 }

.github/release-please-config.json

@@ -56,5 +56,5 @@
       ]
     }
   },
-  "last-release-sha": "cd81f7bde91df78d6cece539a6f98dda2aa8c9c0"
+  "last-release-sha": "0cb4c814928f579bfbac9b9e1f95669e4304e089"
 }

.github/workflows/copybara-pr-handler.yml

@@ -59,20 +59,20 @@ jobs:
                 console.log(`Committer: ${committer}`);
 
                 // Check if this is a Copybara commit or has a pull request reference
+                const prRegex = /Merges?:?\s+(?:https:\/\/github\.com\/google\/adk-python\/pull\/|#)(\d+)/i;
                 const isCopybara = committer === 'Copybara-Service' ||
                                    commit.author?.email === 'genai-sdk-bot@google.com' ||
                                    message.includes('GitOrigin-RevId:') ||
                                    message.includes('PiperOrigin-RevId:') ||
-                                   /Merge:?\s+https:\/\/github\.com\/google\/adk-python\/pull\/(\d+)/.test(message);
+                                   prRegex.test(message);
 
                 if (!isCopybara) {
                   console.log('Not a Copybara commit, skipping');
                   continue;
                 }
 
                 // Extract PR number from commit message
-                // Pattern matches both "Merge https://..." and "Merge: https://..."
-                const prMatch = message.match(/Merge:?\s+https:\/\/github\.com\/google\/adk-python\/pull\/(\d+)/);
+                const prMatch = message.match(prRegex);
 
                 if (!prMatch) {
                   console.log('No PR number found in Copybara commit message');

CHANGELOG.md

@@ -31,7 +31,7 @@ generate_headline = Agent(
 async def orchestrate(ctx: Context, node_input: str) -> str:
   # Dynamically execute the child agent and await its output
   headline = await ctx.run_node(generate_headline, node_input=node_input)
-  
+
   yield Event(output=headline)
 
 # Build the workflow
@@ -175,7 +175,7 @@ async def parallel_orchestrator(ctx: Context, node_input: list[str]):
             use_sub_branch=True, # Critical for parallel isolation
         )
     )
-  
+
   # Await all tasks concurrently
   results = await asyncio.gather(*tasks)
   yield Event(output=results)

contributing/samples/core/nested_state/README.md

@@ -7,6 +7,7 @@
 In distributed systems and AI workflows, transient failures (such as network glitches, rate limits, or temporary service outages) are common. `RetryConfig` allows developers to define a resilient policy for individual nodes. When a node execution fails with a configured exception, the ADK will automatically retrying the node execution according to the specified delay and backoff strategy, before propagating the failure.
 
 Key benefits:
+
 - **Resilience**: Automatically recovers from transient errors.
 - **Configurable Backoff**: Supports exponential backoff to avoid overwhelming downstream services.
 - **Jitter**: Introduces randomness to retry delays to prevent thundering herd problems.
@@ -38,28 +39,34 @@ async def call_unstable_api(node_input: str):
 
 When a node configured with `RetryConfig` raises an exception during execution:
 
-1.  **Exception Matching**: The `NodeRunner` catches the exception and checks if it matches any of the types specified in `RetryConfig.exceptions`. If `exceptions` is `None` (the default), it matches all exceptions.
-2.  **Attempt Count Check**: It checks if the current attempt count is less than `max_attempts`.
-3.  **Delay Calculation**: If a retry is warranted, it calculates the delay:
+1. **Exception Matching**: The `NodeRunner` catches the exception and checks if it matches any of the types specified in `RetryConfig.exceptions`. If `exceptions` is `None` (the default), it matches all exceptions.
+1. **Attempt Count Check**: It checks if the current attempt count is less than `max_attempts`.
+1. **Delay Calculation**: If a retry is warranted, it calculates the delay. The delay is capped at `max_delay`.
+
+```math
     $$\text{delay} = \text{initial\_delay} \times (\text{backoff\_factor}^{\text{attempt} - 1})$$
-    The delay is capped at `max_delay`.
-4.  **Jitter Application**: If `jitter` is enabled (greater than 0.0), a random offset is added to the delay:
+```
+
+4. **Jitter Application**: If `jitter` is enabled (greater than 0.0), a random offset is added to the delay. The final delay is guaranteed to be non-negative.
+
+```math
     $$\text{delay} = \text{delay} + \text{random}(-jitter \times \text{delay}, jitter \times \text{delay})$$
-    The final delay is guaranteed to be non-negative.
-5.  **Execution Pause and Retry**: The runner sleeps for the calculated delay and then re-executes the node's logic.
+```
+
+5. **Execution Pause and Retry**: The runner sleeps for the calculated delay and then re-executes the node's logic.
 
 ## Configuration options
 
 `RetryConfig` is a Pydantic model with the following fields:
 
-| Field | Type | Default | Description |
-| :--- | :--- | :--- | :--- |
-| `max_attempts` | `int \| None` | `5` (if omitted) | Maximum number of attempts, including the original request. If `0` or `1`, retries are disabled. |
-| `initial_delay` | `float \| None` | `1.0` | Initial delay before the first retry, in seconds. |
-| `max_delay` | `float \| None` | `60.0` | Maximum delay between retries, in seconds. |
-| `backoff_factor` | `float \| None` | `2.0` | Multiplier by which the delay increases after each attempt. |
-| `jitter` | `float \| None` | `1.0` | Randomness factor for the delay. Set to `0.0` to disable jitter (deterministic delays). |
-| `exceptions` | `list[str \| type[BaseException]] \| None` | `None` | Exceptions to retry on. Can be exception classes or their string names. `None` means retry on all exceptions. |
+| Field            | Type                                       | Default          | Description                                                                                                   |
+| :--------------- | :----------------------------------------- | :--------------- | :------------------------------------------------------------------------------------------------------------ |
+| `max_attempts`   | `int \| None`                              | `5` (if omitted) | Maximum number of attempts, including the original request. If `0` or `1`, retries are disabled.              |
+| `initial_delay`  | `float \| None`                            | `1.0`            | Initial delay before the first retry, in seconds.                                                             |
+| `max_delay`      | `float \| None`                            | `60.0`           | Maximum delay between retries, in seconds.                                                                    |
+| `backoff_factor` | `float \| None`                            | `2.0`            | Multiplier by which the delay increases after each attempt.                                                   |
+| `jitter`         | `float \| None`                            | `1.0`            | Randomness factor for the delay. Set to `0.0` to disable jitter (deterministic delays).                       |
+| `exceptions`     | `list[str \| type[BaseException]] \| None` | `None`           | Exceptions to retry on. Can be exception classes or their string names. `None` means retry on all exceptions. |
 
 ## Advanced applications