Skip to content

Commit a3a3159

Browse files
committed
tests: replace separate tests with fixtures
1 parent a4db08d commit a3a3159

2 files changed

Lines changed: 63 additions & 73 deletions

File tree

‎tests/conversions/fixtures.py‎

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,45 @@
515515
version=12,
516516
order_value=order_value_float,
517517
)
518+
scored_point_shard_key_order_value_falsy_value = grpc.ScoredPoint(
519+
id=point_id,
520+
payload=payload,
521+
score=0.99,
522+
vectors=single_vector_output,
523+
version=12,
524+
shard_key=grpc.ShardKey(number=0),
525+
order_value=grpc.OrderValue(int=3),
526+
)
527+
retrieved_point_shard_key_order_value_falsy_value = grpc.RetrievedPoint(
528+
id=point_id,
529+
payload=payload,
530+
vectors=single_vector_output,
531+
shard_key=grpc.ShardKey(number=0),
532+
order_value=grpc.OrderValue(int=3),
533+
)
534+
retrieved_point = grpc.ScoredPoint(
535+
id=point_id,
536+
payload=payload,
537+
vectors=single_vector_output,
538+
)
539+
retrieved_point_order_value_int = grpc.ScoredPoint(
540+
id=point_id,
541+
payload=payload,
542+
vectors=single_vector_output,
543+
order_value=order_value_int,
544+
)
545+
retrieved_point_order_value_float = grpc.ScoredPoint(
546+
id=point_id,
547+
# payload=payload,
548+
vectors=named_vectors_output,
549+
# order_value=order_value_float,
550+
)
551+
retrieved_point_multivector = grpc.ScoredPoint(
552+
id=point_id,
553+
payload=payload,
554+
vectors=multi_vector_output,
555+
order_value=order_value_float,
556+
)
518557
create_alias = grpc.CreateAlias(collection_name="col1", alias_name="col2")
519558

520559
quantization_search_params = grpc.QuantizationSearchParams(
@@ -591,6 +630,7 @@
591630
integer_index_params_1 = grpc.IntegerIndexParams(
592631
lookup=True, range=True, on_disk=True, is_principal=True, enable_hnsw=True
593632
)
633+
integer_index_params_2 = grpc.IntegerIndexParams()
594634

595635
keyword_index_params_0 = grpc.KeywordIndexParams()
596636
keyword_index_params_1 = grpc.KeywordIndexParams(is_tenant=True, on_disk=True, enable_hnsw=True)
@@ -634,6 +674,7 @@
634674
points=0,
635675
)
636676

677+
637678
payload_schema_integer_no_disk_not_principal = grpc.PayloadSchemaInfo(
638679
data_type=grpc.PayloadSchemaType.Integer,
639680
params=grpc.PayloadIndexParams(integer_index_params=integer_index_params_0),
@@ -646,6 +687,12 @@
646687
points=0,
647688
)
648689

690+
payload_schema_integer_default = grpc.PayloadSchemaInfo(
691+
data_type=grpc.PayloadSchemaType.Integer,
692+
params=grpc.PayloadIndexParams(integer_index_params=integer_index_params_0),
693+
points=0,
694+
)
695+
649696
payload_schema_keyword_no_disk_not_tenant = grpc.PayloadSchemaInfo(
650697
data_type=grpc.PayloadSchemaType.Keyword,
651698
params=grpc.PayloadIndexParams(keyword_index_params=keyword_index_params_0),
@@ -748,6 +795,7 @@
748795
"text_field_multilingual": payload_schema_text_multilingual,
749796
"integer_no_disk_not_principal": payload_schema_integer_no_disk_not_principal,
750797
"integer_on_disk_is_principal": payload_schema_integer_on_disk_is_principal,
798+
"integer_default": payload_schema_integer_default,
751799
"keyword_no_disk_not_tenant": payload_schema_keyword_no_disk_not_tenant,
752800
"keyword_on_disk_is_tenant": payload_schema_keyword_on_disk_is_tenant,
753801
"float_no_disk_not_principal": payload_schema_float_no_disk_not_principal,
@@ -889,6 +937,8 @@
889937
modifier=getattr(grpc.Modifier, "None"),
890938
)
891939

