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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
23 changes: 22 additions & 1 deletion docs/source/python/numpy.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,28 @@ factory function.
]

Converting from NumPy supports a wide range of input dtypes, including
structured dtypes or strings.
structured dtypes and both fixed-width (``S`` and ``U``) and variable-width
(:class:`numpy.dtypes.StringDType`) strings.

A ``StringDType`` array converts to :func:`~pyarrow.string` unless
:func:`~pyarrow.large_string` or :func:`~pyarrow.string_view` is requested with
``type``. Missing entries become nulls:

.. code-block:: python

>>> dtype = np.dtypes.StringDType(na_object=np.nan)
>>> arr = pa.array(np.array(["some", np.nan, "strings"], dtype=dtype))
>>> arr
<pyarrow.lib.StringArray object at ...>
[
"some",
null,
"strings"
]

When the ``na_object`` is a string, NumPy treats missing entries as that string
in every operation, and so does the conversion. Pass ``mask`` to mark values as
null explicitly.

Arrow to NumPy
--------------
Expand Down
1 change: 1 addition & 0 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ Result<std::shared_ptr<DataType>> NumPyDtypeToArrow(PyArray_Descr* descr) {
TO_ARROW_TYPE_CASE(FLOAT64, float64);
TO_ARROW_TYPE_CASE(STRING, binary);
TO_ARROW_TYPE_CASE(UNICODE, utf8);
TO_ARROW_TYPE_CASE(VSTRING, utf8);
case NPY_DATETIME: {
auto date_dtype =
reinterpret_cast<PyArray_DatetimeDTypeMetaData*>(PyDataType_C_METADATA(descr));
Expand Down
66 changes: 66 additions & 0 deletions python/pyarrow/src/arrow/python/numpy_to_arrow.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

Expand DownExpand Up@@ -295,6 +296,9 @@ class NumPyConverter {
template <typename T>
Status VisitString(T* builder);

template <typename T>
Status VisitStringDType(T* builder);

Status TypeNotImplemented(std::string type_name) {
return Status::NotImplemented("NumPyConverter doesn't implement <", type_name,
"> conversion. ");
Expand DownExpand Up@@ -342,6 +346,11 @@ Status NumPyConverter::Convert() {
return Status::Invalid("Must pass data type for non-object arrays");
}

if (dtype_->type_num == NPY_VSTRING && !is_string_or_string_view(type_->id())) {
return Status::TypeError("Expected an Arrow string type for NumPy StringDType, got ",
type_->ToString());
}

// Visit the type to perform conversion
return VisitTypeInline(*type_, this);
}
Expand DownExpand Up@@ -697,8 +706,65 @@ Status AppendUTF32(const char* data, int64_t itemsize, int byteorder, T* builder

} // namespace

namespace {

std::string_view ToStringView(const npy_static_string& value) {
return value.buf == nullptr ? std::string_view()
: std::string_view(value.buf, value.size);
}

} // namespace

template <typename T>
Status NumPyConverter::VisitStringDType(T* builder) {
auto* descr = reinterpret_cast<PyArray_StringDTypeObject*>(dtype_);
// Use the na_object itself when na_object is a string
const bool null_is_missing = descr->na_object != nullptr && !descr->has_string_na;
const std::string_view null_string = ToStringView(descr->default_string);

const char* data = PyArray_BYTES(arr_);
Ndarray1DIndexer<uint8_t> mask_values;
if (mask_ != nullptr) {
mask_values = Ndarray1DIndexer<uint8_t>(mask_);
}

// Acquiring the allocator lock, so do not acquire the GIL or lock other
// mutexes below or risk deadlocks
auto* allocator = NpyString_acquire_allocator(descr);
std::unique_ptr<npy_string_allocator, decltype(&NpyString_release_allocator)>
allocator_guard(allocator, &NpyString_release_allocator);

npy_static_string value = {0, nullptr};
for (int64_t i = 0; i < length_; ++i, data += stride_) {
if (mask_ != nullptr && mask_values[i]) {
RETURN_NOT_OK(builder->AppendNull());
continue;
}
const auto* packed = reinterpret_cast<const npy_packed_static_string*>(data);
const int is_null = NpyString_load(allocator, packed, &value);
if (is_null == -1) {
return Status::Invalid("Failed to load NumPy StringDType value");
}
if (is_null) {
if (null_is_missing) {
RETURN_NOT_OK(builder->AppendNull());
} else {
RETURN_NOT_OK(builder->Append(null_string));
}
continue;
}
RETURN_NOT_OK(builder->Append(ToStringView(value)));
}
return Status::OK();
}

template <typename T>
Status NumPyConverter::VisitString(T* builder) {
if (dtype_->type_num == NPY_VSTRING) {
// Acquires a lock, so must stay ahead of the gil_lock below
return VisitStringDType(builder);
}

auto data = reinterpret_cast<const uint8_t*>(PyArray_DATA(arr_));

char numpy_byteorder = dtype_->byteorder;
Expand Down
79 changes: 79 additions & 0 deletions python/pyarrow/tests/test_array.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2925,6 +2925,85 @@ def test_array_from_numpy_unicode(string_type):
assert arrow_arr.equals(expected)


@pytest.fixture
def numpy_string_dtype():
dtypes = pytest.importorskip("numpy.dtypes")
return dtypes.StringDType


@pytest.mark.numpy
@pytest.mark.parametrize('string_type', [
None,
pa.string(),
pa.large_string(),
pa.string_view()])
def test_array_from_numpy_string_dtype(numpy_string_dtype, string_type):
values = [
"short",
"a" * 100,
"b" * 300,
"árvíztűrő tükörfúrógép 🥐 你好",
"🥐" * 200,
"",
]
arr = np.array(values, dtype=numpy_string_dtype())

arrow_arr = pa.array(arr, type=string_type)

arrow_arr.validate(full=True)
assert arrow_arr.type == (string_type or pa.string())
assert arrow_arr.to_pylist() == arr.tolist()

strided = np.array(list(itertools.chain.from_iterable(
zip(values, itertools.repeat("skip")))),
dtype=numpy_string_dtype())[::2]
arrow_arr = pa.array(strided, type=string_type)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == values


@pytest.mark.numpy
@pytest.mark.parametrize('na_object, expected', [
(None, None),
(float("nan"), None),
("__placeholder__", "__placeholder__"),
])
def test_array_from_numpy_string_dtype_na_object(
numpy_string_dtype, na_object, expected):
arr = np.array(["some", na_object, "strings"],
dtype=numpy_string_dtype(na_object=na_object))

arrow_arr = pa.array(arr)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, "strings"]

mask = np.array([False, False, True])
arrow_arr = pa.array(arr, mask=mask)
arrow_arr.validate(full=True)
assert arrow_arr.to_pylist() == ["some", expected, None]


@pytest.mark.numpy
def test_array_from_numpy_string_dtype_rejects_non_string_type(
numpy_string_dtype):
arr = np.array(["some", "strings"], dtype=numpy_string_dtype())

msg = "Expected an Arrow string type.*got binary"
with pytest.raises(TypeError, match=msg):
pa.array(arr, type=pa.binary())


@pytest.mark.numpy
def test_array_from_list_of_numpy_string_dtype_arrays(numpy_string_dtype):
values = [["a", "bb"], ["ccc"]]
arrays = [np.array(v, dtype=numpy_string_dtype()) for v in values]

result = pa.array(arrays)

assert result.type == pa.list_(pa.string())
assert result.to_pylist() == values


@pytest.mark.numpy
def test_array_string_from_non_string():
# ARROW-5682 - when converting to string raise on non string-like dtype
Expand Down
Loading