Fix #2459 allow overrides for "findAndRerank" command by tatu-at-datastax · Pull Request #2460 · stargate/data-api

tatu-at-datastax · 2026-04-27T17:55:10Z

What this PR does:

Adds ability to provide rerank provider/model overrides for findAndRerank; see #2459 for details.

Which issue(s) this PR fixes:
Fixes #2459

Checklist

Changes manually tested
Automated Tests added/updated
Documentation added/updated
CLA Signed: DataStax CLA

github-actions · 2026-04-27T17:57:40Z

Unit Test Coverage Report

Overall Project	51.62% `-0.09%`	🍏
Files changed	65.33%	🍏

File	Coverage
RequestException.java	100%	🍏
FindAndRerankCommand.java	88.79%	🍏
FindAndRerankOperationBuilder.java	81.97% `-2.19%`	🍏
CollectionRerankDef.java	52.34% `-10.85%`	🍏

github-actions · 2026-04-27T18:32:35Z

📈 Integration Test Coverage Delta vs Main Branch (dse69-it)

Metric	Value
Main Branch	72.66%
This PR	72.78%
Delta	🟢 +0.12%
✅ Coverage improved!

github-actions · 2026-04-27T18:32:37Z

Integration Test Coverage Report (dse69-it)

Overall Project	72.78% `-0.04%`	🍏
Files changed	85.4%	🍏

File	Coverage
RequestException.java	100%	🍏
FindAndRerankOperationBuilder.java	84.7%	🍏
FindAndRerankCommand.java	84.11%	🍏
CollectionRerankDef.java	79.12% `-5.49%`	🍏

github-actions · 2026-04-27T18:34:38Z

Integration Test Coverage Report (hcd-it)

Overall Project	74.21% `-0.04%`	🍏
Files changed	85.4%	🍏

File	Coverage
RequestException.java	100%	🍏
FindAndRerankOperationBuilder.java	90.57%	🍏
FindAndRerankCommand.java	85.05%	🍏
CollectionRerankDef.java	79.4% `-5.49%`	🍏

github-actions · 2026-04-28T01:36:04Z

📈 Integration Test Coverage Delta vs Main Branch (hcd-it)

Metric	Value
Main Branch	74.10%
This PR	74.21%
Delta	🟢 +0.11%
✅ Coverage improved!

amorton · 2026-04-28T02:22:26Z

