diff --git a/advisors/spring-ai-advisors/pom.xml b/advisors/spring-ai-advisors/pom.xml
index 75402280d..22d88d957 100644
--- a/advisors/spring-ai-advisors/pom.xml
+++ b/advisors/spring-ai-advisors/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/pom.xml b/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/pom.xml
index 2277c3167..4092f256f 100644
--- a/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/pom.xml
+++ b/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml
index 08172e974..ce15195db 100644
--- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml
+++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
index 43875302c..37575263d 100644
--- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
+++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation/pom.xml b/auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation/pom.xml
index cef7c81bb..dd008d333 100644
--- a/auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation/pom.xml
+++ b/auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${parent.version}
diff --git a/auto-configurations/models/embedding/observation/spring-ai-autoconfigure-model-embedding-observation/pom.xml b/auto-configurations/models/embedding/observation/spring-ai-autoconfigure-model-embedding-observation/pom.xml
index b41cdd752..813d414ef 100644
--- a/auto-configurations/models/embedding/observation/spring-ai-autoconfigure-model-embedding-observation/pom.xml
+++ b/auto-configurations/models/embedding/observation/spring-ai-autoconfigure-model-embedding-observation/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${parent.version}
diff --git a/auto-configurations/models/image/observation/spring-ai-autoconfigure-model-image-observation/pom.xml b/auto-configurations/models/image/observation/spring-ai-autoconfigure-model-image-observation/pom.xml
index 428a5953f..66778c7ca 100644
--- a/auto-configurations/models/image/observation/spring-ai-autoconfigure-model-image-observation/pom.xml
+++ b/auto-configurations/models/image/observation/spring-ai-autoconfigure-model-image-observation/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${parent.version}
diff --git a/auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/pom.xml b/auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/pom.xml
index c632a6553..fd1dc1554 100644
--- a/auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/pom.xml
+++ b/auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/pom.xml
@@ -26,7 +26,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
true
diff --git a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml
index 3162434d1..920e2e830 100644
--- a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml
+++ b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml
@@ -40,7 +40,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/document-readers/jsoup-reader/pom.xml b/document-readers/jsoup-reader/pom.xml
index 472a8e720..a1f13104e 100644
--- a/document-readers/jsoup-reader/pom.xml
+++ b/document-readers/jsoup-reader/pom.xml
@@ -41,7 +41,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/document-readers/markdown-reader/pom.xml b/document-readers/markdown-reader/pom.xml
index 54bdb8570..03aa61a66 100644
--- a/document-readers/markdown-reader/pom.xml
+++ b/document-readers/markdown-reader/pom.xml
@@ -40,7 +40,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/document-readers/pdf-reader/pom.xml b/document-readers/pdf-reader/pom.xml
index 53ba5b2c7..58bd20034 100644
--- a/document-readers/pdf-reader/pom.xml
+++ b/document-readers/pdf-reader/pom.xml
@@ -42,7 +42,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/document-readers/tika-reader/pom.xml b/document-readers/tika-reader/pom.xml
index 10e264982..07989dca2 100644
--- a/document-readers/tika-reader/pom.xml
+++ b/document-readers/tika-reader/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/mcp/common/pom.xml b/mcp/common/pom.xml
index 398158945..0cf19e577 100644
--- a/mcp/common/pom.xml
+++ b/mcp/common/pom.xml
@@ -66,7 +66,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-anthropic/pom.xml b/models/spring-ai-anthropic/pom.xml
index 0cf4bbc9d..cf0bbfc59 100644
--- a/models/spring-ai-anthropic/pom.xml
+++ b/models/spring-ai-anthropic/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-azure-openai/pom.xml b/models/spring-ai-azure-openai/pom.xml
index 402bb7a8a..f44c6dcd1 100644
--- a/models/spring-ai-azure-openai/pom.xml
+++ b/models/spring-ai-azure-openai/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-bedrock-converse/pom.xml b/models/spring-ai-bedrock-converse/pom.xml
index 611e7ac6c..993f00654 100644
--- a/models/spring-ai-bedrock-converse/pom.xml
+++ b/models/spring-ai-bedrock-converse/pom.xml
@@ -42,7 +42,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-bedrock/pom.xml b/models/spring-ai-bedrock/pom.xml
index 25a54b28f..6694fe3b1 100644
--- a/models/spring-ai-bedrock/pom.xml
+++ b/models/spring-ai-bedrock/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-huggingface/pom.xml b/models/spring-ai-huggingface/pom.xml
index 753001f80..0334fcd87 100644
--- a/models/spring-ai-huggingface/pom.xml
+++ b/models/spring-ai-huggingface/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-minimax/pom.xml b/models/spring-ai-minimax/pom.xml
index ee9b952bc..db2a10891 100644
--- a/models/spring-ai-minimax/pom.xml
+++ b/models/spring-ai-minimax/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-mistral-ai/pom.xml b/models/spring-ai-mistral-ai/pom.xml
index 409a328dd..72dde6473 100644
--- a/models/spring-ai-mistral-ai/pom.xml
+++ b/models/spring-ai-mistral-ai/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-moonshot/pom.xml b/models/spring-ai-moonshot/pom.xml
index a55b938ba..763a98e56 100644
--- a/models/spring-ai-moonshot/pom.xml
+++ b/models/spring-ai-moonshot/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-oci-genai/pom.xml b/models/spring-ai-oci-genai/pom.xml
index c87cf0834..f5f9c7267 100644
--- a/models/spring-ai-oci-genai/pom.xml
+++ b/models/spring-ai-oci-genai/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml
index 540beb427..7856025bb 100644
--- a/models/spring-ai-ollama/pom.xml
+++ b/models/spring-ai-ollama/pom.xml
@@ -47,7 +47,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-openai/pom.xml b/models/spring-ai-openai/pom.xml
index 5fd576f31..03757a8fc 100644
--- a/models/spring-ai-openai/pom.xml
+++ b/models/spring-ai-openai/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-postgresml/pom.xml b/models/spring-ai-postgresml/pom.xml
index 889d72f2d..6bb0306e4 100644
--- a/models/spring-ai-postgresml/pom.xml
+++ b/models/spring-ai-postgresml/pom.xml
@@ -42,7 +42,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-qianfan/pom.xml b/models/spring-ai-qianfan/pom.xml
index 0055ae5f2..5ee1d3fa4 100644
--- a/models/spring-ai-qianfan/pom.xml
+++ b/models/spring-ai-qianfan/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-stability-ai/pom.xml b/models/spring-ai-stability-ai/pom.xml
index b8cababc4..70a7f2324 100644
--- a/models/spring-ai-stability-ai/pom.xml
+++ b/models/spring-ai-stability-ai/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-transformers/pom.xml b/models/spring-ai-transformers/pom.xml
index 757e6cc2f..01384108d 100644
--- a/models/spring-ai-transformers/pom.xml
+++ b/models/spring-ai-transformers/pom.xml
@@ -54,7 +54,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-vertex-ai-embedding/pom.xml b/models/spring-ai-vertex-ai-embedding/pom.xml
index 3159198c6..e3c534012 100644
--- a/models/spring-ai-vertex-ai-embedding/pom.xml
+++ b/models/spring-ai-vertex-ai-embedding/pom.xml
@@ -67,7 +67,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-vertex-ai-gemini/pom.xml b/models/spring-ai-vertex-ai-gemini/pom.xml
index 1f3324553..452047005 100644
--- a/models/spring-ai-vertex-ai-gemini/pom.xml
+++ b/models/spring-ai-vertex-ai-gemini/pom.xml
@@ -79,7 +79,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-watsonx-ai/pom.xml b/models/spring-ai-watsonx-ai/pom.xml
index 2513d95de..838802e94 100644
--- a/models/spring-ai-watsonx-ai/pom.xml
+++ b/models/spring-ai-watsonx-ai/pom.xml
@@ -47,7 +47,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/models/spring-ai-zhipuai/pom.xml b/models/spring-ai-zhipuai/pom.xml
index 39358da13..b2b50a396 100644
--- a/models/spring-ai-zhipuai/pom.xml
+++ b/models/spring-ai-zhipuai/pom.xml
@@ -42,7 +42,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/pom.xml b/pom.xml
index 879f238a3..476602675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
spring-ai-docs
spring-ai-bom
spring-ai-commons
- spring-ai-core
+ spring-ai-client-chat
spring-ai-model
spring-ai-test
spring-ai-vector-store
diff --git a/spring-ai-bom/pom.xml b/spring-ai-bom/pom.xml
index a3f9e0154..dc44f686c 100644
--- a/spring-ai-bom/pom.xml
+++ b/spring-ai-bom/pom.xml
@@ -50,11 +50,11 @@
${project.version}
-
+
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.version}
diff --git a/spring-ai-core/pom.xml b/spring-ai-client-chat/pom.xml
similarity index 99%
rename from spring-ai-core/pom.xml
rename to spring-ai-client-chat/pom.xml
index 41016d961..283308ff6 100644
--- a/spring-ai-core/pom.xml
+++ b/spring-ai-client-chat/pom.xml
@@ -24,7 +24,7 @@
spring-ai
1.0.0-SNAPSHOT
- spring-ai-core
+ spring-ai-client-chat
jar
Spring AI Core
Core domain for AI programming
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/ResourceUtils.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/ResourceUtils.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/ResourceUtils.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/ResourceUtils.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/AiRuntimeHints.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/AiRuntimeHints.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/AiRuntimeHints.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/AiRuntimeHints.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/ToolRuntimeHints.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/ToolRuntimeHints.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/ToolRuntimeHints.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/ToolRuntimeHints.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/aot/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/aot/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/aot/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/aot/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClientCustomizer.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClientCustomizer.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClientCustomizer.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClientCustomizer.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ResponseEntity.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ResponseEntity.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/ResponseEntity.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ResponseEntity.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/LastMaxTokenSizeContentPurger.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/LastMaxTokenSizeContentPurger.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/LastMaxTokenSizeContentPurger.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/LastMaxTokenSizeContentPurger.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequest.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequest.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequest.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequest.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponse.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponse.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponse.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponse.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtils.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtils.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtils.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtils.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/Advisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/Advisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/Advisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/Advisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisorChain.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisorChain.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisorChain.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/CallAroundAdvisorChain.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisor.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisor.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisor.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisorChain.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisorChain.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisorChain.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/StreamAroundAdvisorChain.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/api/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContext.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContext.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContext.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContext.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationConvention.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationConvention.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationConvention.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationConvention.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/observation/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationContext.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationContext.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationContext.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationContext.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationConvention.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationConvention.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationConvention.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationConvention.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationDocumentation.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationDocumentation.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationDocumentation.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/ChatClientObservationDocumentation.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConvention.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConvention.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConvention.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConvention.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/observation/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/client/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/memory/ChatMemory.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/memory/ChatMemory.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/memory/ChatMemory.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/memory/ChatMemory.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/memory/InMemoryChatMemory.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/memory/InMemoryChatMemory.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/memory/InMemoryChatMemory.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/memory/InMemoryChatMemory.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/model/MessageAggregator.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/model/MessageAggregator.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/model/MessageAggregator.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/model/MessageAggregator.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/package-info.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/package-info.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/chat/package-info.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/chat/package-info.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/AbstractConversionServiceOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/AbstractConversionServiceOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/AbstractConversionServiceOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/AbstractConversionServiceOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/AbstractMessageOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/AbstractMessageOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/AbstractMessageOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/AbstractMessageOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/FormatProvider.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/FormatProvider.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/FormatProvider.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/FormatProvider.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/ListOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/ListOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/ListOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/ListOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/MapOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/MapOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/MapOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/MapOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/README.md b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/README.md
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/README.md
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/README.md
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/converter/StructuredOutputConverter.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/converter/StructuredOutputConverter.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/converter/StructuredOutputConverter.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/converter/StructuredOutputConverter.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/EvaluationRequest.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/EvaluationRequest.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/evaluation/EvaluationRequest.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/EvaluationRequest.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/EvaluationResponse.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/EvaluationResponse.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/evaluation/EvaluationResponse.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/EvaluationResponse.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/Evaluator.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/Evaluator.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/evaluation/Evaluator.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/Evaluator.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/FactCheckingEvaluator.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/FactCheckingEvaluator.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/evaluation/FactCheckingEvaluator.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/FactCheckingEvaluator.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/KeywordMetadataEnricher.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/transformer/SummaryMetadataEnricher.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/util/LoggingMarkers.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/util/LoggingMarkers.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/util/LoggingMarkers.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/util/LoggingMarkers.java
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/util/PromptAssert.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/util/PromptAssert.java
similarity index 100%
rename from spring-ai-core/src/main/java/org/springframework/ai/util/PromptAssert.java
rename to spring-ai-client-chat/src/main/java/org/springframework/ai/util/PromptAssert.java
diff --git a/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt b/spring-ai-client-chat/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt
similarity index 100%
rename from spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt
rename to spring-ai-client-chat/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt
diff --git a/spring-ai-core/src/main/resources/META-INF/spring/aot.factories b/spring-ai-client-chat/src/main/resources/META-INF/spring/aot.factories
similarity index 100%
rename from spring-ai-core/src/main/resources/META-INF/spring/aot.factories
rename to spring-ai-client-chat/src/main/resources/META-INF/spring/aot.factories
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/TestConfiguration.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/TestConfiguration.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/TestConfiguration.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/TestConfiguration.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/aot/AiRuntimeHintsTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/aot/AiRuntimeHintsTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/aot/AiRuntimeHintsTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/aot/AiRuntimeHintsTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/aot/KnuddelsRuntimeHintsTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/aot/KnuddelsRuntimeHintsTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/aot/KnuddelsRuntimeHintsTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/aot/KnuddelsRuntimeHintsTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessorTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessorTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessorTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/aot/ToolBeanRegistrationAotProcessorTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/aot/ToolRuntimeHintsTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/aot/ToolRuntimeHintsTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/aot/ToolRuntimeHintsTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/aot/ToolRuntimeHintsTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientAdvisorTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientAdvisorTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientAdvisorTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientAdvisorTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientResponseEntityTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientResponseEntityTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientResponseEntityTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientResponseEntityTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/ChatClientTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/DefaultChatClientBuilderTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientBuilderTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/DefaultChatClientBuilderTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientBuilderTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/DefaultChatClientTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/DefaultChatClientTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/AdvisorsTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/AdvisorsTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/AdvisorsTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/AdvisorsTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisorTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisorTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisorTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisorTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequestTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequestTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequestTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedRequestTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtilsTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtilsTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtilsTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseStreamUtilsTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/api/AdvisedResponseTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContextTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContextTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContextTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContextTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConventionTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConventionTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConventionTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConventionTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilterTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilterTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilterTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilterTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/ChatClientObservationContextTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/ChatClientObservationContextTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/ChatClientObservationContextTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/ChatClientObservationContextTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConventionTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConventionTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConventionTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/observation/DefaultChatClientObservationConventionTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/converter/BeanOutputConverterTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/converter/BeanOutputConverterTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/converter/BeanOutputConverterTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/converter/BeanOutputConverterTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/converter/ListOutputConverterTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/converter/ListOutputConverterTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/converter/ListOutputConverterTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/converter/ListOutputConverterTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/metadata/PromptMetadataTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/metadata/PromptMetadataTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/metadata/PromptMetadataTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/metadata/PromptMetadataTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/prompt/ChatTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/ChatTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/prompt/ChatTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/ChatTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/prompt/PromptTemplateTest.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/PromptTemplateTest.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/prompt/PromptTemplateTest.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/PromptTemplateTest.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/prompt/PromptTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/PromptTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/prompt/PromptTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/prompt/PromptTests.java
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/util/PromptAssertTests.java b/spring-ai-client-chat/src/test/java/org/springframework/ai/util/PromptAssertTests.java
similarity index 100%
rename from spring-ai-core/src/test/java/org/springframework/ai/util/PromptAssertTests.java
rename to spring-ai-client-chat/src/test/java/org/springframework/ai/util/PromptAssertTests.java
diff --git a/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt b/spring-ai-client-chat/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt
similarity index 100%
rename from spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt
rename to spring-ai-client-chat/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt
diff --git a/spring-ai-core/src/test/resources/application-logging-test.properties b/spring-ai-client-chat/src/test/resources/application-logging-test.properties
similarity index 100%
rename from spring-ai-core/src/test/resources/application-logging-test.properties
rename to spring-ai-client-chat/src/test/resources/application-logging-test.properties
diff --git a/spring-ai-core/src/test/resources/bikes.json b/spring-ai-client-chat/src/test/resources/bikes.json
similarity index 100%
rename from spring-ai-core/src/test/resources/bikes.json
rename to spring-ai-client-chat/src/test/resources/bikes.json
diff --git a/spring-ai-core/src/test/resources/logback.xml b/spring-ai-client-chat/src/test/resources/logback.xml
similarity index 100%
rename from spring-ai-core/src/test/resources/logback.xml
rename to spring-ai-client-chat/src/test/resources/logback.xml
diff --git a/spring-ai-core/src/test/resources/system-prompt.txt b/spring-ai-client-chat/src/test/resources/system-prompt.txt
similarity index 100%
rename from spring-ai-core/src/test/resources/system-prompt.txt
rename to spring-ai-client-chat/src/test/resources/system-prompt.txt
diff --git a/spring-ai-core/src/test/resources/tabby-cat.png b/spring-ai-client-chat/src/test/resources/tabby-cat.png
similarity index 100%
rename from spring-ai-core/src/test/resources/tabby-cat.png
rename to spring-ai-client-chat/src/test/resources/tabby-cat.png
diff --git a/spring-ai-core/src/test/resources/text_source.txt b/spring-ai-client-chat/src/test/resources/text_source.txt
similarity index 100%
rename from spring-ai-core/src/test/resources/text_source.txt
rename to spring-ai-client-chat/src/test/resources/text_source.txt
diff --git a/spring-ai-core/src/test/resources/user-prompt.txt b/spring-ai-client-chat/src/test/resources/user-prompt.txt
similarity index 100%
rename from spring-ai-core/src/test/resources/user-prompt.txt
rename to spring-ai-client-chat/src/test/resources/user-prompt.txt
diff --git a/spring-ai-rag/pom.xml b/spring-ai-rag/pom.xml
index eba5d4e14..3ec250b30 100644
--- a/spring-ai-rag/pom.xml
+++ b/spring-ai-rag/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/spring-ai-retry/pom.xml b/spring-ai-retry/pom.xml
index aa6375834..104223946 100644
--- a/spring-ai-retry/pom.xml
+++ b/spring-ai-retry/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/spring-ai-test/pom.xml b/spring-ai-test/pom.xml
index 2b0c64984..5a2301c19 100644
--- a/spring-ai-test/pom.xml
+++ b/spring-ai-test/pom.xml
@@ -52,7 +52,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.version}
diff --git a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
index ca93a9ece..bc044a6b7 100644
--- a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
+++ b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
@@ -49,7 +49,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-azure-store/pom.xml b/vector-stores/spring-ai-azure-store/pom.xml
index 7c2d2d662..8fe337674 100644
--- a/vector-stores/spring-ai-azure-store/pom.xml
+++ b/vector-stores/spring-ai-azure-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-cassandra-store/pom.xml b/vector-stores/spring-ai-cassandra-store/pom.xml
index 16d6d2e7e..bddea67c2 100644
--- a/vector-stores/spring-ai-cassandra-store/pom.xml
+++ b/vector-stores/spring-ai-cassandra-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-chroma-store/pom.xml b/vector-stores/spring-ai-chroma-store/pom.xml
index 7764b5d8e..2e330049d 100644
--- a/vector-stores/spring-ai-chroma-store/pom.xml
+++ b/vector-stores/spring-ai-chroma-store/pom.xml
@@ -40,7 +40,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-coherence-store/pom.xml b/vector-stores/spring-ai-coherence-store/pom.xml
index 2b20ef684..e056301fc 100644
--- a/vector-stores/spring-ai-coherence-store/pom.xml
+++ b/vector-stores/spring-ai-coherence-store/pom.xml
@@ -28,7 +28,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-couchbase-store/pom.xml b/vector-stores/spring-ai-couchbase-store/pom.xml
index 3d9127739..52fdde868 100644
--- a/vector-stores/spring-ai-couchbase-store/pom.xml
+++ b/vector-stores/spring-ai-couchbase-store/pom.xml
@@ -29,7 +29,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${parent.version}
diff --git a/vector-stores/spring-ai-elasticsearch-store/pom.xml b/vector-stores/spring-ai-elasticsearch-store/pom.xml
index 9928fc8a0..87b1aff1c 100644
--- a/vector-stores/spring-ai-elasticsearch-store/pom.xml
+++ b/vector-stores/spring-ai-elasticsearch-store/pom.xml
@@ -46,7 +46,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-gemfire-store/pom.xml b/vector-stores/spring-ai-gemfire-store/pom.xml
index 719b3ffdf..651e0a369 100644
--- a/vector-stores/spring-ai-gemfire-store/pom.xml
+++ b/vector-stores/spring-ai-gemfire-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-hanadb-store/pom.xml b/vector-stores/spring-ai-hanadb-store/pom.xml
index 7bde3251a..e694edf86 100644
--- a/vector-stores/spring-ai-hanadb-store/pom.xml
+++ b/vector-stores/spring-ai-hanadb-store/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-mariadb-store/pom.xml b/vector-stores/spring-ai-mariadb-store/pom.xml
index 18331999a..e372f5802 100644
--- a/vector-stores/spring-ai-mariadb-store/pom.xml
+++ b/vector-stores/spring-ai-mariadb-store/pom.xml
@@ -39,7 +39,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-milvus-store/pom.xml b/vector-stores/spring-ai-milvus-store/pom.xml
index 9369a14c5..77a02b478 100644
--- a/vector-stores/spring-ai-milvus-store/pom.xml
+++ b/vector-stores/spring-ai-milvus-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
index c8bc4b656..591af7344 100644
--- a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
+++ b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-neo4j-store/pom.xml b/vector-stores/spring-ai-neo4j-store/pom.xml
index f032de116..874f91108 100644
--- a/vector-stores/spring-ai-neo4j-store/pom.xml
+++ b/vector-stores/spring-ai-neo4j-store/pom.xml
@@ -56,7 +56,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-opensearch-store/pom.xml b/vector-stores/spring-ai-opensearch-store/pom.xml
index 055f959dc..dbbf23185 100644
--- a/vector-stores/spring-ai-opensearch-store/pom.xml
+++ b/vector-stores/spring-ai-opensearch-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-oracle-store/pom.xml b/vector-stores/spring-ai-oracle-store/pom.xml
index c2ba7ba30..dc92d2f4f 100644
--- a/vector-stores/spring-ai-oracle-store/pom.xml
+++ b/vector-stores/spring-ai-oracle-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-pgvector-store/pom.xml b/vector-stores/spring-ai-pgvector-store/pom.xml
index c36d71f21..9aa9cc6e5 100644
--- a/vector-stores/spring-ai-pgvector-store/pom.xml
+++ b/vector-stores/spring-ai-pgvector-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-pinecone-store/pom.xml b/vector-stores/spring-ai-pinecone-store/pom.xml
index ab24bea9e..647bd8742 100644
--- a/vector-stores/spring-ai-pinecone-store/pom.xml
+++ b/vector-stores/spring-ai-pinecone-store/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-qdrant-store/pom.xml b/vector-stores/spring-ai-qdrant-store/pom.xml
index 149d81b80..85794bfc5 100644
--- a/vector-stores/spring-ai-qdrant-store/pom.xml
+++ b/vector-stores/spring-ai-qdrant-store/pom.xml
@@ -44,7 +44,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-redis-store/pom.xml b/vector-stores/spring-ai-redis-store/pom.xml
index 34b078cd9..a3f98db9f 100644
--- a/vector-stores/spring-ai-redis-store/pom.xml
+++ b/vector-stores/spring-ai-redis-store/pom.xml
@@ -46,7 +46,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-typesense-store/pom.xml b/vector-stores/spring-ai-typesense-store/pom.xml
index cb32789ab..1b3119edd 100644
--- a/vector-stores/spring-ai-typesense-store/pom.xml
+++ b/vector-stores/spring-ai-typesense-store/pom.xml
@@ -45,7 +45,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}
diff --git a/vector-stores/spring-ai-weaviate-store/pom.xml b/vector-stores/spring-ai-weaviate-store/pom.xml
index d603c8a0f..950d88412 100644
--- a/vector-stores/spring-ai-weaviate-store/pom.xml
+++ b/vector-stores/spring-ai-weaviate-store/pom.xml
@@ -43,7 +43,7 @@
org.springframework.ai
- spring-ai-core
+ spring-ai-client-chat
${project.parent.version}