Skip to content

Vector types: optimize error path #1226

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

Merged
merged 2 commits into from
Jul 29, 2025
Merged

Vector types: optimize error path #1226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d788b
Vector types: optimize error path
robsdedude Jul 24, 2025
9c6ca1f
Merge branch '6.x' into feat/vector-from-native-optimization
robsdedude Jul 24, 2025
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
45 changes: 27 additions & 18 deletions src/neo4j/vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
]


_DEFAULT = object()


class Vector:
r"""
A class representing a Neo4j vector.
Expand Down Expand Up @@ -753,10 +756,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_float = tuple(item for item in data if not isinstance(item, float))
if non_float:
non_float_gen = (item for item in data if not isinstance(item, float))
non_float = next(non_float_gen, _DEFAULT)
if non_float is not _DEFAULT:
raise TypeError(
f"Cannot build f64 vector from {type(non_float[0]).__name__}, "
f"Cannot build f64 vector from {type(non_float).__name__}, "
"expected float."
)
return cls(_np.fromiter(data, dtype=_np.dtype(">f8")).tobytes())
Expand Down Expand Up @@ -826,10 +830,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_float = tuple(item for item in data if not isinstance(item, float))
if non_float:
non_float_gen = (item for item in data if not isinstance(item, float))
non_float = next(non_float_gen, _DEFAULT)
if non_float is not _DEFAULT:
raise TypeError(
f"Cannot build f32 vector from {type(non_float[0]).__name__}, "
f"Cannot build f32 vector from {type(non_float).__name__}, "
"expected float."
)
return cls(_np.fromiter(data, dtype=_np.dtype(">f4")).tobytes())
Expand Down Expand Up @@ -903,10 +908,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_int = tuple(item for item in data if not isinstance(item, int))
if non_int:
non_int_gen = (item for item in data if not isinstance(item, int))
non_int = next(non_int_gen, _DEFAULT)
if non_int is not _DEFAULT:
raise TypeError(
f"Cannot build i64 vector from {type(non_int[0]).__name__}, "
f"Cannot build i64 vector from {type(non_int).__name__}, "
"expected int."
)
data = _t.cast(tuple[int, ...], data)
Expand Down Expand Up @@ -994,10 +1000,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_int = tuple(item for item in data if not isinstance(item, int))
if non_int:
non_int_gen = (item for item in data if not isinstance(item, int))
non_int = next(non_int_gen, _DEFAULT)
if non_int is not _DEFAULT:
raise TypeError(
f"Cannot build i32 vector from {type(non_int[0]).__name__}, "
f"Cannot build i32 vector from {type(non_int).__name__}, "
"expected int."
)
data = _t.cast(tuple[int, ...], data)
Expand Down Expand Up @@ -1085,10 +1092,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_int = tuple(item for item in data if not isinstance(item, int))
if non_int:
non_int_gen = (item for item in data if not isinstance(item, int))
non_int = next(non_int_gen, _DEFAULT)
if non_int is not _DEFAULT:
raise TypeError(
f"Cannot build i16 vector from {type(non_int[0]).__name__}, "
f"Cannot build i16 vector from {type(non_int).__name__}, "
"expected int."
)
data = _t.cast(tuple[int, ...], data)
Expand Down Expand Up @@ -1176,10 +1184,11 @@ def _from_native_rust(cls, data: _t.Iterable[object], /) -> _t.Self:
@classmethod
def _from_native_np(cls, data: _t.Iterable[object], /) -> _t.Self:
data = tuple(data)
non_int = tuple(item for item in data if not isinstance(item, int))
if non_int:
non_int_gen = (item for item in data if not isinstance(item, int))
non_int = next(non_int_gen, _DEFAULT)
if non_int is not _DEFAULT:
raise TypeError(
f"Cannot build i8 vector from {type(non_int[0]).__name__}, "
f"Cannot build i8 vector from {type(non_int).__name__}, "
"expected int."
)
data = _t.cast(tuple[int, ...], data)
Expand Down