dependencies: upgrade to Spring AI 1.0.0

Author: bsbodden

.gitignore

@@ -39,3 +39,4 @@ docs/build/
 /out/
 build/
 .gradle/
+compile_debug.log

gradle.properties

@@ -18,5 +18,5 @@ elementaryVersion            = 2.0.1
 gsonVersion                  = 2.10.1
 djlStarterVersion            = 0.26
 djlVersion                   = 0.30.0
-springAiVersion              = 1.0.0-M8
+springAiVersion              = 1.0.0
 azureIdentityVersion         = 1.15.4

redis-om-spring-ai/src/main/java/com/redis/om/spring/AIRedisConfiguration.java

@@ -14,6 +14,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.lang.Nullable;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.RestClient;
+import org.springframework.web.reactive.function.client.WebClient;
+import io.micrometer.observation.ObservationRegistry;
 
 import com.redis.om.spring.vectorize.DefaultEmbedder;
 import com.redis.om.spring.vectorize.Embedder;
@@ -79,9 +84,40 @@ public class AIRedisConfiguration {
 ////    }
 
   @Bean
-  public EmbeddingModelFactory embeddingModelFactory(AIRedisOMProperties properties,
-      SpringAiProperties springAiProperties) {
-    return new EmbeddingModelFactory(properties, springAiProperties);
+  public RestClient.Builder restClientBuilder() {
+    return RestClient.builder();
+  }
+  
+  @Bean
+  public WebClient.Builder webClientBuilder() {
+    return WebClient.builder();
+  }
+  
+  @Bean
+  public ResponseErrorHandler defaultResponseErrorHandler() {
+    return new DefaultResponseErrorHandler();
+  }
+  
+  @Bean
+  public ObservationRegistry observationRegistry() {
+    return ObservationRegistry.create();
+  }
+
+  @Bean
+  public EmbeddingModelFactory embeddingModelFactory(
+      AIRedisOMProperties properties,
+      SpringAiProperties springAiProperties, 
+      RestClient.Builder restClientBuilder,
+      WebClient.Builder webClientBuilder, 
+      ResponseErrorHandler responseErrorHandler,
+      ObservationRegistry observationRegistry) {
+    return new EmbeddingModelFactory(
+        properties, 
+        springAiProperties, 
+        restClientBuilder, 
+        webClientBuilder, 
+        responseErrorHandler, 
+        observationRegistry);
   }
 
   @Bean(

redis-om-spring-ai/src/main/java/com/redis/om/spring/vectorize/EmbeddingModelFactory.java

@@ -27,7 +27,10 @@
 import org.springframework.ai.vertexai.embedding.text.VertexAiTextEmbeddingOptions;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.util.StringUtils;
+import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestClient;
+import org.springframework.web.reactive.function.client.WebClient;
+import io.micrometer.observation.ObservationRegistry;
 
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
@@ -43,10 +46,24 @@
 public class EmbeddingModelFactory {
   private final AIRedisOMProperties properties;
   private final SpringAiProperties springAiProperties;
-
-  public EmbeddingModelFactory(AIRedisOMProperties properties, SpringAiProperties springAiProperties) {
+  private final RestClient.Builder restClientBuilder;
+  private final WebClient.Builder webClientBuilder;
+  private final ResponseErrorHandler responseErrorHandler;
+  private final ObservationRegistry observationRegistry;
+
+  public EmbeddingModelFactory(
+      AIRedisOMProperties properties, 
+      SpringAiProperties springAiProperties,
+      RestClient.Builder restClientBuilder,
+      WebClient.Builder webClientBuilder,
+      ResponseErrorHandler responseErrorHandler,
+      ObservationRegistry observationRegistry) {
     this.properties = properties;
     this.springAiProperties = springAiProperties;
+    this.restClientBuilder = restClientBuilder;
+    this.webClientBuilder = webClientBuilder;
+    this.responseErrorHandler = responseErrorHandler;
+    this.observationRegistry = observationRegistry;
   }
 
   public TransformersEmbeddingModel createTransformersEmbeddingModel(Vectorize vectorize) {
@@ -174,7 +191,12 @@ public VertexAiTextEmbeddingModel createVertexAiTextEmbeddingModel(String model)
   }
 
   public OllamaEmbeddingModel createOllamaEmbeddingModel(String model) {
-    OllamaApi api = new OllamaApi(properties.getOllama().getBaseUrl());
+    OllamaApi api = OllamaApi.builder()
+        .baseUrl(properties.getOllama().getBaseUrl())
+        .restClientBuilder(restClientBuilder)
+        .webClientBuilder(webClientBuilder)
+        .responseErrorHandler(responseErrorHandler)
+        .build();
 
     OllamaOptions options = OllamaOptions.builder().model(model).truncate(false).build();
 
@@ -228,6 +250,6 @@ public BedrockTitanEmbeddingModel createTitanEmbeddingModel(String model) {
         properties.getAws().getRegion(), ModelOptionsUtils.OBJECT_MAPPER, Duration.ofMinutes(properties.getAws()
             .getBedrockTitan().getResponseTimeOut()));
 
-    return new BedrockTitanEmbeddingModel(titanEmbeddingApi);
+    return new BedrockTitanEmbeddingModel(titanEmbeddingApi, observationRegistry);
   }
 }

redis-om-spring/src/main/java/com/redis/om/spring/RedisEnhancedKeyValueAdapter.java

@@ -498,7 +498,7 @@ private <T> T readTimeToLiveIfSet(@Nullable byte[] key, @Nullable T target) {
     }
 
     RedisPersistentEntity<?> entity = this.converter.getMappingContext().getRequiredPersistentEntity(target.getClass());
-    if (entity.hasExplictTimeToLiveProperty()) {
+    if (entity.hasExplicitTimeToLiveProperty()) {
 
       RedisPersistentProperty ttlProperty = entity.getExplicitTimeToLiveProperty();
       if (ttlProperty == null) {