Skip to content

more flexible type of input arguments for px functions #1768

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.

Sign up for GitHub

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

Merged
merged 69 commits into from
Oct 4, 2019
Merged

more flexible type of input arguments for px functions #1768

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
152f87f
more flexible type of input arguments for px functions
emmanuelle Sep 13, 2019
fe4eda3
wrong col name case
emmanuelle Sep 13, 2019
86937ea
corner case of functions grabbing all cols
emmanuelle Sep 13, 2019
1ad0f5c
better behavior of index, more tests
emmanuelle Sep 14, 2019
7d0e985
comment code
emmanuelle Sep 14, 2019
915a5a1
black
emmanuelle Sep 15, 2019
5d5ab81
debugging
emmanuelle Sep 15, 2019
ea0fa6a
relax column ordering in tests
emmanuelle Sep 15, 2019
e5f6953
tests
emmanuelle Sep 15, 2019
29d7e18
array arguments
emmanuelle Sep 16, 2019
4a028a2
move column checks
emmanuelle Sep 16, 2019
ab35b42
case of dimensions
emmanuelle Sep 16, 2019
e4b8835
clean code + black
emmanuelle Sep 16, 2019
3b0d21a
deduplicated labels logics
emmanuelle Sep 16, 2019
2a6ff71
better handling of dimensions
emmanuelle Sep 17, 2019
72b5d1c
corner case when column was modified
emmanuelle Sep 17, 2019
19431dd
modified docs
emmanuelle Sep 17, 2019
7297a7f
black
emmanuelle Sep 17, 2019
dadd645
case when no df provided and str arguments
emmanuelle Sep 17, 2019
2cb9dba
argument=None
emmanuelle Sep 17, 2019
b09dc58
better handling of problematic case
emmanuelle Sep 17, 2019
91e6cda
simplify code
emmanuelle Sep 17, 2019
33db488
symbol and line_dash
emmanuelle Sep 17, 2019
e58c82e
stricter check on column
emmanuelle Sep 17, 2019
9d65a07
more readable error message
emmanuelle Sep 17, 2019
64010de
check length
emmanuelle Sep 17, 2019
20bd812
error when multiindex
emmanuelle Sep 17, 2019
a7241a5
accept int as column names
emmanuelle Sep 18, 2019
dc1fc0a
array and dict as dataframe
emmanuelle Sep 18, 2019
61678c2
splom case
emmanuelle Sep 18, 2019
71756a3
simplified index case
emmanuelle Sep 18, 2019
40ba5b9
black
emmanuelle Sep 18, 2019
749db6c
better error messages
emmanuelle Sep 19, 2019
cd8574a
better handling of Series (name is None)
emmanuelle Sep 19, 2019
299fdde
handle case of name conflicts
emmanuelle Sep 19, 2019
8753797
removed print statements
emmanuelle Sep 20, 2019
ed24d8b
black
emmanuelle Sep 20, 2019
2da2b21
wip
emmanuelle Sep 20, 2019
102b89f
name heuristic
emmanuelle Sep 20, 2019
0a50f6a
Py2 fix
emmanuelle Sep 20, 2019
58c9eba
more complex test
emmanuelle Sep 20, 2019
0a92537
use sets instead of lists
emmanuelle Sep 20, 2019
372bd8f
bug correction and new test
emmanuelle Sep 20, 2019
3d0aff0
comments
emmanuelle Sep 20, 2019
5a329ad
simpler way to use names
emmanuelle Sep 23, 2019
e0e0dd5
comments
emmanuelle Sep 23, 2019
6bced73
docstring
emmanuelle Sep 23, 2019
bcc41a2
more tests
emmanuelle Sep 23, 2019
382e768
integer column names
emmanuelle Sep 23, 2019
82c6592
typo
emmanuelle Sep 24, 2019
9caeee1
better error message
emmanuelle Sep 24, 2019
adc68d3
better test
emmanuelle Sep 24, 2019
5dc0ab1
order of tests
emmanuelle Sep 24, 2019
f5d056c
doc modification
emmanuelle Sep 24, 2019
bedf74f
qa
emmanuelle Sep 24, 2019
074342b
case of named index
emmanuelle Sep 24, 2019
ead8430
be more defensive with names
emmanuelle Sep 24, 2019
db10967
better error msg with index
emmanuelle Sep 24, 2019
ef29378
do not modify input arguments
emmanuelle Sep 24, 2019
5e40653
corrected bug
emmanuelle Sep 25, 2019
78564cc
name consistency
emmanuelle Sep 25, 2019
2534ca9
name consistency
emmanuelle Sep 25, 2019
c88660f
qa
emmanuelle Sep 25, 2019
b5adbcf
if args[field] is a dict it should stay a dict
emmanuelle Sep 25, 2019
b375f91
addressed Jon's comments
emmanuelle Sep 26, 2019
c59a4d5
spaces in error messages
emmanuelle Sep 28, 2019
1774ade
case of size column
emmanuelle Sep 28, 2019
16d95af
qa
emmanuelle Sep 30, 2019
5c95786
revert to is
emmanuelle Sep 30, 2019
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
6 changes: 3 additions & 3 deletions packages/python/plotly/plotly/express/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,9 @@ def build_dataframe(args, attrables, array_attrables):
keep_name = df_provided and argument is df_input.index
else:
# we use getattr/hasattr because of index
keep_name = hasattr(
df_input, col_name
) and argument is getattr(df_input, col_name)
keep_name = col_name in df_input and argument.equals(
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it intentional to move from is to .equals() here?

Copy link
Contributor

Choose a reason for hiding this comment

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

(also we should remove the comment above now ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes it was intentional, I think it's enough that the values are all equal. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok I reverted to is

df_input[col_name]
)
col_name = (
col_name
if keep_name
Expand Down
6 changes: 6 additions & 0 deletions packages/python/plotly/plotly/tests/test_core/test_px/test_px_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,9 @@ def test_pass_df_columns():
assert fig.data[1].hovertemplate.count("customdata") == len(tips.columns)
tips_copy = px.data.tips()
assert tips_copy.columns.equals(tips.columns)


def test_size_column():
df = px.data.tips()
fig = px.scatter(df, x=df["size"], y=df.tip)
assert fig.data[0].hovertemplate == "size=%{x}<br>tip=%{y}"