Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add unminified components bundle support. by T4rk1n · Pull Request #369 · plotly/dash · GitHub
Skip to content
Merged
3 changes: 2 additions & 1 deletion .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,8 @@ confidence=
# --disable=W"
disable=fixme,
missing-docstring,
invalid-name
invalid-name,
too-many-lines
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,8 @@ disable=invalid-name,
comprehension-escape,
no-else-return,
useless-object-inheritance,
possibly-unused-variable
possibly-unused-variable,
too-many-lines

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
## 0.27.0 - 2018-09-20
## Added
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)

## Fixed
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)

## 0.26.6 - 2018-09-19
## Fixed
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)
Expand Down
9 changes: 6 additions & 3 deletions dash/_configs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,18 +19,21 @@ def env_configs():
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
'DASH_ASSETS_EXTERNAL_PATH',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_COMPONENTS_CACHE_MAX_AGE'
'DASH_COMPONENTS_CACHE_MAX_AGE',
'DASH_INCLUDE_ASSETS_FILES',
'DASH_SERVE_DEV_BUNDLES',
'DASH_DEBUG'
)})


def get_config(config_name, init, env, default=None):
def get_config(config_name, init, env, default=None, is_bool=False):
if init is not None:
return init

env_value = env.get('DASH_{}'.format(config_name.upper()))
if env_value is None:
return default
return env_value
return env_value if not is_bool else env_value.lower() == 'true'


def pathname_configs(url_base_pathname=None,
Expand Down
57 changes: 52 additions & 5 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

# add a handler for components suites errors to return 404
self.server.errorhandler(exceptions.InvalidResourceError)(
Expand DownExpand Up@@ -373,11 +376,14 @@ def _generate_scripts_html(self):
# pylint: disable=protected-access
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies
dash_renderer._js_dist_dependencies,
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts() +
self.scripts.get_all_scripts(
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist
dash_renderer._js_dist,
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand DownExpand Up@@ -541,7 +547,7 @@ def dependencies(self):
'inputs': v['inputs'],
'state': v['state'],
'events': v['events']
} for k, v in list(self.callback_map.items())
} for k, v in self.callback_map.items()
])

# pylint: disable=unused-argument, no-self-use
Expand DownExpand Up@@ -979,8 +985,49 @@ def get_asset_url(self, path):

return asset

def enable_dev_tools(self,
debug=False,
dev_tools_serve_dev_bundles=None):
"""
Activate the dev tools, called by `run_server`. If your application is
served by wsgi and you want to activate the dev tools, you can call
this method out of `__main__`.

:param debug: If True, then activate all the tools unless specified.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles.
:type dev_tools_serve_dev_bundles: bool
:return:
"""
env = _configs.env_configs()
debug = debug or _configs.get_config('debug', None, env, debug,
is_bool=True)

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_dev_bundles, env,
default=debug,
is_bool=True
)
return debug

def run_server(self,
port=8050,
debug=False,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
self.server.run(port=port, debug=debug, **flask_run_options)
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead.

:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of components
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
debug = self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)
14 changes: 9 additions & 5 deletions dash/resources.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,18 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

def _filter_resources(self, all_resources):
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
)
elif 'relative_package_path' in s:
filtered_resource['relative_package_path'] = (
s['relative_package_path']
Expand DownExpand Up@@ -54,7 +58,7 @@ def _filter_resources(self, all_resources):

return filtered_resources

def get_all_resources(self):
def get_all_resources(self, dev_bundles=False):
all_resources = []
if self.config.infer_from_layout:
all_resources = (
Expand All@@ -63,7 +67,7 @@ def get_all_resources(self):
else:
all_resources = self._resources

return self._filter_resources(all_resources)
return self._filter_resources(all_resources, dev_bundles)

def get_inferred_resources(self):
namespaces = []
Expand DownExpand Up@@ -127,8 +131,8 @@ def _update_layout(self, layout):
def append_script(self, script):
self._resources.append_resource(script)

def get_all_scripts(self):
return self._resources.get_all_resources()
def get_all_scripts(self, dev_bundles=False):
return self._resources.get_all_resources(dev_bundles)

def get_inferred_scripts(self):
return self._resources.get_inferred_resources()
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.26.6'
__version__ = '0.27.0'