Skip to content

Commit 525e6e1

Browse files
committed
make task id not required
1 parent 36cd5ba commit 525e6e1

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939
"pytest-asyncio>=1.0.0",
4040
"scale-gp-beta==0.1.0a20",
4141
"ipykernel>=6.29.5",
42-
"openai==1.99.9", # anything higher than 1.99.9 breaks litellm - https://github.com/BerriAI/litellm/issues/13711
42+
"openai==1.99.9", # anything higher than 1.99.9 breaks litellm - https://github.com/BerriAI/litellm/issues/13711
4343
"cloudpickle>=3.1.1",
4444
]
4545
requires-python = ">= 3.12,<4"

src/agentex/lib/adk/_modules/acp.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from datetime import timedelta
2-
from typing import Any
2+
from typing import Any, List
33

4+
from agentex.types import Event
45
from temporalio.common import RetryPolicy
56

67
from agentex import AsyncAgentex
@@ -58,7 +59,7 @@ async def create_task(
5859
start_to_close_timeout: timedelta = timedelta(seconds=5),
5960
heartbeat_timeout: timedelta = timedelta(seconds=5),
6061
retry_policy: RetryPolicy = DEFAULT_RETRY_POLICY,
61-
):
62+
) -> Task:
6263
"""
6364
Create a new task.
6465
@@ -111,7 +112,7 @@ async def send_event(
111112
start_to_close_timeout: timedelta = timedelta(seconds=5),
112113
heartbeat_timeout: timedelta = timedelta(seconds=5),
113114
retry_policy: RetryPolicy = DEFAULT_RETRY_POLICY,
114-
):
115+
) -> Event:
115116
"""
116117
Send an event to a task.
117118
@@ -152,16 +153,16 @@ async def send_event(
152153

153154
async def send_message(
154155
self,
155-
task_id: str,
156156
content: TaskMessageContent,
157+
task_id: str | None = None,
157158
agent_id: str | None = None,
158159
agent_name: str | None = None,
159160
trace_id: str | None = None,
160161
parent_span_id: str | None = None,
161162
start_to_close_timeout: timedelta = timedelta(seconds=5),
162163
heartbeat_timeout: timedelta = timedelta(seconds=5),
163164
retry_policy: RetryPolicy = DEFAULT_RETRY_POLICY,
164-
):
165+
) -> List[TaskMessage]:
165166
"""
166167
Send a message to a task.
167168
@@ -209,7 +210,7 @@ async def cancel_task(
209210
start_to_close_timeout: timedelta = timedelta(seconds=5),
210211
heartbeat_timeout: timedelta = timedelta(seconds=5),
211212
retry_policy: RetryPolicy = DEFAULT_RETRY_POLICY,
212-
):
213+
) -> Task:
213214
"""
214215
Cancel a task.
215216

src/agentex/lib/core/services/adk/acp/acp.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ async def message_send(
116116
raise ValueError("Either agent_name or agent_id must be provided")
117117

118118
task_messages: List[TaskMessage] = []
119+
logger.info(f"json_rpc_response: {json_rpc_response}")
119120
if isinstance(json_rpc_response.result, list):
120121
for message in json_rpc_response.result:
121122
task_message = TaskMessage.model_validate(message)

src/agentex/lib/core/temporal/activities/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import httpx
12
from agentex.lib.adk.utils._modules.client import create_async_agentex_client
23
from scale_gp import SGPClient, SGPClientError
34

@@ -59,7 +60,9 @@ def get_all_activities(sgp_client=None):
5960

6061
llm_gateway = LiteLLMGateway()
6162
stream_repository = RedisStreamRepository()
62-
agentex_client = create_async_agentex_client()
63+
agentex_client = create_async_agentex_client(
64+
timeout=httpx.Timeout(timeout=1000),
65+
)
6366
tracer = AsyncTracer(agentex_client)
6467

6568
# Services

src/agentex/lib/core/temporal/activities/adk/acp/acp_activities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from enum import Enum
2-
from typing import Any
2+
from typing import Any, List
33

44
from temporalio import activity
55

@@ -61,7 +61,7 @@ async def task_create(self, params: TaskCreateParams) -> Task:
6161
)
6262

6363
@activity.defn(name=ACPActivityName.MESSAGE_SEND)
64-
async def message_send(self, params: MessageSendParams) -> TaskMessage:
64+
async def message_send(self, params: MessageSendParams) -> List[TaskMessage]:
6565
return await self._acp_service.message_send(
6666
agent_id=params.agent_id,
6767
agent_name=params.agent_name,

uv.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)