Skip to content

Commit 5d6bbd9

Browse files
tzolovtzolov
committed
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 <[email protected]>
1 parent 8a5f68d commit 5d6bbd9

File tree

25 files changed

+65
-49
lines changed

25 files changed

+65
-49
lines changed

‎document-readers/jsoup-reader/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
</scm>
4040

4141
<dependencies>
42+
4243
<dependency>
4344
<groupId>org.springframework.ai</groupId>
44-
<artifactId>spring-ai-client-chat</artifactId>
45+
<artifactId>spring-ai-commons</artifactId>
4546
<version>${project.parent.version}</version>
4647
</dependency>
4748

‎document-readers/markdown-reader/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependencies>
4141
<dependency>
4242
<groupId>org.springframework.ai</groupId>
43-
<artifactId>spring-ai-client-chat</artifactId>
43+
<artifactId>spring-ai-commons</artifactId>
4444
<version>${project.parent.version}</version>
4545
</dependency>
4646

‎document-readers/pdf-reader/pom.xml

+10-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
-->
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
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">
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2021
<modelVersion>4.0.0</modelVersion>
2122
<parent>
2223
<groupId>org.springframework.ai</groupId>
@@ -42,7 +43,7 @@
4243
<dependencies>
4344
<dependency>
4445
<groupId>org.springframework.ai</groupId>
45-
<artifactId>spring-ai-client-chat</artifactId>
46+
<artifactId>spring-ai-commons</artifactId>
4647
<version>${project.parent.version}</version>
4748
</dependency>
4849

@@ -58,6 +59,12 @@
5859
</exclusions>
5960
</dependency>
6061

62+
<dependency>
63+
<groupId>org.slf4j</groupId>
64+
<artifactId>slf4j-api</artifactId>
65+
<optional>true</optional>
66+
</dependency>
67+
6168
<!-- TESTING -->
6269
<dependency>
6370
<groupId>org.springframework.boot</groupId>
@@ -79,4 +86,4 @@
7986

8087
</dependencies>
8188

82-
</project>
89+
</project>

‎document-readers/tika-reader/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependencies>
4444
<dependency>
4545
<groupId>org.springframework.ai</groupId>
46-
<artifactId>spring-ai-client-chat</artifactId>
46+
<artifactId>spring-ai-commons</artifactId>
4747
<version>${project.parent.version}</version>
4848
</dependency>
4949

‎mcp/common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<dependency>
6868
<groupId>org.springframework.ai</groupId>
69-
<artifactId>spring-ai-client-chat</artifactId>
69+
<artifactId>spring-ai-model</artifactId>
7070
<version>${project.parent.version}</version>
7171
</dependency>
7272

‎memory/repository/spring-ai-model-chat-memory-repository-cassandra/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependencies>
4242
<dependency>
4343
<groupId>org.springframework.ai</groupId>
44-
<artifactId>spring-ai-client-chat</artifactId>
44+
<artifactId>spring-ai-model</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747

‎memory/repository/spring-ai-model-chat-memory-repository-neo4j/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
<dependencies>
4242
<dependency>
4343
<groupId>org.springframework.ai</groupId>
44-
<artifactId>spring-ai-client-chat</artifactId>
44+
<artifactId>spring-ai-model</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
47-
47+
4848
<dependency>
4949
<groupId>org.springframework.data</groupId>
5050
<artifactId>spring-data-neo4j</artifactId>

‎models/spring-ai-anthropic/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<!-- production dependencies -->
4646
<dependency>
4747
<groupId>org.springframework.ai</groupId>
48-
<artifactId>spring-ai-client-chat</artifactId>
48+
<artifactId>spring-ai-model</artifactId>
4949
<version>${project.parent.version}</version>
5050
</dependency>
5151

