Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new: return copy of payload #627

Merged
merged 2 commits into from
May 21, 2024
Merged

new: return copy of payload #627

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd966b
new: return copy of payload
joein May 15, 2024
c9f6543
new: deepcopy new payload (#628)
joein May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions qdrant_client/local/local_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
Any,
Callable,
Dict,
Iterable,
List,
Optional,
Sequence,
Tuple,
Union,
get_args,
)
from copy import deepcopy

import numpy as np
from pydantic.version import VERSION as PYDANTIC_VERSION
Expand Down Expand Up @@ -357,9 +357,11 @@ def _get_payload(
self,
idx: int,
with_payload: Union[bool, Sequence[str], types.PayloadSelector] = True,
return_copy: bool = True,
) -> Optional[models.Payload]:
payload = self.payload[idx]
return self._process_payload(payload, with_payload)
processed_payload = self._process_payload(payload, with_payload)
return deepcopy(processed_payload) if return_copy else processed_payload

def _get_vectors(
self, idx: int, with_vectors: Union[bool, Sequence[str]] = False
Expand Down Expand Up @@ -1235,7 +1237,9 @@ def _scroll_by_value(

def _update_point(self, point: models.PointStruct) -> None:
idx = self.ids[point.id]
self.payload[idx] = to_jsonable_python(point.payload) if point.payload is not None else {}
self.payload[idx] = deepcopy(
to_jsonable_python(point.payload) if point.payload is not None else {}
)

if isinstance(point.vector, list):
vectors = {DEFAULT_VECTOR_NAME: point.vector}
Expand Down Expand Up @@ -1272,7 +1276,9 @@ def _add_point(self, point: models.PointStruct) -> None:
self.ids[point.id] = idx
self.ids_inv.append(point.id)

self.payload.append(to_jsonable_python(point.payload) if point.payload is not None else {})
self.payload.append(
deepcopy(to_jsonable_python(point.payload) if point.payload is not None else {})
)
assert len(self.payload) == len(self.ids_inv), "Payload and ids_inv must be the same size"
self.deleted = np.append(self.deleted, 0)

Expand Down Expand Up @@ -1487,7 +1493,7 @@ def _persist_by_id(self, point_id: models.ExtendedPointId) -> None:
idx = self.ids[point_id]
point = models.PointStruct(
id=point_id,
payload=self._get_payload(idx, with_payload=True),
payload=self._get_payload(idx, with_payload=True, return_copy=False),
vector=self._get_vectors(idx, with_vectors=True),
)
self.storage.persist(point)
Expand All @@ -1504,7 +1510,7 @@ def set_payload(
key: Optional[str] = None,
) -> None:
ids = self._selector_to_ids(selector)
jsonable_payload = to_jsonable_python(payload)
jsonable_payload = deepcopy(to_jsonable_python(payload))

keys: Optional[List[JsonPathItem]] = parse_json_path(key) if key is not None else None

Expand All @@ -1531,7 +1537,7 @@ def overwrite_payload(
ids = self._selector_to_ids(selector)
for point_id in ids:
idx = self.ids[point_id]
self.payload[idx] = to_jsonable_python(payload) or {}
self.payload[idx] = deepcopy(to_jsonable_python(payload)) or {}
self._persist_by_id(point_id)

def delete_payload(
Expand Down
Loading