Revert "chore: update some code"

pom.xml

@@ -518,4 +518,4 @@
 			</releases>
 		</repository>
 	</repositories>
-</project>
+</project>

spring-ai-alibaba-core/pom.xml

@@ -53,6 +53,7 @@
 		</dependency>
 
 		<!-- test dependencies -->
+
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-test</artifactId>
@@ -72,4 +73,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeAutoConfiguration.java

@@ -65,7 +65,6 @@
 
 /**
  * @author nuocheng.lxm
- * @author yuluo
  * @date 2024/8/16 11:45
  */
 @AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
@@ -228,4 +227,33 @@ private record ResolvedConnectionProperties(String baseUrl, String apiKey, Strin
 				CollectionUtils.toMultiValueMap(connectionHeaders));
 	}
 
+	/**
+	 * Setting the API key.
+	 * @param connectionProperties {@link DashScopeConnectionProperties}
+	 */
+	private void settingApiKey(DashScopeConnectionProperties connectionProperties) {
+		String apiKey;
+		try {
+			// It is recommended to set the key by defining the api-key in an environment
+			// variable.
+			var envKey = System.getenv(DASHSCOPE_API_KEY);
+			if (Objects.nonNull(envKey)) {
+				Constants.apiKey = envKey;
+				return;
+			}
+			if (Objects.nonNull(connectionProperties.getApiKey())) {
+				apiKey = connectionProperties.getApiKey();
+			}
+			else {
+				apiKey = ApiKey.getApiKey(null);
+			}
+
+			Constants.apiKey = apiKey;
+		}
+		catch (NoApiKeyException e) {
+			throw new RuntimeException(e.getMessage());
+		}
+
+	}
+
 }

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeChatProperties.java

