more tests

Author: clun

astra-db-java/src/main/java/com/datastax/astra/client/Database.java

@@ -126,6 +126,7 @@ public Database(String apiEndpoint, String token, String namespace, DataAPIOptio
         this.namespaceName = namespace;
         this.token         = token;
         this.options       = options;
+
         // Adding version number if needed
         this.databaseAdminEndpoint = apiEndpoint.endsWith(options.getApiVersion()) ?
                 apiEndpoint :
@@ -451,7 +452,7 @@ public <T> Collection<T> createCollection(String collectionName, CollectionOptio
     public void dropCollection(String collectionName) {
         runCommand(Command
                 .create("deleteCollection")
-                .append("name", collectionName), new CommandOptions());
+                .append("name", collectionName), commandOptions);
         log.info("Collection  '" + green("{}") + "' has been deleted", collectionName);
     }
 

astra-db-java/src/main/java/com/datastax/astra/client/admin/AstraDBDatabaseAdmin.java

@@ -21,12 +21,14 @@
  */
 
 import com.datastax.astra.client.DataAPIOptions;
+import com.datastax.astra.client.model.EmbeddingProvider;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.dtsx.astra.sdk.db.AstraDBOpsClient;
 import com.dtsx.astra.sdk.db.domain.Database;
 import com.dtsx.astra.sdk.db.exception.DatabaseNotFoundException;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -135,6 +137,12 @@ public Set<String> listNamespaceNames() {
                 .keyspaces().findAll();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, EmbeddingProvider> listEmbeddingProviders() {
+        return new DataAPIDatabaseAdmin(getApiEndpoint() + "/" + options.getApiVersion(), token, options).listEmbeddingProviders();
+    }
+
     /** {@inheritDoc} */
     @Override
     public void createNamespace(String namespace) {

astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java

@@ -23,6 +23,7 @@
 import com.datastax.astra.client.DataAPIOptions;
 import com.datastax.astra.client.Database;
 import com.datastax.astra.client.model.CommandOptions;
+import com.datastax.astra.client.model.EmbeddingProvider;
 import com.datastax.astra.client.model.HttpClientOptions;
 import com.datastax.astra.internal.command.AbstractCommandRunner;
 import com.datastax.astra.client.model.Command;
@@ -32,6 +33,7 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -92,6 +94,13 @@ public Set<String> listNamespaceNames() {
                 .collect(Collectors.toSet());
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, EmbeddingProvider> listEmbeddingProviders() {
+        return runCommand(Command.create("findEmbeddingProviders"))
+                .getStatusKeyAsMap("embeddingProviders", EmbeddingProvider.class);
+    }
+
     /** {@inheritDoc} */
     @Override
     public Database getDatabase(String namespaceName) {

astra-db-java/src/main/java/com/datastax/astra/client/admin/DatabaseAdmin.java

@@ -22,7 +22,9 @@
 
 import com.datastax.astra.client.Database;
 import com.datastax.astra.client.model.CommandRunner;
+import com.datastax.astra.client.model.EmbeddingProvider;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
@@ -81,6 +83,22 @@ public interface DatabaseAdmin {
      */
     Set<String> listNamespaceNames();
 
+    /**
+     * Retrieve the list of embedding providers available in the current database. Embedding providers are services
+     * that provide embeddings for text, images, or other data types. This method returns a map of provider names to
+     * {@link EmbeddingProvider} instances, allowing applications to access and utilize the embedding services.
+     *
+     * <p>Example usage:</p>
+     * <pre>
+     * {@code
+     * // Assuming 'client' is an instance of DataApiClient
+     * Map<String, EmbeddingProvider> providers = client.listEmbeddingProviders());
+     * }
+     * </pre>
+     * @return
+     */
+    Map<String, EmbeddingProvider> listEmbeddingProviders();
+
     /**
      * Asynchronously retrieves a stream of namespace names available in the current database. This method facilitates
      * non-blocking operations by allowing the application to continue executing other tasks while the list of namespace

astra-db-java/src/main/java/com/datastax/astra/client/model/CollectionOptions.java

@@ -348,9 +348,28 @@ public CollectionOptionsBuilder vector(int dimension, @NonNull SimilarityMetric
          *      self reference
          */
         public CollectionOptionsBuilder vectorize(String provider, String modeName) {
+            return vectorize(provider, modeName, null);
+        }
+
+        /**
+         * Enable Vectorization within the collection.
+         *
+         * @param provider
+         *      provider Name (LLM)
+         * @param modeName
+         *      mode name
+         * @param keyName
+         *      name of the key in the system
+         * @return
+         *      self reference
+         */
+        public CollectionOptionsBuilder vectorize(String provider, String modeName, String keyName) {
             Service embeddingService = new Service();
             embeddingService.setProvider(provider);
             embeddingService.setModelName(modeName);
+            if (keyName != null) {
+                embeddingService.setAuthentication(Map.of("providerKey", keyName + ".providerKey"));
+            }
             getVector().setService(embeddingService);
             return this;
         }
@@ -364,11 +383,13 @@ public CollectionOptionsBuilder vectorize(String provider, String modeName) {
          *      mode name
          * @param parameters
          *      expected parameters for vectorize
+         * @param keyName
+         *      name of the key in the system
          * @return
          *      self reference
          */
-        public CollectionOptionsBuilder vectorize(String provider, String modeName, Map<String, Object> parameters) {
-            vectorize(provider, modeName);
+        public CollectionOptionsBuilder vectorize(String provider, String modeName, String keyName, Map<String, Object> parameters) {
+            vectorize(provider, modeName, keyName);
             getVector().getService().setParameters(parameters);
             return this;
         }

astra-db-java/src/main/java/com/datastax/astra/client/model/EmbeddingProvider.java

@@ -0,0 +1,114 @@
+package com.datastax.astra.client.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Data
+@NoArgsConstructor
+public class EmbeddingProvider {
+
+   /** Keys for the supported authentication methods */
+   public static final String AUTHENTICATION_METHOD_NONE          = "NONE";
+
+   /** Keys for the supported authentication methods */
+   public static final String AUTHENTICATION_METHOD_SHARED_SECRET = "SHARED_SECRET";
+
+   /** Keys for the supported authentication methods */
+   public static final String AUTHENTICATION_METHOD_HEADER        = "HEADER";
+
+   /** Display name of the provider */
+   private String displayName;
+
+   /** Display name of the provider */
+   private String url;
+
+   /** Authentication */
+   private Map<String, AuthenticationMethod> supportedAuthentication;
+
+   /** Parameters fo the Servuce */
+   private List<Parameter> parameters;
+
+   /** List of models support. */
+   private List<Model> models;
+
+    /**
+     * Accessor for the Share Secret Authentication.
+     *
+     * @return
+     *      shared Secret authentication
+     */
+   public Optional<AuthenticationMethod> getSharedSecretAuthentication() {
+       return Optional.ofNullable(supportedAuthentication.get(AUTHENTICATION_METHOD_SHARED_SECRET));
+   }
+
+    /**
+     * Accessor for the Share Secret Authentication.
+     *
+     * @return
+     *      shared Secret authentication
+     */
+    public Optional<AuthenticationMethod> getHeaderAuthentication() {
+        return Optional.ofNullable(supportedAuthentication.get(AUTHENTICATION_METHOD_HEADER));
+    }
+
+    /**
+     * Model for the service.
+     */
+    @Data
+    @NoArgsConstructor
+    public static class Model {
+        private String name;
+        private Integer vectorDimension;
+        private List<Parameter> parameters;
+    }
+
+    /**
+     * Authentication method.
+     */
+   @Data
+   @NoArgsConstructor
+   public static class AuthenticationMethod {
+    private boolean enabled;
+    private List<Token> tokens;
+   }
+
+    /**
+     * Token method.
+     */
+    @Data
+    @NoArgsConstructor
+    public static class Token {
+        private String forwarded;
+        private String accepted;
+    }
+
+    /**
+     * Parameters for the service.
+     */
+    @Data
+    @NoArgsConstructor
+    public static class Parameter {
+        private String name;
+        private String type;
+        private boolean required;
+        private String defaultValue;
+        private Validation validation;
+        private String help;
+    }
+
+    /**
+     * Validation Component for the parameter.
+     */
+    @Data
+    @NoArgsConstructor
+    public static class Validation {
+        private List<Integer> numericRange;
+    }
+
+
+
+}

astra-db-java/src/main/java/com/datastax/astra/internal/api/ApiResponse.java

@@ -31,6 +31,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 /**
@@ -100,4 +101,20 @@ public <T> List<T> getStatusKeyAsList(@NonNull String key, Class<T> targetClass)
                         .constructCollectionType(List.class, targetClass));
     }
 
+    /**
+     * Retrieves a list of objects from the 'status' map based on the provided key, casting them to the specified class.
+     * This method is suitable for cases where the status information contains lists of objects under a single key.
+     *
+     * @param key The key for which to retrieve the list.
+     * @param targetClass The class to which the objects in the list should be cast.
+     * @param <T> The type of the objects in the list to be returned.
+     * @return The list of objects associated with the specified key, cast to the specified class; {@code null} if the key does not exist.
+     */
+    public <T> Map<String, T> getStatusKeyAsMap(@NonNull String key, Class<T> targetClass) {
+        Assert.isTrue(status.containsKey(key), "Key not found in status map");
+        return JsonUtils.getDataApiObjectMapper().convertValue(status.get(key),
+                JsonUtils.getDataApiObjectMapper().getTypeFactory()
+                        .constructMapType(Map.class, String.class, targetClass));
+    }
+
 }

astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java

@@ -24,7 +24,6 @@
 import com.datastax.astra.client.model.Command;
 import com.datastax.astra.client.model.CommandOptions;
 import com.datastax.astra.client.model.CommandRunner;
-import com.datastax.astra.client.model.HttpClientOptions;
 import com.datastax.astra.internal.api.ApiResponse;
 import com.datastax.astra.internal.api.ApiResponseHttp;
 import com.datastax.astra.internal.http.RetryHttpClient;
@@ -42,6 +41,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -97,7 +97,11 @@ public ApiResponse runCommand(Command command, CommandOptions<?> overridingOptio
         // === OBSERVERS ===
         List<CommandObserver> observers = new ArrayList<>(commandOptions.getObservers().values());
         if (overridingOptions != null && overridingOptions.getObservers() != null) {
-            observers.addAll(overridingOptions.getObservers().values());
+            for (Map.Entry<String, CommandObserver> observer : overridingOptions.getObservers().entrySet()) {
+                if (!commandOptions.getObservers().containsKey(observer.getKey())) {
+                    observers.add(observer.getValue());
+                }
+            }
         }
 
         // === TOKEN ===