Skip to content

Commit e9bb5c5

Browse files
bevzzzbevzzz
committed
feat: add generative w/ nearText query
1 parent 82111dd commit e9bb5c5

2 files changed

Lines changed: 210 additions & 1 deletion

File tree

‎src/main/java/io/weaviate/client6/v1/api/collections/generate/AbstractGenerateClient.java‎

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.weaviate.client6.v1.api.collections.generate;
22

3+
import java.util.List;
34
import java.util.function.Function;
45

56
import io.weaviate.client6.v1.api.WeaviateApiException;
@@ -9,6 +10,7 @@
910
import io.weaviate.client6.v1.api.collections.query.GroupBy;
1011
import io.weaviate.client6.v1.api.collections.query.Hybrid;
1112
import io.weaviate.client6.v1.api.collections.query.NearObject;
13+
import io.weaviate.client6.v1.api.collections.query.NearText;
1214
import io.weaviate.client6.v1.api.collections.query.NearVector;
1315
import io.weaviate.client6.v1.api.collections.query.NearVectorTarget;
1416
import io.weaviate.client6.v1.api.collections.query.QueryOperator;
@@ -642,4 +644,211 @@ public GroupedResponseT nearObject(String uuid,
642644
public GroupedResponseT nearObject(NearObject query, GenerativeTask generate, GroupBy groupBy) {
643645
return performRequest(query, generate, groupBy);
644646
}
647+
648+
// NearText queries ---------------------------------------------------------
649+
650+
/**
651+
* Query collection objects using near text search.
652+
*
653+
* @param text Query concepts.
654+
* @param fn Lambda expression for optional parameters.
655+
* @param generateFn Lambda expression for generative task parameters.
656+
* @throws WeaviateApiException in case the server returned with an
657+
* error status code.
658+
*/
659+
public ResponseT nearText(String text,
660+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
661+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn) {
662+
return nearText(Target.text(List.of(text)), fn, generateFn);
663+
}
664+
665+
/**
666+
* Query collection objects using near text search.
667+
*
668+
* @param text Query concepts.
669+
* @param fn Lambda expression for optional parameters.
670+
* @param generateFn Lambda expression for generative task parameters.
671+
* @throws WeaviateApiException in case the server returned with an
672+
* error status code.
673+
*/
674+
public ResponseT nearText(List<String> text,
675+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
676+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn) {
677+
return nearText(Target.text(text), fn, generateFn);
678+
}
679+
680+
/**
681+
* Query collection objects using near text search.
682+
*
683+
* @param searchTarget Target query concepts.
684+
* @param generateFn Lambda expression for generative task parameters.
685+
* @throws WeaviateApiException in case the server returned with an
686+
* error status code.
687+
*/
688+
public ResponseT nearText(Target searchTarget,
689+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn) {
690+
return nearText(NearText.of(searchTarget), GenerativeTask.of(generateFn));
691+
}
692+
693+
/**
694+
* Query collection objects using near text search.
695+
*
696+
* @param searchTarget Target query concepts.
697+
* @param fn Lambda expression for optional parameters.
698+
* @param generateFn Lambda expression for generative task parameters.
699+
* @throws WeaviateApiException in case the server returned with an
700+
* error status code.
701+
*/
702+
public ResponseT nearText(Target searchTarget,
703+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
704+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn) {
705+
return nearText(NearText.of(searchTarget, fn), GenerativeTask.of(generateFn));
706+
}
707+
708+
/**
709+
* Query collection objects using near text search.
710+
*
711+
* @param query Near text query request.
712+
* @param generate Generative task.
713+
* @throws WeaviateApiException in case the server returned with an
714+
* error status code.
715+
*/
716+
public ResponseT nearText(NearText query, GenerativeTask generate) {
717+
return performRequest(query, generate);
718+
}
719+
720+
/**
721+
* Query collection objects using near text search.
722+
*
723+
* @param text Query concepts.
724+
* @param generateFn Lambda expression for generative task parameters.
725+
* @param groupBy Group-by clause.
726+
* @return Grouped query result.
727+
* @throws WeaviateApiException in case the server returned with an
728+
* error status code.
729+
*
730+
* @see GroupBy
731+
* @see QueryResponseGrouped
732+
*/
733+
public GroupedResponseT nearText(String text,
734+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn,
735+
GroupBy groupBy) {
736+
return nearText(Target.text(List.of(text)), generateFn, groupBy);
737+
}
738+
739+
/**
740+
* Query collection objects using near text search.
741+
*
742+
* @param text Query concepts.
743+
* @param generateFn Lambda expression for generative task parameters.
744+
* @param groupBy Group-by clause.
745+
* @return Grouped query result.
746+
* @throws WeaviateApiException in case the server returned with an
747+
* error status code.
748+
*
749+
* @see GroupBy
750+
* @see QueryResponseGrouped
751+
*/
752+
public GroupedResponseT nearText(List<String> text,
753+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn, GroupBy groupBy) {
754+
return nearText(Target.text(text), generateFn, groupBy);
755+
}
756+
757+
/**
758+
* Query collection objects using near text search.
759+
*
760+
* @param text Query concepts.
761+
* @param fn Lambda expression for optional parameters.
762+
* @param generateFn Lambda expression for generative task parameters.
763+
* @param groupBy Group-by clause.
764+
* @return Grouped query result.
765+
* @throws WeaviateApiException in case the server returned with an
766+
* error status code.
767+
*
768+
* @see GroupBy
769+
* @see QueryResponseGrouped
770+
*/
771+
public GroupedResponseT nearText(String text,
772+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
773+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn,
774+
GroupBy groupBy) {
775+
return nearText(Target.text(List.of(text)), fn, generateFn, groupBy);
776+
}
777+
778+
/**
779+
* Query collection objects using near text search.
780+
*
781+
* @param text Query concepts.
782+
* @param fn Lambda expression for optional parameters.
783+
* @param generateFn Lambda expression for generative task parameters.
784+
* @param groupBy Group-by clause.
785+
* @return Grouped query result.
786+
* @throws WeaviateApiException in case the server returned with an
787+
* error status code.
788+
*
789+
* @see GroupBy
790+
* @see QueryResponseGrouped
791+
*/
792+
public GroupedResponseT nearText(List<String> text,
793+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
794+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn,
795+
GroupBy groupBy) {
796+
return nearText(Target.text(text), fn, generateFn, groupBy);
797+
}
798+
799+
/**
800+
* Query collection objects using near text search.
801+
*
802+
* @param searchTarget Target query concepts.
803+
* @param generateFn Lambda expression for generative task parameters.
804+
* @param groupBy Group-by clause.
805+
* @return Grouped query result.
806+
* @throws WeaviateApiException in case the server returned with an
807+
* error status code.
808+
*
809+
* @see GroupBy
810+
* @see QueryResponseGrouped
811+
*/
812+
public GroupedResponseT nearText(Target searchTarget,
813+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn, GroupBy groupBy) {
814+
return nearText(NearText.of(searchTarget), GenerativeTask.of(generateFn), groupBy);
815+
}
816+
817+
/**
818+
* Query collection objects using near text search.
819+
*
820+
* @param searchTarget Target query concepts.
821+
* @param fn Lambda expression for optional parameters.
822+
* @param generateFn Lambda expression for generative task parameters.
823+
* @param groupBy Group-by clause.
824+
* @return Grouped query result.
825+
* @throws WeaviateApiException in case the server returned with an
826+
* error status code.
827+
*
828+
* @see GroupBy
829+
* @see QueryResponseGrouped
830+
*/
831+
public GroupedResponseT nearText(Target searchTarget,
832+
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
833+
Function<GenerativeTask.Builder, ObjectBuilder<GenerativeTask>> generateFn,
834+
GroupBy groupBy) {
835+
return nearText(NearText.of(searchTarget, fn), GenerativeTask.of(generateFn), groupBy);
836+
}
837+
838+
/**
839+
* Query collection objects using near text search.
840+
*
841+
* @param query Near text query request.
842+
* @param generate Generative task.
843+
* @param groupBy Group-by clause.
844+
* @return Grouped query result.
845+
* @throws WeaviateApiException in case the server returned with an
846+
* error status code.
847+
*
848+
* @see GroupBy
849+
* @see QueryResponseGrouped
850+
*/
851+
public GroupedResponseT nearText(NearText query, GenerativeTask generate, GroupBy groupBy) {
852+
return performRequest(query, generate, groupBy);
853+
}
645854
}

‎src/main/java/io/weaviate/client6/v1/api/collections/query/AbstractQueryClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ public GroupedResponseT nearText(String text,
734734
public GroupedResponseT nearText(List<String> text,
735735
Function<NearText.Builder, ObjectBuilder<NearText>> fn,
736736
GroupBy groupBy) {
737-
return nearText(Target.text(text), groupBy);
737+
return nearText(Target.text(text), fn, groupBy);
738738
}
739739

740740
/**

0 commit comments

Comments
 (0)