Skip to content

Commit

Permalink
Refactor enable_dev_tools variables names.
Browse files Browse the repository at this point in the history
  • Loading branch information
T4rk1n committed Sep 17, 2018
1 parent 72a0db7 commit 1669e08
Showing 1 changed file with 26 additions and 24 deletions.
50 changes: 26 additions & 24 deletions dash/dash.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@ def add_url(name, view_func, methods=('GET',)):
self._layout = None
self._cached_layout = None
self.routes = []
self._serve_dev_bundle = False
self._dev_tools = _AttributeDict({
'serve_dev_bundles': False
})

@property
def layout(self):
Expand Down Expand Up @@ -359,13 +361,13 @@ def _generate_scripts_html(self):
srcs = self._collect_and_register_resources(
self.scripts._resources._filter_resources(
dash_renderer._js_dist_dependencies,
dev_bundles=self._serve_dev_bundle
dev_bundles=self._dev_tools.serve_dev_bundles
)) + self._external_scripts + self._collect_and_register_resources(
self.scripts.get_all_scripts(
dev_bundles=self._serve_dev_bundle) +
dev_bundles=self._dev_tools.serve_dev_bundles) +
self.scripts._resources._filter_resources(
dash_renderer._js_dist,
dev_bundles=self._serve_dev_bundle
dev_bundles=self._dev_tools.serve_dev_bundles
))

return '\n'.join([
Expand Down Expand Up @@ -954,46 +956,46 @@ def get_asset_url(self, path):
self.config.routes_pathname_prefix,
path)

def activate_dev_tools(self,
dev_tools=True,
dev_tools_bundles=True):
def enable_dev_tools(self,
debug=False,
dev_tools_serve_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 dev_tools: If false no tools will be activated.
:type dev_tools: bool
:param dev_tools_bundles: Serve the dev bundles of component libs.
:type dev_tools_bundles: bool
:param debug: If false no tools will be activated.
:type debug: bool
:param dev_tools_serve_bundles: Serve the dev bundles of component libs.
:type dev_tools_serve_bundles: bool
:return:
"""
if not dev_tools:
if not debug:
return
self._serve_dev_bundle = dev_tools_bundles

env = _configs.env_configs()

self._dev_tools['serve_dev_bundles'] = _configs.get_config(
'serve_dev_bundles', dev_tools_serve_bundles, env, True)

def run_server(self,
port=8050,
debug=False,
dev_tools=True,
dev_tools_bundles=True,
dev_tools_serve_dev_bundles=None,
**flask_run_options):
"""
Start the flask server in local mode, you should not run this on a
production server and use gunicorn/waitress instead. By default will
activate the dev tools (dev bundles).
production server and use gunicorn/waitress instead.
:param port: Port the application
:type port: int
:param debug: Set the debug mode of flask.
:param debug: Set the debug mode of flask and enable the dev tools.
:type debug: bool
:param dev_tools: Activate all the dev tools.
:type dev_tools: bool
:param dev_tools_bundles: Serve the dev bundles of component libs.
:type dev_tools_bundles: bool
:param dev_tools_serve_dev_bundles: Serve the dev bundles of component libs.
:type dev_tools_serve_dev_bundles: bool
:param flask_run_options: Given to `Flask.run`
:return:
"""
self.activate_dev_tools(dev_tools, dev_tools_bundles)
self.server.run(port=port, debug=dev_tools or debug,
self.enable_dev_tools(debug, dev_tools_serve_dev_bundles)
self.server.run(port=port, debug=debug,
**flask_run_options)

0 comments on commit 1669e08

Please sign in to comment.