Skip to content

Commit 09e487d

Browse files
seanzhougooglecopybara-github
authored andcommitted
chore: Use context_id as session_id and construct temp user_id from context_id
PiperOrigin-RevId: 776639713
1 parent 51a559e commit 09e487d

File tree

2 files changed

+76
-219
lines changed

2 files changed

+76
-219
lines changed

src/google/adk/a2a/converters/request_converter.py

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,19 @@
3333
from ...runners import RunConfig
3434
from ...utils.feature_decorator import working_in_progress
3535
from .part_converter import convert_a2a_part_to_genai_part
36-
from .utils import _from_a2a_context_id
37-
from .utils import _get_adk_metadata_key
3836

3937

40-
def _get_user_id(request: RequestContext, user_id_from_context: str) -> str:
38+
def _get_user_id(request: RequestContext) -> str:
4139
# Get user from call context if available (auth is enabled on a2a server)
42-
if request.call_context and request.call_context.user:
40+
if (
41+
request.call_context
42+
and request.call_context.user
43+
and request.call_context.user.user_name
44+
):
4345
return request.call_context.user.user_name
4446

45-
# Get user from context id if available
46-
if user_id_from_context:
47-
return user_id_from_context
48-
49-
# Get user from message metadata if available (client is an ADK agent)
50-
if request.message.metadata:
51-
user_id = request.message.metadata.get(_get_adk_metadata_key('user_id'))
52-
if user_id:
53-
return f'ADK_USER_{user_id}'
54-
55-
# Get user from task if available (client is a an ADK agent)
56-
if request.current_task:
57-
user_id = request.current_task.metadata.get(
58-
_get_adk_metadata_key('user_id')
59-
)
60-
if user_id:
61-
return f'ADK_USER_{user_id}'
62-
return (
63-
f'temp_user_{request.task_id}'
64-
if request.task_id
65-
else f'TEMP_USER_{request.message.messageId}'
66-
)
47+
# Get user from context id
48+
return f'A2A_USER_{request.context_id}'
6749

6850

6951
@working_in_progress
@@ -74,11 +56,9 @@ def convert_a2a_request_to_adk_run_args(
7456
if not request.message:
7557
raise ValueError('Request message cannot be None')
7658

77-
_, user_id, session_id = _from_a2a_context_id(request.context_id)
78-
7959
return {
80-
'user_id': _get_user_id(request, user_id),
81-
'session_id': session_id,
60+
'user_id': _get_user_id(request),
61+
'session_id': request.context_id,
8262
'new_message': genai_types.Content(
8363
role='user',
8464
parts=[

0 commit comments

Comments
 (0)