From f5d0fa7108556973cb67b1299065b348bd2e2a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 9 Oct 2024 10:10:47 +0200 Subject: [PATCH] Make the embedder mandatory everywhere --- index_search_test.go | 18 ++++-------------- index_settings_test.go | 2 +- types.go | 6 +++--- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/index_search_test.go b/index_search_test.go index 88bcb27..ff2093a 100644 --- a/index_search_test.go +++ b/index_search_test.go @@ -1943,19 +1943,6 @@ func TestIndex_SearchWithVectorStore(t *testing.T) { RetrieveVectors: true, }, }, - { - name: "empty Embedder", - UID: "indexUID", - client: sv, - query: "Pride and Prejudice", - request: SearchRequest{ - Hybrid: &SearchRequestHybrid{ - SemanticRatio: 0.5, - Embedder: "", - }, - RetrieveVectors: true, - }, - }, } for _, tt := range tests { @@ -2029,6 +2016,7 @@ func TestIndex_SearchSimilarDocuments(t *testing.T) { client: sv, request: &SimilarDocumentQuery{ Id: "123", + Embedder: "default", }, resp: new(SimilarDocumentResult), wantErr: false, @@ -2036,7 +2024,9 @@ func TestIndex_SearchSimilarDocuments(t *testing.T) { { UID: "indexUID", client: sv, - request: &SimilarDocumentQuery{}, + request: &SimilarDocumentQuery{ + Embedder: "default", + }, resp: new(SimilarDocumentResult), wantErr: true, }, diff --git a/index_settings_test.go b/index_settings_test.go index 1933d38..748641a 100644 --- a/index_settings_test.go +++ b/index_settings_test.go @@ -3422,7 +3422,7 @@ func TestIndex_UpdateSettingsEmbedders(t *testing.T) { "default": { Source: "openAi", ApiKey: "xxx", - Model: "text-embedding-ada-002", + Model: "text-embedding-3-small", DocumentTemplate: "A movie titled '{{doc.title}}'", }, }, diff --git a/types.go b/types.go index 061ade7..3c746cd 100644 --- a/types.go +++ b/types.go @@ -433,7 +433,7 @@ type SearchRequest struct { IndexUID string `json:"indexUid,omitempty"` Query string `json:"q"` Distinct string `json:"distinct,omitempty"` - Hybrid *SearchRequestHybrid `json:"hybrid,omitempty"` + Hybrid *SearchRequestHybrid `json:"hybrid"` RetrieveVectors bool `json:"retrieveVectors,omitempty"` RankingScoreThreshold float64 `json:"rankingScoreThreshold,omitempty"` FederationOptions *SearchFederationOptions `json:"federationOptions,omitempty"` @@ -446,7 +446,7 @@ type SearchFederationOptions struct { type SearchRequestHybrid struct { SemanticRatio float64 `json:"semanticRatio,omitempty"` - Embedder string `json:"embedder,omitempty"` + Embedder string `json:"embedder"` } type MultiSearchRequest struct { @@ -517,7 +517,7 @@ type DocumentsQuery struct { // SimilarDocumentQuery is query parameters of similar documents type SimilarDocumentQuery struct { Id interface{} `json:"id,omitempty"` - Embedder string `json:"embedder,omitempty"` + Embedder string `json:"embedder"` AttributesToRetrieve []string `json:"attributesToRetrieve,omitempty"` Offset int64 `json:"offset,omitempty"` Limit int64 `json:"limit,omitempty"`