Skip to content

Commit 60ea783

Browse files
clunclun
committed
Update for Stargate Beta7
1 parent b35bb40 commit 60ea783

Some content is hidden

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

51 files changed

+1577
-483
lines changed

‎astra-db-client/pom.xml‎

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
</parent>
1212

1313
<properties>
14+
<!-- used for test in this module -->
15+
<stargate-sdk.version>2.3.0</stargate-sdk.version>
1416
<openai-java.version>0.18.2</openai-java.version>
17+
<langchain4j.version>0.25.0</langchain4j.version>
18+
<okhttp.version>4.10.0</okhttp.version>
1519
</properties>
1620

1721
<dependencies>
22+
1823
<dependency>
1924
<groupId>org.slf4j</groupId>
2025
<artifactId>slf4j-api</artifactId>
@@ -25,36 +30,24 @@
2530
<artifactId>lombok</artifactId>
2631
</dependency>
2732

33+
<!-- DATA API -->
34+
<dependency>
35+
<groupId>com.datastax.stargate</groupId>
36+
<artifactId>stargate-sdk-data</artifactId>
37+
<version>2.3.0</version>
38+
</dependency>
39+
40+
<!-- CQL API (CassioIO) -->
41+
<dependency>
42+
<groupId>com.datastax.oss</groupId>
43+
<artifactId>java-driver-core</artifactId>
44+
</dependency>
45+
46+
<!-- DEVOPS AI -->
2847
<dependency>
2948
<groupId>com.datastax.astra</groupId>
30-
<artifactId>astra-sdk</artifactId>
49+
<artifactId>astra-sdk-devops</artifactId>
3150
<version>${project.version}</version>
32-
<exclusions>
33-
<exclusion>
34-
<groupId>com.datastax.astra</groupId>
35-
<artifactId>astra-sdk-pulsar</artifactId>
36-
</exclusion>
37-
<exclusion>
38-
<groupId>com.datastax.stargate</groupId>
39-
<artifactId>stargate-sdk-document</artifactId>
40-
</exclusion>
41-
<exclusion>
42-
<groupId>com.datastax.stargate</groupId>
43-
<artifactId>stargate-sdk-graphql</artifactId>
44-
</exclusion>
45-
<exclusion>
46-
<groupId>com.datastax.stargate</groupId>
47-
<artifactId>stargate-sdk-grpc</artifactId>
48-
</exclusion>
49-
<exclusion>
50-
<groupId>com.datastax.stargate</groupId>
51-
<artifactId>stargate-sdk-grpc</artifactId>
52-
</exclusion>
53-
<exclusion>
54-
<groupId>com.datastax.stargate</groupId>
55-
<artifactId>stargate-sdk-cql</artifactId>
56-
</exclusion>
57-
</exclusions>
5851
</dependency>
5952

6053
<!-- TEST -->
@@ -68,6 +61,11 @@
6861
<artifactId>logback-classic</artifactId>
6962
<scope>test</scope>
7063
</dependency>
64+
<dependency>
65+
<groupId>com.squareup.okhttp3</groupId>
66+
<artifactId>okhttp</artifactId>
67+
<version>${okhttp.version}</version>
68+
</dependency>
7169
<dependency>
7270
<groupId>com.theokanning.openai-gpt3-java</groupId>
7371
<artifactId>service</artifactId>
@@ -77,15 +75,10 @@
7775
<dependency>
7876
<groupId>dev.langchain4j</groupId>
7977
<artifactId>langchain4j-open-ai</artifactId>
80-
<version>0.25.0</version>
81-
<scope>test</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>dev.langchain4j</groupId>
85-
<artifactId>langchain4j-hugging-face</artifactId>
86-
<version>0.25.0</version>
78+
<version>${langchain4j.version}</version>
8779
<scope>test</scope>
8880
</dependency>
81+
8982
</dependencies>
9083

9184
<build>

