feat: Add Azure OpenAI support with Entra ID integration

- Add dynamic support for Azure OpenAI auth via Entra ID or API key fallback
- Add Azure Entra ID properties for authentication
- Improve transformers embedding model initialization
- Centralize Spring AI properties and model creation
- Enhance OpenAI configuration with response timeout setting

Author: Luigi Fugaro

redis-om-spring/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.redis.om</groupId>
     <artifactId>redis-om-spring</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.9.12-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>redis-om-spring</name>
@@ -81,6 +81,7 @@
         <djl.version>0.30.0</djl.version>
         <junit-bom.version>5.10.2</junit-bom.version>
         <spring-ai.version>1.0.0-M6</spring-ai.version>
+        <azure-identity.version>1.15.4</azure-identity.version>
     </properties>
 
     <dependencyManagement>
@@ -235,6 +236,13 @@
             <optional>true</optional>
         </dependency>
         <!-- Spring AI end -->
+        <!-- Azure Identity begin -->
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-identity</artifactId>
+            <version>${azure-identity.version}</version>
+        </dependency>
+        <!-- Azure Identity end -->
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>

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

@@ -14,6 +14,7 @@ public class RedisOMAiProperties {
   private final Djl djl = new Djl();
   private final OpenAi openAi = new OpenAi();
   private final AzureOpenAi azureOpenAi = new AzureOpenAi();
+  private final AzureEntraId azureEntraId = new AzureEntraId();
   private final VertexAi vertexAi = new VertexAi();
   private final Aws aws = new Aws();
   private final Ollama ollama = new Ollama();
@@ -38,6 +39,10 @@ public AzureOpenAi getAzureOpenAi() {
     return azureOpenAi;
   }
 
+  public AzureEntraId getAzureEntraId() {
+    return azureEntraId;
+  }
+
   public VertexAi getVertexAi() {
     return vertexAi;
   }
@@ -268,6 +273,63 @@ public void setEndpoint(String endpoint) {
     }
   }
 