+  private boolean hasRerankOverride() {
+    var override =
+        getOrDefault(command.options(), FindAndRerankCommand.Options::rerankServiceOverride, null);
+    return override != null && (override.provider() != null || override.modelName() != null);


there is an isEmpty() on the record, the one on the create collection command is better. we should use that.

github-actions · 2026-04-29T17:11:45Z

📈 Unit Test Coverage Delta vs Main Branch

Metric	Value
Main Branch	51.42%
This PR	51.62%
Delta	🟢 +0.20%
✅ Coverage improved!

tatu-at-datastax · 2026-04-29T21:53:21Z

Re-prompted:

Requirements changed -- re-plan based on issue https://github.com/stargate/data-api/issues/2459 that this PR is for
...
Review your work
...
Now, can you add one or more unit tests
...
Add one or more ITs as well
...
How about tests with auth override?

amorton

see comments, too much code duplication going on.

amorton · 2026-05-06T03:07:36Z

+   * providers configuration.
+   */
+  // package-private for unit testing
+  void validateRerankOverride(


-1 for this function, it is duplicating code and breaking encapsulation.

CollectionRerankDef.fromApiDesc() is the existing funciton we use to validate the reranking provided by the user. It is designed to be called when from create collection. It has parts we can re-use for vliadating the service description, the only difference is that we may use a different error code

e.g. INVALID_CREATE_COLLECTION_OPTIONS for create and RequestException.Code.INVALID_RERANK_OVERRIDE for findAndRerank.

AND theat we may have different rules for the model support.

When we do createCollection the model cannot be DEPRECATED or END_OF_LIFE

When we do findAndReRank using the model from the collection schema it cannot be END_OF_LIFE

when we do findAndRerank using an overload it cannot be DEPRECATED or END_OF_LIFE

Refactor CollectionRerankDef as needed so we can all it to create the CollectionRerankDef for the overridden service def, and centralize error throwing into it for checking the model has the correct support status. We should update all places we check model status to be in this class.

Ok. Good clarification: I was not sure whether DEPRECATED should be allowed (like from defaults) for overrides or not -- could see either way being possible.

But decision is that overrides are not allowed to use DEPRECATED model.

Refactored to reduce code duplication, centralize handling. Have a look if this makes sense, @amorton.

… against mutable state dup calls

…rank-override

erichare · 2026-05-11T20:49:53Z

+  private CollectionRerankDef.RerankServiceDef resolveRerankServiceDef() {
+    var rerankOverride =
+        getOrDefault(command.options(), FindAndRerankCommand.Options::rerankServiceOverride, null);
+    boolean hasOverride = rerankOverride != null && !rerankOverride.isEmpty();


NIT: I believe this would mean that:

"rerank": {"provider": null, "modelName": null}

Would be treated as hasOverride=FALSE (if i'm thinking of isEmpty() correctly). Just wondering if we want to be more explicit there - that's a case where (potentially) the client might want to provide an override, but made a mistake that led to nulls for the values. In which case, maybe we'd want to either document this, or reject these as invalid?

Hmmmh. Good question. Let me see.

Ok. Looks like it is rather difficult to both allow { } AND exclude {"provider": null, "modelName": null} -- especially when we are re-using (for better or worse) RerankingServiceDesc for both reranking definition (Collection creation) and for reranking overrides.
But I'll see if I can figure out something. :)

@erichare Changed so that Overrides with both { } and {"provider": null, "modelName": null} will now fail: only explicit null (and missing override) are accepted as valid "no overrides".

erichare

LGTM @tatu-at-datastax ! One NIT that i found.

Aaron indicated review by Eric and/or Hazel sufficient to address concerns.

tatu-at-datastax · 2026-05-12T18:01:34Z

LGTM @tatu-at-datastax ! One NIT that i found.

This has now been resolved: no more quiet ignoral of non-null overrides.

Implement #2459: allow overrides for "findAndRerank" command

a66df30

tatu-at-datastax self-assigned this Apr 27, 2026

tatu-at-datastax added 4 commits April 27, 2026 10:59

Add block of DEPRECATED model overrides

55216df

Config passing clean up

3df34e8

Change to coerce blank Strings to nulls for options

5d43561

Extract helper method

f2bdfa3

tatu-at-datastax added 2 commits April 27, 2026 11:36

Further correctness fixes

fd060f9

Unify empty/missing value handling

51e58a9

amorton requested changes Apr 28, 2026

View reviewed changes

tatu-at-datastax changed the title ~~Implement #2459: allow overrides for "findAndRerank" command~~ Implement #2459 (https://github.com/stargate/data-api/issues/2459): allow overrides for "findAndRerank" command Apr 29, 2026

tatu-at-datastax added 2 commits April 29, 2026 10:05

Rework based on clarified definition (update issue description).

361c726

Minor comment improvement

1f72f78

tatu-at-datastax added 4 commits April 29, 2026 10:23

Streamlining

2dcff8c

Minor reordering of validation

930f015

Add unit tests

743fd15

Add basic ITs as well

5d705e9

tatu-at-datastax added 5 commits April 29, 2026 14:56

Moar testing

ddec95c

Improve ITs

bcdfa46

Simplify tests

1eae708

Fix failing IT

b6afdc2

Remove unused helper method

f2afee0

tatu-at-datastax marked this pull request as ready for review May 4, 2026 20:18

tatu-at-datastax requested a review from a team as a code owner May 4, 2026 20:18

amorton changed the title ~~Implement #2459 (https://github.com/stargate/data-api/issues/2459): allow overrides for "findAndRerank" command~~ Fix #2459 allow overrides for "findAndRerank" command May 6, 2026

amorton previously requested changes May 6, 2026

View reviewed changes

tatu-at-datastax added 10 commits May 6, 2026 10:01

Fixed wording (remove "per-request" phrasing); add null checks; guard…

ee799c8

… against mutable state dup calls

Refactor to reduce code duplication

6b3d02c

Minor clean up

fdf1edb

Fix 4 failing ITs

63c321f

Merge remote-tracking branch 'origin/main' into tatu/2459-find-and-re…

401feb5

…rank-override

Add a test

744fc18

Refactoring, renaming

5c6e8bf

Minor renaming

c70c22b

Fix handling of empty Object for reranking

4cfeec5

Merge branch 'main' into tatu/2459-find-and-rerank-override

d35f1ca

tatu-at-datastax requested a review from amorton May 11, 2026 20:37

erichare self-requested a review May 11, 2026 20:41

erichare reviewed May 11, 2026

View reviewed changes

erichare approved these changes May 11, 2026

View reviewed changes

tatu-at-datastax added 3 commits May 11, 2026 18:24

Changed logic on "empty" Override based on code review feedback

72c87f6

Forgot to check in actual change

46acd52

Merge branch 'main' into tatu/2459-find-and-rerank-override

32e028d

Add test coverage

aa27d8c

tatu-at-datastax merged commit 554fe9a into main May 12, 2026
3 checks passed

tatu-at-datastax deleted the tatu/2459-find-and-rerank-override branch May 12, 2026 19:11

tatu-at-datastax added this to the 1.0.47 milestone May 12, 2026

Conversation

tatu-at-datastax commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Unit Test Coverage Report

Uh oh!

github-actions Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📈 Integration Test Coverage Delta vs Main Branch (dse69-it)

Uh oh!

github-actions Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Integration Test Coverage Report (dse69-it)

Uh oh!

github-actions Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Integration Test Coverage Report (hcd-it)

Uh oh!

github-actions Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📈 Integration Test Coverage Delta vs Main Branch (hcd-it)

Uh oh!

Uh oh!

Uh oh!

amorton Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📈 Unit Test Coverage Delta vs Main Branch

Uh oh!

tatu-at-datastax commented Apr 29, 2026

Uh oh!

amorton left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

amorton May 6, 2026

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax May 6, 2026

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax May 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

erichare May 11, 2026

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax May 12, 2026

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax May 12, 2026

Choose a reason for hiding this comment

Uh oh!

erichare left a comment

Choose a reason for hiding this comment

Uh oh!

tatu-at-datastax commented May 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

tatu-at-datastax commented Apr 27, 2026 •

edited

Loading

github-actions Bot commented Apr 27, 2026 •

edited

Loading

github-actions Bot commented Apr 27, 2026 •

edited

Loading

github-actions Bot commented Apr 27, 2026 •

edited

Loading

github-actions Bot commented Apr 27, 2026 •

edited

Loading

github-actions Bot commented Apr 28, 2026 •

edited

Loading

github-actions Bot commented Apr 29, 2026 •

edited

Loading

tatu-at-datastax May 12, 2026 •

edited

Loading