Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>

<!-- Spring version -->
<spring-ai.version>1.0.0</spring-ai.version>
<spring-boot.version>3.4.5</spring-boot.version>
<spring-ai.version>1.0.1</spring-ai.version>
<spring-boot.version>3.4.8</spring-boot.version>
<springdoc-openapi.version>2.8.8</springdoc-openapi.version>

<!-- DashScope SDK Version -->
Expand All @@ -241,7 +241,7 @@
<commons-exec.version>1.3</commons-exec.version>
<commons-collections4.version>4.4</commons-collections4.version>

<docker-java>3.3.3</docker-java>
<docker-java.version>3.5.3</docker-java.version>

<opennlp-tools.version>2.3.3</opennlp-tools.version>

Expand Down Expand Up @@ -339,7 +339,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-bom</artifactId>
<version>${docker-java.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions spring-ai-alibaba-deepresearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.5</spring-boot.version>
<spring-boot.version>3.4.8</spring-boot.version>

<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<moditect-maven-plugin.version>1.2.0.Final</moditect-maven-plugin.version>
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>

<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.3</spring-ai-alibaba.version>
<spring-ai.version>1.0.1</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>

<openhtmltopdf.version>1.1.30</openhtmltopdf.version>
<commonmark.version>0.24.0</commonmark.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -76,7 +82,9 @@ public class ChatController {
public ChatController(@Qualifier("deepResearch") StateGraph stateGraph, SearchBeanUtil searchBeanUtil,
ObjectProvider<ObservationRegistry> 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")
Expand Down
3 changes: 0 additions & 3 deletions spring-ai-alibaba-graph-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${docker-java}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -120,13 +119,11 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
<version>${docker-java}</version>
</dependency>

<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-zerodep</artifactId>
<version>${docker-java}</version>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions spring-ai-alibaba-jmanus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<jsoup-version>1.18.1</jsoup-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-boot.version>3.4.5</spring-boot.version>
<spring-ai.version>1.0.1</spring-ai.version>
<spring-boot.version>3.4.8</spring-boot.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>

Expand Down Expand Up @@ -114,7 +114,7 @@
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-starter-mcp-client-webflux</artifactId>
</dependency>

<!-- MCP SDK -->
<dependency>
<groupId>io.modelcontextprotocol.sdk</groupId>
Expand Down Expand Up @@ -319,7 +319,7 @@
<version>2.15.1</version>
</dependency>
</dependencies>


<build>
<finalName>jmanus</finalName>
Expand Down
12 changes: 0 additions & 12 deletions spring-ai-alibaba-nl2sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<properties>
<gpdb.version>3.0.0</gpdb.version>
<druid.version>1.2.22</druid.version>
<commons-lang3.version>3.9</commons-lang3.version>
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
<postgresql.version>42.4.1</postgresql.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commonmark.version>0.17.0</commonmark.version>
Expand All @@ -52,21 +50,11 @@
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>3.5.12</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down
20 changes: 6 additions & 14 deletions spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
<url>https://github.com/alibaba/spring-ai-alibaba</url>
</scm>

<properties>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -84,8 +76,8 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -94,14 +86,14 @@
<dependency>
<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-core</artifactId>
<version>${spring-ai-alibaba.version}</version>
<version>${project.version}</version>
</dependency>

<!-- Spring AI Alibaba DashScope Starter -->
<dependency>
<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-starter-dashscope</artifactId>
<version>${spring-ai-alibaba.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -121,7 +113,7 @@
<dependency>
<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-graph-core</artifactId>
<version>${spring-ai-alibaba.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -163,7 +155,7 @@
<dependency>
<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-starter-store-analyticdb</artifactId>
<version>${spring-ai-alibaba.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
13 changes: 3 additions & 10 deletions spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
<url>https://github.com/alibaba/spring-ai-alibaba</url>
</scm>

<properties>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.ai</groupId>
Expand All @@ -43,8 +36,8 @@
<artifactId>httpclient5</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -67,7 +60,7 @@
<dependency>
<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-core</artifactId>
<version>${spring-ai-alibaba.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Loading
Loading