github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade spring ai version to 1.0.0-M1 (#3759)

Browse Source
pull/3762/head
zhangqian9158 8 months ago committed by GitHub
parent c21921d522
commit 0d81c19f6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 102 additions and 74 deletions
Show Stats Download Patch File Download Diff File

2
spring-cloud-alibaba-dependencies/pom.xml
Unescape Escape View File

@ -27,7 +27,7 @@
<rocketmq.version>5.1.4</rocketmq.version> <rocketmq.version>5.1.4</rocketmq.version>
<!-- Spring AI --> <!-- Spring AI -->
<spring.ai.version>0.8.1</spring.ai.version> <spring.ai.version>1.0.0-M1</spring.ai.version>
<dashscope-sdk-java.version>2.14.0</dashscope-sdk-java.version> <dashscope-sdk-java.version>2.14.0</dashscope-sdk-java.version>
<!-- scheduling --> <!-- scheduling -->

18
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/helloworld/TongYiSimpleServiceImpl.java
Unescape Escape View File

@ -25,9 +25,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.ai.chat.ChatClient;
import org.springframework.ai.chat.StreamingChatClient;
import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.model.StreamingChatModel;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -47,15 +47,15 @@ public class TongYiSimpleServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ChatClient chatClient; private final ChatModel chatModel;
private final StreamingChatClient streamingChatClient; private final StreamingChatModel streamingChatModel;
@Autowired @Autowired
public TongYiSimpleServiceImpl(ChatClient chatClient, StreamingChatClient streamingChatClient) { public TongYiSimpleServiceImpl(ChatModel chatModel, StreamingChatModel streamingChatModel) {
this.chatClient = chatClient; this.chatModel = chatModel;
this.streamingChatClient = streamingChatClient; this.streamingChatModel = streamingChatModel;
} }
@Override @Override
@ -63,7 +63,7 @@ public class TongYiSimpleServiceImpl extends AbstractTongYiServiceImpl {
Prompt prompt = new Prompt(new UserMessage(message)); Prompt prompt = new Prompt(new UserMessage(message));
return chatClient.call(prompt).getResult().getOutput().getContent(); return chatModel.call(prompt).getResult().getOutput().getContent();
} }
@Override @Override
@ -71,7 +71,7 @@ public class TongYiSimpleServiceImpl extends AbstractTongYiServiceImpl {
StringBuilder fullContent = new StringBuilder(); StringBuilder fullContent = new StringBuilder();
streamingChatClient.stream(new Prompt(message)) streamingChatModel.stream(new Prompt(message))
.flatMap(chatResponse -> Flux.fromIterable(chatResponse.getResults())) .flatMap(chatResponse -> Flux.fromIterable(chatResponse.getResults()))
.map(content -> content.getOutput().getContent()) .map(content -> content.getOutput().getContent())
.doOnNext(fullContent::append) .doOnNext(fullContent::append)

10
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/images/TongYiImagesServiceImpl.java
Unescape Escape View File

@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.image.ImageClient; import org.springframework.ai.image.ImageModel;
import org.springframework.ai.image.ImagePrompt; import org.springframework.ai.image.ImagePrompt;
import org.springframework.ai.image.ImageResponse; import org.springframework.ai.image.ImageResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -42,12 +42,12 @@ public class TongYiImagesServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ImageClient imageClient; private final ImageModel imageModel;
@Autowired @Autowired
public TongYiImagesServiceImpl(ImageClient client) { public TongYiImagesServiceImpl(ImageModel imageModel) {
this.imageClient = client; this.imageModel = imageModel;
} }
@Override @Override
@ -55,7 +55,7 @@ public class TongYiImagesServiceImpl extends AbstractTongYiServiceImpl {
var prompt = new ImagePrompt(imgPrompt); var prompt = new ImagePrompt(imgPrompt);
return imageClient.call(prompt); return imageModel.call(prompt);
} }
} }

12
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/output/TongYiOutputParseServiceImpl.java
Unescape Escape View File