@@ -33,12 +33,12 @@
 public class DashScopeChatProperties extends DashScopeParentProperties {
 
 	/**
-	 * Spring AI Alibaba configuration prefix.
+	 * Spring Cloud Alibaba AI configuration prefix.
 	 */
 	public static final String CONFIG_PREFIX = "spring.ai.dashscope.chat";
 
 	/**
-	 * Default DashScope Chat model.
+	 * Default DashScope Qwen Chat model.
 	 */
 	public static final String DEFAULT_DEPLOYMENT_NAME = Generation.Models.QWEN_TURBO;
 
@@ -48,7 +48,7 @@ public class DashScopeChatProperties extends DashScopeParentProperties {
 	private static final Float DEFAULT_TEMPERATURE = 0.8f;
 
 	/**
-	 * Enable Dashscope ai chat client.
+	 * Enable qwen ai chat client.
 	 */
 	private boolean enabled = true;
 

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeConnectionProperties.java

@@ -22,7 +22,7 @@
 import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DEFAULT_READ_TIMEOUT;
 
 /**
- * Spring AI Alibaba TongYi LLM connection properties.
+ * Spring Cloud Alibaba AI TongYi LLM connection properties.
  *
  * @author yuluo
  * @author <a href="mailto:[email protected]">yuluo</a>

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeImageProperties.java

@@ -34,17 +34,17 @@
 public class DashScopeImageProperties extends DashScopeParentProperties {
 
 	/**
-	 * Spring AI Alibaba configuration prefix.
+	 * Spring Cloud Alibaba AI configuration prefix.
 	 */
 	public static final String CONFIG_PREFIX = "spring.ai.dashscope.image";
 
 	/**
-	 * Default DashScope Chat model.
+	 * Default TongYi Chat model.
 	 */
 	public static final String DEFAULT_IMAGES_MODEL_NAME = ImageSynthesis.Models.WANX_V1;
 
 	/**
-	 * Enable DashScope ai images client.
+	 * Enable TongYiQWEN ai images client.
 	 */
 	private boolean enabled = true;
 

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeParentProperties.java

@@ -49,11 +49,11 @@ public void setBaseUrl(String baseUrl) {
 		this.baseUrl = baseUrl;
 	}
 
-	public String getWorkspaceId() {
+	String getWorkspaceId() {
 		return workspaceId;
 	}
 
-	public void setWorkspaceId(String workspaceId) {
+	void setWorkspaceId(String workspaceId) {
 		this.workspaceId = workspaceId;
 	}
 

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/api/DashScopeApi.java

@@ -38,8 +38,6 @@
 
 /**
  * @author nuocheng.lxm
- * @author yuluo
- *
  * @date 2024/7/31 14:15
  */
 public class DashScopeApi {
@@ -347,19 +345,28 @@ public record DocumentChunk(@JsonProperty("chunk_id") int chunkId, @JsonProperty
 		}
 	}
 
+	/**
+	 * 上传文件 返回文件ID
+	 * @param file
+	 * @param request
+	 * @return
+	 */
 	public String upload(File file, UploadRequest request) {
 		// 申请上传
 		ResponseEntity<UploadLeaseResponse> responseEntity = uploadLease(request);
 		var uploadLeaseResponse = responseEntity.getBody();
 		if (uploadLeaseResponse == null) {
 			throw new DashScopeException(ErrorCodeEnum.READER_APPLY_LEASE_ERROR);
 		}
-		if (!"SUCCESS".equalsIgnoreCase(uploadLeaseResponse.code())) {
+		if (!"SUCCESS".equals(uploadLeaseResponse.code().toUpperCase())) {
 			throw new DashScopeException("ApplyLease Failed,code:%s,message:%s".formatted(uploadLeaseResponse.code(),
 					uploadLeaseResponse.message()));
 		}
+		// 上传文件
 		uploadFile(file, uploadLeaseResponse);
-        return addFile(uploadLeaseResponse.data.leaseId(), request);
+		// 开始解析
+		String fileId = addFile(uploadLeaseResponse.data.leaseId(), request);
+		return fileId;
 	}
 
 	public ResponseEntity<CommonResponse<QueryFileResponseData>> queryFileInfo(String categoryId,
@@ -444,7 +451,8 @@ public String getFilename() {
 				}
 			};
 			HttpEntity<InputStreamResource> requestEntity = new HttpEntity<>(resource, headers);
-			restTemplate.exchange(new URI(uploadParam.url), HttpMethod.PUT, requestEntity, Void.class);
+			ResponseEntity<Void> response = restTemplate.exchange(new URI(uploadParam.url), HttpMethod.PUT,
+					requestEntity, Void.class);
 		}
 		catch (Exception ex) {
 			throw new DashScopeException("Upload File Failed", ex);
@@ -664,8 +672,8 @@ public void upsertPipeline(List<Document> documents, DashScopeStoreOptions store
 								retrieverOptions.getRerankModelName())),
 						retrieverOptions.getRerankMinScore(), retrieverOptions.getRerankTopN()));
 		List<String> documentIdList = documents.stream()
+			.filter(e -> e.getId() != null)
 			.map(Document::getId)
-			.filter(Objects::nonNull)
 			.collect(Collectors.toList());
 		UpsertPipelineRequest upsertPipelineRequest = new UpsertPipelineRequest(storeOptions.getIndexName(),
 				"MANAGED_SHARED", null, "unstructured", "recommend",
@@ -681,7 +689,7 @@ public void upsertPipeline(List<Document> documents, DashScopeStoreOptions store
 			.retrieve()
 			.toEntity(UpsertPipelineResponse.class);
 		if (upsertPipelineResponse.getBody() == null
-				|| !"SUCCESS".equalsIgnoreCase(upsertPipelineResponse.getBody().status)) {
+				|| !"SUCCESS".equals(upsertPipelineResponse.getBody().status.toUpperCase())) {
 			throw new DashScopeException(ErrorCodeEnum.CREATE_INDEX_ERROR);
 		}
 		String pipelineId = upsertPipelineResponse.getBody().id;
@@ -691,7 +699,7 @@ public void upsertPipeline(List<Document> documents, DashScopeStoreOptions store
 			.retrieve()
 			.toEntity(StartPipelineResponse.class);
 		if (startPipelineResponse.getBody() == null
-				|| !"SUCCESS".equalsIgnoreCase(startPipelineResponse.getBody().code)
+				|| !"SUCCESS".equals(startPipelineResponse.getBody().code.toUpperCase())
 				|| startPipelineResponse.getBody().ingestionId == null) {
 			throw new DashScopeException(ErrorCodeEnum.INDEX_ADD_DOCUMENT_ERROR);
 		}
@@ -707,7 +715,7 @@ public boolean deletePipelineDocument(String pipelineId, List<String> idList) {
 			.retrieve()
 			.toEntity(DelePipelineDocumentResponse.class);
 		if (deleDocumentResponse == null || deleDocumentResponse.getBody() == null
-				|| !"SUCCESS".equalsIgnoreCase(deleDocumentResponse.getBody().code)) {
+				|| !"SUCCESS".equals(deleDocumentResponse.getBody().code.toUpperCase())) {
 			return false;
 		}
 		return true;
@@ -728,11 +736,11 @@ public List<Document> retriever(String pipelineId, String query, DashScopeDocume
 			.retrieve()
 			.toEntity(DocumentRetrieveResponse.class);
 		if (deleDocumentResponse == null || deleDocumentResponse.getBody() == null
-				|| !"SUCCESS".equalsIgnoreCase(deleDocumentResponse.getBody().code)) {
+				|| !"SUCCESS".equals(deleDocumentResponse.getBody().code.toUpperCase())) {
 			throw new DashScopeException(ErrorCodeEnum.RETRIEVER_DOCUMENT_ERROR);
 		}
 		List<DocumentRetrieveResponse.DocumentRetrieveResponseNode> nodeList = deleDocumentResponse.getBody().nodes;
-		if (nodeList == null || nodeList.isEmpty()) {
+		if (nodeList == null || nodeList.size() == 0) {
 			return new ArrayList<>();
 		}
 		List<Document> documents = new ArrayList<>();

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/api/DashScopeAudioApi.java

@@ -180,7 +180,7 @@ public record SpeechRequest(
 		 */
 		public enum Voice {
 
-			// @formatter:off
+		// @formatter:off
 			@JsonProperty("alloy") ALLOY("alloy"),
 			@JsonProperty("echo") ECHO("echo"),
 			@JsonProperty("fable") FABLE("fable"),
@@ -191,7 +191,7 @@ public enum Voice {
 
 			public final String value;
 
-			Voice(String value) {
+			private Voice(String value) {
 				this.value = value;
 			}
 
@@ -481,7 +481,7 @@ public Class<?> getResponseType() {
 	 */
 	@JsonInclude(Include.NON_NULL)
 	public record TranslationRequest(
-		// @formatter:off
+	// @formatter:off
 		@JsonProperty("file") byte[] file,
 		@JsonProperty("model") String model,
 		@JsonProperty("prompt") String prompt,
@@ -557,7 +557,7 @@ public TranslationRequest build() {
 	 */
 	@JsonInclude(Include.NON_NULL)
 	public record StructuredResponse(
-		// @formatter:off
+	// @formatter:off
 		@JsonProperty("language") String language,
 		@JsonProperty("duration") Float duration,
 		@JsonProperty("text") String text,
@@ -566,7 +566,7 @@ public record StructuredResponse(
 		// @formatter:on
 
 		/**
-		 * Extracted word and it's corresponding timestamps.
+		 * Extracted word and it corresponding timestamps.
 		 *
 		 * @param word The text content of the word.
 		 * @param start The start time of the word in seconds.
@@ -600,7 +600,7 @@ public record Word(
 		 */
 		@JsonInclude(Include.NON_NULL)
 		public record Segment(
-			// @formatter:off
+		// @formatter:off
 			@JsonProperty("id") Integer id,
 			@JsonProperty("seek") Integer seek,
 			@JsonProperty("start") Float start,

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/DashScopeAudioSpeechModelOpenAPI.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.cloud.ai.dashscope.audio;
 
+import java.nio.ByteBuffer;
+
 import com.alibaba.cloud.ai.dashscope.api.DashScopeAudioApi;
 import com.alibaba.cloud.ai.dashscope.audio.speech.Speech;
 import com.alibaba.cloud.ai.dashscope.audio.speech.SpeechModel;
@@ -27,6 +29,7 @@
 import com.alibaba.cloud.ai.dashscope.metadata.audio.DashScopeAudioSpeechResponseMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.metadata.RateLimit;
 import org.springframework.ai.retry.RetryUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.retry.support.RetryTemplate;
@@ -35,6 +38,8 @@
 
 import reactor.core.publisher.Flux;
 
+import static org.springframework.util.ObjectUtils.isEmpty;
+
 /**
  * OpenAI audio speech client implementation for backed by {@link DashScopeAudioApi}.
  *

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/DashScopeAudioTranscriptionModelOpenAPI.java

@@ -17,14 +17,18 @@
 package com.alibaba.cloud.ai.dashscope.audio;
 
 import com.alibaba.cloud.ai.dashscope.api.DashScopeAudioApi;
+import com.alibaba.cloud.ai.dashscope.metadata.audio.DashScopeAudioTranscriptionResponseMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.ai.audio.transcription.AudioTranscription;
 import org.springframework.ai.audio.transcription.AudioTranscriptionPrompt;
 import org.springframework.ai.audio.transcription.AudioTranscriptionResponse;
+import org.springframework.ai.chat.metadata.RateLimit;
 import org.springframework.ai.model.Model;
 import org.springframework.ai.retry.RetryUtils;
 import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;
 

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/DashScopeAudioTranscriptionOptions.java

@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.springframework.ai.audio.transcription.AudioTranscriptionOptions;
+import org.springframework.ai.model.ModelOptions;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/speech/Speech.java

@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.ai.dashscope.audio.speech;
 
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Objects;
 

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/speech/SpeechModel.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.cloud.ai.dashscope.audio.speech;
 
+import java.nio.ByteBuffer;
+
 import org.springframework.ai.model.Model;
 
 /**

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/speech/SpeechStreamModel.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.cloud.ai.dashscope.audio.speech;
 
+import java.nio.ByteBuffer;
+
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.model.StreamingModel;

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/audio/speech/StreamingSpeechModel.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.cloud.ai.dashscope.audio.speech;
 
+import java.nio.ByteBuffer;
+
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.model.StreamingModel;

spring-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeChatModel.java

@@ -41,15 +41,6 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
 
-/**
- * {@link ChatModel} implementation for {@literal Alibaba DashScope}
- * backed by {@link Generation}.
- *
- * @author yuluo
- * @author <a href="mailto:[email protected]">yuluo</a>
- * @see ChatModel
- * @see com.alibaba.dashscope.aigc.generation
- */
 public class DashScopeChatModel extends AbstractToolCallSupport implements ChatModel {
 
 	private static final Logger logger = LoggerFactory.getLogger(DashScopeChatModel.class);
@@ -150,7 +141,7 @@ public Flux<ChatResponse> stream(Prompt prompt) {
 					@SuppressWarnings("null")
 					String requestId = chatCompletion2.requestId();
 
-						// @formatter:off
+			// @formatter:off
 						List<Generation> generations = chatCompletion2.output().choices().stream().map(choice -> {
 							if (choice.message().role() != null) {
 								roleMap.putIfAbsent(requestId, choice.message().role().name());