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
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* Auto-configuration for Redis Chat Memory using Lettuce.
*
* @author benym
* @date 2025/7/31 16:23
* @since 2025/7/31 16:23
*/
@AutoConfiguration(before = ChatMemoryAutoConfiguration.class)
@ConditionalOnClass({ LettuceRedisChatMemoryRepository.class, RedisClient.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Auto-configuration for Redis Memory support.
*
* @author benym
* @date 2025/7/30 23:35
* @since 2025/7/30 23:35
*/
@AutoConfiguration
@EnableConfigurationProperties(RedisChatMemoryProperties.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* Configuration for Redis Memory using Redis Cluster
*
* @author benym
* @date 2025/7/30 21:33
* @since 2025/7/30 21:33
*/
public record RedisChatMemoryClusterConfiguration(List<String> nodeAddresses, String username, String password,
int timeout) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Base Redis Memory Connection Configuration
*
* @author benym
* @date 2025/7/30 21:24
* @since 2025/7/30 21:24
*/
public abstract class RedisChatMemoryConnectionAutoConfiguration<T extends ChatMemoryRepository> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Adapts RedisChatMemoryProperties to RedisChatMemoryConnectionDetails.
*
* @author benym
* @date 2025/7/30 20:39
* @since 2025/7/30 20:39
*/
public class RedisChatMemoryConnectionDetails implements RedisConnectionDetails {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* Configuration for Redis Memory using Redis Standalone
*
* @author benym
* @date 2025/7/30 21:32
* @since 2025/7/30 21:32
*/
public record RedisChatMemoryStandaloneConfiguration(String hostName, int port, String username, String password,
int timeout) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* Auto-configuration for Redis Chat Memory using Redisson.
*
* @author benym
* @date 2025/7/30 19:01
* @since 2025/7/30 19:01
*/
@AutoConfiguration(before = ChatMemoryAutoConfiguration.class)
@ConditionalOnClass({ RedissonRedisChatMemoryRepository.class, RedissonClient.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* Base class for Redis-based chat memory repositories
*
* @author benym
* @date 2025/7/31 0:05
* @since 2025/7/31 0:05
*/
public abstract class BaseRedisChatMemoryRepository implements ChatMemoryRepository, AutoCloseable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* Redis implementation of ChatMemoryRepository using Lettuce
*
* @author benym
* @date 2025/7/31 14:40
* @since 2025/7/31 14:40
*/
public class LettuceRedisChatMemoryRepository extends BaseRedisChatMemoryRepository {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* Redis implementation of ChatMemoryRepository using Redisson
*
* @author benym
* @date 2025/7/30 18:47
* @since 2025/7/30 18:47
*/
public class RedissonRedisChatMemoryRepository extends BaseRedisChatMemoryRepository {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* Integration test using Testcontainers to automatically manage Redis test environment
*
* @author benym
* @date 2025/7/31 16:48
* @since 2025/7/31 16:48
*/
@SpringBootTest(classes = LettuceRedisChatMemoryRepositoryIT.TestConfiguration.class)
@Testcontainers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* Integration test using Testcontainers to automatically manage Redis test environment
*
* @author benym
* @date 2025/7/31 16:47
* @since 2025/7/31 16:47
*/
@SpringBootTest(classes = RedissonRedisChatMemoryRepositoryIT.TestConfiguration.class)
@Testcontainers
Expand Down
26 changes: 13 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<properties>

<!-- Spring AI Alibaba Version -->
<revision>1.0.0.3-SNAPSHOT</revision>
<revision>1.0.0.3</revision>

<!-- Maven project basic config -->
<java.version>17</java.version>
Expand Down Expand Up @@ -303,6 +303,8 @@
<maven-checkstyle-plugin.failOnViolation>true</maven-checkstyle-plugin.failOnViolation>
<puppycrawl-tools-checkstyle.version>9.3</puppycrawl-tools-checkstyle.version>
<spotless.version>2.44.5</spotless.version>

<central.publishing.maven.version>0.7.0</central.publishing.maven.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -589,18 +591,7 @@
<profile>
<id>release</id>

<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<distributionManagement></distributionManagement>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -659,6 +650,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central.publishing.maven.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion spring-ai-alibaba-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>com.alibaba.cloud.ai</groupId>
<artifactId>spring-ai-alibaba-bom</artifactId>
<version>1.0.0.3-SNAPSHOT</version>
<version>1.0.0.3</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion spring-ai-alibaba-deepresearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<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-SNAPSHOT</spring-ai-alibaba.version>
<spring-ai-alibaba.version>1.0.0.3</spring-ai-alibaba.version>

<openhtmltopdf.version>1.0.10</openhtmltopdf.version>
<commonmark.version>0.24.0</commonmark.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public boolean isInterrupted(String nodeId) {
/**
* Marks a node as not interrupted by setting its value to false in the metadata.
* @param nodeId the ID of the node to mark as not interrupted
* @return a new {@code RunnableConfig} instance with the updated metadata
*/
public void withNodeResumed(String nodeId) {
String formattedNodeId = HasMetadata.formatNodeId(nodeId);
Expand All @@ -105,7 +104,6 @@ public void withNodeResumed(String nodeId) {
* Removes the interrupted marker for a specific node by removing its entry from the
* metadata.
* @param nodeId the ID of the node to remove the interrupted marker for
* @return a new {@code RunnableConfig} instance with the updated metadata
*/
public void removeInterrupted(String nodeId) {
String formattedNodeId = HasMetadata.formatNodeId(nodeId);
Expand All @@ -120,7 +118,6 @@ public void removeInterrupted(String nodeId) {
* node ID is formatted using {@link #formatNodeId(String)} and associated with a
* value of {@code true} in the metadata map.
* @param nodeId the ID of the node to mark as interrupted; must not be null
* @return this {@code Builder} instance for method chaining
* @throws NullPointerException if nodeId is null
*/
public void markNodeAsInterrupted(String nodeId) {
Expand Down Expand Up @@ -247,7 +244,7 @@ public Builder threadId(String threadId) {

/**
* Sets the checkpoint ID for the configuration.
* @param {@code checkPointId} - the ID of the checkpoint to be set
* @param checkPointId {@code checkPointId} - the ID of the checkpoint to be set
* @return {@literal this} - a reference to the current `Builder` instance
*/
public Builder checkPointId(String checkPointId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ private static String getStrReplaced(String jsonTemplate) {
* Parse nested JSON string.
* @param json JSON string
* @return parsed JSON object
* @throws Exception if parsing fails
* @throws JsonProcessingException if parsing fails
*/
public static Object parseNestedJson(String json) throws JsonProcessingException {
JsonNode rootNode = mapper.readTree(json);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
<name>Spring AI Alibaba Graph Examples</name>

<description>Spring AI Alibaba Graph Example</description>
<url>https://github.com/alibaba/spring-ai-alibaba</url>
<scm>
<connection>git://github.com/alibaba/spring-ai-alibaba.git</connection>
<developerConnection>git@github.com:alibaba/spring-ai-alibaba.git</developerConnection>
<url>https://github.com/alibaba/spring-ai-alibaba</url>
</scm>

<properties>
<gson.version>2.10.1</gson.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,19 @@
<artifactId>spring-ai-alibaba-graph-studio</artifactId>
<name>Spring AI Graph Studio</name>

<url>https://github.com/alibaba/spring-ai-alibaba</url>
<scm>
<connection>git://github.com/alibaba/spring-ai-alibaba.git</connection>
<developerConnection>git@github.com:alibaba/spring-ai-alibaba.git</developerConnection>
<url>https://github.com/alibaba/spring-ai-alibaba</url>
</scm>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<spring-initializr.version>0.21.0</spring-initializr.version>
<org.eclipse.jdt.core.version>3.42.0</org.eclipse.jdt.core.version>

<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-ai-alibaba-jmanus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>

<!-- Spring AI Alibaba is adapting to Spring AI M8, latest code may fail to run -->
<spring-ai-alibaba.version>1.0.0.3-SNAPSHOT</spring-ai-alibaba.version>
<spring-ai-alibaba.version>1.0.0.3</spring-ai-alibaba.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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/**
* @author dahua
* @date 2025/7/12 13:02
* @since 2025/7/12 13:02
*/
@Converter
public class MapToStringConverter implements AttributeConverter<Map<String, String>, String> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

/**
* @author lizhenning
* @date 2025/7/8
* @since 2025/7/8
*/
public enum ModelType {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/**
* @author lizhenning
* @date 2025/7/8
* @since 2025/7/8
*/
public class ModelConfig {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/**
* @author lizhenning
* @date 2025/7/8
* @since 2025/7/8
*/
@Service
public class ModelDataInitialization implements IModelDataInitialization {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

/**
* @author lizhenning
* @date 2025/7/8
* @since 2025/7/8
*/
public class NamespaceConfig {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.3-SNAPSHOT</spring-ai-alibaba.version>
<spring-ai-alibaba.version>1.0.0.3</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public String callWithSystemPrompt(String system, String user) {
/**
* 流式返回用户prompt的回复
* @param prompt 用户输入的提示
* @return Flux<ChatResponse> 流式响应
* @return 流式响应
*/
public Flux<ChatResponse> streamCall(String prompt) {
return chatClient.prompt().user(prompt).stream().chatResponse();
Expand All @@ -50,7 +50,7 @@ public Flux<ChatResponse> streamCall(String prompt) {
* 流式返回用户prompt的回复,带有系统提示
* @param system 系统提示
* @param user 用户输入
* @return Flux<ChatResponse> 流式响应
* @return 流式响应
*/
public Flux<ChatResponse> streamCallWithSystemPrompt(String system, String user) {
return chatClient.prompt().system(system).user(user).stream().chatResponse();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.3-SNAPSHOT</spring-ai-alibaba.version>
<spring-ai-alibaba.version>1.0.0.3</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<spring-ai.version>1.0.0</spring-ai.version>
<spring-ai-alibaba.version>1.0.0.3-SNAPSHOT</spring-ai-alibaba.version>
<spring-ai-alibaba.version>1.0.0.3</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>
Expand Down
Loading