@ -25,8 +25,8 @@ import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.ChatClient; import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.Generation; import org.springframework.ai.chat.model.Generation;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.chat.prompt.PromptTemplate; import org.springframework.ai.chat.prompt.PromptTemplate;
import org.springframework.ai.parser.BeanOutputParser; import org.springframework.ai.parser.BeanOutputParser;
@ -47,10 +47,10 @@ public class TongYiOutputParseServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ChatClient chatClient; private final ChatModel chatModel;
public TongYiOutputParseServiceImpl(ChatClient chatClient) { public TongYiOutputParseServiceImpl(ChatModel chatModel) {
this.chatClient = chatClient; this.chatModel = chatModel;
} }
@Override @Override
@ -66,7 +66,7 @@ public class TongYiOutputParseServiceImpl extends AbstractTongYiServiceImpl {
"""; """;
PromptTemplate promptTemplate = new PromptTemplate(userMessage, Map.of("actor", actor, "format", format)); PromptTemplate promptTemplate = new PromptTemplate(userMessage, Map.of("actor", actor, "format", format));
Prompt prompt = promptTemplate.create(); Prompt prompt = promptTemplate.create();
Generation generation = chatClient.call(prompt).getResult(); Generation generation = chatModel.call(prompt).getResult();
// {@link BeanOutputParser#getFormat} // {@link BeanOutputParser#getFormat}
// simple solve. // simple solve.

10
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/prompttemplate/TongYiPromptTemplateServiceImpl.java
Unescape Escape View File

@ -24,8 +24,8 @@ import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.ChatClient;
import org.springframework.ai.chat.messages.AssistantMessage; import org.springframework.ai.chat.messages.AssistantMessage;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.chat.prompt.PromptTemplate; import org.springframework.ai.chat.prompt.PromptTemplate;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -47,13 +47,13 @@ public class TongYiPromptTemplateServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ChatClient chatClient; private final ChatModel chatModel;
@Value("classpath:/prompts/joke-prompt.st") @Value("classpath:/prompts/joke-prompt.st")
private Resource jokeResource; private Resource jokeResource;
public TongYiPromptTemplateServiceImpl(ChatClient chatClient) { public TongYiPromptTemplateServiceImpl(ChatModel chatModel) {
this.chatClient = chatClient; this.chatModel = chatModel;
} }
@Override @Override
@ -62,6 +62,6 @@ public class TongYiPromptTemplateServiceImpl extends AbstractTongYiServiceImpl {
PromptTemplate promptTemplate = new PromptTemplate(jokeResource); PromptTemplate promptTemplate = new PromptTemplate(jokeResource);
Prompt prompt = promptTemplate.create(Map.of("adjective", adjective, "topic", topic)); Prompt prompt = promptTemplate.create(Map.of("adjective", adjective, "topic", topic));
return chatClient.call(prompt).getResult().getOutput(); return chatModel.call(prompt).getResult().getOutput();
} }
} }

10
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/roles/TongYiRolesServiceImpl.java
Unescape Escape View File

@ -25,9 +25,9 @@ import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.ChatClient;
import org.springframework.ai.chat.messages.AssistantMessage; import org.springframework.ai.chat.messages.AssistantMessage;
import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.chat.prompt.SystemPromptTemplate; import org.springframework.ai.chat.prompt.SystemPromptTemplate;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -46,10 +46,10 @@ public class TongYiRolesServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ChatClient chatClient; private final ChatModel chatModel;
public TongYiRolesServiceImpl(ChatClient chatClient) { public TongYiRolesServiceImpl(ChatModel chatModel) {
this.chatClient = chatClient; this.chatModel = chatModel;
} }
@Value("classpath:/prompts/assistant-message.st") @Value("classpath:/prompts/assistant-message.st")
@ -74,6 +74,6 @@ public class TongYiRolesServiceImpl extends AbstractTongYiServiceImpl {
Prompt prompt = new Prompt(List.of(systemPromptTemplateMessage, userMessage)); Prompt prompt = new Prompt(List.of(systemPromptTemplateMessage, userMessage));
return chatClient.call(prompt).getResult().getOutput(); return chatModel.call(prompt).getResult().getOutput();
} }
} }

12
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/stuff/TongYiStuffServiceImpl.java
Unescape Escape View File

@ -26,8 +26,8 @@ import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.ChatClient; import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.Generation; import org.springframework.ai.chat.model.Generation;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.chat.prompt.PromptTemplate; import org.springframework.ai.chat.prompt.PromptTemplate;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -48,10 +48,10 @@ public class TongYiStuffServiceImpl extends AbstractTongYiServiceImpl {
private static final Logger logger = LoggerFactory.getLogger(TongYiService.class); private static final Logger logger = LoggerFactory.getLogger(TongYiService.class);
private final ChatClient chatClient; private final ChatModel chatModel;
public TongYiStuffServiceImpl(ChatClient chatClient) { public TongYiStuffServiceImpl(ChatModel chatModel) {
this.chatClient = chatClient; this.chatModel = chatModel;
} }
@Value("classpath:/docs/wikipedia-curling.md") @Value("classpath:/docs/wikipedia-curling.md")
@ -76,7 +76,7 @@ public class TongYiStuffServiceImpl extends AbstractTongYiServiceImpl {
} }
Prompt prompt = promptTemplate.create(map); Prompt prompt = promptTemplate.create(map);
Generation generation = chatClient.call(prompt).getResult(); Generation generation = chatModel.call(prompt).getResult();
return new Completion(generation.getOutput().getContent()); return new Completion(generation.getOutput().getContent());
} }
} }

