Skip to content

Retry on more edge cases for bedrock #55201

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
o-nikolas merged 2 commits into from
Sep 3, 2025
Merged

Retry on more edge cases for bedrock #55201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
030d738
Retry on more edge cases for bedrock
o-nikolas Sep 3, 2025
807f1ec
Merge branch 'main' into onikolas/bedrock_auth
o-nikolas Sep 3, 2025
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
9 changes: 8 additions & 1 deletion providers/amazon/src/airflow/providers/amazon/aws/operators/bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,17 @@ def _create_kb():
**self.create_knowledge_base_kwargs,
)["knowledgeBase"]["knowledgeBaseId"]
except ClientError as error:
error_message = error.response["Error"]["Message"].lower()
is_known_retryable_message = (
"no such index" in error_message
# It may also be that permissions haven't even propagated yet to check for the index
or "server returned 401" in error_message
or "User does not have permissions" in error_message
)
if all(
[
error.response["Error"]["Code"] == "ValidationException",
"no such index" in error.response["Error"]["Message"],
is_known_retryable_message,
self.wait_for_indexing,
self.indexing_error_max_attempts > 0,
]
Expand Down
3 changes: 2 additions & 1 deletion providers/amazon/tests/system/amazon/aws/example_bedrock_retrieve_and_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import boto3
from botocore.exceptions import ClientError
from opensearchpy import (
AuthenticationException,
AuthorizationException,
AWSV4SignerAuth,
OpenSearch,
Expand Down Expand Up @@ -265,7 +266,7 @@ def create_vector_index(index_name: str, collection_id: str, region: str):
response = oss_client.indices.create(index=index_name, body=json.dumps(index_config))
log.info("Creating index: %s.", response)
break
except AuthorizationException as e:
except (AuthorizationException, AuthenticationException) as e:
# Index creation can take up to a minute and there is no (apparent?) way to check the current state.
log.info(
"Access denied; policy permissions have likely not yet propagated, %s tries remaining.",
Expand Down