diff --git a/pom.xml b/pom.xml index 3fd5f78f02..085dd84c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -213,8 +213,8 @@ ${java.version} - 1.0.0 - 3.4.5 + 1.0.1 + 3.4.8 2.8.8 @@ -241,7 +241,7 @@ 1.3 4.4 - 3.3.3 + 3.5.3 2.3.3 @@ -339,7 +339,13 @@ pom import - + + com.github.docker-java + docker-java-bom + ${docker-java.version} + pom + import + diff --git a/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeMultiModalChatTests.java b/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeMultiModalChatTests.java index 2aac34908a..5c487ef3e3 100644 --- a/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeMultiModalChatTests.java +++ b/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeMultiModalChatTests.java @@ -15,6 +15,13 @@ */ package com.alibaba.cloud.ai.dashscope.chat; +import java.io.IOException; +import java.net.URI; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + import com.alibaba.cloud.ai.dashscope.api.DashScopeApi; import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletion; import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionChunk; @@ -29,6 +36,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.mockito.Mockito; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; + import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.model.ChatResponse; import org.springframework.ai.chat.prompt.Prompt; @@ -39,15 +49,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.util.MimeTypeUtils; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; - -import java.io.IOException; -import java.net.URI; -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.MESSAGE_FORMAT; import static org.assertj.core.api.Assertions.assertThat; @@ -419,12 +420,11 @@ void integrationTestVideoWithMultipleFrames() throws IOException { */ @Test @Tag("integration") - @EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = ".+") + @EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = "sk.+") void integrationTestAudioWithMultipleFrames() throws IOException { // Create real API client String apiKey = System.getenv("AI_DASHSCOPE_API_KEY"); DashScopeApi realApi = DashScopeApi.builder().apiKey(apiKey).build(); - ; // Create real chat model DashScopeChatModel realChatModel = DashScopeChatModel.builder().dashScopeApi(realApi).build(); diff --git a/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/image/observation/DashScopeImageModelObservationITests.java b/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/image/observation/DashScopeImageModelObservationITests.java index be743df948..daca976665 100644 --- a/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/image/observation/DashScopeImageModelObservationITests.java +++ b/spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/image/observation/DashScopeImageModelObservationITests.java @@ -15,6 +15,8 @@ */ package com.alibaba.cloud.ai.dashscope.image.observation; +import java.util.List; + import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi; import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi.DashScopeImageAsyncResponse; import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi.DashScopeImageAsyncResponse.DashScopeImageAsyncResponseOutput; @@ -29,6 +31,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.mockito.Mockito; + import org.springframework.ai.image.Image; import org.springframework.ai.image.ImagePrompt; import org.springframework.ai.image.ImageResponse; @@ -40,8 +43,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestClient; -import java.util.List; - import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DEFAULT_BASE_URL; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -71,7 +72,7 @@ public DashScopeImageModelObservationTests() { @Test @Tag("observation") - @EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = ".*") + @EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = "sk.+") void imageModelObservationTest() { DashScopeImageOptions options = DashScopeImageOptions.builder() diff --git a/spring-ai-alibaba-deepresearch/pom.xml b/spring-ai-alibaba-deepresearch/pom.xml index 8a138ad55c..70f6f3f491 100644 --- a/spring-ai-alibaba-deepresearch/pom.xml +++ b/spring-ai-alibaba-deepresearch/pom.xml @@ -13,7 +13,7 @@ 17 17 UTF-8 - 3.4.5 + 3.4.8 3.11.0 1.2.0.Final @@ -21,8 +21,8 @@ 3.1.1 3.3.1 - 1.0.0 - 1.0.0.3 + 1.0.1 + 1.0.0.4-SNAPSHOT 1.1.30 0.24.0 diff --git a/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/controller/ChatController.java b/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/controller/ChatController.java index 90bfd1cca2..26826b63a6 100644 --- a/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/controller/ChatController.java +++ b/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/controller/ChatController.java @@ -16,6 +16,9 @@ package com.alibaba.cloud.ai.example.deepresearch.controller; +import java.util.HashMap; +import java.util.Map; + import com.alibaba.cloud.ai.example.deepresearch.config.DeepResearchProperties; import com.alibaba.cloud.ai.example.deepresearch.controller.graph.GraphProcess; import com.alibaba.cloud.ai.example.deepresearch.controller.request.ChatRequestProcess; @@ -32,7 +35,7 @@ import com.alibaba.cloud.ai.graph.StateGraph; import com.alibaba.cloud.ai.graph.async.AsyncGenerator; import com.alibaba.cloud.ai.graph.checkpoint.config.SaverConfig; -import com.alibaba.cloud.ai.graph.checkpoint.constant.SaverConstant; +import com.alibaba.cloud.ai.graph.checkpoint.constant.SaverEnum; import com.alibaba.cloud.ai.graph.checkpoint.savers.MemorySaver; import com.alibaba.cloud.ai.graph.exception.GraphRunnerException; import com.alibaba.cloud.ai.graph.exception.GraphStateException; @@ -41,19 +44,22 @@ import io.micrometer.observation.ObservationRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.MediaType; import org.springframework.http.codec.ServerSentEvent; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; - -import java.util.HashMap; -import java.util.Map; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author yingzi @@ -76,7 +82,9 @@ public class ChatController { public ChatController(@Qualifier("deepResearch") StateGraph stateGraph, SearchBeanUtil searchBeanUtil, ObjectProvider observationRegistry, DeepResearchProperties deepResearchProperties) throws GraphStateException { - SaverConfig saverConfig = SaverConfig.builder().register(SaverConstant.MEMORY, new MemorySaver()).build(); + SaverConfig saverConfig = SaverConfig.builder() + .register(SaverEnum.MEMORY.getValue(), new MemorySaver()) + .build(); this.compiledGraph = stateGraph.compile(CompileConfig.builder() .saverConfig(saverConfig) .interruptBefore("human_feedback") diff --git a/spring-ai-alibaba-graph-core/pom.xml b/spring-ai-alibaba-graph-core/pom.xml index 2840b9c1ce..931d217c57 100644 --- a/spring-ai-alibaba-graph-core/pom.xml +++ b/spring-ai-alibaba-graph-core/pom.xml @@ -97,7 +97,6 @@ com.github.docker-java docker-java - ${docker-java} org.apache.httpcomponents @@ -120,13 +119,11 @@ com.github.docker-java docker-java-core - ${docker-java} com.github.docker-java docker-java-transport-zerodep - ${docker-java} diff --git a/spring-ai-alibaba-jmanus/pom.xml b/spring-ai-alibaba-jmanus/pom.xml index 89cc7d5a83..9fb11e6867 100644 --- a/spring-ai-alibaba-jmanus/pom.xml +++ b/spring-ai-alibaba-jmanus/pom.xml @@ -15,8 +15,8 @@ 1.18.1 UTF-8 UTF-8 - 1.0.0 - 3.4.5 + 1.0.1 + 3.4.8 3.1.1 3.3.1 @@ -114,7 +114,7 @@ org.springframework.ai spring-ai-starter-mcp-client-webflux - + io.modelcontextprotocol.sdk @@ -319,7 +319,7 @@ 2.15.1 - + jmanus diff --git a/spring-ai-alibaba-nl2sql/pom.xml b/spring-ai-alibaba-nl2sql/pom.xml index 2e64f4c43e..f1bbf036a5 100644 --- a/spring-ai-alibaba-nl2sql/pom.xml +++ b/spring-ai-alibaba-nl2sql/pom.xml @@ -28,8 +28,6 @@ 3.0.0 1.2.22 - 3.9 - 8.0.15 42.4.1 3.2.1 0.17.0 @@ -52,21 +50,11 @@ druid ${druid.version} - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - com.baomidou mybatis-plus-spring-boot3-starter 3.5.12 - - mysql - mysql-connector-java - ${mysql-connector-java.version} - org.postgresql postgresql diff --git a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml index a5f42d30bc..a559dba86d 100644 --- a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml +++ b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml @@ -17,14 +17,6 @@ https://github.com/alibaba/spring-ai-alibaba - - 1.0.0 - 1.0.0.4-SNAPSHOT - 17 - 17 - UTF-8 - - @@ -84,8 +76,8 @@ commons-lang3 - mysql - mysql-connector-java + com.mysql + mysql-connector-j org.postgresql @@ -94,14 +86,14 @@ com.alibaba.cloud.ai spring-ai-alibaba-core - ${spring-ai-alibaba.version} + ${project.version} com.alibaba.cloud.ai spring-ai-alibaba-starter-dashscope - ${spring-ai-alibaba.version} + ${project.version} org.springframework @@ -121,7 +113,7 @@ com.alibaba.cloud.ai spring-ai-alibaba-graph-core - ${spring-ai-alibaba.version} + ${project.version} @@ -163,7 +155,7 @@ com.alibaba.cloud.ai spring-ai-alibaba-starter-store-analyticdb - ${spring-ai-alibaba.version} + ${project.version} org.springframework.boot diff --git a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml index cac1ab5442..3900398a4e 100644 --- a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml +++ b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml @@ -17,13 +17,6 @@ https://github.com/alibaba/spring-ai-alibaba - - 1.0.0 - 1.0.0.4-SNAPSHOT - 17 - 17 - UTF-8 - org.springframework.ai @@ -43,8 +36,8 @@ httpclient5 - mysql - mysql-connector-java + com.mysql + mysql-connector-j org.postgresql @@ -67,7 +60,7 @@ com.alibaba.cloud.ai spring-ai-alibaba-core - ${spring-ai-alibaba.version} + ${project.version} compile diff --git a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-management/pom.xml b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-management/pom.xml index 26f0154fa5..03a9bd8b44 100644 --- a/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-management/pom.xml +++ b/spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-management/pom.xml @@ -17,14 +17,6 @@ https://github.com/alibaba/spring-ai-alibaba - - 1.0.0 - 1.0.0.4-SNAPSHOT - 17 - 17 - UTF-8 - - com.alibaba.cloud.ai @@ -103,14 +95,14 @@ com.alibaba.cloud.ai spring-ai-alibaba-core - ${spring-ai-alibaba.version} + ${project.version} com.alibaba.cloud.ai spring-ai-alibaba-starter-dashscope - ${spring-ai-alibaba.version} + ${project.version}