From 5d6bbd93686686cd6f7d9e28c1de93093deeb9b9 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Fri, 16 May 2025 19:40:48 +0200 Subject: [PATCH] refactor: update dependencies to use spring-ai-model and spring-ai-commons Replace spring-ai-client-chat dependency with spring-ai-model in model implementations and memory repositories, and with spring-ai-commons in document readers. This change improves the dependency structure by having components depend on the appropriate abstraction level. Additional changes: - Add slf4j-api dependency to pdf-reader and spring-ai-retry - Move spring-ai-client-chat to test scope in spring-ai-ollama - Fix XML formatting in some pom.xml files Signed-off-by: Christian Tzolov --- document-readers/jsoup-reader/pom.xml | 3 ++- document-readers/markdown-reader/pom.xml | 2 +- document-readers/pdf-reader/pom.xml | 13 ++++++++++--- document-readers/tika-reader/pom.xml | 2 +- mcp/common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 ++-- models/spring-ai-anthropic/pom.xml | 2 +- models/spring-ai-azure-openai/pom.xml | 2 +- models/spring-ai-bedrock-converse/pom.xml | 2 +- models/spring-ai-bedrock/pom.xml | 2 +- models/spring-ai-deepseek/pom.xml | 2 +- models/spring-ai-huggingface/pom.xml | 2 +- models/spring-ai-minimax/pom.xml | 10 +++++----- models/spring-ai-mistral-ai/pom.xml | 2 +- models/spring-ai-oci-genai/pom.xml | 10 +++++----- models/spring-ai-ollama/pom.xml | 19 +++++++++++++------ models/spring-ai-openai/pom.xml | 2 +- models/spring-ai-postgresml/pom.xml | 2 +- models/spring-ai-stability-ai/pom.xml | 2 +- models/spring-ai-transformers/pom.xml | 2 +- models/spring-ai-vertex-ai-embedding/pom.xml | 2 +- models/spring-ai-vertex-ai-gemini/pom.xml | 2 +- models/spring-ai-zhipuai/pom.xml | 2 +- spring-ai-retry/pom.xml | 19 ++++++++++--------- 25 files changed, 65 insertions(+), 49 deletions(-) diff --git a/document-readers/jsoup-reader/pom.xml b/document-readers/jsoup-reader/pom.xml index 610b29ffa..0e122b1da 100644 --- a/document-readers/jsoup-reader/pom.xml +++ b/document-readers/jsoup-reader/pom.xml @@ -39,9 +39,10 @@ + org.springframework.ai - spring-ai-client-chat + spring-ai-commons ${project.parent.version} diff --git a/document-readers/markdown-reader/pom.xml b/document-readers/markdown-reader/pom.xml index e32d3d92b..34f73ecec 100644 --- a/document-readers/markdown-reader/pom.xml +++ b/document-readers/markdown-reader/pom.xml @@ -40,7 +40,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-commons ${project.parent.version} diff --git a/document-readers/pdf-reader/pom.xml b/document-readers/pdf-reader/pom.xml index faf3d7ff2..15f209d15 100644 --- a/document-readers/pdf-reader/pom.xml +++ b/document-readers/pdf-reader/pom.xml @@ -16,7 +16,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework.ai @@ -42,7 +43,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-commons ${project.parent.version} @@ -58,6 +59,12 @@ + + org.slf4j + slf4j-api + true + + org.springframework.boot @@ -79,4 +86,4 @@ - + \ No newline at end of file diff --git a/document-readers/tika-reader/pom.xml b/document-readers/tika-reader/pom.xml index 1f3e2d8cb..f16a6bcfd 100644 --- a/document-readers/tika-reader/pom.xml +++ b/document-readers/tika-reader/pom.xml @@ -43,7 +43,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-commons ${project.parent.version} diff --git a/mcp/common/pom.xml b/mcp/common/pom.xml index caa1ad7f8..e4ae7733c 100644 --- a/mcp/common/pom.xml +++ b/mcp/common/pom.xml @@ -66,7 +66,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/memory/repository/spring-ai-model-chat-memory-repository-cassandra/pom.xml b/memory/repository/spring-ai-model-chat-memory-repository-cassandra/pom.xml index 9769db0a2..687c8274d 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-cassandra/pom.xml +++ b/memory/repository/spring-ai-model-chat-memory-repository-cassandra/pom.xml @@ -41,7 +41,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.version} diff --git a/memory/repository/spring-ai-model-chat-memory-repository-neo4j/pom.xml b/memory/repository/spring-ai-model-chat-memory-repository-neo4j/pom.xml index f8fad8723..b93a1c419 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-neo4j/pom.xml +++ b/memory/repository/spring-ai-model-chat-memory-repository-neo4j/pom.xml @@ -41,10 +41,10 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.version} - + org.springframework.data spring-data-neo4j diff --git a/models/spring-ai-anthropic/pom.xml b/models/spring-ai-anthropic/pom.xml index 8f1263dab..e594e2df5 100644 --- a/models/spring-ai-anthropic/pom.xml +++ b/models/spring-ai-anthropic/pom.xml @@ -45,7 +45,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-azure-openai/pom.xml b/models/spring-ai-azure-openai/pom.xml index 3265b188d..c30904723 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-bedrock-converse/pom.xml b/models/spring-ai-bedrock-converse/pom.xml index 323d5c963..9747f1c7d 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-bedrock/pom.xml b/models/spring-ai-bedrock/pom.xml index c8bddd129..5fc70575b 100644 --- a/models/spring-ai-bedrock/pom.xml +++ b/models/spring-ai-bedrock/pom.xml @@ -44,7 +44,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-deepseek/pom.xml b/models/spring-ai-deepseek/pom.xml index c84a19fcd..25155b98c 100644 --- a/models/spring-ai-deepseek/pom.xml +++ b/models/spring-ai-deepseek/pom.xml @@ -24,7 +24,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-huggingface/pom.xml b/models/spring-ai-huggingface/pom.xml index 7e681298f..1323d5ff7 100644 --- a/models/spring-ai-huggingface/pom.xml +++ b/models/spring-ai-huggingface/pom.xml @@ -43,7 +43,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-minimax/pom.xml b/models/spring-ai-minimax/pom.xml index f792e5849..282785dff 100644 --- a/models/spring-ai-minimax/pom.xml +++ b/models/spring-ai-minimax/pom.xml @@ -42,11 +42,11 @@ - - org.springframework.ai - spring-ai-client-chat - ${project.parent.version} - + + org.springframework.ai + spring-ai-model + ${project.parent.version} + org.springframework.ai diff --git a/models/spring-ai-mistral-ai/pom.xml b/models/spring-ai-mistral-ai/pom.xml index c0ae06ed0..c4675e7d3 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-oci-genai/pom.xml b/models/spring-ai-oci-genai/pom.xml index e0b68bb3d..3c337b174 100644 --- a/models/spring-ai-oci-genai/pom.xml +++ b/models/spring-ai-oci-genai/pom.xml @@ -42,11 +42,11 @@ - - org.springframework.ai - spring-ai-client-chat - ${project.parent.version} - + + org.springframework.ai + spring-ai-model + ${project.parent.version} + com.oracle.oci.sdk diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml index 648283277..36f762916 100644 --- a/models/spring-ai-ollama/pom.xml +++ b/models/spring-ai-ollama/pom.xml @@ -44,12 +44,12 @@ - - - org.springframework.ai - spring-ai-client-chat - ${project.parent.version} - + + + org.springframework.ai + spring-ai-model + ${project.parent.version} + org.springframework.ai @@ -73,6 +73,13 @@ + + org.springframework.ai + spring-ai-client-chat + ${project.parent.version} + test + + org.springframework.boot spring-boot-starter-test diff --git a/models/spring-ai-openai/pom.xml b/models/spring-ai-openai/pom.xml index cb4ddedc0..d0826a5ec 100644 --- a/models/spring-ai-openai/pom.xml +++ b/models/spring-ai-openai/pom.xml @@ -45,7 +45,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-postgresml/pom.xml b/models/spring-ai-postgresml/pom.xml index ccc810e3a..ba2dfa50d 100644 --- a/models/spring-ai-postgresml/pom.xml +++ b/models/spring-ai-postgresml/pom.xml @@ -42,7 +42,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-stability-ai/pom.xml b/models/spring-ai-stability-ai/pom.xml index 97afa1dc2..a5e6f0368 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-transformers/pom.xml b/models/spring-ai-transformers/pom.xml index 90babe31e..26cf5a09a 100644 --- a/models/spring-ai-transformers/pom.xml +++ b/models/spring-ai-transformers/pom.xml @@ -54,7 +54,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-vertex-ai-embedding/pom.xml b/models/spring-ai-vertex-ai-embedding/pom.xml index 8223287a2..d1a8dcd8e 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-vertex-ai-gemini/pom.xml b/models/spring-ai-vertex-ai-gemini/pom.xml index 91d5c5241..4cab86c47 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-client-chat + spring-ai-model ${project.parent.version} diff --git a/models/spring-ai-zhipuai/pom.xml b/models/spring-ai-zhipuai/pom.xml index 526fe82b1..4c815259e 100644 --- a/models/spring-ai-zhipuai/pom.xml +++ b/models/spring-ai-zhipuai/pom.xml @@ -42,7 +42,7 @@ org.springframework.ai - spring-ai-client-chat + spring-ai-model ${project.parent.version} diff --git a/spring-ai-retry/pom.xml b/spring-ai-retry/pom.xml index 8241762e4..066945757 100644 --- a/spring-ai-retry/pom.xml +++ b/spring-ai-retry/pom.xml @@ -16,7 +16,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework.ai @@ -41,22 +42,22 @@ - - org.springframework.ai - spring-ai-client-chat - ${project.parent.version} - - org.springframework.retry spring-retry - + org.springframework spring-webflux + + org.slf4j + slf4j-api + true + + org.springframework.boot @@ -65,4 +66,4 @@ - + \ No newline at end of file