topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-12 04:27:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Improvement][headless] Replace deprecated LangChain4j APIs (#2235)

Browse Source
This commit is contained in:
beat4ocean
2025-05-05 15:47:51 +08:00
committed by GitHub
parent 763def2de0
commit acffc03c79
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/dev/langchain4j/model/dify/DifyAiChatModel.java
View File

@@ -9,6 +9,7 @@ import dev.langchain4j.data.message.ChatMessage;
import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.model.chat.ChatLanguageModel;
import dev.langchain4j.model.output.Response; import dev.langchain4j.model.output.Response;
import lombok.Builder; import lombok.Builder;
import lombok.Setter;
import java.util.List; import java.util.List;
@@ -32,6 +33,7 @@ public class DifyAiChatModel implements ChatLanguageModel {
private final Double temperature; private final Double temperature;
private final Long timeOut; private final Long timeOut;
@Setter
private String userName; private String userName;
@Builder @Builder
@@ -54,7 +56,7 @@ public class DifyAiChatModel implements ChatLanguageModel {
@Override @Override
public String generate(String message) { public String generate(String message) {
DifyResult difyResult = this.difyClient.generate(message, this.getUserName()); DifyResult difyResult = this.difyClient.generate(message, this.getUserName());
return difyResult.getAnswer().toString(); return difyResult.getAnswer();
} }
@Override @Override
@@ -67,7 +69,7 @@ public class DifyAiChatModel implements ChatLanguageModel {
List<ToolSpecification> toolSpecifications) { List<ToolSpecification> toolSpecifications) {
ensureNotEmpty(messages, "messages"); ensureNotEmpty(messages, "messages");
DifyResult difyResult = DifyResult difyResult =
this.difyClient.generate(messages.get(0).text(), this.getUserName()); this.difyClient.generate(messages.get(0).toString(), this.getUserName());
System.out.println(difyResult.toString()); System.out.println(difyResult.toString());
if (!isNullOrEmpty(toolSpecifications)) { if (!isNullOrEmpty(toolSpecifications)) {
@@ -84,12 +86,8 @@ public class DifyAiChatModel implements ChatLanguageModel {
toolSpecification != null ? singletonList(toolSpecification) : null); toolSpecification != null ? singletonList(toolSpecification) : null);
} }
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserName() { public String getUserName() {
return null == userName ? "zhaodongsheng" : userName; return null == userName ? "admin" : userName;
} }
} }

6
common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModel.java
View File

@@ -52,7 +52,7 @@ import static dev.langchain4j.model.openai.InternalOpenAiHelper.toOpenAiMessages
import static dev.langchain4j.model.openai.InternalOpenAiHelper.toOpenAiResponseFormat; import static dev.langchain4j.model.openai.InternalOpenAiHelper.toOpenAiResponseFormat;
import static dev.langchain4j.model.openai.InternalOpenAiHelper.toTools; import static dev.langchain4j.model.openai.InternalOpenAiHelper.toTools;
import static dev.langchain4j.model.openai.InternalOpenAiHelper.tokenUsageFrom; import static dev.langchain4j.model.openai.InternalOpenAiHelper.tokenUsageFrom;
import static dev.langchain4j.model.openai.OpenAiModelName.GPT_3_5_TURBO; import static dev.langchain4j.model.openai.OpenAiChatModelName.GPT_3_5_TURBO;
import static dev.langchain4j.spi.ServiceHelper.loadFactories; import static dev.langchain4j.spi.ServiceHelper.loadFactories;
import static java.time.Duration.ofSeconds; import static java.time.Duration.ofSeconds;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
@@ -111,7 +111,7 @@ public class OpenAiChatModel implements ChatLanguageModel, TokenCountEstimator {
.connectTimeout(timeout).readTimeout(timeout).writeTimeout(timeout).proxy(proxy) .connectTimeout(timeout).readTimeout(timeout).writeTimeout(timeout).proxy(proxy)
.logRequests(logRequests).logResponses(logResponses).userAgent(DEFAULT_USER_AGENT) .logRequests(logRequests).logResponses(logResponses).userAgent(DEFAULT_USER_AGENT)
.customHeaders(customHeaders).build(); .customHeaders(customHeaders).build();
this.modelName = getOrDefault(modelName, GPT_3_5_TURBO); this.modelName = getOrDefault(modelName, GPT_3_5_TURBO.name());
this.apiVersion = apiVersion; this.apiVersion = apiVersion;
this.temperature = getOrDefault(temperature, 0.7); this.temperature = getOrDefault(temperature, 0.7);
this.topP = topP; this.topP = topP;
@@ -130,7 +130,7 @@ public class OpenAiChatModel implements ChatLanguageModel, TokenCountEstimator {
this.strictTools = getOrDefault(strictTools, false); this.strictTools = getOrDefault(strictTools, false);
this.parallelToolCalls = parallelToolCalls; this.parallelToolCalls = parallelToolCalls;
this.maxRetries = getOrDefault(maxRetries, 3); this.maxRetries = getOrDefault(maxRetries, 3);
this.tokenizer = getOrDefault(tokenizer, OpenAiTokenizer::new); this.tokenizer = getOrDefault(tokenizer, () -> new OpenAiTokenizer(this.modelName));
this.listeners = listeners == null ? emptyList() : new ArrayList<>(listeners); this.listeners = listeners == null ? emptyList() : new ArrayList<>(listeners);
} }