Merge origin/main and resolve conflicts

Co-authored-by: brianstrauch <7474900+brianstrauch@users.noreply.github.com>

Author: Copilot

.github/CODEOWNERS

@@ -15,12 +15,14 @@
 # The AI SDK team owns the AI integration samples and their tests. We add
 # @temporalio/sdk too, so the SDK team can continue to manage repo-wide concerns.
 /google_adk_agents/       @temporalio/sdk @temporalio/ai-sdk
+/google_genai/            @temporalio/sdk @temporalio/ai-sdk
 /langfuse_tracing/        @temporalio/sdk @temporalio/ai-sdk
 /langgraph_plugin/        @temporalio/sdk @temporalio/ai-sdk
 /langsmith_tracing/       @temporalio/sdk @temporalio/ai-sdk
 /openai_agents/           @temporalio/sdk @temporalio/ai-sdk
 /strands_plugin/          @temporalio/sdk @temporalio/ai-sdk
 /tests/google_adk_agents/ @temporalio/sdk @temporalio/ai-sdk
+/tests/google_genai/      @temporalio/sdk @temporalio/ai-sdk
 /tests/langfuse_tracing/  @temporalio/sdk @temporalio/ai-sdk
 /tests/langgraph_plugin/  @temporalio/sdk @temporalio/ai-sdk
 /tests/langsmith_tracing/ @temporalio/sdk @temporalio/ai-sdk

README.md

@@ -7,8 +7,10 @@ This is a collection of samples showing how to use the [Python SDK](https://gith
 Prerequisites:
 
 * [uv](https://docs.astral.sh/uv/)
-* [Temporal CLI installed](https://docs.temporal.io/cli#install)
-* [Local Temporal server running](https://docs.temporal.io/cli/server#start-dev)
+* [Temporal CLI](https://docs.temporal.io/cli) with a local dev server running:
+  ```
+  temporal server start-dev
+  ```
 
 The SDK requires Python >= 3.10. You can install Python using uv. For example,
 
@@ -73,6 +75,7 @@ Some examples require extra dependencies. See each sample's directory for specif
 * [external_storage_redis](external_storage_redis) - Redis driver for external storage
 * [gevent_async](gevent_async) - Combine gevent and Temporal.
 * [google_adk_agents](google_adk_agents) - Run Google ADK agents as durable Temporal workflows (model calls, tools, multi-agent, MCP, streaming).
+* [google_genai](google_genai) - Run the Google Gemini SDK inside durable Temporal workflows.
 * [hello_nexus](hello_nexus) - Define a Nexus service, implement operation handlers, and call them from a workflow.
 * [hello_standalone_nexus](hello_standalone_nexus) - Use Nexus Operations without using a workflow.
 * [hello_standalone_activity](hello_standalone_activity) - Use activities without using a workflow.

bedrock/README.md

@@ -12,7 +12,11 @@ Demonstrates how Temporal and Amazon Bedrock can be used to quickly build bullet
 
 1. An AWS account with Bedrock enabled.
 2. A machine that has access to Bedrock.
-3. A local Temporal server running on the same machine. See [Temporal's dev server docs](https://docs.temporal.io/cli#start-dev-server) for more information.
+3. A local Temporal server running on the same machine, started with the [Temporal CLI](https://docs.temporal.io/cli):
+
+   ```
+   temporal server start-dev
+   ```
 
 These examples use Amazon's Python SDK (Boto3). To configure Boto3 to use your AWS credentials, follow the instructions in [the Boto3 documentation](https://boto3.amazonaws.com/v1/documentation/api/latest/guide/credentials.html).
 

external_storage/README.md

@@ -25,7 +25,7 @@ on demand for the Temporal Web UI.
 ## Prerequisites
 
 * [uv](https://docs.astral.sh/uv/)
-* [Temporal CLI](https://docs.temporal.io/cli#install) with a local dev server running:
+* [Temporal CLI](https://docs.temporal.io/cli) with a local dev server running:
   ```
   temporal server start-dev
   ```

google_adk_agents/README.md

@@ -23,7 +23,10 @@ model turn is durable and observable.
 
 ## Prerequisites
 
-- Temporal server [running locally](https://docs.temporal.io/cli/server#start-dev)
+- [Temporal CLI](https://docs.temporal.io/cli) with a local dev server running:
+  ```
+  temporal server start-dev
+  ```
 - Dependencies installed via `uv sync --group google-adk`
 - Google API key set as an environment variable:
   `export GOOGLE_API_KEY=your_key_here`
@@ -49,6 +52,6 @@ To run any scenario, start its worker in one terminal and its workflow starter
 in another:
 
 ```bash
-uv run python -m google_adk_agents.<scenario>.run_worker
-uv run python -m google_adk_agents.<scenario>.run_<name>_workflow
+uv run google_adk_agents/<scenario>/run_worker.py
+uv run google_adk_agents/<scenario>/run_<name>_workflow.py
 ```

google_adk_agents/agent_patterns/README.md

@@ -15,13 +15,13 @@ Before running, review the [prerequisites in the suite README](../README.md)
 Start the worker in one terminal:
 
 ```bash
-uv run python -m google_adk_agents.agent_patterns.run_worker
+uv run google_adk_agents/agent_patterns/run_worker.py
 ```
 
 Then start the workflow in another terminal:
 
 ```bash
-uv run python -m google_adk_agents.agent_patterns.run_multi_agent_workflow
+uv run google_adk_agents/agent_patterns/run_multi_agent_workflow.py
 ```
 
 ## What to expect

google_adk_agents/agent_patterns/run_multi_agent_workflow.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 
 from temporalio.client import Client
 from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
@@ -9,7 +10,10 @@
 
 
 async def main():
-    client = await Client.connect("localhost:7233", plugins=[GoogleAdkPlugin()])
+    client = await Client.connect(
+        os.environ.get("TEMPORAL_ADDRESS", "localhost:7233"),
+        plugins=[GoogleAdkPlugin()],
+    )
 
     result = await client.execute_workflow(
         MultiAgentWorkflow.run,

google_adk_agents/agent_patterns/run_worker.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import os
 
 from temporalio.client import Client
 from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
@@ -14,7 +15,9 @@
 async def main():
     plugin = GoogleAdkPlugin()
 
-    client = await Client.connect("localhost:7233", plugins=[plugin])
+    client = await Client.connect(
+        os.environ.get("TEMPORAL_ADDRESS", "localhost:7233"), plugins=[plugin]
+    )
 
     worker = Worker(
         client,

google_adk_agents/basic/README.md

@@ -17,13 +17,13 @@ Before running, review the [prerequisites in the suite README](../README.md)
 Start the worker in one terminal:
 
 ```bash
-uv run python -m google_adk_agents.basic.run_worker
+uv run google_adk_agents/basic/run_worker.py
 ```
 
 Then start the workflow in another terminal:
 
 ```bash
-uv run python -m google_adk_agents.basic.run_hello_world_workflow
+uv run google_adk_agents/basic/run_hello_world_workflow.py
 ```
 
 ## What to expect

google_adk_agents/basic/run_hello_world_workflow.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 
 from temporalio.client import Client
 from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
@@ -10,7 +11,10 @@
 
 async def main():
     # @@@SNIPSTART google-adk-agents-basic-starter
-    client = await Client.connect("localhost:7233", plugins=[GoogleAdkPlugin()])
+    client = await Client.connect(
+        os.environ.get("TEMPORAL_ADDRESS", "localhost:7233"),
+        plugins=[GoogleAdkPlugin()],
+    )
 
     result = await client.execute_workflow(
         HelloWorldAgentWorkflow.run,