+  public static class AzureEntraId {
+    private boolean enabled = false;
+    private String apiKey;
+    private String endpoint;
+    private String tenantId;
+    private String clientId;
+    private String clientSecret;
+
+    public String getApiKey() {
+      return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+      this.apiKey = apiKey;
+    }
+
+    public String getEndpoint() {
+      return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+      this.endpoint = endpoint;
+    }
+
+    public boolean isEnabled() {
+      return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
+
+    public String getTenantId() {
+      return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+      this.tenantId = tenantId;
+    }
+
+    public String getClientId() {
+      return clientId;
+    }
+
+    public void setClientId(String clientId) {
+      this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+      return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+      this.clientSecret = clientSecret;
+    }
+  }
+
   public static class VertexAi {
     private String apiKey;
     private String endpoint;

redis-om-spring/src/main/java/com/redis/om/spring/client/RedisModulesClient.java

@@ -17,7 +17,6 @@
 import redis.clients.jedis.bloom.commands.TopKFilterCommands;
 import redis.clients.jedis.json.commands.RedisJsonCommands;
 import redis.clients.jedis.search.RediSearchCommands;
-import redis.clients.jedis.bloom.commands.TDigestSketchCommands;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -63,10 +62,6 @@ public TopKFilterCommands clientForTopK() {
     return unifiedJedis;
   }
 
-  public TDigestSketchCommands clientForTDigest() {
-    return unifiedJedis;
-  }
-
   private UnifiedJedis getUnifiedJedis() {
 
     var sentinelConfiguration = jedisConnectionFactory.getSentinelConfiguration();

redis-om-spring/src/main/java/com/redis/om/spring/ops/RedisModulesOperations.java

@@ -35,8 +35,4 @@ public CuckooFilterOperations<K> opsForCuckoFilter() {
   public TopKOperations<K> opsForTopK() {
     return new TopKOperationsImpl<>(client);
   }
-
-  public TDigestOperations<K> opsForTDigest() {
-    return new TDigestOperationsImpl<>(client);
-  }
 }

redis-om-spring/src/main/java/com/redis/om/spring/ops/pds/TopKOperations.java

@@ -1,88 +1,5 @@
 package com.redis.om.spring.ops.pds;
 
-import java.util.List;
-import java.util.Map;
-
 public interface TopKOperations<K> {
-  /**
-   * Create a new TopK filter.
-   *
-   * @param key       The key of the filter
-   * @param topk      Number of top items to keep
-   * @return Status string reply
-   */
-  String createFilter(K key, long topk);
-
-  /**
-   * Create a new TopK filter with additional parameters.
-   *
-   * @param key           The key of the filter
-   * @param topk          Number of top items to keep
-   * @param width         Number of counters kept in each array
-   * @param depth         Number of arrays
-   * @param decay         The probability of reducing a counter in an occupied bucket
-   * @return Status string reply
-   */
-  String createFilter(K key, long topk, long width, long depth, double decay);
-
-  /**
-   * Add one or more items to the filter.
-   *
-   * @param key   The key of the filter
-   * @param items Items to add to the filter
-   * @return List of items dropped from the filter
-   */
-  List<String> add(K key, String... items);
-
-  /**
-   * Increase the score of an item by increment.
-   *
-   * @param key       The key of the filter
-   * @param item      Item to increment
-   * @param increment Increment by this much
-   * @return Item dropped from the filter, or null if no item was dropped
-   */
-  String incrementBy(K key, String item, long increment);
-
-  /**
-   * Increase the score of multiple items by their increments.
-   *
-   * @param key               The key of the filter
-   * @param itemIncrementMap  Map of item to increment
-   * @return List of items dropped from the filter
-   */
-  List<String> incrementBy(K key, Map<String, Long> itemIncrementMap);
-
-  /**
-   * Check if items exist in the filter.
-   *
-   * @param key   The key of the filter
-   * @param items Items to check
-   * @return List of boolean values indicating if items exist in the filter
-   */
-  List<Boolean> query(K key, String... items);
-
-  /**
-   * Return the top k items in the filter.
-   *
-   * @param key The key of the filter
-   * @return List of items
-   */
-  List<String> list(K key);
-
-  /**
-   * Return the top k items with their respective counts.
-   *
-   * @param key The key of the filter
-   * @return Map of items to their counts
-   */
-  Map<String, Long> listWithCount(K key);
 
-  /**
-   * Get information about the filter.
-   *
-   * @param key The key of the filter
-   * @return Map of information about the filter
-   */
-  Map<String, Object> info(K key);
 }

redis-om-spring/src/main/java/com/redis/om/spring/ops/pds/TopKOperationsImpl.java

@@ -2,58 +2,10 @@
 
 import com.redis.om.spring.client.RedisModulesClient;
 
-import java.util.List;
-import java.util.Map;
-
 public class TopKOperationsImpl<K> implements TopKOperations<K> {
   final RedisModulesClient client;
 
   public TopKOperationsImpl(RedisModulesClient client) {
     this.client = client;
   }
-
-  @Override
-  public String createFilter(K key, long topk) {
-    return client.clientForTopK().topkReserve(key.toString(), topk);
-  }
-
-  @Override
-  public String createFilter(K key, long topk, long width, long depth, double decay) {
-    return client.clientForTopK().topkReserve(key.toString(), topk, width, depth, decay);
-  }
-
-  @Override
-  public List<String> add(K key, String... items) {
-    return client.clientForTopK().topkAdd(key.toString(), items);
-  }
-
-  @Override
-  public String incrementBy(K key, String item, long increment) {
-    return client.clientForTopK().topkIncrBy(key.toString(), item, increment);
-  }
-
-  @Override
-  public List<String> incrementBy(K key, Map<String, Long> itemIncrementMap) {
-    return client.clientForTopK().topkIncrBy(key.toString(), itemIncrementMap);
-  }
-
-  @Override
-  public List<Boolean> query(K key, String... items) {
-    return client.clientForTopK().topkQuery(key.toString(), items);
-  }
-
-  @Override
-  public List<String> list(K key) {
-    return client.clientForTopK().topkList(key.toString());
-  }
-
-  @Override
-  public Map<String, Long> listWithCount(K key) {
-    return client.clientForTopK().topkListWithCount(key.toString());
-  }
-
-  @Override
-  public Map<String, Object> info(K key) {
-    return client.clientForTopK().topkInfo(key.toString());
-  }
 }

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

@@ -3,6 +3,7 @@
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
 import com.azure.core.credential.AzureKeyCredential;
+import com.azure.identity.*;
 import com.redis.om.spring.RedisOMAiProperties;
 import com.redis.om.spring.annotations.Vectorize;
 import org.springframework.ai.azure.openai.AzureOpenAiEmbeddingModel;
@@ -106,6 +107,18 @@ public OpenAiEmbeddingModel createOpenAiEmbeddingModel(String model) {
         );
     }
 
+    private OpenAIClient getOpenAIClient() {
+        OpenAIClientBuilder builder = new OpenAIClientBuilder();
+        if (properties.getAzureEntraId().isEnabled()) {
+            builder.credential(new DefaultAzureCredentialBuilder().tenantId(properties.getAzureEntraId().getTenantId()).build())
+                    .endpoint(properties.getAzureEntraId().getEndpoint());
+        } else {
+            builder.credential(new AzureKeyCredential(properties.getAzureOpenAi().getApiKey()))
+                    .endpoint(properties.getAzureOpenAi().getEndpoint());
+        }
+        return builder.buildClient();
+    }
+
     public AzureOpenAiEmbeddingModel createAzureOpenAiEmbeddingModel(String deploymentName) {
         String apiKey = properties.getAzureOpenAi().getApiKey();
         if (!StringUtils.hasText(apiKey)) {
@@ -119,16 +132,13 @@ public AzureOpenAiEmbeddingModel createAzureOpenAiEmbeddingModel(String deployme
             properties.getAzureOpenAi().setEndpoint(endpoint);
         }
 
-        OpenAIClient openAIClientBuilder = new OpenAIClientBuilder()
-                .credential(new AzureKeyCredential(properties.getAzureOpenAi().getApiKey()))
-                .endpoint(properties.getAzureOpenAi().getEndpoint())
-                .buildClient();
+        OpenAIClient openAIClient = getOpenAIClient();
 
-        AzureOpenAiEmbeddingOptions options = AzureOpenAiEmbeddingOptions.builder()
+      AzureOpenAiEmbeddingOptions options = AzureOpenAiEmbeddingOptions.builder()
                 .deploymentName(deploymentName)
                 .build();
 
-        return new AzureOpenAiEmbeddingModel(openAIClientBuilder, MetadataMode.EMBED, options);
+        return new AzureOpenAiEmbeddingModel(openAIClient, MetadataMode.EMBED, options);
     }
 
     public VertexAiTextEmbeddingModel createVertexAiTextEmbeddingModel(String model) {