Skip to content

Commit caa7b96

Browse files
clunclun
authored
Merge pull request #47 from datastax/main
Updating 2.0 with latest
2 parents a2706e9 + e2c424f commit caa7b96

File tree

247 files changed

+18410
-7064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+18410
-7064
lines changed

‎File

Whitespace-only changes.

‎Preferences...

Whitespace-only changes.

‎RELEASE.MD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,11 @@ cd ~/.ssh
4343
ssh-add githubff4j
4444
```
4545

46+
- [x] Deploy
47+
48+
```console
49+
mvn versions:set -DnewVersion=2.0.0-PREVIEW3 -DgenerateBackupPoms=false
50+
git tag 2.0.1 && git push origin 2.0.1
51+
```
52+
4653

‎Resources

Whitespace-only changes.

‎astra-db-java-tools/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.datastax.astra</groupId>
99
<artifactId>astra-db-java-parent</artifactId>
10-
<version>2.0.0-PREVIEW1-SNAPSHOT</version>
10+
<version>2.0.0-PREVIEW3</version>
1111
</parent>
1212

1313
<dependencies>
@@ -24,12 +24,12 @@
2424
<dependency>
2525
<groupId>org.apache.commons</groupId>
2626
<artifactId>commons-csv</artifactId>
27-
<version>1.12.0</version>
27+
<version>1.14.0</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>com.opencsv</groupId>
3131
<artifactId>opencsv</artifactId>
32-
<version>5.9</version>
32+
<version>5.10</version>
3333
</dependency>
3434
</dependencies>
3535

‎astra-db-java-tools/src/main/java/com/datastax/astra/tool/loader/rag/RagRepository.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
import com.datastax.astra.client.core.vectorize.VectorServiceOptions;
88
import com.datastax.astra.client.databases.Database;
99
import com.datastax.astra.client.databases.DatabaseOptions;
10+
import com.datastax.astra.client.databases.commands.options.CreateKeyspaceOptions;
1011
import com.datastax.astra.client.databases.definition.DatabaseInfo;
12+
import com.datastax.astra.client.databases.definition.keyspaces.KeyspaceDefinition;
1113
import com.datastax.astra.client.tables.Table;
1214
import com.datastax.astra.client.tables.commands.options.CreateTableOptions;
1315
import com.datastax.astra.client.tables.commands.options.CreateVectorIndexOptions;
1416
import com.datastax.astra.client.tables.definition.rows.Row;
15-
import com.datastax.astra.internal.utils.Utils;
1617
import com.datastax.astra.tool.loader.rag.ingestion.RagEmbeddingsModels;
1718
import com.datastax.astra.tool.loader.rag.ingestion.RagIngestionConfig;
1819
import com.datastax.astra.tool.loader.rag.ingestion.RagIngestionJob;
@@ -24,6 +25,8 @@
2425
import java.util.Optional;
2526
import java.util.UUID;
2627

28+
import static com.datastax.astra.internal.utils.Assert.notNull;
29+
2730
@Slf4j
2831
public class RagRepository {
2932

@@ -53,7 +56,9 @@ public Database getOrCreateDatabase(UUID tenantId) {
5356
log.info("Database {} does not exists and will be created.", tenantId.toString());
5457
DatabaseAdmin dbAdmin = astraDBAdmin
5558
.createDatabase(tenantId.toString(), cloudProvider, cloudRegion);
56-
dbAdmin.createKeyspace(keyspace, true);
59+
dbAdmin.createKeyspace(
60+
new KeyspaceDefinition().name(keyspace),
61+
new CreateKeyspaceOptions().updateDBKeyspace(true));
5762
return dbAdmin.getDatabase(keyspace);
5863
}
5964
log.info("Database {} already exists.", tenantId);
@@ -128,8 +133,7 @@ public Table<RagStore> getTableRagStore(UUID tenantId, RagIngestionConfig config
128133
}
129134

130135
public Table<RagStore> getTableRagStore(Database db, String provider, String model, int dimension, VectorServiceOptions options) {
131-
Utils.hasLength(provider);
132-
Utils.hasLength(model);
136+
notNull(provider, "provider");
133137
String tableName = RagStore.getTableName(provider, model);
134138
db.useKeyspace(keyspace);
135139

‎astra-db-java-tools/src/main/java/com/datastax/astra/tool/loader/rag/ingestion/RagEmbeddingsModels.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.datastax.astra.tool.loader.rag.ingestion;
22

33
public enum RagEmbeddingsModels {
4+
/** Embedding models */
45
NVIDIA_NEMO("nvidia", "NV-Embed-QA", 1024),
56
OPENAI_ADA002("open-ai", "text-embedding-ada-002", 1536),
67
OPENAI_3_SMALL("open-ai", "text-embedding-3-small", 1536),

‎astra-db-java/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>astra-db-java</artifactId>
5-
<name>Java Client Library for Data API</name>
5+
<name>Data API Client Java</name>
6+
<packaging>jar</packaging>
67
<description>Implementation of a client to the Astra/Stargate Data API written in Java</description>
78

89
<!-- Reference to parent -->
910
<parent>
1011
<groupId>com.datastax.astra</groupId>
1112
<artifactId>astra-db-java-parent</artifactId>
12-
<version>2.0.0-PREVIEW2-SNAPSHOT</version>
13+
<version>2.0.0-PREVIEW3</version>
1314
</parent>
1415

1516
<properties>
@@ -22,6 +23,7 @@
2223
<dependency>
2324
<groupId>com.datastax.astra</groupId>
2425
<artifactId>astra-sdk-devops</artifactId>
26+
<version>${project.version}</version>
2527
</dependency>
2628
<dependency>
2729
<groupId>com.fasterxml.uuid</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class AdminOptions extends BaseOptions<AdminOptions> {
5858
* Serializer for the collections.
5959
* Defaults to {@link DatabaseSerializer}.
6060
*/
61-
private static final DataAPISerializer DEFAULT_SERIALIZER = new DatabaseSerializer();
61+
public static final DataAPISerializer DEFAULT_SERIALIZER = new DatabaseSerializer();
6262

6363
/**
6464
* Serializer for the collections.

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

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@
2323
import com.datastax.astra.client.DataAPIDestination;
2424
import com.datastax.astra.client.core.options.BaseOptions;
2525
import com.datastax.astra.client.core.options.DataAPIClientOptions;
26+
import com.datastax.astra.client.databases.commands.options.CreateKeyspaceOptions;
27+
import com.datastax.astra.client.databases.commands.options.DropKeyspaceOptions;
2628
import com.datastax.astra.client.databases.commands.results.FindEmbeddingProvidersResult;
2729
import com.datastax.astra.client.databases.DatabaseOptions;
2830
import com.datastax.astra.client.databases.commands.results.FindRerankingProvidersResult;
31+
import com.datastax.astra.client.databases.definition.keyspaces.KeyspaceDefinition;
2932
import com.datastax.astra.internal.api.AstraApiEndpoint;
3033
import com.datastax.astra.internal.command.AbstractCommandRunner;
3134
import com.datastax.astra.internal.utils.Assert;
3235
import com.dtsx.astra.sdk.db.AstraDBOpsClient;
36+
import com.dtsx.astra.sdk.db.DbKeyspacesClient;
3337
import com.dtsx.astra.sdk.db.domain.Database;
3438
import com.dtsx.astra.sdk.db.exception.DatabaseNotFoundException;
3539
import com.dtsx.astra.sdk.utils.AstraEnvironment;
@@ -203,26 +207,36 @@ public FindRerankingProvidersResult findRerankingProviders() {
203207

204208
/** {@inheritDoc} */
205209
@Override
206-
public void createKeyspace(String keyspace, boolean updateDBKeyspace) {
207-
log.debug("createKeyspace");
208-
devopsDbClient.database(databaseId.toString()).keyspaces().create(keyspace);
210+
public void createKeyspace(String keyspace) {
211+
createKeyspace(
212+
new KeyspaceDefinition().name(keyspace),
213+
new CreateKeyspaceOptions().ifNotExists(true));
214+
}
215+
216+
@Override
217+
public void createKeyspace(KeyspaceDefinition keyspace, CreateKeyspaceOptions options) {
218+
String keyspaceName = keyspace.getName();
219+
DbKeyspacesClient ks = devopsDbClient.database(databaseId.toString()).keyspaces();
220+
if (!ks.exist(keyspaceName) && options.isIfNotExists()) {
221+
ks.create(keyspaceName);
222+
}
209223
}
210224

211225
/** {@inheritDoc} */
212226
@Override
213227
public void dropKeyspace(String keyspace) {
214228
log.debug("dropKeyspace");
215-
try {
216-
devopsDbClient.database(databaseId.toString()).keyspaces().delete(keyspace);
217-
} catch(NullPointerException e) {
218-
// Left blank to parse output from a delete
219-
}
229+
dropKeyspace(keyspace, new DropKeyspaceOptions().ifExists(true));
220230
}
221231

232+
/** {@inheritDoc} */
222233
@Override
223-
public void dropKeyspace(String keyspace, BaseOptions<?> options) {
234+
public void dropKeyspace(String keyspace, DropKeyspaceOptions options) {
224235
log.warn("CommandOptions are not supported for dropKeyspace in Astra MODE");
225-
dropKeyspace(keyspace);
236+
DbKeyspacesClient ks = devopsDbClient.database(databaseId.toString()).keyspaces();
237+
if (ks.exist(keyspace) && options.isIfExists()) {
238+
ks.delete(keyspace);
239+
}
226240
}
227241

228242
/** {@inheritDoc} */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy