Skip to content

Commit 0733315

Browse files
clunclun
committed
adding samples
1 parent d878310 commit 0733315

File tree

177 files changed

+16756
-6750
lines changed

Some content is hidden

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

177 files changed

+16756
-6750
lines changed

‎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

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

Lines changed: 1 addition & 1 deletion
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-PREVIEW2</version>
10+
<version>2.0.0-PREVIEW3</version>
1111
</parent>
1212

1313
<dependencies>

‎astra-db-java/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.datastax.astra</groupId>
1212
<artifactId>astra-db-java-parent</artifactId>
13-
<version>2.0.0-PREVIEW2</version>
13+
<version>2.0.0-PREVIEW3</version>
1414
</parent>
1515

1616
<properties>
@@ -23,6 +23,7 @@
2323
<dependency>
2424
<groupId>com.datastax.astra</groupId>
2525
<artifactId>astra-sdk-devops</artifactId>
26+
<version>${project.version}</version>
2627
</dependency>
2728
<dependency>
2829
<groupId>com.fasterxml.uuid</groupId>

‎astra-db-java/src/main/java/com/datastax/astra/client/collections/Collection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import com.datastax.astra.client.core.query.Filter;
6060
import com.datastax.astra.client.core.query.Filters;
6161
import com.datastax.astra.client.core.query.Projection;
62-
import com.datastax.astra.client.core.rerank.RerankResult;
62+
import com.datastax.astra.client.core.rerank.RerankedResult;
6363
import com.datastax.astra.client.core.vector.DataAPIVector;
6464
import com.datastax.astra.client.databases.Database;
6565
import com.datastax.astra.client.exceptions.DataAPIException;
@@ -1169,7 +1169,7 @@ public <R> CollectionFindAndRerankCursor<T, R> findAndRerank(Filter filter, Coll
11691169
* @param <R>
11701170
* the type of the result items after mapping
11711171
* @return
1172-
* a {@link Page} of {@link RerankResult} objects containing the paginated reranked results
1172+
* a {@link Page} of {@link RerankedResult} objects containing the paginated reranked results
11731173
*
11741174
* <p>Example usage:</p>
11751175
* <pre>
@@ -1181,7 +1181,7 @@ public <R> CollectionFindAndRerankCursor<T, R> findAndRerank(Filter filter, Coll
11811181
* </pre>
11821182
*/
11831183
@BetaPreview
1184-
public <R> Page<RerankResult<R>> findAndRerankPage(Filter filter, CollectionFindAndRerankOptions options, Class<R> newRowType) {
1184+
public <R> Page<RerankedResult<R>> findAndRerankPage(Filter filter, CollectionFindAndRerankOptions options, Class<R> newRowType) {
11851185
Command findAndRerankCommand = Command
11861186
.create("findAndRerank")
11871187
.withFilter(filter);
@@ -1208,7 +1208,7 @@ public <R> Page<RerankResult<R>> findAndRerankPage(Filter filter, CollectionFind
12081208
sortVector = apiResponse.getStatus().getSortVector();
12091209
}
12101210

1211-
List<RerankResult<R>> results = new ArrayList<>();
1211+
List<RerankedResult<R>> results = new ArrayList<>();
12121212
List<Document> documents = apiResponse.getData().getDocuments();
12131213
List<Document> documentResponses = apiResponse.getStatus().getDocumentResponses();
12141214
if (documents == null || documentResponses == null) {
@@ -1233,7 +1233,7 @@ public <R> Page<RerankResult<R>> findAndRerankPage(Filter filter, CollectionFind
12331233
Document documentResponse = documentResponses.get(i);
12341234
Map<String, Double> scores = documentResponse.getMap("scores", String.class, Double.class);
12351235

1236-
results.add(new RerankResult<>(results1, scores));
1236+
results.add(new RerankedResult<>(results1, scores));
12371237
}
12381238
// PageState is always NULL
12391239
return new Page<>(null, results, sortVector);

‎astra-db-java/src/main/java/com/datastax/astra/client/collections/commands/cursor/CollectionFindAndRerankCursor.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
import com.datastax.astra.client.core.query.Filter;
2727
import com.datastax.astra.client.core.query.Projection;
2828
import com.datastax.astra.client.core.query.Sort;
29-
import com.datastax.astra.client.core.rerank.RerankResult;
29+
import com.datastax.astra.client.core.rerank.RerankedResult;
30+
import com.datastax.astra.client.core.vector.DataAPIVector;
3031
import com.datastax.astra.internal.command.AbstractCursor;
3132
import lombok.Getter;
3233

3334
import java.util.ArrayList;
35+
import java.util.Optional;
3436

3537

3638
/**
@@ -50,7 +52,7 @@
5052
* @param <R>
5153
* working object for results, should be same as DOC if no projections
5254
*/
53-
public class CollectionFindAndRerankCursor<T, R> extends AbstractCursor<T, RerankResult<R>> {
55+
public class CollectionFindAndRerankCursor<T, R> extends AbstractCursor<T, RerankedResult<R>> {
5456

5557
/**
5658
* Input table reference
@@ -89,7 +91,7 @@ public class CollectionFindAndRerankCursor<T, R> extends AbstractCursor<T, Reran
8991
*/
9092
@SuppressWarnings("unchecked")
9193
public CollectionFindAndRerankCursor(Collection<T> dataSource, Filter filter, CollectionFindAndRerankOptions options, Class<R> recordType) {
92-
super((Class<RerankResult<R>>) (Class<?>) RerankResult.class);
94+
super((Class<RerankedResult<R>>) (Class<?>) RerankedResult.class);
9395
this.dataSource = dataSource;
9496
this.filter = filter;
9597
this.options = options;

‎astra-db-java/src/main/java/com/datastax/astra/client/collections/commands/cursor/CollectionFindCursor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.datastax.astra.client.core.query.Filter;
2828
import com.datastax.astra.client.core.query.Projection;
2929
import com.datastax.astra.client.core.query.Sort;
30+
import com.datastax.astra.client.core.vector.DataAPIVector;
3031
import com.datastax.astra.client.tables.definition.rows.Row;
3132
import com.datastax.astra.internal.command.AbstractCursor;
3233
import com.datastax.astra.internal.serdes.tables.RowMapper;

‎astra-db-java/src/main/java/com/datastax/astra/client/core/options/BaseOptions.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.datastax.astra.client.core.headers.EmbeddingAPIKeyHeaderProvider;
2424
import com.datastax.astra.client.core.headers.EmbeddingHeadersProvider;
2525
import com.datastax.astra.client.core.commands.CommandType;
26+
import com.datastax.astra.client.core.headers.RerankingAPIKeyHeaderProvider;
2627
import com.datastax.astra.client.core.headers.RerankingHeadersProvider;
2728
import com.datastax.astra.client.core.http.HttpClientOptions;
2829
import com.datastax.astra.internal.command.CommandObserver;
@@ -192,6 +193,19 @@ public T embeddingApiKey(String apiKey) {
192193
return embeddingAuthProvider(new EmbeddingAPIKeyHeaderProvider(apiKey));
193194
}
194195

196+
/**
197+
* Provide the reranking service API key.
198+
*
199+
* @param apiKey
200+
* target api key
201+
* @return
202+
* service key
203+
*/
204+
public T rerankingApiKey(String apiKey) {
205+
Assert.hasLength(apiKey, "apiKey");
206+
return rerankingAuthProvider(new RerankingAPIKeyHeaderProvider(apiKey));
207+
}
208+
195209
/**
196210
* Provide the token.
197211
*

‎astra-db-java/src/main/java/com/datastax/astra/client/core/rerank/RerankResult.java renamed to ‎astra-db-java/src/main/java/com/datastax/astra/client/core/rerank/RerankedResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* document result type
3232
*/
3333
@Getter
34-
public class RerankResult<DOC> {
34+
public class RerankedResult<DOC> {
3535

3636
/**
3737
* Document result.
@@ -51,7 +51,7 @@ public class RerankResult<DOC> {
5151
* @param scores
5252
* score map
5353
*/
54-
public RerankResult(DOC document, Map<String, Double> scores) {
54+
public RerankedResult(DOC document, Map<String, Double> scores) {
5555
this.document = document;
5656
this.scores = scores;
5757
}

‎astra-db-java/src/main/java/com/datastax/astra/client/tables/cursor/TableFindCursor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
import com.datastax.astra.client.core.query.Filter;
2525
import com.datastax.astra.client.core.query.Projection;
2626
import com.datastax.astra.client.core.query.Sort;
27+
import com.datastax.astra.client.core.vector.DataAPIVector;
2728
import com.datastax.astra.client.tables.Table;
2829
import com.datastax.astra.client.tables.commands.options.TableFindOptions;
2930
import com.datastax.astra.internal.command.AbstractCursor;
3031
import lombok.Getter;
3132

3233
import java.util.ArrayList;
34+
import java.util.Optional;
3335

3436
/**
3537
* Implementation of a cursor across the find items

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/astra/DemoAstraDevFindAndRerank.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.datastax.astra.client.core.query.Projection;
1818
import com.datastax.astra.client.core.query.Sort;
1919
import com.datastax.astra.client.core.rerank.CollectionRerankOptions;
20-
import com.datastax.astra.client.core.rerank.RerankResult;
20+
import com.datastax.astra.client.core.rerank.RerankedResult;
2121
import com.datastax.astra.client.core.rerank.RerankServiceOptions;
2222
import com.datastax.astra.client.core.vector.SimilarityMetric;
2323
import com.datastax.astra.client.core.vector.VectorOptions;
@@ -36,7 +36,6 @@
3636

3737
import static com.datastax.astra.client.DataAPIDestination.ASTRA_DEV;
3838
import static com.datastax.astra.client.core.lexical.AnalyzerTypes.STANDARD;
39-
import static com.datastax.astra.client.core.lexical.AnalyzerTypes.WHITESPACE;
4039
import static com.dtsx.astra.sdk.db.domain.CloudProviderType.GCP;
4140

4241
@Slf4j
@@ -287,7 +286,7 @@ public void should_query_collection_bring_my_own_vector() {
287286
.hybridLimits(20);
288287

289288
// Run the query
290-
List<RerankResult<Document>> result = myCol.findAndRerank(farrOptions).toList();
289+
List<RerankedResult<Document>> result = myCol.findAndRerank(farrOptions).toList();
291290
Assertions.assertNotNull(result);
292291
Assertions.assertFalse(result.isEmpty());
293292
System.out.println("Result: " + result.size());

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