Skip to content

Commit 60ae836

Browse files
authored
Remove deprecated APIs (#81)
## Change This is part of langchain4j/langchain4j#2726 Removed: - `BertTokenizer` -> Replaced by: `HuggingFaceTokenizer` - `OnnxEmbeddingModel(Path)` -> Replaced by: `OnnxEmbeddingModel(Path, Path, PoolingMode)` - `OnnxEmbeddingModel(String)` -> Replaced by: `OnnxEmbeddingModel(Path, Path, PoolingMode)` ## General checklist - [ ] There are no breaking changes - [ ] I have added unit and/or integration tests for my change - [ ] The tests cover both positive and negative cases - [x] I have manually run all the unit and integration tests in the module I have added/changed, and they are all green - [ ] I have added/updated the [documentation](https://github.com/langchain4j/langchain4j/tree/main/docs/docs) - [ ] I have added an example in the [examples repo](https://github.com/langchain4j/langchain4j-examples) (only for "big" features) - [ ] I have added/updated [Spring Boot starter(s)](https://github.com/langchain4j/langchain4j-spring) (if applicable)
1 parent 775a7f5 commit 60ae836

File tree

4 files changed

+12
-149
lines changed

4 files changed

+12
-149
lines changed

langchain4j-embeddings/src/main/java/dev/langchain4j/model/embedding/onnx/BertTokenizer.java

-65
This file was deleted.

langchain4j-embeddings/src/main/java/dev/langchain4j/model/embedding/onnx/HuggingFaceTokenizer.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.langchain4j.model.embedding.onnx;
22

33
import ai.djl.huggingface.tokenizers.Encoding;
4-
import dev.langchain4j.data.message.ChatMessage;
4+
import dev.langchain4j.data.message.*;
55
import dev.langchain4j.model.Tokenizer;
66

77
import java.io.InputStream;
@@ -101,7 +101,17 @@ public int estimateTokenCountInText(String text) {
101101

102102
@Override
103103
public int estimateTokenCountInMessage(ChatMessage message) {
104-
return estimateTokenCountInText(message.text());
104+
if (message instanceof SystemMessage systemMessage) {
105+
return estimateTokenCountInText(systemMessage.text());
106+
} else if (message instanceof UserMessage userMessage) {
107+
return estimateTokenCountInText(userMessage.singleText());
108+
} else if (message instanceof AiMessage aiMessage) {
109+
return estimateTokenCountInText(aiMessage.text());
110+
} else if (message instanceof ToolExecutionResultMessage toolExecutionResultMessage) {
111+
return estimateTokenCountInText(toolExecutionResultMessage.text());
112+
} else {
113+
throw new IllegalArgumentException("Unknown message type: " + message);
114+
}
105115
}
106116

107117
@Override

langchain4j-embeddings/src/main/java/dev/langchain4j/model/embedding/onnx/OnnxEmbeddingModel.java

-25
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,6 @@ public OnnxEmbeddingModel(String pathToModel, String pathToTokenizer, PoolingMod
7070
this(Paths.get(pathToModel), Paths.get(pathToTokenizer), poolingMode, executor);
7171
}
7272

73-
/**
74-
* @param pathToModel The path to the modelPath file (e.g., "/path/to/model.onnx")
75-
* @deprecated Use {@link OnnxEmbeddingModel#OnnxEmbeddingModel(Path, Path, PoolingMode)} or
76-
* {@link OnnxEmbeddingModel#OnnxEmbeddingModel(String, String, PoolingMode)} instead.
77-
*/
78-
@Deprecated(forRemoval = true)
79-
public OnnxEmbeddingModel(Path pathToModel) {
80-
super(null);
81-
this.onnxBertBiEncoder = loadFromFileSystem(
82-
pathToModel,
83-
OnnxEmbeddingModel.class.getResourceAsStream("/bert-tokenizer.json"),
84-
PoolingMode.MEAN
85-
);
86-
}
87-
88-
/**
89-
* @param pathToModel The path to the modelPath file (e.g., "/path/to/model.onnx")
90-
* @deprecated Use {@link OnnxEmbeddingModel#OnnxEmbeddingModel(Path, Path, PoolingMode)} or
91-
* {@link OnnxEmbeddingModel#OnnxEmbeddingModel(String, String, PoolingMode)} instead.
92-
*/
93-
@Deprecated(forRemoval = true)
94-
public OnnxEmbeddingModel(String pathToModel) {
95-
this(Paths.get(pathToModel));
96-
}
97-
9873
@Override
9974
protected OnnxBertBiEncoder model() {
10075
return onnxBertBiEncoder;

langchain4j-embeddings/src/test/java/dev/langchain4j/model/embedding/onnx/BertTokenizerTest.java

-57
This file was deleted.

0 commit comments

Comments
 (0)