feat: multiple file support for file_drop #562

hkayabilisim · 2024-03-16T18:37:12Z

Added multiple file support to file_drop component.
Same as the original component, directories are simply ignored. Multiple file support was actually embedded in the underlying VUE scripts. I've done minor changes.

Compatibility:
on_file callback function now accepts List[FileInfo] as opposed to single FileInfo object. This may bring some problems for existing codes. As a remedy, if the number of files is just one, we can return a single FileInfo. If not, we return list. I leave it up to you to decide.

This is related to: #260

mariobuikhuizen

Thanks for your contribution @hkayabilisim!

We would like to keep this component backward compatible. We could accomplish this by adding an argument multiple with a default value of False and have on_file also work with a single file (see this for an example of the typing, note the argument optional: Literal[False])

solara/components/file_drop.vue

hkayabilisim

missing ';' at the end of the "padding:" line was causing CSS problem.

hkayabilisim

Changes required for backward compatibility:

multiple property is added to FileDrop
Two different on_file callback signature used: FileInfo and List[FileInfo]
FileDrop is overloaded to match two different on_file signatures.
FileDrop apidoc is updated
FileDrop example is updated
bullet list in VUE template is removed
isFile property is always set to True (this was a hidden bug)
app/scatter.py is reverted to original version

hkayabilisim

Comments of @mariobuikhuizen are handled in 7d44858ec65c103c299d9757c4ef169e5f5b9f9b

maartenbreddels · 2024-03-21T16:04:54Z

Looking good!
A few issues

