Skip to content

Commit 977500f

Browse files
ilayaperumalgmarkpollack
authored andcommitted
Remove deprecated classes and methods in spring-ai-core
* Remove use of Document.getContext method from spring-ai-core, use getText * Remove deprecated ChatOptionsBuilder class * Remove deprecated FunctionCallingOptionsBuilder class
1 parent 0738122 commit 977500f

File tree

88 files changed

+160
-1706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+160
-1706
lines changed

document-readers/markdown-reader/src/test/java/org/springframework/ai/reader/markdown/MarkdownDocumentReaderTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void testDocumentNotDividedViaHorizontalRulesWhenIsDisabled() {
105105

106106
Document documentsFirst = documents.get(0);
107107
assertThat(documentsFirst.getMetadata()).isEmpty();
108-
assertThat(documentsFirst.getContent()).startsWith("Lorem ipsum dolor sit amet, consectetur adipiscing elit")
108+
assertThat(documentsFirst.getText()).startsWith("Lorem ipsum dolor sit amet, consectetur adipiscing elit")
109109
.endsWith("Phasellus eget tellus sed nibh ornare interdum eu eu mi.");
110110
}
111111

@@ -119,7 +119,7 @@ void testSimpleMarkdownDocumentWithHardAndSoftLineBreaks() {
119119

120120
Document documentsFirst = documents.get(0);
121121
assertThat(documentsFirst.getMetadata()).isEmpty();
122-
assertThat(documentsFirst.getContent()).isEqualTo(
122+
assertThat(documentsFirst.getText()).isEqualTo(
123123
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tincidunt velit non bibendum gravida. Cras accumsan tincidunt ornare. Donec hendrerit consequat tellus blandit accumsan. Aenean aliquam metus at arcu elementum dignissim.Nullam nisi dui, egestas nec sem nec, interdum lobortis enim. Pellentesque odio orci, faucibus eu luctus nec, venenatis et magna. Vestibulum nec eros non felis fermentum posuere eget ac risus.Aenean eu leo eu nibh tristique posuere quis quis massa. Nullam lacinia luctus sem ut vehicula.");
124124
}
125125

@@ -135,22 +135,22 @@ void testCode() {
135135

136136
assertThat(documents).satisfiesExactly(document -> {
137137
assertThat(document.getMetadata()).isEqualTo(Map.of());
138-
assertThat(document.getContent()).isEqualTo("This is a Java sample application:");
138+
assertThat(document.getText()).isEqualTo("This is a Java sample application:");
139139
}, document -> {
140140
assertThat(document.getMetadata()).isEqualTo(Map.of("lang", "java", "category", "code_block"));
141-
assertThat(document.getContent()).startsWith("package com.example.demo;")
141+
assertThat(document.getText()).startsWith("package com.example.demo;")
142142
.contains("SpringApplication.run(DemoApplication.class, args);");
143143
}, document -> {
144144
assertThat(document.getMetadata()).isEqualTo(Map.of("category", "code_inline"));
145-
assertThat(document.getContent()).isEqualTo(
145+
assertThat(document.getText()).isEqualTo(
146146
"Markdown also provides the possibility to use inline code formatting throughout the entire sentence.");
147147
}, document -> {
148148
assertThat(document.getMetadata()).isEqualTo(Map.of());
149-
assertThat(document.getContent())
149+
assertThat(document.getText())
150150
.isEqualTo("Another possibility is to set block code without specific highlighting:");
151151
}, document -> {
152152
assertThat(document.getMetadata()).isEqualTo(Map.of("lang", "", "category", "code_block"));
153-
assertThat(document.getContent()).isEqualTo("./mvnw spring-javaformat:apply\n");
153+
assertThat(document.getText()).isEqualTo("./mvnw spring-javaformat:apply\n");
154154
});
155155
}
156156

@@ -167,15 +167,15 @@ void testCodeWhenCodeBlockShouldNotBeSeparatedDocument() {
167167

168168
assertThat(documents).satisfiesExactly(document -> {
169169
assertThat(document.getMetadata()).isEqualTo(Map.of("lang", "java", "category", "code_block"));
170-
assertThat(document.getContent()).startsWith("This is a Java sample application: package com.example.demo")
170+
assertThat(document.getText()).startsWith("This is a Java sample application: package com.example.demo")
171171
.contains("SpringApplication.run(DemoApplication.class, args);");
172172
}, document -> {
173173
assertThat(document.getMetadata()).isEqualTo(Map.of("category", "code_inline"));
174-
assertThat(document.getContent()).isEqualTo(
174+
assertThat(document.getText()).isEqualTo(
175175
"Markdown also provides the possibility to use inline code formatting throughout the entire sentence.");
176176
}, document -> {
177177
assertThat(document.getMetadata()).isEqualTo(Map.of("lang", "", "category", "code_block"));
178-
assertThat(document.getContent()).isEqualTo(
178+
assertThat(document.getText()).isEqualTo(
179179
"Another possibility is to set block code without specific highlighting: ./mvnw spring-javaformat:apply\n");
180180
});
181181
}
@@ -208,7 +208,7 @@ void testBlockquoteWhenBlockquoteShouldNotBeSeparatedDocument() {
208208

209209
Document documentsFirst = documents.get(0);
210210
assertThat(documentsFirst.getMetadata()).isEqualTo(Map.of("category", "blockquote"));
211-
assertThat(documentsFirst.getContent()).isEqualTo(
211+
assertThat(documentsFirst.getText()).isEqualTo(
212212
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue. Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero. Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit.");
213213
}
214214

@@ -241,7 +241,7 @@ void testWithAdditionalMetadata() {
241241

242242
Document documentsFirst = documents.get(0);
243243
assertThat(documentsFirst.getMetadata()).isEqualTo(Map.of("service", "some-service-name", "env", "prod"));
244-
assertThat(documentsFirst.getContent()).startsWith("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
244+
assertThat(documentsFirst.getText()).startsWith("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
245245
}
246246

247247
}

document-readers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/ParagraphPdfDocumentReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public List<Document> get() {
145145
while (itr.hasNext()) {
146146
var next = itr.next();
147147
Document document = toDocument(current, next);
148-
if (document != null && StringUtils.hasText(document.getContent())) {
148+
if (document != null && StringUtils.hasText(document.getText())) {
149149
documents.add(toDocument(current, next));
150150
}
151151
current = next;

document-readers/tika-reader/src/test/java/org/springframework/ai/reader/tika/TikaDocumentReaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testDocx(String resourceUri, String resourceName, String contentSnip
4343

4444
assertThat(doc.getMetadata()).containsKeys(TikaDocumentReader.METADATA_SOURCE);
4545
assertThat(doc.getMetadata().get(TikaDocumentReader.METADATA_SOURCE)).isEqualTo(resourceName);
46-
assertThat(doc.getContent()).contains(contentSnipped);
46+
assertThat(doc.getText()).contains(contentSnipped);
4747
}
4848

4949
}

models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/experiments/BedrockConverseChatModelMain2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static void main(String[] args) {
4545
String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
4646

4747
// var prompt = new Prompt("Tell me a joke?",
48-
// ChatOptionsBuilder.builder().withModel(modelId).build());
48+
// ChatOptions.builder().model(modelId).build();
4949
var prompt = new Prompt(
5050
// "What's the weather like in San Francisco, Tokyo, and Paris? Return the
5151
// temperature in Celsius.",

models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/experiments/BedrockConverseChatModelMain3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void main(String[] args) {
4343
String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
4444

4545
// var prompt = new Prompt("Tell me a joke?",
46-
// ChatOptionsBuilder.builder().withModel(modelId).build());
46+
// ChatOptions.builder().model(modelId).build();
4747
var prompt = new Prompt(
4848
// "What's the weather like in San Francisco, Tokyo, and Paris? Return the
4949
// temperature in Celsius.",

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/BedrockCohereEmbeddingModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public BedrockCohereEmbeddingModel(CohereEmbeddingBedrockApi cohereEmbeddingBedr
7373

7474
@Override
7575
public float[] embed(Document document) {
76-
return embed(document.getContent());
76+
return embed(document.getText());
7777
}
7878

7979
@Override

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanEmbeddingModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public BedrockTitanEmbeddingModel withInputType(InputType inputType) {
7171

7272
@Override
7373
public float[] embed(Document document) {
74-
return embed(document.getContent());
74+
return embed(document.getText());
7575
}
7676

7777
@Override

models/spring-ai-oci-genai/src/main/java/org/springframework/ai/oci/OCIEmbeddingModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public EmbeddingResponse call(EmbeddingRequest request) {
100100

101101
@Override
102102
public float[] embed(Document document) {
103-
return embed(document.getContent());
103+
return embed(document.getText());
104104
}
105105

106106
private EmbeddingResponse embedAllWithContext(List<EmbedTextRequest> embedTextRequests,

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static Builder builder() {
9696

9797
@Override
9898
public float[] embed(Document document) {
99-
return embed(document.getContent());
99+
return embed(document.getText());
100100
}
101101

102102
@Override

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/acme/AcmeIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void acmeChain() {
117117
private Message getSystemMessage(List<Document> similarDocuments) {
118118

119119
String documents = similarDocuments.stream()
120-
.map(entry -> entry.getContent())
120+
.map(entry -> entry.getText())
121121
.collect(Collectors.joining(System.lineSeparator()));
122122

123123
SystemPromptTemplate systemPromptTemplate = new SystemPromptTemplate(this.systemBikePrompt);

0 commit comments

Comments
 (0)