‎models/spring-ai-azure-openai/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!-- production dependencies -->
4444
<dependency>
4545
<groupId>org.springframework.ai</groupId>
46-
<artifactId>spring-ai-client-chat</artifactId>
46+
<artifactId>spring-ai-model</artifactId>
4747
<version>${project.parent.version}</version>
4848
</dependency>
4949

‎models/spring-ai-bedrock-converse/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- production dependencies -->
4343
<dependency>
4444
<groupId>org.springframework.ai</groupId>
45-
<artifactId>spring-ai-client-chat</artifactId>
45+
<artifactId>spring-ai-model</artifactId>
4646
<version>${project.parent.version}</version>
4747
</dependency>
4848

‎models/spring-ai-bedrock/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- production dependencies -->
4545
<dependency>
4646
<groupId>org.springframework.ai</groupId>
47-
<artifactId>spring-ai-client-chat</artifactId>
47+
<artifactId>spring-ai-model</artifactId>
4848
<version>${project.parent.version}</version>
4949
</dependency>
5050

‎models/spring-ai-deepseek/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- production dependencies -->
2525
<dependency>
2626
<groupId>org.springframework.ai</groupId>
27-
<artifactId>spring-ai-client-chat</artifactId>
27+
<artifactId>spring-ai-model</artifactId>
2828
<version>${project.parent.version}</version>
2929
</dependency>
3030

‎models/spring-ai-huggingface/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!-- production dependencies -->
4444
<dependency>
4545
<groupId>org.springframework.ai</groupId>
46-
<artifactId>spring-ai-client-chat</artifactId>
46+
<artifactId>spring-ai-model</artifactId>
4747
<version>${project.parent.version}</version>
4848
</dependency>
4949

‎models/spring-ai-minimax/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<dependencies>
4343

4444
<!-- production dependencies -->
45-
<dependency>
46-
<groupId>org.springframework.ai</groupId>
47-
<artifactId>spring-ai-client-chat</artifactId>
48-
<version>${project.parent.version}</version>
49-
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.ai</groupId>
47+
<artifactId>spring-ai-model</artifactId>
48+
<version>${project.parent.version}</version>
49+
</dependency>
5050

5151
<dependency>
5252
<groupId>org.springframework.ai</groupId>

‎models/spring-ai-mistral-ai/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<!-- production dependencies -->
4646
<dependency>
4747
<groupId>org.springframework.ai</groupId>
48-
<artifactId>spring-ai-client-chat</artifactId>
48+
<artifactId>spring-ai-model</artifactId>
4949
<version>${project.parent.version}</version>
5050
</dependency>
5151

‎models/spring-ai-oci-genai/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<dependencies>
4343

4444
<!-- production dependencies -->
45-
<dependency>
46-
<groupId>org.springframework.ai</groupId>
47-
<artifactId>spring-ai-client-chat</artifactId>
48-
<version>${project.parent.version}</version>
49-
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.ai</groupId>
47+
<artifactId>spring-ai-model</artifactId>
48+
<version>${project.parent.version}</version>
49+
</dependency>
5050

5151
<dependency>
5252
<groupId>com.oracle.oci.sdk</groupId>

‎models/spring-ai-ollama/pom.xml

+13-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
</properties>
4545

4646
<dependencies>
47-
48-
<dependency>
49-
<groupId>org.springframework.ai</groupId>
50-
<artifactId>spring-ai-client-chat</artifactId>
51-
<version>${project.parent.version}</version>
52-
</dependency>
47+
48+
<dependency>
49+
<groupId>org.springframework.ai</groupId>
50+
<artifactId>spring-ai-model</artifactId>
51+
<version>${project.parent.version}</version>
52+
</dependency>
5353

5454
<dependency>
5555
<groupId>org.springframework.ai</groupId>
@@ -73,6 +73,13 @@
7373
</dependency>
7474

7575
<!-- test dependencies -->
76+
<dependency>
77+
<groupId>org.springframework.ai</groupId>
78+
<artifactId>spring-ai-client-chat</artifactId>
79+
<version>${project.parent.version}</version>
80+
<scope>test</scope>
81+
</dependency>
82+
7683
<dependency>
7784
<groupId>org.springframework.boot</groupId>
7885
<artifactId>spring-boot-starter-test</artifactId>

