From 1cfff7e886c2a76b58b0eb8ce58efa4f5ab0f1b1 Mon Sep 17 00:00:00 2001 From: ozanarmagan Date: Thu, 21 Dec 2023 11:42:24 +0300 Subject: [PATCH] Remove unnecesarry blank lines --- src/core_api.cpp | 2 -- test/collection_vector_search_test.cpp | 6 ------ 2 files changed, 8 deletions(-) diff --git a/src/core_api.cpp b/src/core_api.cpp index 519a5a42..42bda405 100644 --- a/src/core_api.cpp +++ b/src/core_api.cpp @@ -619,8 +619,6 @@ bool post_multi_search(const std::shared_ptr& req, const std::shared_p continue; } - - if(conversation && search_item.key() == "q") { // q is common for all searches res->set_400("`q` parameter cannot be used in POST body if `conversation` is enabled. Please set `q` as a query parameter in the request, instead of inside the POST body"); diff --git a/test/collection_vector_search_test.cpp b/test/collection_vector_search_test.cpp index 7a2d6467..bbef267f 100644 --- a/test/collection_vector_search_test.cpp +++ b/test/collection_vector_search_test.cpp @@ -3296,7 +3296,6 @@ TEST_F(CollectionVectorTest, TestEmbeddingValues) { } } - TEST_F(CollectionVectorTest, InvalidMultiSearchConversation) { auto schema_json = R"({ @@ -3327,8 +3326,6 @@ TEST_F(CollectionVectorTest, InvalidMultiSearchConversation) { ASSERT_TRUE(model_add_op.ok()); auto model_id = model_add_op.get()["id"]; - - auto collection_create_op = collectionManager.create_collection(schema_json); ASSERT_TRUE(collection_create_op.ok()); @@ -3370,7 +3367,6 @@ TEST_F(CollectionVectorTest, InvalidMultiSearchConversation) { ASSERT_EQ(res->status_code, 400); ASSERT_EQ(res_json["message"], "`conversation_model_id` cannot be used in POST body. Please set `conversation_model_id` as a query parameter in the request, instead of inside the POST body"); - search_body["searches"][0].erase("conversation_model_id"); search_body["searches"][0]["conversation_id"] = "123"; @@ -3383,7 +3379,6 @@ TEST_F(CollectionVectorTest, InvalidMultiSearchConversation) { ASSERT_EQ(res_json["message"], "`conversation_id` cannot be used in POST body. Please set `conversation_id` as a query parameter in the request, instead of inside the POST body"); - search_body["searches"][0].erase("conversation_id"); search_body["searches"][0]["conversation"] = true; @@ -3394,6 +3389,5 @@ TEST_F(CollectionVectorTest, InvalidMultiSearchConversation) { res_json = nlohmann::json::parse(res->body); ASSERT_EQ(res->status_code, 400); - ASSERT_EQ(res_json["message"], "`conversation` cannot be used in POST body. Please set `conversation` as a query parameter in the request, instead of inside the POST body"); } \ No newline at end of file