Skip to content
Merged
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
20 changes: 7 additions & 13 deletions audformat/core/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def get(
if index is None:
result = self.df
else:
result, result_is_copy = self._get_by_index(index)
result = self._get_by_index(index)

if map is not None:

Expand Down Expand Up @@ -1136,8 +1136,8 @@ def __init__(
meta=meta,
)

def _get_by_index(self, index: pd.Index) -> (pd.DataFrame, bool):
return self.df.loc[index], False
def _get_by_index(self, index: pd.Index) -> pd.DataFrame:
return self.df.loc[index]


class Table(Base):
Expand Down Expand Up @@ -1533,26 +1533,20 @@ def pick_files(
def _get_by_index(
self,
index: pd.Index,
) -> (pd.DataFrame, bool):

result_is_copy = False
) -> pd.DataFrame:

if index_type(self.index) == index_type(index):
result = self.df.loc[index]
else:
files = index.get_level_values(define.IndexField.FILE)
if self.is_filewise: # index is segmented
result = pd.DataFrame(
self.df.loc[files].values,
index,
columns=self.columns
)
result_is_copy = True # to avoid another copy
result = self.df.loc[files]
result.index = index
else: # index is filewise
files = list(dict.fromkeys(files)) # remove duplicates
result = self.df.loc[files]

return result, result_is_copy
return result


def _assert_table_index(
Expand Down
12 changes: 12 additions & 0 deletions tests/test_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,18 @@ def test_get_as_segmented():
db._files_duration = {}


def test_get_preserves_dtypes():

db = pytest.DB

for table in [db['files'], db['segments']]:
df = table.get()
pd.testing.assert_series_equal(df.dtypes, table.df.dtypes)
for index in [table.files, db.segments]:
df = table.get(index)
pd.testing.assert_series_equal(df.dtypes, table.df.dtypes)


def test_load(tmpdir):

path_pkl = os.path.join(tmpdir, 'db.table.pkl')
Expand Down