Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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 > 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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down
, '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
Closed
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
96 changes: 66 additions & 30 deletions python/pyarrow/pandas_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ def index_level_name(index, i):
return '__index_level_{:d}__'.format(i)


def construct_metadata(df, index_levels, preserve_index, types):
def construct_metadata(df, column_names, index_levels, preserve_index, types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pass the column_names instead of:

column_names = [str(col) for col in df.columns]

?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these got sanitized earlier as part of creating the schema

"""Returns a dictionary containing enough metadata to reconstruct a pandas
DataFrame as an Arrow Table, including index columns.

Expand All@@ -170,41 +170,77 @@ def construct_metadata(df, index_levels, preserve_index, types):
-------
dict
"""
ncolumns = len(df.columns)
ncolumns = len(column_names)
df_types = types[:ncolumns]
index_types = types[ncolumns:ncolumns + len(index_levels)]

column_metadata = [
get_column_metadata(df[col_name], name=sanitized_name,
arrow_type=arrow_type)
for col_name, sanitized_name, arrow_type in
zip(df.columns, column_names, df_types)
]

if preserve_index:
index_column_names = [index_level_name(level, i)
for i, level in enumerate(index_levels)]
index_column_metadata = [
get_column_metadata(level, name=index_level_name(level, i),
arrow_type=arrow_type)
for i, (level, arrow_type) in enumerate(zip(index_levels,
index_types))
]
else:
index_column_names = index_column_metadata = []

return {
b'pandas': json.dumps(
{
'index_columns': [
index_level_name(level, i)
for i, level in enumerate(index_levels)
] if preserve_index else [],
'columns': [
get_column_metadata(
df[name],
name=name,
arrow_type=arrow_type
)
for name, arrow_type in zip(df.columns, df_types)
] + (
[
get_column_metadata(
level,
name=index_level_name(level, i),
arrow_type=arrow_type
)
for i, (level, arrow_type) in enumerate(
zip(index_levels, index_types)
)
] if preserve_index else []
),
'pandas_version': pd.__version__,
}
).encode('utf8')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start making more local variables :)

b'pandas': json.dumps({
'index_columns': index_column_names,
'columns': column_metadata + index_column_metadata,
'pandas_version': pd.__version__
}).encode('utf8')
}


def dataframe_to_arrays(df, timestamps_to_ms, schema, preserve_index):
names = []
arrays = []
index_columns = []
types = []
type = None

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if not isinstance(name, six.string_types):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows anything that isn't a string including floats, timestamps, and other any wacky thing someone puts in a column index. Should this be more strict about what type(df.columns) is?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a lot of cases it will just be "Index". I'd rather have someone complaining about this rather than pre-emptively guessing what will be the right thing to do

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

name = str(name)

if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = pa.Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = pa.Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(index_level_name(column, i))
types.append(array.type)

metadata = construct_metadata(
df, names, index_columns, preserve_index, types
)
return names, arrays, metadata


def table_to_blockmanager(table, nthreads=1):
import pandas.core.internals as _int
from pyarrow.compat import DatetimeTZDtype
Expand Down
49 changes: 2 additions & 47 deletions python/pyarrow/table.pxi
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,51 +317,6 @@ cdef int _schema_from_arrays(
return 0


cdef tuple _dataframe_to_arrays(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity , why was this written in cython originally?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started small, got bigger =)

df,
bint timestamps_to_ms,
Schema schema,
bint preserve_index
):
cdef:
list names = []
list arrays = []
list index_columns = []
list types = []
DataType type = None
dict metadata
Py_ssize_t i
Py_ssize_t n

if preserve_index:
n = len(getattr(df.index, 'levels', [df.index]))
index_columns.extend(df.index.get_level_values(i) for i in range(n))

for name in df.columns:
col = df[name]
if schema is not None:
field = schema.field_by_name(name)
type = getattr(field, "type", None)

array = Array.from_pandas(
col, type=type, timestamps_to_ms=timestamps_to_ms
)
arrays.append(array)
names.append(name)
types.append(array.type)

for i, column in enumerate(index_columns):
array = Array.from_pandas(column, timestamps_to_ms=timestamps_to_ms)
arrays.append(array)
names.append(pdcompat.index_level_name(column, i))
types.append(array.type)

metadata = pdcompat.construct_metadata(
df, index_columns, preserve_index, types
)
return names, arrays, metadata


cdef class RecordBatch:
"""
Batch of rows of columns of equal length
Expand DownExpand Up@@ -570,7 +525,7 @@ cdef class RecordBatch:
-------
pyarrow.RecordBatch
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df, False, schema, preserve_index
)
return cls.from_arrays(arrays, names, metadata)
Expand DownExpand Up@@ -748,7 +703,7 @@ cdef class Table:
>>> pa.Table.from_pandas(df)
<pyarrow.lib.Table object at 0x7f05d1fb1b40>
"""
names, arrays, metadata = _dataframe_to_arrays(
names, arrays, metadata = pdcompat.dataframe_to_arrays(
df,
timestamps_to_ms=timestamps_to_ms,
schema=schema,
Expand Down
5 changes: 5 additions & 0 deletions python/pyarrow/tests/test_convert_pandas.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@ def test_all_none_category(self):
df['a'] = df['a'].astype('category')
self._check_pandas_roundtrip(df)

def test_non_string_columns(self):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for additional column types that either fails or explicitly succeeds based on what we decide about allowing other types in.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can leave this as the only test right now and say that anything other integers or strings is undefined behavior.

df = pd.DataFrame({0: [1, 2, 3]})
table = pa.Table.from_pandas(df)
assert table.column(0).name == '0'

def test_float_no_nulls(self):
data = {}
fields = []
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/tests/test_ipc.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ def test_pandas_serialize_round_trip_multi_index():


@pytest.mark.xfail(
raises=TypeError,
raises=AssertionError,
reason='Non string columns are not supported',
)
def test_pandas_serialize_round_trip_not_string_columns():
Expand Down