due to a large refactor, files have moved (see refactor: Uniting API, Docs, and Examples under Documentation on solara.dev #421)
I think we need to pass 'multiple' to the frontend, because now you can still drag in multiple files and they render in the component, I think we should show only 1
Some style issues (if you install pre-commit and run pre-commit install, those will be fixed for you - and we should document this on https://solara.dev/docs/howto/contribute )

Looking forward to see this green in CI, and get this merged 🥳

hkayabilisim · 2024-03-21T22:29:23Z

Used "multiple" option in file_drop.vue to list single file in drop zone when multiple is not selected. However, I couldn't propogate "multiple" to further inside Vue to prevent processing multiple file when multiple is not selected. I don't think this is a big issue.
I could select a wrong return type from FileDrop. I guess, it must have been reacton.core.something but couldn't find it properly.
I used pre-commit to clean style issues but couldn't solve the following one. So, I had to disable pre-commit right before commit:

hkayabilisim · 2024-03-22T07:47:33Z

Hi @maartenbreddels

There is only one error I couldn't resolve. Help needed!

solara/components/file_drop.py

solara/website/pages/documentation/components/input/file_drop.py

maartenbreddels · 2024-03-22T13:21:41Z

Hi Huseyin,

we had quite a long discussion internally on this PR.
For ToggleButton https://github.com/widgetti/solara/blob/master/solara/components/togglebuttons.py we had two different components

ToggleButtonsSingle
ToggleButtonsMultiple

This is because otherwise the typing becomes quite complex (as you can see now for FileDrop), and it only works for literals. So if you want to take advantage of the typing you need to do:

if multiple:
  FileDrop(..., multiple=True)
else:
  FileDrop(..., multiple=False)

Which is a bit odd. For this reason, it might be better to have
FileDrop and FileDropMultiple (they can call the same internal component btw, it's just the public API)

However, also that would be inconsistent in the naming, so either solution is not perfect.

Two questions:

What do you think about the typing and one vs two components
If you also prefer FileDropMultiple, are you willing to do the changes? If not, we're happy to help.

Let us know, and thanks you for your help on this.

Regards,

Maarten

hkayabilisim · 2024-03-22T19:54:58Z

Hi Maarten,

Getting rid of some complexity by creating two variants (FileDrop and FileDropMultiple) seems a good idea.

I've just created FileDropMultiple and commited to the branch and tested little bit (fa6cd23). It seems ok, and CI checks are green. Yet, you should revise my implementation in case if I missed some points.

Sincerely
Huseyin

maartenbreddels · 2024-03-22T20:04:06Z

Hi Huseyin,

whow, many thank for doing all this work!
CI looks green (ignore that failing one, that's not related to what you do)
Will review after the weekend probably. Have a good weekend.

Regards,

Maarten

maartenbreddels

Awesome work.
Let me know if you have the energy to do these last changes. I know we're asking a lot from you, so we are happy to do the last mile.

solara/components/file_drop.py

hkayabilisim · 2024-03-24T15:25:57Z

No problem Maarten! I've added _FileDrop to prevent code repetitions. I hope this is what you have in your mind!

hkayabilisim

It may not fit 100% to the code styling requirements but I think my last commit e5e6f40 solves most of the highlighted issues.

One of the checks keeps failing but I couldn't understand why.

iisakkirotko · 2024-03-27T08:38:44Z

Hi @hkayabilisim! Just wanted to let you know that the CI failure is still unrelated, it should be fixed by #574. We'll try to get this PR in soon™️ :)

Co-authored-by: Iisakki Rotko <iisakki.rotko@gmail.com>

"Navigation to X is interrupted to another navigation to Y" In the logs we see: ``` FAILED tests/integration/ssg_test.py::test_ssg[starlette-chromium] - playwright._impl._errors.Error: Navigation to "http://localhost:18768/" is interrupted by another navigation to "http://localhost:18768/" FAILED tests/integration/starlette_test.py::test_starlette_mount[starlette-chromium] - playwright._impl._errors.Error: Navigation to "http://localhost:18770/solara_mount/" is interrupted by another navigation to "http://localhost:18768/" ERROR tests/integration/widget_test.py::test_widget_button_solara[starlette-chromium] - playwright._impl._errors.Error: Navigation to "http://localhost:18768/?id=4004e29b-a9e6-4b1e-9652-7b1c61ef86cd" is interrupted by another navigation to "http://localhost:18770/solara_mount/" ERROR tests/integration/widget_test.py::test_solara_button_all[starlette-solara-chromium] - playwright._impl._errors.Error: Navigation to "http://localhost:18768/?id=c8f0b1fb-abdb-4969-b340-1156d2699783" is interrupted by another navigation to "http://localhost:18768/?id=4004e29b-a9e6-4b1e-9652-7b1c61ef86cd" ERROR tests/integration/widget_test.py::test_slider_all[starlette-solara-chromium] - playwright._impl._errors.Error: Navigation to "http://localhost:18768/?id=680f1fc7-5a19-4e1c-a382-088f2ec96b78" is interrupted by another navigation to "http://localhost:18768/?id=c8f0b1fb-abdb-4969-b340-1156d2699783" ```

maartenbreddels · 2024-03-27T11:31:13Z

This branch had some flakiness that we wanted to attack (see the last commit) before merging it. Thanks for your patience!

hkayabilisim mentioned this pull request Mar 16, 2024

Multiple file support for FileDrop #260

Open

mariobuikhuizen requested changes Mar 19, 2024

View reviewed changes

solara/components/file_drop.vue Outdated Show resolved Hide resolved

solara/components/file_drop.vue Outdated Show resolved Hide resolved

mariobuikhuizen reviewed Mar 19, 2024

View reviewed changes

solara/components/file_drop.vue Outdated Show resolved Hide resolved

hkayabilisim commented Mar 19, 2024

View reviewed changes

hkayabilisim requested a review from mariobuikhuizen March 20, 2024 19:56

hkayabilisim closed this Mar 21, 2024

hkayabilisim reopened this Mar 21, 2024

iisakkirotko reviewed Mar 22, 2024

View reviewed changes

solara/components/file_drop.py Outdated Show resolved Hide resolved

solara/website/pages/documentation/components/input/file_drop.py Outdated Show resolved Hide resolved

solara/website/pages/documentation/components/input/file_drop.py Outdated Show resolved Hide resolved

maartenbreddels requested changes Mar 23, 2024

View reviewed changes

solara/components/file_drop.py Outdated Show resolved Hide resolved

solara/components/file_drop.py Outdated Show resolved Hide resolved

solara/components/file_drop.py Outdated Show resolved Hide resolved

hkayabilisim commented Mar 25, 2024

View reviewed changes

hkayabilisim and others added 2 commits March 27, 2024 12:17

feat: multiple file support for file_drop

e77139a

Co-authored-by: Iisakki Rotko <iisakki.rotko@gmail.com>

maartenbreddels merged commit c8ab5f6 into widgetti:master Mar 27, 2024

feat: multiple file support for file_drop #562

feat: multiple file support for file_drop #562

Uh oh!

Conversation

hkayabilisim commented Mar 16, 2024

Uh oh!

mariobuikhuizen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hkayabilisim left a comment

Choose a reason for hiding this comment

Uh oh!

hkayabilisim left a comment

Choose a reason for hiding this comment

Uh oh!

hkayabilisim left a comment

Choose a reason for hiding this comment

Uh oh!

maartenbreddels commented Mar 21, 2024

Uh oh!

hkayabilisim commented Mar 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hkayabilisim commented Mar 22, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maartenbreddels commented Mar 22, 2024

Uh oh!

hkayabilisim commented Mar 22, 2024

Uh oh!

maartenbreddels commented Mar 22, 2024

Uh oh!

maartenbreddels left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hkayabilisim commented Mar 24, 2024

Uh oh!

hkayabilisim left a comment

Choose a reason for hiding this comment

Uh oh!

iisakkirotko commented Mar 27, 2024

Uh oh!

maartenbreddels commented Mar 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hkayabilisim commented Mar 21, 2024 •

edited

Loading