Skip to content

Commit 2b089b8

Browse files
maxjnetoCopilot
andcommitted
Refactor Google ADK plugin initialization and clean up code in worker scripts
Co-authored-by: Copilot <copilot@github.com>
1 parent 1660616 commit 2b089b8

7 files changed

Lines changed: 13 additions & 38 deletions

File tree

google_adk/basic/run_worker.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from __future__ import annotations
22

33
import asyncio
4-
from datetime import timedelta
54

65
from temporalio.client import Client
7-
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin, ModelActivityParameters
6+
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
87
from temporalio.worker import Worker
98

109
from google_adk.basic.activities.get_weather_activity import get_weather
@@ -16,13 +15,7 @@
1615
async def main():
1716
client = await Client.connect(
1817
"localhost:7233",
19-
plugins=[
20-
GoogleAdkPlugin(
21-
model_params=ModelActivityParameters(
22-
start_to_close_timeout=timedelta(seconds=30)
23-
)
24-
),
25-
],
18+
plugins=[GoogleAdkPlugin()],
2619
)
2720

2821
worker = Worker(

google_adk/human_in_the_loop/run_hitl_workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ async def main():
5252

5353
# Show pending approval and approve it
5454
for call in pending:
55-
print(f"\nPending approval:")
55+
print("\nPending approval:")
5656
print(f" Tool: {call.tool_name}")
5757
print(f" Arguments: {call.arguments}")
5858
print(f" Approving call {call.call_id}...")

google_adk/human_in_the_loop/run_worker.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from __future__ import annotations
22

33
import asyncio
4-
from datetime import timedelta
54

65
from temporalio.client import Client
7-
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin, ModelActivityParameters
6+
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
87
from temporalio.worker import Worker
98

109
from google_adk.human_in_the_loop.activities.sensitive_actions import (
@@ -19,13 +18,7 @@
1918
async def main():
2019
client = await Client.connect(
2120
"localhost:7233",
22-
plugins=[
23-
GoogleAdkPlugin(
24-
model_params=ModelActivityParameters(
25-
start_to_close_timeout=timedelta(seconds=30)
26-
)
27-
),
28-
],
21+
plugins=[GoogleAdkPlugin()],
2922
)
3023

3124
worker = Worker(

google_adk/human_in_the_loop/workflows/hitl_workflow.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@ async def before_tool_callback(
8181
)
8282

8383
# Pause until approval signal arrives
84-
await workflow.wait_condition(
85-
lambda cid=call_id: cid in wf_self._approval_results
86-
)
84+
def _is_approved(cid: str = call_id) -> bool:
85+
return cid in wf_self._approval_results
86+
87+
await workflow.wait_condition(_is_approved)
8788

8889
# Process approval
8990
approval = wf_self._approval_results.pop(call_id)

google_adk/orchestration/run_worker.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from __future__ import annotations
22

33
import asyncio
4-
from datetime import timedelta
54

65
from temporalio.client import Client
7-
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin, ModelActivityParameters
6+
from temporalio.contrib.google_adk_agents import GoogleAdkPlugin
87
from temporalio.worker import Worker
98

109
from google_adk.orchestration.workflows.loop_workflow import LoopWorkflow
@@ -15,13 +14,7 @@
1514
async def main():
1615
client = await Client.connect(
1716
"localhost:7233",
18-
plugins=[
19-
GoogleAdkPlugin(
20-
model_params=ModelActivityParameters(
21-
start_to_close_timeout=timedelta(seconds=60)
22-
)
23-
),
24-
],
17+
plugins=[GoogleAdkPlugin()],
2518
)
2619

2720
worker = Worker(

google_adk/orchestration/workflows/loop_workflow.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
22

33
from contextlib import aclosing
4-
from dataclasses import dataclass
4+
from dataclasses import dataclass, field
55

66
from temporalio import workflow
77
from temporalio.contrib.google_adk_agents import TemporalModel
@@ -35,14 +35,10 @@ class LoopInput:
3535
class OrchestrationOutput:
3636
"""Output from an orchestration workflow."""
3737

38-
responses: list[str] | None = None
38+
responses: list[str] = field(default_factory=list)
3939
final_response: str = ""
4040
iterations: int = 0
4141

42-
def __post_init__(self):
43-
if self.responses is None:
44-
self.responses = []
45-
4642

4743
@workflow.defn
4844
class LoopWorkflow:

google_adk/orchestration/workflows/sequential_workflow.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from contextlib import aclosing
44
from dataclasses import dataclass, field
5-
from typing import Any
65

76
from temporalio import workflow
87
from temporalio.contrib.google_adk_agents import TemporalModel

0 commit comments

Comments
 (0)