Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLN: make kwargs explicit for pytables read_ methods #29935

Merged
merged 2 commits into from
Dec 1, 2019
Merged
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
80 changes: 62 additions & 18 deletions pandas/io/pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,17 @@
import itertools
import os
import re
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, Union
from typing import (
TYPE_CHECKING,
Any,
Dict,
Hashable,
List,
Optional,
Tuple,
Type,
Union,
)
import warnings

import numpy as np
Expand Down Expand Up @@ -2784,13 +2794,16 @@ def read_array(
else:
return ret

def read_index(self, key: str, **kwargs) -> Index:
def read_index(
self, key: str, start: Optional[int] = None, stop: Optional[int] = None
) -> Index:
variety = _ensure_decoded(getattr(self.attrs, f"{key}_variety"))

if variety == "multi":
return self.read_multi_index(key, **kwargs)
return self.read_multi_index(key, start=start, stop=stop)
elif variety == "regular":
_, index = self.read_index_node(getattr(self.group, key), **kwargs)
node = getattr(self.group, key)
_, index = self.read_index_node(node, start=start, stop=stop)
return index
else: # pragma: no cover
raise TypeError(f"unrecognized index variety: {variety}")
Expand Down Expand Up @@ -2843,20 +2856,23 @@ def write_multi_index(self, key: str, index: MultiIndex):
label_key = f"{key}_label{i}"
self.write_array(label_key, level_codes)

def read_multi_index(self, key: str, **kwargs) -> MultiIndex:
def read_multi_index(
self, key: str, start: Optional[int] = None, stop: Optional[int] = None
) -> MultiIndex:
nlevels = getattr(self.attrs, f"{key}_nlevels")

levels = []
codes = []
names = []
for i in range(nlevels):
level_key = f"{key}_level{i}"
name, lev = self.read_index_node(getattr(self.group, level_key), **kwargs)
node = getattr(self.group, level_key)
name, lev = self.read_index_node(node, start=start, stop=stop)
levels.append(lev)
names.append(name)

label_key = f"{key}_label{i}"
level_codes = self.read_array(label_key, **kwargs)
level_codes = self.read_array(label_key, start=start, stop=stop)
codes.append(level_codes)

return MultiIndex(
Expand Down Expand Up @@ -3017,17 +3033,25 @@ class SeriesFixed(GenericFixed):
pandas_kind = "series"
attributes = ["name"]

name: Optional[Hashable]

@property
def shape(self):
try:
return (len(self.group.values),)
except (TypeError, AttributeError):
return None

def read(self, **kwargs):
kwargs = self.validate_read(kwargs)
index = self.read_index("index", **kwargs)
values = self.read_array("values", **kwargs)
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):
self.validate_read({"where": where, "columns": columns})
index = self.read_index("index", start=start, stop=stop)
values = self.read_array("values", start=start, stop=stop)
return Series(values, index=index, name=self.name)

def write(self, obj, **kwargs):
Expand All @@ -3041,6 +3065,8 @@ class BlockManagerFixed(GenericFixed):
attributes = ["ndim", "nblocks"]
is_shape_reversed = False

nblocks: int

@property
def shape(self):
try:
Expand Down Expand Up @@ -3072,10 +3098,15 @@ def shape(self):
except AttributeError:
return None

def read(self, start=None, stop=None, **kwargs):
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):
# start, stop applied to rows, so 0th axis only

kwargs = self.validate_read(kwargs)
self.validate_read({"columns": columns, "where": where})
select_axis = self.obj_type()._get_block_manager_axis(0)

axes = []
Expand Down Expand Up @@ -4359,14 +4390,21 @@ def write(self, obj, data_columns=None, **kwargs):
obj.columns = [name]
return super().write(obj=obj, data_columns=obj.columns.tolist(), **kwargs)

def read(self, columns=None, **kwargs):
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):

is_multi_index = self.is_multi_index
if columns is not None and is_multi_index:
assert isinstance(self.levels, list) # needed for mypy
for n in self.levels:
if n not in columns:
columns.insert(0, n)
s = super().read(columns=columns, **kwargs)
s = super().read(where=where, columns=columns, start=start, stop=stop)
if is_multi_index:
s.set_index(self.levels, inplace=True)

Expand Down Expand Up @@ -4469,9 +4507,15 @@ def write(self, obj, data_columns=None, **kwargs):
data_columns.insert(0, n)
return super().write(obj=obj, data_columns=data_columns, **kwargs)

def read(self, **kwargs):
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):

df = super().read(**kwargs)
df = super().read(where=where, columns=columns, start=start, stop=stop)
df = df.set_index(self.levels)

# remove names for 'level_%d'
Expand Down