GH-2518: Remove requestOptions from observation context objects #2896
Conversation
…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 <[email protected]>
| 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.
There was a problem hiding this comment.
yes, it seems we could remove the nullability and return an empty ChatOptions instance. This should send no options on the wire to the model.
There was a problem hiding this comment.
This is addressed via 4eeeb83
|
Rebased and merged as f18aac0 |
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.