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.

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

Jump to bottom

🎬 : Improved file uploader and camera input to call its on_change handler only when necessary #4270

Merged
merged 12 commits into from Jan 25, 2022
Merged

🎬 : Improved file uploader and camera input to call its on_change handler only when necessary #4270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7df6dfe
Add __eq__ method to UploadedFile, to be able to compare different Up…
kajarenc Jan 11, 2022
d339a5c
fix comment after review, raise NotImplemented to be semantically cor…
kajarenc Jan 22, 2022
5cde03a
Simplify test_file_uploader_serde test, since now we can use `check_r…
kajarenc Jan 22, 2022
6ab523e
Add regression test
kajarenc Jan 23, 2022
ba8b23d
Merge branch 'develop' into fix-4256
kajarenc Jan 23, 2022
e339cc4
fix after merge
kajarenc Jan 23, 2022
80f8804
remove unused variable from test
kajarenc Jan 24, 2022
aaa123f
remove tests, check for test
kajarenc Jan 24, 2022
dedae3d
exclude latest pandas, check for tests
kajarenc Jan 24, 2022
1e27363
try to fix failing tests
kajarenc Jan 24, 2022
7eceb95
Remove latest Pandas version exclusion
kajarenc Jan 24, 2022
246342f
Merge branch 'develop' into fix-4256
kajarenc Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/streamlit/uploaded_file_manager.py
View file
Open in desktop
Expand Up @@ -50,6 +50,11 @@ def __init__(self, record: UploadedFileRec):
self.type = record.type
self.size = len(record.data)

def __eq__(self, other):
if other is not None:
return self.id == other.id
return False

Copy link
Contributor

Choose a reason for hiding this comment

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

To be really correct, __eq__ should typecheck its argument (and we might as well also type-annotate the function)

def __eq__(self, other: object) -> bool:
  if not isinstance(other, UploadedFile):
    return NotImplemented
  return self.id == other.id

(This StackOverflow has more details about the weird "return NotImplemented" line: https://stackoverflow.com/questions/878943/why-return-notimplemented-instead-of-raising-notimplementederror)

def __repr__(self) -> str:
return util.repr_(self)

Expand Down
2 changes: 1 addition & 1 deletion lib/tests/streamlit/file_uploader_test.py
View file
Open in desktop
Expand Up @@ -125,7 +125,7 @@ def test_unique_uploaded_file_instance(self, get_file_recs_patch):
file1: UploadedFile = st.file_uploader("a", accept_multiple_files=False)
file2: UploadedFile = st.file_uploader("b", accept_multiple_files=False)

self.assertNotEqual(file1, file2)
self.assertNotEqual(id(file1), id(file2))

# Seeking in one instance should not impact the position in the other.
file1.seek(2)
Expand Down