Skip to content

Commit a4db08d

Browse files
committed
Preserve proto3 field presence for falsy values in REST/gRPC conversion
Three spots in conversions/conversion.py lost information for legitimately falsy values when converting between the REST and gRPC models: - ScoredPoint/Record: a shard_key of 0 or an order_value of 0/0.0 was dropped by a truthiness check (`if model.shard_key`), so it never made it into the gRPC message. Check `is not None` instead. - IntegerIndexParams: `range` and `lookup` are optional bools but were read without a HasField guard, so an unset field turned into False instead of None, silently overriding the server-side default. - SparseVectorParams: the index guard was `HasField("index") is not None`, which is always true since HasField returns a bool, so an empty SparseIndexParams was fabricated even when no index was configured. Added regression tests covering all three.
1 parent b4713cd commit a4db08d

2 files changed

Lines changed: 76 additions & 9 deletions

File tree

‎qdrant_client/conversions/conversion.py‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,8 +1594,8 @@ def convert_integer_index_params(
15941594
) -> rest.IntegerIndexParams:
15951595
return rest.IntegerIndexParams(
15961596
type=rest.IntegerIndexType.INTEGER,
1597-
range=model.range,
1598-
lookup=model.lookup,
1597+
range=model.range if model.HasField("range") else None,
1598+
lookup=model.lookup if model.HasField("lookup") else None,
15991599
is_principal=model.is_principal if model.HasField("is_principal") else None,
16001600
on_disk=model.on_disk if model.HasField("on_disk") else None,
16011601
enable_hnsw=model.enable_hnsw if model.HasField("enable_hnsw") else None,
@@ -2155,9 +2155,7 @@ def convert_sparse_vector_params(
21552155
) -> rest.SparseVectorParams:
21562156
return rest.SparseVectorParams(
21572157
index=(
2158-
cls.convert_sparse_index_config(model.index)
2159-
if model.HasField("index") is not None
2160-
else None
2158+
cls.convert_sparse_index_config(model.index) if model.HasField("index") else None
21612159
),
21622160
modifier=(
21632161
cls.convert_modifier(model.modifier) if model.HasField("modifier") else None
@@ -3092,8 +3090,14 @@ def convert_scored_point(cls, model: rest.ScoredPoint) -> grpc.ScoredPoint:
30923090
else None
30933091
),
30943092
version=model.version,
3095-
shard_key=cls.convert_shard_key(model.shard_key) if model.shard_key else None,
3096-
order_value=cls.convert_order_value(model.order_value) if model.order_value else None,
3093+
shard_key=(
3094+
cls.convert_shard_key(model.shard_key) if model.shard_key is not None else None
3095+
),
3096+
order_value=(
3097+
cls.convert_order_value(model.order_value)
3098+
if model.order_value is not None
3099+
else None
3100+
),
30973101
)
30983102

30993103
@classmethod
@@ -3558,8 +3562,14 @@ def convert_record(cls, model: rest.Record) -> grpc.RetrievedPoint:
35583562
if model.vector is not None
35593563
else None
35603564
),
3561-
shard_key=cls.convert_shard_key(model.shard_key) if model.shard_key else None,
3562-
order_value=cls.convert_order_value(model.order_value) if model.order_value else None,
3565+
shard_key=(
3566+
cls.convert_shard_key(model.shard_key) if model.shard_key is not None else None
3567+
),
3568+
order_value=(
3569+
cls.convert_order_value(model.order_value)
3570+
if model.order_value is not None
3571+
else None
3572+
),
35633573
)
35643574

35653575
@classmethod

‎tests/conversions/test_validate_conversions.py‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,3 +594,60 @@ 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)