Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with CosmosDBVectorStore.Builder where the different Assert.hasText(..., "... must not be empty") evaluates the current value (null) rather than the argument passes to each builder function. Fix issue where partitionKeyPath is required, yet is never configured via CosmosDBVectorStoreAutoConfiguration

Browse Source 
Signed-off-by: Jonas Muribø <jmurib@gmail.com>
This commit is contained in:
Jonas Muribø
2025-02-17 13:47:13 +01:00
committed by Ilayaperumal Gopinathan
parent fd9f388724
commit fcc56f4abf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/cosmosdb/CosmosDBVectorStoreAutoConfiguration.java
View File

@@ -77,6 +77,7 @@ public class CosmosDBVectorStoreAutoConfiguration {
.metadataFields(List.of(properties.getMetadataFields()))
.vectorStoreThroughput(properties.getVectorStoreThroughput())
.vectorDimensions(properties.getVectorDimensions())
.partitionKeyPath(properties.getPartitionKeyPath())
.build();
}

10
vector-stores/spring-ai-azure-cosmos-db-store/src/main/java/org/springframework/ai/vectorstore/cosmosdb/CosmosDBVectorStore.java
View File

@@ -416,7 +416,7 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
* @throws IllegalArgumentException if containerName is null or empty
*/
public Builder containerName(String containerName) {
Assert.hasText(this.containerName, "Container name must not be empty");
Assert.hasText(containerName, "Container name must not be empty");
this.containerName = containerName;
return this;
}
@@ -428,7 +428,7 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
* @throws IllegalArgumentException if databaseName is null or empty
*/
public Builder databaseName(String databaseName) {
Assert.hasText(this.databaseName, "Database name must not be empty");
Assert.hasText(databaseName, "Database name must not be empty");
this.databaseName = databaseName;
return this;
}
@@ -440,7 +440,7 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
* @throws IllegalArgumentException if partitionKeyPath is null or empty
*/
public Builder partitionKeyPath(String partitionKeyPath) {
Assert.hasText(this.partitionKeyPath, "Partition key path must not be empty");
Assert.hasText(partitionKeyPath, "Partition key path must not be empty");
this.partitionKeyPath = partitionKeyPath;
return this;
}
@@ -452,7 +452,7 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
* @throws IllegalArgumentException if vectorStoreThroughput is not positive
*/
public Builder vectorStoreThroughput(int vectorStoreThroughput) {
Assert.isTrue(this.vectorStoreThroughput > 0, "Vector store throughput must be positive");
Assert.isTrue(vectorStoreThroughput > 0, "Vector store throughput must be positive");
this.vectorStoreThroughput = vectorStoreThroughput;
return this;
}
@@ -464,7 +464,7 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
* @throws IllegalArgumentException if vectorDimensions is not positive
*/
public Builder vectorDimensions(long vectorDimensions) {
Assert.isTrue(this.vectorDimensions > 0, "Vector dimensions must be positive");
Assert.isTrue(vectorDimensions > 0, "Vector dimensions must be positive");
this.vectorDimensions = vectorDimensions;
return this;
}