10
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-example/src/main/java/com/alibaba/cloud/ai/example/tongyi/service/impl/textembedding/TongYiTextEmbeddingServiceImpl.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.util.List;
import com.alibaba.cloud.ai.example.tongyi.service.AbstractTongYiServiceImpl; import com.alibaba.cloud.ai.example.tongyi.service.AbstractTongYiServiceImpl;
import org.springframework.ai.embedding.EmbeddingClient; import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -31,17 +31,17 @@ import org.springframework.stereotype.Service;
@Service @Service
public class TongYiTextEmbeddingServiceImpl extends AbstractTongYiServiceImpl { public class TongYiTextEmbeddingServiceImpl extends AbstractTongYiServiceImpl {
private final EmbeddingClient embeddingClient; private final EmbeddingModel embeddingModel;
public TongYiTextEmbeddingServiceImpl(EmbeddingClient embeddingClient) { public TongYiTextEmbeddingServiceImpl(EmbeddingModel embeddingModel) {
this.embeddingClient = embeddingClient; this.embeddingModel = embeddingModel;
} }
@Override @Override
public List<Double> textEmbedding(String text) { public List<Double> textEmbedding(String text) {
return embeddingClient.embed(text); return embeddingModel.embed(text);
} }
} }

14
spring-cloud-alibaba-examples/ai-example/spring-cloud-ai-rag-example/src/main/java/com/alibaba/cloud/example/ai/rag/service/RAGService.java
Unescape Escape View File

@ -20,11 +20,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.springframework.ai.chat.ChatClient;
import org.springframework.ai.chat.ChatResponse;
import org.springframework.ai.chat.Generation;
import org.springframework.ai.chat.messages.Message; import org.springframework.ai.chat.messages.Message;
import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.model.Generation;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.chat.prompt.SystemPromptTemplate; import org.springframework.ai.chat.prompt.SystemPromptTemplate;
import org.springframework.ai.document.Document; import org.springframework.ai.document.Document;
@ -48,13 +48,13 @@ public class RAGService {
@Value("${topk:10}") @Value("${topk:10}")
private int topK; private int topK;
private final ChatClient client; private final ChatModel chatModel;
private final VectorStore store; private final VectorStore store;
public RAGService(ChatClient client, VectorStore store) { public RAGService(ChatModel chatModel, VectorStore store) {
this.client = client; this.chatModel = chatModel;
this.store = store; this.store = store;
} }
@ -67,7 +67,7 @@ public class RAGService {
UserMessage userMessage = new UserMessage(message); UserMessage userMessage = new UserMessage(message);
Prompt prompt = new Prompt(List.of(systemMessage, userMessage)); Prompt prompt = new Prompt(List.of(systemMessage, userMessage));
ChatResponse response = client.call(prompt); ChatResponse response = chatModel.call(prompt);
return response.getResult(); return response.getResult();
} }

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/audio/speech/api/SpeechClient.java
Unescape Escape View File

