GH-2518: Remove requestOptions from observation context objects #2896
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
…t objects Fixes: spring-projects#2518 Issue: spring-projects#2518 This commit removes the deprecated requestOptions field from ChatModelObservationContext and EmbeddingModelObservationContext classes. Instead of passing options separately, the code now retrieves them directly from the request objects (prompt.getOptions() or embeddingRequest.getOptions()). Key changes: - Removed requestOptions parameter from observation context builders - Updated all model implementations to stop passing options separately - Fixed EmbeddingRequest handling in several model implementations - Added buildEmbeddingRequest method in models to properly merge options This change simplifies the API and removes duplication, as options are already available in the request objects themselves. Signed-off-by: Soby Chacko <soby.chacko@broadcom.com>
| return "%s %s".formatted(context.getOperationMetadata().operationType(), | ||
| context.getRequestOptions().getModel()); | ||
| ChatOptions options = context.getRequest().getOptions(); | ||
| if (StringUtils.hasText(options.getModel())) { |
There was a problem hiding this comment.
Unfortunately, a Prompt object can return null ChatOptions. Before, when handling options separately, we were enforcing the non-nullability. Now, we need to take into account that whenever we call the getOptions() method from a Prompt object, we might get back a null object. This line might throw a NullPointerException. The same applies to the other places here an in the embedding observations where we extract values from ChatOptions.
It would be nice if, in the future, we could enhance the Prompt class to always return a valid ChatOptions object.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #2518
Issue: #2518
This commit removes the deprecated requestOptions field from ChatModelObservationContext and EmbeddingModelObservationContext classes. Instead of passing options separately, the code now retrieves them directly from the request objects (prompt.getOptions() or embeddingRequest.getOptions()).
Key changes:
This change simplifies the API and removes duplication, as options are already available in the request objects themselves.