From 72e746db13430872be45dbee298a1e2441048e27 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 1 Apr 2025 16:05:39 -0400 Subject: [PATCH] Move chat based enrichers to a new package to avoid conflicts with other enrichers in different modules --- .../ai/openai/transformer/MetadataTransformerIT.java | 4 ++-- .../ai/{ => chat}/transformer/KeywordMetadataEnricher.java | 2 +- .../ai/{ => chat}/transformer/SummaryMetadataEnricher.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename spring-ai-client-chat/src/main/java/org/springframework/ai/{ => chat}/transformer/KeywordMetadataEnricher.java (97%) rename spring-ai-client-chat/src/main/java/org/springframework/ai/{ => chat}/transformer/SummaryMetadataEnricher.java (98%) diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java index ed4c155c2..7823dabaa 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java @@ -29,8 +29,8 @@ import org.springframework.ai.document.Document; import org.springframework.ai.openai.OpenAiChatModel; import org.springframework.ai.openai.api.OpenAiApi; import org.springframework.ai.transformer.ContentFormatTransformer; -import org.springframework.ai.transformer.KeywordMetadataEnricher; -import org.springframework.ai.transformer.SummaryMetadataEnricher; +import org.springframework.ai.chat.transformer.KeywordMetadataEnricher; +import org.springframework.ai.chat.transformer.SummaryMetadataEnricher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/KeywordMetadataEnricher.java similarity index 97% rename from spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/KeywordMetadataEnricher.java index c57b09a19..104c3db37 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/KeywordMetadataEnricher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.transformer; +package org.springframework.ai.chat.transformer; import java.util.List; import java.util.Map; diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/SummaryMetadataEnricher.java similarity index 98% rename from spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/SummaryMetadataEnricher.java index 4f1fe394d..736a56c63 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/transformer/SummaryMetadataEnricher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.transformer; +package org.springframework.ai.chat.transformer; import java.util.ArrayList; import java.util.HashMap;