@ -18,7 +18,7 @@ package com.alibaba.cloud.ai.tongyi.audio.speech.api;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.springframework.ai.model.ModelClient; import org.springframework.ai.model.Model;
/** /**
* @author yuluo * @author yuluo
@ -27,7 +27,7 @@ import org.springframework.ai.model.ModelClient;
*/ */
@FunctionalInterface @FunctionalInterface
public interface SpeechClient extends ModelClient<SpeechPrompt, SpeechResponse> { public interface SpeechClient extends Model<SpeechPrompt, SpeechResponse> {
/** /**
* Generates spoken audio from the provided text message. * Generates spoken audio from the provided text message.

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/audio/speech/api/SpeechStreamClient.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.ai.model.StreamingModelClient; import org.springframework.ai.model.StreamingModel;
/** /**
* @author yuluo * @author yuluo
@ -29,7 +29,7 @@ import org.springframework.ai.model.StreamingModelClient;
*/ */
@FunctionalInterface @FunctionalInterface
public interface SpeechStreamClient extends StreamingModelClient<SpeechPrompt, SpeechResponse> { public interface SpeechStreamClient extends StreamingModel<SpeechPrompt, SpeechResponse> {
/** /**
* Generates a stream of audio bytes from the provided text message. * Generates a stream of audio bytes from the provided text message.

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/audio/transcription/TongYiAudioTranscriptionClient.java
Unescape Escape View File

@ -34,7 +34,7 @@ import com.alibaba.dashscope.audio.asr.transcription.TranscriptionQueryParam;
import com.alibaba.dashscope.audio.asr.transcription.TranscriptionResult; import com.alibaba.dashscope.audio.asr.transcription.TranscriptionResult;
import com.alibaba.dashscope.audio.asr.transcription.TranscriptionTaskResult; import com.alibaba.dashscope.audio.asr.transcription.TranscriptionTaskResult;
import org.springframework.ai.model.ModelClient; import org.springframework.ai.model.Model;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -47,7 +47,7 @@ import org.springframework.util.Assert;
*/ */
public class TongYiAudioTranscriptionClient public class TongYiAudioTranscriptionClient
implements ModelClient<AudioTranscriptionPrompt, AudioTranscriptionResponse> { implements Model<AudioTranscriptionPrompt, AudioTranscriptionResponse> {
/** /**
* TongYi models options. * TongYi models options.

35
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatClient.java
Unescape Escape View File

@ -15,12 +15,12 @@
*/ */
package com.alibaba.cloud.ai.tongyi.chat; package com.alibaba.cloud.ai.tongyi.chat;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.alibaba.cloud.ai.tongyi.exception.TongYiException; import com.alibaba.cloud.ai.tongyi.exception.TongYiException;
import com.alibaba.dashscope.aigc.conversation.ConversationParam; import com.alibaba.dashscope.aigc.conversation.ConversationParam;
import com.alibaba.dashscope.aigc.generation.Generation; import com.alibaba.dashscope.aigc.generation.Generation;
@ -41,11 +41,11 @@ import org.slf4j.LoggerFactory;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
import org.springframework.ai.chat.ChatClient;
import org.springframework.ai.chat.ChatResponse;
import org.springframework.ai.chat.StreamingChatClient;
import org.springframework.ai.chat.messages.Message; import org.springframework.ai.chat.messages.Message;
import org.springframework.ai.chat.metadata.ChatGenerationMetadata; import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.model.StreamingChatModel;
import org.springframework.ai.chat.prompt.ChatOptions; import org.springframework.ai.chat.prompt.ChatOptions;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.model.ModelOptionsUtils; import org.springframework.ai.model.ModelOptionsUtils;
@ -54,14 +54,15 @@ import org.springframework.ai.model.function.FunctionCallbackContext;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
/** /**
* {@link ChatClient} and {@link StreamingChatClient} implementation for {@literal Alibaba DashScope} * {@link ChatModel} and {@link StreamingChatModel} implementation for {@literal Alibaba DashScope}
* backed by {@link Generation}. * backed by {@link Generation}.
* *
* @author yuluo * @author yuluo
* @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a> * @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a>
* @since 2023.0.0.0-RC1 * @since 2023.0.0.0-RC1
* @see ChatClient * @see ChatModel
* @see com.alibaba.dashscope.aigc.generation * @see com.alibaba.dashscope.aigc.generation
*/ */
@ -70,7 +71,7 @@ public class TongYiChatClient extends
com.alibaba.dashscope.common.Message, com.alibaba.dashscope.common.Message,
ConversationParam, ConversationParam,
GenerationResult> GenerationResult>
implements ChatClient, StreamingChatClient { implements ChatModel, StreamingChatModel {
private static final Logger logger = LoggerFactory.getLogger(TongYiChatClient.class); private static final Logger logger = LoggerFactory.getLogger(TongYiChatClient.class);
@ -157,13 +158,13 @@ public class TongYiChatClient extends
msgManager.add(chatCompletions); msgManager.add(chatCompletions);
List<org.springframework.ai.chat.Generation> generations = List<org.springframework.ai.chat.model.Generation> generations =
chatCompletions chatCompletions
.getOutput() .getOutput()
.getChoices() .getChoices()
.stream() .stream()
.map(choice -> .map(choice ->
new org.springframework.ai.chat.Generation( new org.springframework.ai.chat.model.Generation(
choice choice
.getMessage() .getMessage()
.getContent() .getContent()
@ -201,7 +202,7 @@ public class TongYiChatClient extends
.getMessage() .getMessage()
.getContent()) .getContent())
.map(content -> { .map(content -> {
var gen = new org.springframework.ai.chat.Generation(content) var gen = new org.springframework.ai.chat.model.Generation(content)
.withGenerationMetadata(generateChoiceMetadata( .withGenerationMetadata(generateChoiceMetadata(
message.getOutput() message.getOutput()
.getChoices() .getChoices()
@ -449,6 +450,20 @@ public class TongYiChatClient extends
return result; return result;
} }
@Override
protected Flux<GenerationResult> doChatCompletionStream(ConversationParam request) {
final Flowable<GenerationResult> genRes;
try {
genRes = generation.streamCall(request);
}
catch (NoApiKeyException | InputRequiredException e) {
logger.warn("TongYi chat client: " + e.getMessage());
throw new TongYiException(e.getMessage());
}
return Flux.from(genRes);
}
@Override @Override
protected boolean isToolFunctionCall(GenerationResult response) { protected boolean isToolFunctionCall(GenerationResult response) {

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/embedding/TongYiTextEmbeddingClient.java
Unescape Escape View File

@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.ai.document.Document; import org.springframework.ai.document.Document;
import org.springframework.ai.document.MetadataMode; import org.springframework.ai.document.MetadataMode;
import org.springframework.ai.embedding.AbstractEmbeddingClient; import org.springframework.ai.embedding.AbstractEmbeddingModel;
import org.springframework.ai.embedding.Embedding; import org.springframework.ai.embedding.Embedding;
import org.springframework.ai.embedding.EmbeddingRequest; import org.springframework.ai.embedding.EmbeddingRequest;
import org.springframework.ai.embedding.EmbeddingResponse; import org.springframework.ai.embedding.EmbeddingResponse;
@ -47,7 +47,7 @@ import org.springframework.util.Assert;
* {@see TextEmbeddingClient} * {@see TextEmbeddingClient}
*/ */
public class TongYiTextEmbeddingClient extends AbstractEmbeddingClient { public class TongYiTextEmbeddingClient extends AbstractEmbeddingModel {
private final Logger logger = LoggerFactory.getLogger(TongYiTextEmbeddingClient.class); private final Logger logger = LoggerFactory.getLogger(TongYiTextEmbeddingClient.class);

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/image/TongYiImagesClient.java
Unescape Escape View File

@ -30,8 +30,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.ai.image.Image; import org.springframework.ai.image.Image;
import org.springframework.ai.image.ImageClient;
import org.springframework.ai.image.ImageGeneration; import org.springframework.ai.image.ImageGeneration;
import org.springframework.ai.image.ImageModel;
import org.springframework.ai.image.ImageOptions; import org.springframework.ai.image.ImageOptions;
import org.springframework.ai.image.ImagePrompt; import org.springframework.ai.image.ImagePrompt;
import org.springframework.ai.image.ImageResponse; import org.springframework.ai.image.ImageResponse;
@ -48,7 +48,7 @@ import static com.alibaba.cloud.ai.tongyi.metadata.TongYiImagesResponseMetadata.
* @since 2023.0.0.0-RC1 * @since 2023.0.0.0-RC1
*/ */
public class TongYiImagesClient implements ImageClient { public class TongYiImagesClient implements ImageModel {
private final Logger logger = LoggerFactory.getLogger(TongYiImagesClient.class); private final Logger logger = LoggerFactory.getLogger(TongYiImagesClient.class);

6
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/metadata/TongYiAiChatResponseMetadata.java
Unescape Escape View File

@ -16,6 +16,8 @@
package com.alibaba.cloud.ai.tongyi.metadata; package com.alibaba.cloud.ai.tongyi.metadata;
import java.util.HashMap;
import com.alibaba.dashscope.aigc.generation.GenerationResult; import com.alibaba.dashscope.aigc.generation.GenerationResult;
import org.springframework.ai.chat.metadata.ChatResponseMetadata; import org.springframework.ai.chat.metadata.ChatResponseMetadata;
@ -23,6 +25,8 @@ import org.springframework.ai.chat.metadata.PromptMetadata;
import org.springframework.ai.chat.metadata.Usage; import org.springframework.ai.chat.metadata.Usage;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* {@link ChatResponseMetadata} implementation for {@literal Alibaba DashScope}. * {@link ChatResponseMetadata} implementation for {@literal Alibaba DashScope}.
* *
@ -31,7 +35,7 @@ import org.springframework.util.Assert;
* @since 2023.0.0.0-RC1 * @since 2023.0.0.0-RC1
*/ */
public class TongYiAiChatResponseMetadata implements ChatResponseMetadata { public class TongYiAiChatResponseMetadata extends HashMap<String, Object> implements ChatResponseMetadata {
protected static final String AI_METADATA_STRING = "{ @type: %1$s, id: %2$s, usage: %3$s, rateLimit: %4$s }"; protected static final String AI_METADATA_STRING = "{ @type: %1$s, id: %2$s, usage: %3$s, rateLimit: %4$s }";

6
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/metadata/TongYiImagesResponseMetadata.java
Unescape Escape View File

@ -16,6 +16,7 @@
package com.alibaba.cloud.ai.tongyi.metadata; package com.alibaba.cloud.ai.tongyi.metadata;
import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
import com.alibaba.dashscope.aigc.imagesynthesis.ImageSynthesisResult; import com.alibaba.dashscope.aigc.imagesynthesis.ImageSynthesisResult;
@ -31,7 +32,7 @@ import org.springframework.util.Assert;
* @since 2023.0.0.0-RC1 * @since 2023.0.0.0-RC1
*/ */
public class TongYiImagesResponseMetadata implements ImageResponseMetadata { public class TongYiImagesResponseMetadata extends HashMap<String, Object> implements ImageResponseMetadata {
private final Long created; private final Long created;
@ -74,6 +75,7 @@ public class TongYiImagesResponseMetadata implements ImageResponseMetadata {
this.usage = usage; this.usage = usage;
} }
@Override
public Long getCreated() { public Long getCreated() {
return created; return created;
} }
@ -94,7 +96,7 @@ public class TongYiImagesResponseMetadata implements ImageResponseMetadata {
this.metrics = metrics; this.metrics = metrics;
} }
@Override
public Long created() { public Long created() {
return this.created; return this.created;
} }

5
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/metadata/audio/TongYiAudioSpeechResponseMetadata.java
Unescape Escape View File

@ -15,6 +15,7 @@
*/ */
package com.alibaba.cloud.ai.tongyi.metadata.audio; package com.alibaba.cloud.ai.tongyi.metadata.audio;
import java.util.HashMap;
import com.alibaba.dashscope.audio.tts.SpeechSynthesisResult; import com.alibaba.dashscope.audio.tts.SpeechSynthesisResult;
import com.alibaba.dashscope.audio.tts.SpeechSynthesisUsage; import com.alibaba.dashscope.audio.tts.SpeechSynthesisUsage;
@ -26,13 +27,15 @@ import org.springframework.ai.model.ResponseMetadata;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* @author yuluo * @author yuluo
* @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a> * @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a>
* @since 2023.0.0.0-RC1 * @since 2023.0.0.0-RC1
*/ */
public class TongYiAudioSpeechResponseMetadata implements ResponseMetadata { public class TongYiAudioSpeechResponseMetadata extends HashMap<String, Object> implements ResponseMetadata {
private SpeechSynthesisUsage usage; private SpeechSynthesisUsage usage;

6
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/metadata/audio/TongYiAudioTranscriptionResponseMetadata.java
Unescape Escape View File

@ -16,6 +16,8 @@
package com.alibaba.cloud.ai.tongyi.metadata.audio; package com.alibaba.cloud.ai.tongyi.metadata.audio;
import java.util.HashMap;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.alibaba.dashscope.audio.asr.transcription.TranscriptionResult; import com.alibaba.dashscope.audio.asr.transcription.TranscriptionResult;
@ -26,13 +28,15 @@ import org.springframework.ai.chat.metadata.RateLimit;
import org.springframework.ai.model.ResponseMetadata; import org.springframework.ai.model.ResponseMetadata;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* @author yuluo * @author yuluo
* @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a> * @author <a href="mailto:yuluo08290126@gmail.com">yuluo</a>
* @since 2023.0.0.0 * @since 2023.0.0.0
*/ */
public class TongYiAudioTranscriptionResponseMetadata implements ResponseMetadata { public class TongYiAudioTranscriptionResponseMetadata extends HashMap<String, Object> implements ResponseMetadata {
@Nullable @Nullable
private RateLimit rateLimit; private RateLimit rateLimit;

Write Preview
Loading…
Cancel
Save