fix: support us-gov. and other multi-character Bedrock geo prefixes #3645
+64
−17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Leundai
commented
Dec 4, 2025
|
|
||
|
|
||
| # Known geo prefixes for cross-region inference profile IDs | ||
| _BEDROCK_GEO_PREFIXES: tuple[str, ...] = ('us.', 'eu.', 'apac.', 'jp.', 'au.', 'ca.', 'global.', 'us-gov.') |
Author
There was a problem hiding this comment.
I think at some point it might be worth unifying this and the other private constant in models/bedrock.py
But this just extends it to support govcloud and global. Its been a real issue since Claude 4.5 came out and AWS doing cross-region inferencing
Contributor
There was a problem hiding this comment.
I think you should definitely not duplicate it, since we're already importing the BedrockModelProfile in models/bedrock.py we should make this public and import it there.
@DouweM do you agree?
dsfaccini
suggested changes
Dec 5, 2025
|
|
||
|
|
||
| # Known geo prefixes for cross-region inference profile IDs | ||
| _BEDROCK_GEO_PREFIXES: tuple[str, ...] = ('us.', 'eu.', 'apac.', 'jp.', 'au.', 'ca.', 'global.', 'us-gov.') |
Contributor
There was a problem hiding this comment.
I think you should definitely not duplicate it, since we're already importing the BedrockModelProfile in models/bedrock.py we should make this public and import it there.
@DouweM do you agree?
The BedrockProvider.model_profile method previously only handled 2-character regional prefixes (e.g., 'us.', 'eu.'), causing issues with models using longer prefixes like 'us-gov.' (AWS GovCloud) and 'global.'. This caused extended thinking to fail in multi-turn conversations because bedrock_send_back_thinking_parts stayed at its default False value for these models. ThinkingPart blocks from previous turns were converted to text blocks instead of reasoningContent, causing Bedrock to reject requests with: 'Expected thinking or redacted_thinking, but found text' Changes: - Add _strip_geo_prefix() helper function to properly handle all known geo prefixes including us-gov. and global. - Update _AWS_BEDROCK_INFERENCE_GEO_PREFIXES to include us-gov. - Add comprehensive tests for all geo prefixes Fixes cross-region inference for AWS GovCloud environments.
… BEDROCK_GEO_PREFIXES This test ensures we don't add new model names with geo prefixes that aren't handled by the provider's model_profile method. Also exports BEDROCK_GEO_PREFIXES in __all__.
Model names with geo prefixes have 3+ dot-separated parts, so we can detect them without knowing the provider names.
Leundai
force-pushed
the
fix/bedrock-us-gov-regional-prefixes
branch
from
53d0013 to
745e2eb
Compare
Updated the docstring for the test_bedrock_provider_model_profile_all_geo_prefixes function to be more concise. Modified the error message in the test_latest_bedrock_model_names_geo_prefixes_are_supported function to remove the file path reference, enhancing clarity.
Author
|
@dsfaccini Thanks so much for taking a look! I've addressed your comments here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The
BedrockProvider.model_profilemethod previously only handled 2-character regional prefixes (e.g.,us.,eu.), causing issues with models using longer prefixes likeus-gov.(AWS GovCloud) andglobal..Problem
When using extended thinking with
us-gov.anthropic.*models via Bedrock, themodel_profilemethod doesn't recognize theus-gov.prefix because it only strips 2-character prefixes:This causes
bedrock_send_back_thinking_partsto stay at its defaultFalsevalue. As a result,ThinkingPartblocks from previous conversation turns are converted to text blocks with thinking tags instead ofreasoningContent, causing Bedrock to reject the request with:Solution
_strip_geo_prefix()helper function that properly handles all known geo prefixes includingus-gov.andglobal._AWS_BEDROCK_INFERENCE_GEO_PREFIXESconstant to includeus-gov.(the comment in the code already suggested this)Affected Models
us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0us-gov.anthropic.claude-3-7-sonnet-20250219-v1:0global.anthropic.claude-opus-4-5-20251101-v1:0Testing
All existing tests pass, plus new parametrized tests for all geo prefixes