Skip to content

fix: save artifact in streaming agent run with events when multiturn #6349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −5
Open

fix: save artifact in streaming agent run with events when multiturn #6349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions vertexai/agent_engines/templates/adk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,18 @@ async def _init_session(
if request.events:
for event in request.events:
await session_service.append_event(session, Event(**event))
if request.artifacts:
await self._save_artifacts(session.id, artifact_service, request)
return session

async def _save_artifacts(
self,
session_id: str,
artifact_service: "BaseArtifactService",
request: _StreamRunRequest,
):
"""Saves the artifacts."""
app = self._tmpl_attrs.get("app")
if request.artifacts:
for artifact in request.artifacts:
artifact = _Artifact(**artifact)
Expand All @@ -693,7 +705,7 @@ async def _init_session(
saved_version = await artifact_service.save_artifact(
app_name=app.name if app else self._tmpl_attrs.get("app_name"),
user_id=request.user_id,
session_id=session.id,
session_id=session_id,
filename=artifact.file_name,
artifact=version_data.data,
)
Expand All @@ -707,7 +719,6 @@ async def _init_session(
saved_version,
version_data.version,
)
return session

async def _convert_response_events(
self,
Expand Down Expand Up @@ -1209,6 +1220,12 @@ async def streaming_agent_run_with_events(self, request_json: str):
user_id=request.user_id,
session_id=request.session_id,
)
if session:
await self._save_artifacts(
session_id=request.session_id,
artifact_service=artifact_service,
request=request,
)
except ClientError:
pass
if not session:
Expand Down
28 changes: 25 additions & 3 deletions vertexai/preview/reasoning_engines/templates/adk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,23 @@ async def _init_session(
if request.events:
for event in request.events:
await session_service.append_event(session, Event(**event))
if request.artifacts:
await self._save_artifacts(
session_id=session.id,
artifact_service=artifact_service,
request=request,
)

return session

async def _save_artifacts(
self,
session_id: str,
artifact_service: "BaseArtifactService",
request: _StreamRunRequest,
):
"""Saves the artifacts."""
app = self._tmpl_attrs.get("app")
if request.artifacts:
for artifact in request.artifacts:
artifact = _Artifact(**artifact)
Expand All @@ -624,9 +641,9 @@ async def _init_session(
):
version_data = _ArtifactVersion(**version_data)
saved_version = await artifact_service.save_artifact(
app_name=self._tmpl_attrs.get("app_name"),
app_name=app.name if app else self._tmpl_attrs.get("app_name"),
user_id=request.user_id,
session_id=session.id,
session_id=session_id,
filename=artifact.file_name,
artifact=version_data.data,
)
Expand All @@ -640,7 +657,6 @@ async def _init_session(
saved_version,
version_data.version,
)
return session

async def _convert_response_events(
self,
Expand Down Expand Up @@ -1043,6 +1059,12 @@ async def _invoke_agent_async():
user_id=request.user_id,
session_id=request.session_id,
)
if session:
await self._save_artifacts(
session_id=request.session_id,
artifact_service=artifact_service,
request=request,
)
except ClientError:
pass
if not session:
Expand Down
Loading