‎models/spring-ai-openai/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<dependency>
4747
<groupId>org.springframework.ai</groupId>
48-
<artifactId>spring-ai-client-chat</artifactId>
48+
<artifactId>spring-ai-model</artifactId>
4949
<version>${project.parent.version}</version>
5050
</dependency>
5151

‎models/spring-ai-postgresml/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependencies>
4343
<dependency>
4444
<groupId>org.springframework.ai</groupId>
45-
<artifactId>spring-ai-client-chat</artifactId>
45+
<artifactId>spring-ai-model</artifactId>
4646
<version>${project.parent.version}</version>
4747
</dependency>
4848

‎models/spring-ai-stability-ai/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- production dependencies -->
4545
<dependency>
4646
<groupId>org.springframework.ai</groupId>
47-
<artifactId>spring-ai-client-chat</artifactId>
47+
<artifactId>spring-ai-model</artifactId>
4848
<version>${project.parent.version}</version>
4949
</dependency>
5050

‎models/spring-ai-transformers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependencies>
5555
<dependency>
5656
<groupId>org.springframework.ai</groupId>
57-
<artifactId>spring-ai-client-chat</artifactId>
57+
<artifactId>spring-ai-model</artifactId>
5858
<version>${project.parent.version}</version>
5959
</dependency>
6060

‎models/spring-ai-vertex-ai-embedding/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<!-- production dependencies -->
6868
<dependency>
6969
<groupId>org.springframework.ai</groupId>
70-
<artifactId>spring-ai-client-chat</artifactId>
70+
<artifactId>spring-ai-model</artifactId>
7171
<version>${project.parent.version}</version>
7272
</dependency>
7373

‎models/spring-ai-vertex-ai-gemini/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<!-- production dependencies -->
8080
<dependency>
8181
<groupId>org.springframework.ai</groupId>
82-
<artifactId>spring-ai-client-chat</artifactId>
82+
<artifactId>spring-ai-model</artifactId>
8383
<version>${project.parent.version}</version>
8484
</dependency>
8585

‎models/spring-ai-zhipuai/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- production dependencies -->
4343
<dependency>
4444
<groupId>org.springframework.ai</groupId>
45-
<artifactId>spring-ai-client-chat</artifactId>
45+
<artifactId>spring-ai-model</artifactId>
4646
<version>${project.parent.version}</version>
4747
</dependency>
4848

‎spring-ai-retry/pom.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
-->
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
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">
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2021
<modelVersion>4.0.0</modelVersion>
2122
<parent>
2223
<groupId>org.springframework.ai</groupId>
@@ -41,22 +42,22 @@
4142
<dependencies>
4243

4344
<!-- production dependencies -->
44-
<dependency>
45-
<groupId>org.springframework.ai</groupId>
46-
<artifactId>spring-ai-client-chat</artifactId>
47-
<version>${project.parent.version}</version>
48-
</dependency>
49-
5045
<dependency>
5146
<groupId>org.springframework.retry</groupId>
5247
<artifactId>spring-retry</artifactId>
5348
</dependency>
54-
49+
5550
<dependency>
5651
<groupId>org.springframework</groupId>
5752
<artifactId>spring-webflux</artifactId>
5853
</dependency>
5954

55+
<dependency>
56+
<groupId>org.slf4j</groupId>
57+
<artifactId>slf4j-api</artifactId>
58+
<optional>true</optional>
59+
</dependency>
60+
6061
<!-- test dependencies -->
6162
<dependency>
6263
<groupId>org.springframework.boot</groupId>
@@ -65,4 +66,4 @@
6566
</dependency>
6667

6768
</dependencies>
68-
</project>
69+
</project>

0 commit comments

Comments
 (0)