Skip to content
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.

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

ValueError in boto3 Bedrock Patch for invoke_model with Cross-Region Inference Model IDs #10772

Closed
mmcains opened this issue Sep 24, 2024 · 0 comments · Fixed by #10949
Closed
Assignees

Comments

@mmcains
Copy link

mmcains commented Sep 24, 2024

Summary of problem

The boto3 patch logic is broken for bedrock when using invoke_model with cross-region inference. To use an inference profile, a region name is prepended to the modelId e.g.

  • with cross-region inference: us.anthropic.claude-3-5-sonnet-20240620-v1:0
  • without cross-region inference: anthropic.claude-3-5-sonnet-20240620-v1:0

and this seems to break part of the code that splits the model id into the provider and model name, but this works with boto3.

File /python3.11/site-packages/ddtrace/contrib/internal/botocore/services/bedrock.py:321, in patched_bedrock_api_call(original_func, instance, args, kwargs, function_vars)
    319 params = function_vars.get("params")
    320 pin = function_vars.get("pin")
--> 321 model_provider, model_name = params.get("modelId").split(".")
    322 integration = function_vars.get("integration")
    323 submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name

ValueError: too many values to unpack (expected 2)

Which version of dd-trace-py are you using?

2.12.2

Which version of pip are you using?

24.2

Which libraries and their versions are you using?

 name         : boto3                  
 version      : 1.34.34
 description  : The AWS SDK for Python

How can we reproduce your problem?

Execute the bedrock-runtime boto3 client invoke_model with a model id that uses the cross-region inference model id structure like: us.anthropic.claude-3-5-sonnet-20240620-v1:0.

What is the result that you get?

It throws a ValueError exception and breaks our application code

What is the result that you expected?

It should not break our application code and should successfully make the request

@sabrenner sabrenner self-assigned this Sep 24, 2024
github-actions bot pushed a commit that referenced this issue Oct 7, 2024
…ow (#10949)

## What does this PR do?
Fixes #10772

Model IDs with cross-region inference would throw because we assumed
`modelID` would only have the `provider` and `model_name`, when it could
have the region as well. This would result in:

```
File /python3.11/site-packages/ddtrace/contrib/internal/botocore/services/bedrock.py:321, in patched_bedrock_api_call(original_func, instance, args, kwargs, function_vars)
    319 params = function_vars.get("params")
    320 pin = function_vars.get("pin")
--> 321 model_provider, model_name = params.get("modelId").split(".")
    322 integration = function_vars.get("integration")
    323 submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name

ValueError: too many values to unpack (expected 2)
```

We are not tagging that cross-region inference in this PR, just
resolving the error.

### Testing
To test this change, a singular `anthropic_message` test case and
corresponding cassette was modified. This had an unfortunate side effect
of affecting an LLMObs test as well. I can add a different test instead,
but I believe that would require an additional 60+ line cassette which
isn't totally needed, so I opted for this instead.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 80a3ee8)
github-actions bot pushed a commit that referenced this issue Oct 7, 2024
…ow (#10949)

## What does this PR do?
Fixes #10772

Model IDs with cross-region inference would throw because we assumed
`modelID` would only have the `provider` and `model_name`, when it could
have the region as well. This would result in:

```
File /python3.11/site-packages/ddtrace/contrib/internal/botocore/services/bedrock.py:321, in patched_bedrock_api_call(original_func, instance, args, kwargs, function_vars)
    319 params = function_vars.get("params")
    320 pin = function_vars.get("pin")
--> 321 model_provider, model_name = params.get("modelId").split(".")
    322 integration = function_vars.get("integration")
    323 submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name

ValueError: too many values to unpack (expected 2)
```

We are not tagging that cross-region inference in this PR, just
resolving the error.

### Testing
To test this change, a singular `anthropic_message` test case and
corresponding cassette was modified. This had an unfortunate side effect
of affecting an LLMObs test as well. I can add a different test instead,
but I believe that would require an additional 60+ line cassette which
isn't totally needed, so I opted for this instead.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 80a3ee8)
sabrenner added a commit that referenced this issue Oct 15, 2024
…ow [backport 2.14] (#10966)

Backport 80a3ee8 from #10949 to 2.14.

## What does this PR do?
Fixes #10772 

Model IDs with cross-region inference would throw because we assumed
`modelID` would only have the `provider` and `model_name`, when it could
have the region as well. This would result in:

```
File /python3.11/site-packages/ddtrace/contrib/internal/botocore/services/bedrock.py:321, in patched_bedrock_api_call(original_func, instance, args, kwargs, function_vars)
    319 params = function_vars.get("params")
    320 pin = function_vars.get("pin")
--> 321 model_provider, model_name = params.get("modelId").split(".")
    322 integration = function_vars.get("integration")
    323 submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name

ValueError: too many values to unpack (expected 2)
```

We are not tagging that cross-region inference in this PR, just
resolving the error.

### Testing
To test this change, a singular `anthropic_message` test case and
corresponding cassette was modified. This had an unfortunate side effect
of affecting an LLMObs test as well. I can add a different test instead,
but I believe that would require an additional 60+ line cassette which
isn't totally needed, so I opted for this instead.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>
sabrenner added a commit that referenced this issue Oct 15, 2024
…ow [backport 2.13] (#10965)

Backport 80a3ee8 from #10949 to 2.13.

## What does this PR do?
Fixes #10772 

Model IDs with cross-region inference would throw because we assumed
`modelID` would only have the `provider` and `model_name`, when it could
have the region as well. This would result in:

```
File /python3.11/site-packages/ddtrace/contrib/internal/botocore/services/bedrock.py:321, in patched_bedrock_api_call(original_func, instance, args, kwargs, function_vars)
    319 params = function_vars.get("params")
    320 pin = function_vars.get("pin")
--> 321 model_provider, model_name = params.get("modelId").split(".")
    322 integration = function_vars.get("integration")
    323 submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name

ValueError: too many values to unpack (expected 2)
```

We are not tagging that cross-region inference in this PR, just
resolving the error.

### Testing
To test this change, a singular `anthropic_message` test case and
corresponding cassette was modified. This had an unfortunate side effect
of affecting an LLMObs test as well. I can add a different test instead,
but I believe that would require an additional 60+ line cassette which
isn't totally needed, so I opted for this instead.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants