GH-6007: Unwrap Optional values in Neo4jChatMemoryRepository metadata before saving#6190
Open
suryateja-g13 wants to merge 1 commit into
Open
Conversation
…ore saving When using Neo4jChatMemoryRepository with chat models whose SDK returns Optional-typed fields in response objects (e.g. OpenAI Java SDK's refusal and toolCalls fields), those Optional instances are stored in the AssistantMessage metadata map and then passed directly to the Neo4j driver via Values.value(), which does not know how to convert java.util.Optional and throws ClientException. Fix: add a sanitizeMetadata() helper that copies the metadata map while unwrapping any Optional values — present Optionals yield their wrapped value, empty Optionals are dropped entirely. This keeps the metadata neo4j-compatible without requiring changes to how individual model SDKs populate metadata. Fixes: spring-projects#6007 Signed-off-by: Gorre Surya <suryateja.g13@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
Neo4jChatMemoryRepository.saveAll()to unwrapjava.util.Optionalvalues from theAssistantMessagemetadata map before passing them to the Neo4j driverOptional-typed fields in response objects (e.g. the OpenAI Java SDK'srefusalandtoolCallsfields onChatCompletionMessage), thoseOptionalinstances end up in theAssistantMessagemetadata mapValues.value()does not know how to convertjava.util.Optionaland throwsClientException: Unable to convert java.util.Optional to Neo4j ValuesanitizeMetadata()helper that copies the metadata map while unwrappingOptionalvalues — presentOptionals yield their wrapped value, emptyOptionals are dropped (treated as absent)Test plan
./mvnw -pl memory/repository/spring-ai-model-chat-memory-repository-neo4j testNeo4jChatMemoryRepositoryITrequire a live Neo4j instance; unit verification: the change is a straightforwardinstanceof Optional<?>pattern-match applied before handing off to the driverFixes: #6007