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

Async dash bio #430

Merged
merged 13 commits into from
Nov 5, 2019
Merged

Async dash bio #430

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
97c9840
[wip] make all components async-enabled
Oct 18, 2019
0b2ca02
remove bundle analyzer
Oct 18, 2019
f1fd259
async in init
Oct 22, 2019
28f761b
use fragments for tests instead of async components
Oct 22, 2019
82082a1
remove alignment viewer from build
Oct 22, 2019
bb2a315
fix &&
Oct 24, 2019
8ee0e74
Merge remote-tracking branch 'origin/master' into exp-dynamic
Oct 24, 2019
c451173
Update requirements.txt
Marc-Andre-Rivet Nov 1, 2019
bb9dd7e
Update package.json
Marc-Andre-Rivet Nov 1, 2019
b1eea20
- fix remotely hosted versioning bug in __init__.py
Nov 4, 2019
89d6027
Merge branch 'exp-dynamic' of github.com:plotly/dash-bio into exp-dyn…
Nov 4, 2019
24300c0
changelog and version update
Nov 5, 2019
59814e1
update demo version, required version on install
Nov 5, 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
10 changes: 8 additions & 2 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{
"presets": ["@babel/env", "@babel/react"]
}
"presets": [
"@babel/env",
"@babel/react"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import"
]
}
8 changes: 2 additions & 6 deletions dash_bio/SequenceViewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,12 @@ class SequenceViewer(Component):
- sequenceMaxHeight (string; default '400px'): The maximum height of the sequence.
- badge (boolean; default True): The option of whether or not to display a badge showing the
amino acid count at the top of the component beside the title.
- selection (dict; optional): A highlighted section of the sequence; the color of the highlight
- selection (optional): A highlighted section of the sequence; the color of the highlight
can also be defined. Takes a list of format [min, max, color] where
min is a number that represents the starting index of the selection,
max is a number that represents the stopping index of the selection,
and color is a string that defines the highlight color.
Cannot be used at the same time as coverage. selection has the following type: list of dicts containing keys 'low', 'high', 'color'.
Those keys have the following types:
- low (number; optional)
- high (number; optional)
- color (string; optional)
Cannot be used at the same time as coverage.
- coverage (dict; optional): A coverage of the entire sequence; each section of the sequence
can have its own text color, background color, tooltip (on hover),
and an optional underscore. The props start and end represent the
Expand Down
37 changes: 35 additions & 2 deletions dash_bio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,41 @@

_this_module = _sys.modules[__name__]

async_resources = [
'alignment',
'circos',
'ideogram',
'moleculeviewer2',
'moleculeviewer3',
'needle',
'onco',
'sequence',
'speck'
]

_js_dist = []

_js_dist.extend([{
'relative_package_path': 'async~{}.js'.format(async_resource),
'external_url': (
'https://unpkg.com/dash-bio@{}'
'/dash_bio/async~{}.js'
).format(__version__, async_resource),
'namespace': 'dash_bio',
'async': True
} for async_resource in async_resources])

_js_dist = [
_js_dist.extend([{
'relative_package_path': 'async~{}.js.map'.format(async_resource),
'external_url': (
'https://unpkg.com/dash-bio@{}'
'/dash_bio/async~{}.js.map'
).format(__version__, async_resource),
'namespace': 'dash_bio',
'dynamic': True
} for async_resource in async_resources])

_js_dist.extend([
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not for this PR, but at some point - like perhaps, whenever we get around to fully generating __init__.py - this all seems ripe for abstracting into the dash core, like

_js_dist = _dash.development.list_resources(
    ['bundle.js'],
    ['async~{}.js'.format(resource) for resource in async_resources],
    external_prefix='https://unpkg.com/dash-bio@{}/dash_bio'.format(__version__)
)

May still need some tweaking to handle edge cases like async: 'eager'|'lazy', but we should at least be able to auto-detect sourcemaps (which may not exist in release versions plotly/dash#910) and set them all dynamic: True regardless of the resource setting.

{
'relative_package_path': 'bundle.js',
'external_url': (
Expand All @@ -42,7 +75,7 @@
).format(__version__),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hey not new in this PR, but __version__ isn't used in this url?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🔎 Interesting, due to how unpkg.com processes a this request, this works but will always return the latest released version of that file, could make for pretty nice bugs! Fixing.

Copy link
Contributor Author

@Marc-Andre-Rivet Marc-Andre-Rivet Nov 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Someone using the remotely hosted code for an old version will have a nasty surprise after this update..

Copy link
Contributor

Choose a reason for hiding this comment

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

@alexcjohnson Good catch! Surprised we haven't run into it before.

'namespace': package_name
}
]
])

_css_dist = []

Expand Down
2 changes: 0 additions & 2 deletions dash_bio/_imports_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from .AlignmentChart import AlignmentChart
from .AlignmentViewer import AlignmentViewer
from .Circos import Circos
from .Ideogram import Ideogram
from .Molecule2dViewer import Molecule2dViewer
Expand All @@ -11,7 +10,6 @@

__all__ = [
"AlignmentChart",
"AlignmentViewer",
"Circos",
"Ideogram",
"Molecule2dViewer",
Expand Down
63 changes: 63 additions & 0 deletions dash_bio/async~alignment.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions dash_bio/async~circos.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dash_bio/async~ideogram.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dash_bio/async~moleculeviewer2.js
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions dash_bio/async~moleculeviewer3.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dash_bio/async~needle.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading