Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion docarray/typing/tensor/jaxarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ def _docarray_validate(
pass # handled below
elif isinstance(value, str):
value = orjson.loads(value)

# Handle scalar values (int, float, etc.) - wrap in 1D array
elif isinstance(value, (int, float, complex, bool, np.number)):
arr_from_scalar: jnp.ndarray = jnp.array([value])
return cls._docarray_from_native(arr_from_scalar)
try:
arr: jnp.ndarray = jnp.ndarray(value)
return cls._docarray_from_native(arr)
Expand Down
4 changes: 4 additions & 0 deletions docarray/typing/tensor/ndarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ def _docarray_validate(
return cls._docarray_from_native(arr_from_list)
except Exception:
pass # handled below
# Handle scalar values (int, float, etc.) - wrap in 1D array
elif isinstance(value, (int, float, complex, bool, np.number)):
arr_from_scalar: np.ndarray = np.array([value])
return cls._docarray_from_native(arr_from_scalar)
try:
arr: np.ndarray = np.ndarray(value)
return cls._docarray_from_native(arr)
Expand Down
65 changes: 65 additions & 0 deletions tests/units/typing/tensor/test_ndarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,71 @@ def test_from_list():
assert (tensor == np.zeros((2, 2))).all()


def test_from_scalar_int():
"""Test that scalar integers are properly converted to 1-dimensional arrays"""
tensor = parse_obj_as(NdArray, 10)

assert isinstance(tensor, NdArray)
assert isinstance(tensor, np.ndarray)
# Scalar should be wrapped in 1-dimensional array
assert tensor.shape == (1,)
assert tensor[0] == 10
assert tensor.dtype in [np.int32, np.int64] # Platform dependent


def test_from_scalar_float():
"""Test that scalar floats are properly converted to 1-dimensional arrays"""
tensor = parse_obj_as(NdArray, 10.5)

assert isinstance(tensor, NdArray)
assert isinstance(tensor, np.ndarray)
# Scalar should be wrapped in 1-dimensional array
assert tensor.shape == (1,)
assert tensor[0] == 10.5
assert tensor.dtype in [np.float32, np.float64]


def test_from_scalar_complex():
"""Test that scalar complex numbers are properly converted to 1-dimensional arrays"""
tensor = parse_obj_as(NdArray, 3 + 4j)

assert isinstance(tensor, NdArray)
assert isinstance(tensor, np.ndarray)
# Scalar should be wrapped in 1-dimensional array
assert tensor.shape == (1,)
assert tensor[0] == 3 + 4j
assert np.iscomplexobj(tensor)


def test_from_scalar_bool():
"""Test that scalar booleans are properly converted to 1-dimensional arrays"""
tensor = parse_obj_as(NdArray, True)

assert isinstance(tensor, NdArray)
assert isinstance(tensor, np.ndarray)
# Scalar should be wrapped in 1-dimensional array
assert tensor.shape == (1,)
assert tensor[0] == True
assert tensor.dtype == np.bool_


def test_from_scalar_in_document():
"""Test that scalar values work correctly when used in a Document"""

class MyDoc(BaseDoc):
arr: NdArray

# Test with integer
doc_int = MyDoc(arr=42)
assert doc_int.arr.shape == (1,)
assert doc_int.arr[0] == 42

# Test with float
doc_float = MyDoc(arr=3.14)
assert doc_float.arr.shape == (1,)
assert doc_float.arr[0] == 3.14


def test_json_schema():
schema_json_of(NdArray)

Expand Down
Loading