940+
sparse_vector_params_empty = grpc.SparseVectorParams()
941+
892942
sparse_vector_params_datatype = grpc.SparseVectorParams(
893943
index=grpc.SparseIndexConfig(
894944
full_scan_threshold=1000,
@@ -1057,20 +1107,6 @@
10571107
exclude=grpc.PayloadExcludeSelector(fields=["color", "price"])
10581108
)
10591109

1060-
retrieved_point = grpc.RetrievedPoint(
1061-
id=point_id_1,
1062-
payload=payload_to_grpc({"key": payload_value}),
1063-
vectors=single_vector_output,
1064-
)
1065-
1066-
retrieved_point_with_order_value = grpc.RetrievedPoint(
1067-
id=point_id_1,
1068-
payload=payload_to_grpc({"key": payload_value}),
1069-
vectors=single_vector_output,
1070-
order_value=order_value_int,
1071-
)
1072-
1073-
10741110
count_result = grpc.CountResult(count=5)
10751111

10761112
timestamp = Timestamp()
@@ -1664,6 +1700,7 @@
16641700
scored_point_order_value_int,
16651701
scored_point_order_value_float,
16661702
scored_point_multivector,
1703+
scored_point_shard_key_order_value_falsy_value,
16671704
],
16681705
"CreateAlias": [create_alias],
16691706
"GeoBoundingBox": [geo_bounding_box],
@@ -1726,7 +1763,13 @@
17261763
with_payload_include,
17271764
with_payload_exclude,
17281765
],
1729-
"RetrievedPoint": [retrieved_point, retrieved_point_with_order_value],
1766+
"RetrievedPoint": [
1767+
retrieved_point,
1768+
retrieved_point_order_value_int,
1769+
retrieved_point_order_value_float,
1770+
retrieved_point_multivector,
1771+
retrieved_point_shard_key_order_value_falsy_value,
1772+
],
17301773
"CountResult": [count_result],
17311774
"SnapshotDescription": [snapshot_description],
17321775
"VectorParams": [
@@ -1811,7 +1854,11 @@
18111854
delete_vectors_operation,
18121855
delete_vectors_operation_2,
18131856
],
1814-
"SparseVectorParams": [sparse_vector_params, sparse_vector_params_datatype],
1857+
"SparseVectorParams": [
1858+
sparse_vector_params,
1859+
sparse_vector_params_datatype,
1860+
sparse_vector_params_empty,
1861+
],
18151862
"SparseVectorConfig": [sparse_vector_config],
18161863
"ShardKeySelector": [shard_key_selector, shard_key_selector_2],
18171864
"ShardingMethod": [sharding_method_1, sharding_method_2],

‎tests/conversions/test_validate_conversions.py‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -594,60 +594,3 @@ def test_optimizers_config_diff_max_threads():
594594
assert restored_grpc_opt_conf.max_optimization_threads == q_grpc.MaxOptimizationThreads(
595595
value=value
596596
)
597-
598-
599-
def test_convert_point_falsy_shard_key_and_order_value():
600-
from qdrant_client import grpc as q_grpc, models
601-
from qdrant_client.conversions.conversion import RestToGrpc
602-
603-
# A shard key of 0 and an order value of 0/0.0 are valid values, not "missing".
604-
# They used to be dropped by a truthiness check, so make sure they survive.
605-
scored = models.ScoredPoint(id=1, version=0, score=0.5, payload={}, shard_key=0, order_value=0)
606-
grpc_scored = RestToGrpc.convert_scored_point(scored)
607-
assert grpc_scored.HasField("shard_key")
608-
assert grpc_scored.shard_key == q_grpc.ShardKey(number=0)
609-
assert grpc_scored.HasField("order_value")
610-
assert grpc_scored.order_value == q_grpc.OrderValue(int=0)
611-
612-
record = models.Record(id=2, payload={}, shard_key=0, order_value=0.0)
613-
grpc_record = RestToGrpc.convert_record(record)
614-
assert grpc_record.HasField("shard_key")
615-
assert grpc_record.HasField("order_value")
616-
assert grpc_record.order_value == q_grpc.OrderValue(float=0.0)
617-
618-
# None must still map to an unset field.
619-
empty = RestToGrpc.convert_scored_point(models.ScoredPoint(id=3, version=0, score=1.0))
620-
assert not empty.HasField("shard_key")
621-
assert not empty.HasField("order_value")
622-
623-
624-
def test_convert_integer_index_params_optional_flags():
625-
from qdrant_client import grpc as q_grpc
626-
from qdrant_client.conversions.conversion import GrpcToRest
627-
628-
# range/lookup are optional bools. Unset must become None, not False, otherwise
629-
# an unspecified flag silently overrides the server default.
630-
unset = GrpcToRest.convert_integer_index_params(q_grpc.IntegerIndexParams(is_principal=True))
631-
assert unset.range is None
632-
assert unset.lookup is None
633-
634-
explicit = GrpcToRest.convert_integer_index_params(
635-
q_grpc.IntegerIndexParams(range=True, lookup=False)
636-
)
637-
assert explicit.range is True
638-
assert explicit.lookup is False
639-
640-
641-
def test_convert_sparse_vector_params_without_index():
642-
from qdrant_client import grpc as q_grpc
643-
from qdrant_client.conversions.conversion import GrpcToRest
644-
645-
# No index set -> index should be None, not a fabricated empty SparseIndexParams.
646-
no_index = GrpcToRest.convert_sparse_vector_params(q_grpc.SparseVectorParams())
647-
assert no_index.index is None
648-
649-
with_index = GrpcToRest.convert_sparse_vector_params(
650-
q_grpc.SparseVectorParams(index=q_grpc.SparseIndexConfig(on_disk=True))
651-
)
652-
assert with_index.index is not None
653-
assert with_index.index.on_disk is True

0 commit comments

Comments
 (0)