Skip to content

Commit ca47172

Browse files
tisniktisnik
authored
Merge pull request lightspeed-core#1559 from tisnik/lcore-1955-fixed-issues-in-byok-integration-tests
LCORE-1955: Fixed issues in BYOK integration tests
2 parents 73bf455 + 39eca36 commit ca47172

1 file changed

Lines changed: 174 additions & 11 deletions

File tree

‎tests/integration/endpoints/test_query_byok_integration.py‎

Lines changed: 174 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,20 @@ async def test_query_byok_inline_rag_injects_context(
322322
"""
323323
_ = byok_config
324324

325-
query_request = QueryRequest(query="What is OpenShift?")
325+
query_request = QueryRequest(
326+
query="What is OpenShift?",
327+
conversation_id=None,
328+
provider=None,
329+
model=None,
330+
system_prompt=None,
331+
attachments=None,
332+
no_tools=False,
333+
generate_topic_summary=None,
334+
media_type=None,
335+
vector_store_ids=None,
336+
shield_ids=None,
337+
solr=None,
338+
)
326339

327340
response = await query_endpoint_handler(
328341
request=test_request,
@@ -369,7 +382,20 @@ async def test_query_byok_inline_rag_returns_referenced_documents(
369382
_ = byok_config
370383
_ = mock_byok_client
371384

372-
query_request = QueryRequest(query="What is OpenShift?")
385+
query_request = QueryRequest(
386+
query="What is OpenShift?",
387+
conversation_id=None,
388+
provider=None,
389+
model=None,
390+
system_prompt=None,
391+
attachments=None,
392+
no_tools=False,
393+
generate_topic_summary=None,
394+
media_type=None,
395+
vector_store_ids=None,
396+
shield_ids=None,
397+
solr=None,
398+
)
373399

374400
response = await query_endpoint_handler(
375401
request=test_request,
@@ -444,7 +470,17 @@ async def test_query_byok_inline_rag_with_request_vector_store_ids(
444470
# Request specifies source-b which is NOT in rag.inline config
445471
query_request = QueryRequest(
446472
query="What is OpenShift?",
473+
conversation_id=None,
474+
provider=None,
475+
model=None,
476+
system_prompt=None,
477+
attachments=None,
478+
no_tools=False,
479+
generate_topic_summary=None,
480+
media_type=None,
447481
vector_store_ids=["source-b"],
482+
shield_ids=None,
483+
solr=None,
448484
)
449485

450486
await query_endpoint_handler(
@@ -505,7 +541,17 @@ async def test_query_byok_request_vector_store_ids_filters_configured_stores(
505541
# Request narrows down to only source-a (using rag_id, not vector_db_id)
506542
query_request = QueryRequest(
507543
query="What is OpenShift?",
544+
conversation_id=None,
545+
provider=None,
546+
model=None,
547+
system_prompt=None,
548+
attachments=None,
549+
no_tools=False,
550+
generate_topic_summary=None,
551+
media_type=None,
508552
vector_store_ids=["source-a"],
553+
shield_ids=None,
554+
solr=None,
509555
)
510556

511557
response = await query_endpoint_handler(
@@ -544,7 +590,20 @@ async def test_query_byok_inline_rag_empty_vector_store_ids_returns_no_chunks(
544590
"""
545591
_ = byok_config
546592

547-
query_request = QueryRequest(query="What is OpenShift?", vector_store_ids=[])
593+
query_request = QueryRequest(
594+
query="What is OpenShift?",
595+
conversation_id=None,
596+
provider=None,
597+
model=None,
598+
system_prompt=None,
599+
attachments=None,
600+
no_tools=False,
601+
generate_topic_summary=None,
602+
media_type=None,
603+
vector_store_ids=[],
604+
shield_ids=None,
605+
solr=None,
606+
)
548607

549608
response = await query_endpoint_handler(
550609
request=test_request,
@@ -575,7 +634,20 @@ async def test_query_byok_inline_rag_error_is_handled_gracefully(
575634

576635
mock_byok_client.vector_io.query.side_effect = Exception("Connection refused")
577636

578-
query_request = QueryRequest(query="What is OpenShift?")
637+
query_request = QueryRequest(
638+
query="What is OpenShift?",
639+
conversation_id=None,
640+
provider=None,
641+
model=None,
642+
system_prompt=None,
643+
attachments=None,
644+
no_tools=False,
645+
generate_topic_summary=None,
646+
media_type=None,
647+
vector_store_ids=None,
648+
shield_ids=None,
649+
solr=None,
650+
)
579651

580652
response = await query_endpoint_handler(
581653
request=test_request,
@@ -610,7 +682,20 @@ async def test_query_byok_tool_rag_returns_tool_calls(
610682
_ = byok_tool_config
611683
_ = mock_byok_tool_rag_client
612684

613-
query_request = QueryRequest(query="What is OpenShift?")
685+
query_request = QueryRequest(
686+
query="What is OpenShift?",
687+
conversation_id=None,
688+
provider=None,
689+
model=None,
690+
system_prompt=None,
691+
attachments=None,
692+
no_tools=False,
693+
generate_topic_summary=None,
694+
media_type=None,
695+
vector_store_ids=None,
696+
shield_ids=None,
697+
solr=None,
698+
)
614699

615700
response = await query_endpoint_handler(
616701
request=test_request,
@@ -640,7 +725,20 @@ async def test_query_byok_tool_rag_referenced_documents(
640725
_ = byok_tool_config
641726
_ = mock_byok_tool_rag_client
642727

643-
query_request = QueryRequest(query="What is OpenShift?")
728+
query_request = QueryRequest(
729+
query="What is OpenShift?",
730+
conversation_id=None,
731+
provider=None,
732+
model=None,
733+
system_prompt=None,
734+
attachments=None,
735+
no_tools=False,
736+
generate_topic_summary=None,
737+
media_type=None,
738+
vector_store_ids=None,
739+
shield_ids=None,
740+
solr=None,
741+
)
644742

645743
response = await query_endpoint_handler(
646744
request=test_request,
@@ -748,7 +846,20 @@ async def test_query_byok_combined_inline_and_tool_rag( # pylint: disable=too-m
748846

749847
mock_holder_class.return_value.get_client.return_value = mock_client
750848

751-
query_request = QueryRequest(query="What is OpenShift?")
849+
query_request = QueryRequest(
850+
query="What is OpenShift?",
851+
conversation_id=None,
852+
provider=None,
853+
model=None,
854+
system_prompt=None,
855+
attachments=None,
856+
no_tools=False,
857+
generate_topic_summary=None,
858+
media_type=None,
859+
vector_store_ids=None,
860+
shield_ids=None,
861+
solr=None,
862+
)
752863

753864
response = await query_endpoint_handler(
754865
request=test_request,
@@ -816,7 +927,20 @@ async def test_query_byok_inline_rag_only_configured_rag_id_is_queried(
816927

817928
mock_holder_class.return_value.get_client.return_value = mock_client
818929

819-
query_request = QueryRequest(query="What is OpenShift?")
930+
query_request = QueryRequest(
931+
query="What is OpenShift?",
932+
conversation_id=None,
933+
provider=None,
934+
model=None,
935+
system_prompt=None,
936+
attachments=None,
937+
no_tools=False,
938+
generate_topic_summary=None,
939+
media_type=None,
940+
vector_store_ids=None,
941+
shield_ids=None,
942+
solr=None,
943+
)
820944

821945
response = await query_endpoint_handler(
822946
request=test_request,
@@ -906,7 +1030,20 @@ async def _side_effect(**kwargs: Any) -> Any:
9061030

9071031
mock_holder_class.return_value.get_client.return_value = mock_client
9081032

909-
query_request = QueryRequest(query="test query")
1033+
query_request = QueryRequest(
1034+
query="test query",
1035+
conversation_id=None,
1036+
provider=None,
1037+
model=None,
1038+
system_prompt=None,
1039+
attachments=None,
1040+
no_tools=False,
1041+
generate_topic_summary=None,
1042+
media_type=None,
1043+
vector_store_ids=None,
1044+
shield_ids=None,
1045+
solr=None,
1046+
)
9101047

9111048
response = await query_endpoint_handler(
9121049
request=test_request,
@@ -978,7 +1115,20 @@ async def test_query_byok_max_chunks_caps_retrieved_results( # pylint: disable=
9781115

9791116
mock_holder_class.return_value.get_client.return_value = mock_client
9801117

981-
query_request = QueryRequest(query="test query")
1118+
query_request = QueryRequest(
1119+
query="test query",
1120+
conversation_id=None,
1121+
provider=None,
1122+
model=None,
1123+
system_prompt=None,
1124+
attachments=None,
1125+
no_tools=False,
1126+
generate_topic_summary=None,
1127+
media_type=None,
1128+
vector_store_ids=None,
1129+
shield_ids=None,
1130+
solr=None,
1131+
)
9821132

9831133
response = await query_endpoint_handler(
9841134
request=test_request,
@@ -1069,7 +1219,20 @@ async def _side_effect(**kwargs: Any) -> Any:
10691219

10701220
mock_holder_class.return_value.get_client.return_value = mock_client
10711221

1072-
query_request = QueryRequest(query="test query")
1222+
query_request = QueryRequest(
1223+
query="test query",
1224+
conversation_id=None,
1225+
provider=None,
1226+
model=None,
1227+
system_prompt=None,
1228+
attachments=None,
1229+
no_tools=False,
1230+
generate_topic_summary=None,
1231+
media_type=None,
1232+
vector_store_ids=None,
1233+
shield_ids=None,
1234+
solr=None,
1235+
)
10731236

10741237
response = await query_endpoint_handler(
10751238
request=test_request,

0 commit comments

Comments
 (0)