Skip to content

Commit 593dcc9

Browse files
bevzzzbevzzz
committed
feat: add Target to aggregate-nearVector queries
1 parent ad1f62a commit 593dcc9

1 file changed

Lines changed: 98 additions & 11 deletions

File tree

‎src/main/java/io/weaviate/client6/v1/api/collections/aggregate/AbstractAggregateClient.java‎

Lines changed: 98 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.weaviate.client6.v1.api.collections.query.NearText;
1515
import io.weaviate.client6.v1.api.collections.query.NearThermal;
1616
import io.weaviate.client6.v1.api.collections.query.NearVector;
17+
import io.weaviate.client6.v1.api.collections.query.NearVectorTarget;
1718
import io.weaviate.client6.v1.api.collections.query.NearVideo;
1819
import io.weaviate.client6.v1.api.collections.query.Target;
1920
import io.weaviate.client6.v1.internal.ObjectBuilder;
@@ -284,7 +285,8 @@ public GroupedResponseT hybrid(Hybrid filter, Function<Aggregation.Builder, Obje
284285
* error status code.
285286
* @see AggregateResponse
286287
*/
287-
public ResponseT nearVector(float[] vector, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
288+
public ResponseT nearVector(float[] vector,
289+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
288290
return nearVector(NearVector.of(Target.vector(vector)), fn);
289291
}
290292

@@ -300,7 +302,8 @@ public ResponseT nearVector(float[] vector, Function<Aggregation.Builder, Object
300302
* error status code.
301303
* @see AggregateResponse
302304
*/
303-
public ResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
305+
public ResponseT nearVector(float[] vector,
306+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
304307
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
305308
return nearVector(NearVector.of(Target.vector(vector), nv), fn);
306309
}
@@ -332,11 +335,46 @@ public ResponseT nearVector(float[][] vector, Function<Aggregation.Builder, Obje
332335
* error status code.
333336
* @see AggregateResponse
334337
*/
335-
public ResponseT nearVector(float[][] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
338+
public ResponseT nearVector(float[][] vector,
339+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
336340
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
337341
return nearVector(NearVector.of(Target.vector(vector), nv), fn);
338342
}
339343

344+
/**
345+
* Aggregate results of a near vector query.
346+
*
347+
* @param searchTarget Query target.
348+
* @param fn Lambda expression for optional aggregation parameters.
349+
* @return Aggregation result.
350+
*
351+
* @throws WeaviateApiException in case the server returned with an
352+
* error status code.
353+
* @see AggregateResponse
354+
*/
355+
public ResponseT nearVector(NearVectorTarget searchTarget,
356+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
357+
return nearVector(NearVector.of(searchTarget), fn);
358+
}
359+
360+
/**
361+
* Aggregate results of a near vector query.
362+
*
363+
* @param searchTarget Query target.
364+
* @param nv Lambda expression for optional near vector parameters.
365+
* @param fn Lambda expression for optional aggregation parameters.
366+
* @return Aggregation result.
367+
*
368+
* @throws WeaviateApiException in case the server returned with an
369+
* error status code.
370+
* @see AggregateResponse
371+
*/
372+
public ResponseT nearVector(NearVectorTarget searchTarget,
373+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
374+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
375+
return nearVector(NearVector.of(searchTarget), fn);
376+
}
377+
340378
/**
341379
* Aggregate results of a near vector query.
342380
*
@@ -348,7 +386,8 @@ public ResponseT nearVector(float[][] vector, Function<NearVector.Builder, Objec
348386
* error status code.
349387
* @see AggregateResponse
350388
*/
351-
public ResponseT nearVector(NearVector filter, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
389+
public ResponseT nearVector(NearVector filter,
390+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
352391
return performRequest(Aggregation.of(filter, fn));
353392
}
354393

@@ -366,7 +405,8 @@ public ResponseT nearVector(NearVector filter, Function<Aggregation.Builder, Obj
366405
* @see GroupBy
367406
* @see AggregateResponseGrouped
368407
*/
369-
public GroupedResponseT nearVector(float[] vector, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
408+
public GroupedResponseT nearVector(float[] vector,
409+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
370410
GroupBy groupBy) {
371411
return nearVector(NearVector.of(Target.vector(vector)), fn, groupBy);
372412
}
@@ -386,8 +426,10 @@ public GroupedResponseT nearVector(float[] vector, Function<Aggregation.Builder,
386426
* @see GroupBy
387427
* @see AggregateResponseGrouped
388428
*/
389-
public GroupedResponseT nearVector(float[] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
390-
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn, GroupBy groupBy) {
429+
public GroupedResponseT nearVector(float[] vector,
430+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
431+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
432+
GroupBy groupBy) {
391433
return nearVector(NearVector.of(Target.vector(vector), nv), fn, groupBy);
392434
}
393435

@@ -405,7 +447,8 @@ public GroupedResponseT nearVector(float[] vector, Function<NearVector.Builder,
405447
* @see GroupBy
406448
* @see AggregateResponseGrouped
407449
*/
408-
public GroupedResponseT nearVector(float[][] vector, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
450+
public GroupedResponseT nearVector(float[][] vector,
451+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
409452
GroupBy groupBy) {
410453
return nearVector(NearVector.of(Target.vector(vector)), fn, groupBy);
411454
}
@@ -425,11 +468,54 @@ public GroupedResponseT nearVector(float[][] vector, Function<Aggregation.Builde
425468
* @see GroupBy
426469
* @see AggregateResponseGrouped
427470
*/
428-
public GroupedResponseT nearVector(float[][] vector, Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
429-
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn, GroupBy groupBy) {
471+
public GroupedResponseT nearVector(float[][] vector,
472+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
473+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
474+
GroupBy groupBy) {
430475
return nearVector(NearVector.of(Target.vector(vector), nv), fn, groupBy);
431476
}
432477

478+
/**
479+
* Aggregate results of a near vector query.
480+
*
481+
* @param searchTarget Query target.
482+
* @param fn Lambda expression for optional aggregation parameters.
483+
* @param groupBy GroupBy clause.
484+
* @return Grouped aggregation result.
485+
*
486+
* @throws WeaviateApiException in case the server returned with an
487+
* error status code.
488+
*
489+
* @see GroupBy
490+
* @see AggregateResponseGrouped
491+
*/
492+
public GroupedResponseT nearVector(NearVectorTarget searchTarget,
493+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
494+
GroupBy groupBy) {
495+
return nearVector(NearVector.of(searchTarget), fn, groupBy);
496+
}
497+
498+
/**
499+
* Aggregate results of a near vector query.
500+
*
501+
* @param searchTarget Query target.
502+
* @param nv Lambda expression for optional near vector parameters.
503+
* @param fn Lambda expression for optional aggregation parameters.
504+
* @param groupBy GroupBy clause.
505+
* @return Grouped aggregation result.
506+
*
507+
* @throws WeaviateApiException in case the server returned with an
508+
* error status code.
509+
*
510+
* @see GroupBy
511+
* @see AggregateResponseGrouped
512+
*/
513+
public GroupedResponseT nearVector(NearVectorTarget searchTarget,
514+
Function<NearVector.Builder, ObjectBuilder<NearVector>> nv,
515+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn, GroupBy groupBy) {
516+
return nearVector(NearVector.of(searchTarget, nv), fn, groupBy);
517+
}
518+
433519
/**
434520
* Aggregate results of a near vector query.
435521
*
@@ -444,7 +530,8 @@ public GroupedResponseT nearVector(float[][] vector, Function<NearVector.Builder
444530
* @see GroupBy
445531
* @see AggregateResponseGrouped
446532
*/
447-
public GroupedResponseT nearVector(NearVector filter, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
533+
public GroupedResponseT nearVector(NearVector filter,
534+
Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn,
448535
GroupBy groupBy) {
449536
return performRequest(Aggregation.of(filter, fn), groupBy);
450537
}

0 commit comments

Comments
 (0)