Skip to content

fix: Add SDK workaround for double-wrapped Any response in async_retrieve_contexts. #6556

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

Merged
copybara-service merged 1 commit into from
Apr 8, 2026
Merged

fix: Add SDK workaround for double-wrapped Any response in async_retrieve_contexts. #6556

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
19 changes: 18 additions & 1 deletion vertexai/preview/rag/rag_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
from vertexai.preview.rag.utils import _gapic_utils
from vertexai.preview.rag.utils import resources

from google.protobuf import any_pb2


def retrieval_query(
text: str,
Expand Down Expand Up @@ -528,7 +530,22 @@ async def async_retrieve_contexts(
response_lro = await client.async_retrieve_contexts(
request=request, timeout=timeout
)
response = await response_lro.result()
try:
response = await response_lro.result(timeout=timeout)
except Exception as e:
if response_lro.done():
raw_op = response_lro.operation
if raw_op.WhichOneof("result") == "response":
any_response = raw_op.response
inner_any = any_pb2.Any()
if any_response.Unpack(inner_any):
inner_any.type_url = "type.googleapis.com/google.cloud.aiplatform.v1beta1.RagContexts"
rag_contexts = aiplatform_v1beta1.RagContexts()
if inner_any.Unpack(rag_contexts._pb):
return aiplatform_v1beta1.AsyncRetrieveContextsResponse(
contexts=rag_contexts
)
raise e
except Exception as e:
raise RuntimeError(
"Failed in retrieving contexts asynchronously due to: ", e
Expand Down
21 changes: 20 additions & 1 deletion vertexai/rag/rag_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
from vertexai.rag.utils import _gapic_utils
from vertexai.rag.utils import resources

from google.protobuf import any_pb2


def retrieval_query(
text: str,
Expand Down Expand Up @@ -325,7 +327,24 @@ async def async_retrieve_contexts(
response_lro = await client.async_retrieve_contexts(
request=request, timeout=timeout
)
response = await response_lro.result()
try:
response = await response_lro.result(timeout=timeout)
except Exception as e:
if response_lro.done():
raw_op = response_lro.operation
if raw_op.WhichOneof("result") == "response":
any_response = raw_op.response
inner_any = any_pb2.Any()
if any_response.Unpack(inner_any):
inner_any.type_url = (
"type.googleapis.com/google.cloud.aiplatform.v1.RagContexts"
)
rag_contexts = aiplatform_v1.RagContexts()
if inner_any.Unpack(rag_contexts._pb):
return aiplatform_v1.AsyncRetrieveContextsResponse(
contexts=rag_contexts
)
raise e
except Exception as e:
raise RuntimeError(
"Failed in retrieving contexts asynchronously due to: ", e
Expand Down
Loading