LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows
Python ai-agentsdata-engineeringdocument-aigenerative-aiidpjson-extractionllmmcp-serverocrpdf-extractionprompt-engineeringstructured-output
UN-3152 [FIX] Bedrock bearer token lost on LLM.complete() re-validation (#1957)
Jaseem Jas5214892f6c3c
diff --git a/unstract/sdk1/src/unstract/sdk1/adapters/base1.py b/unstract/sdk1/src/unstract/sdk1/adapters/base1.pyindex 22a1e2522..666aa50c7 100644--- a/unstract/sdk1/src/unstract/sdk1/adapters/base1.py+++ b/unstract/sdk1/src/unstract/sdk1/adapters/base1.py@@ -674,11 +674,13 @@ def _resolve_bedrock_aws_credentials(if auth_type == "iam_role":_drop_bedrock_access_keys(validated)validated.pop(_BEDROCK_BEARER_TOKEN_FIELD, None)+ validated.pop(_BEDROCK_LITELLM_BEARER_KWARG, None)return validatedif auth_type == "access_keys":_require_bedrock_access_keys(validated)validated.pop(_BEDROCK_BEARER_TOKEN_FIELD, None)+ validated.pop(_BEDROCK_LITELLM_BEARER_KWARG, None)return validatedif auth_type == "bearer_token":@@ -689,10 +691,16 @@ def _resolve_bedrock_aws_credentials(# No auth_type: strip blank access keys (boto3 chain takes over) and# drop any bearer token — bearer auth must be opted into explicitly# via auth_type='bearer_token' rather than promoted from this branch.+ # A non-blank `api_key` is preserved here to support `LLM.complete()`'s+ # re-validation pass, where bearer-mode kwargs round-trip without their+ # original `auth_type`. A blank `api_key` (Pydantic's `None` default+ # for an unset field) is dropped so LiteLLM doesn't see `api_key=None`.for key in _BEDROCK_AWS_KEY_FIELDS:if not validated.get(key):validated.pop(key, None)validated.pop(_BEDROCK_BEARER_TOKEN_FIELD, None)+ if not validated.get(_BEDROCK_LITELLM_BEARER_KWARG):+ validated.pop(_BEDROCK_LITELLM_BEARER_KWARG, None)return validated@@ -703,6 +711,9 @@ class AWSBedrockLLMParameters(BaseChatCompletionParameters):aws_secret_access_key: str | None = None# AWS_BEARER_TOKEN_BEDROCK; resolver translates to LiteLLM's `api_key`.aws_bearer_token: str | None = None+ # Declared so it survives `LLM.complete()`'s re-validation of self.kwargs;+ # otherwise Pydantic would drop it as an unknown field.+ api_key: str | None = Noneaws_region_name: str | None = Noneaws_profile_name: str | None = None # For AWS SSO authenticationmodel_id: str | None = None # For Application Inference Profile (cost tracking)@@ -1196,6 +1207,9 @@ class AWSBedrockEmbeddingParameters(BaseEmbeddingParameters):aws_secret_access_key: str | None = None# AWS_BEARER_TOKEN_BEDROCK; resolver translates to LiteLLM's `api_key`.aws_bearer_token: str | None = None+ # Declared so it survives Pydantic re-validation if the kwargs ever round-+ # trip through validate() (parity with the LLM param class).+ api_key: str | None = Noneaws_region_name: str | None@staticmethoddiff --git a/unstract/sdk1/tests/test_bedrock_adapter.py b/unstract/sdk1/tests/test_bedrock_adapter.pyindex cfc728a37..531922970 100644--- a/unstract/sdk1/tests/test_bedrock_adapter.py+++ b/unstract/sdk1/tests/test_bedrock_adapter.py@@ -251,6 +251,30 @@ def test_llm_bearer_token_strips_surrounding_whitespace() -> None:assert out["api_key"] == "bedrock-key-abc"+def test_llm_bearer_token_survives_revalidation() -> None:+ """Bearer-mode kwargs must round-trip through a second validate() call.++ ``LLM.complete()`` re-runs ``validate({**self.kwargs, **kwargs})`` on+ every call. The second pass has no ``auth_type`` and no+ ``aws_bearer_token`` (both stripped on the first pass), so the resolver+ can't re-translate. ``api_key`` must survive Pydantic's+ ``model_dump()`` on the round-trip — otherwise LiteLLM falls through+ to SigV4 signing and 401s with "Unable to locate credentials".+ """+ first = AWSBedrockLLMParameters.validate(+ {+ "auth_type": "bearer_token",+ "model": "anthropic.claude-3-haiku-20240307-v1:0",+ "region_name": "us-east-1",+ "aws_bearer_token": "bedrock-key-abc",+ }+ )+ assert first["api_key"] == "bedrock-key-abc"++ second = AWSBedrockLLMParameters.validate({**first, "max_tokens": 100})+ assert second["api_key"] == "bedrock-key-abc"++def test_llm_iam_role_drops_stale_bearer_token() -> None:out = AWSBedrockLLMParameters.validate({@@ -489,6 +513,22 @@ def test_embedding_bearer_token_strips_surrounding_whitespace() -> None:assert out["api_key"] == "bedrock-key-abc"+def test_embedding_bearer_token_survives_revalidation() -> None:+ """Defensive parity with the LLM round-trip test."""+ first = AWSBedrockEmbeddingParameters.validate(+ {+ "auth_type": "bearer_token",+ "model": "amazon.titan-embed-text-v2:0",+ "region_name": "us-east-1",+ "aws_bearer_token": "bedrock-key-abc",+ }+ )+ assert first["api_key"] == "bedrock-key-abc"++ second = AWSBedrockEmbeddingParameters.validate({**first})+ assert second["api_key"] == "bedrock-key-abc"++def test_embedding_iam_role_drops_stale_bearer_token() -> None:out = AWSBedrockEmbeddingParameters.validate({