‎astra-db-client/src/main/java/com/dtsx/astra/sdk/AstraDB.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import com.dtsx.astra.sdk.utils.AstraEnvironment;
88
import io.stargate.sdk.ServiceDeployment;
99
import io.stargate.sdk.api.SimpleTokenProvider;
10+
import io.stargate.sdk.data.DataApiClient;
11+
import io.stargate.sdk.data.NamespaceClient;
12+
import io.stargate.sdk.data.domain.CollectionDefinition;
13+
import io.stargate.sdk.data.domain.SimilarityMetric;
1014
import io.stargate.sdk.http.ServiceHttp;
11-
import io.stargate.sdk.json.ApiClient;
12-
import io.stargate.sdk.json.NamespaceClient;
13-
import io.stargate.sdk.json.domain.CollectionDefinition;
14-
import io.stargate.sdk.json.domain.SimilarityMetric;
1515
import lombok.Getter;
1616
import lombok.NonNull;
1717
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +34,7 @@ public class AstraDB {
3434
/**
3535
* Top level resource for json api.
3636
*/
37-
private final ApiClient apiClient;
37+
private final DataApiClient apiClient;
3838

3939
/**
4040
* Namespace client
@@ -90,7 +90,7 @@ public AstraDB(@NonNull String token, @NonNull String apiEndpoint, @NonNull Stri
9090
ServiceDeployment<ServiceHttp> jsonDeploy = new ServiceDeployment<>();
9191
jsonDeploy.addDatacenterTokenProvider("default", new SimpleTokenProvider(token));
9292
jsonDeploy.addDatacenterServices("default", new ServiceHttp("json", apiEndpoint, apiEndpoint));
93-
this.apiClient = new ApiClient(jsonDeploy);
93+
this.apiClient = new DataApiClient(jsonDeploy);
9494
this.nsClient = apiClient.namespace(keyspace);
9595
}
9696

@@ -142,11 +142,13 @@ public AstraDB(@NonNull String token, @NonNull UUID databaseId, @NonNull String
142142
* @param token
143143
* astra token
144144
* @param databaseId
145-
* databsae id
145+
* database id
146146
* @param region
147147
* database region
148148
* @param env
149149
* environment
150+
* @param keyspace
151+
* destination keyspace
150152
*/
151153
public AstraDB(@NonNull String token, @NonNull UUID databaseId, String region, @NonNull AstraEnvironment env, String keyspace) {
152154
this.env = env;
@@ -170,7 +172,7 @@ public AstraDB(@NonNull String token, @NonNull UUID databaseId, String region, @
170172
jsonDeploy.addDatacenterServices(dc.getName(), new ServiceHttp("json", dcApiEndpoint, dcApiEndpoint));
171173
});
172174

173-
this.apiClient = new ApiClient(jsonDeploy);
175+
this.apiClient = new DataApiClient(jsonDeploy);
174176
if (keyspace == null) {
175177
keyspace = db.getInfo().getKeyspace();
176178
}
@@ -208,6 +210,8 @@ public Stream<CollectionDefinition> findAllCollections() {
208210
*
209211
* @param name
210212
* collection name
213+
* @return
214+
* collection definition
211215
*/
212216
public Optional<CollectionDefinition> findCollection(String name) {
213217
return nsClient.findCollectionByName(name);
@@ -280,6 +284,8 @@ public AstraDBCollection createCollection(String name, int vectorDimension) {
280284
* store name
281285
* @param vectorDimension
282286
* dimension
287+
* @param metric
288+
* similarity metric for the vector
283289
* @return
284290
* json vector store
285291
*/

‎astra-db-client/src/main/java/com/dtsx/astra/sdk/AstraDBAdmin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.dtsx.astra.sdk.utils.Assert;
1212
import com.dtsx.astra.sdk.utils.AstraEnvironment;
1313
import com.dtsx.astra.sdk.utils.AstraRc;
14-
import io.stargate.sdk.json.ApiClient;
14+
import io.stargate.sdk.data.DataApiClient;
1515
import lombok.Getter;
1616
import lombok.NonNull;
1717
import lombok.extern.slf4j.Slf4j;
@@ -382,7 +382,7 @@ private void resumeDb(Database db) {
382382
* @return
383383
* database client
384384
*/
385-
public ApiClient getRawJsonApiClient(@NonNull String databaseName) {
385+
public DataApiClient getInternalDataApiClient(@NonNull String databaseName) {
386386
return database(databaseName).getApiClient();
387387
}
388388

@@ -394,7 +394,7 @@ public ApiClient getRawJsonApiClient(@NonNull String databaseName) {
394394
* @return
395395
* database client
396396
*/
397-
public ApiClient getApiClient(@NonNull UUID databaseId) {
397+
public DataApiClient getInternalDataApiClient(@NonNull UUID databaseId) {
398398
return database(databaseId).getApiClient();
399399
}
400400

@@ -404,7 +404,7 @@ public ApiClient getApiClient(@NonNull UUID databaseId) {
404404
* @return
405405
* devops client.
406406
*/
407-
public AstraDBOpsClient getRawDevopsApiClient() {
407+
public AstraDBOpsClient getInternalDevopsApiClient() {
408408
return this.devopsDbClient;
409409
}
410410

0 commit comments

Comments
 (0)