Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 0.23.0 - 2018-08-01
## Added
- Dash components are now generated at build-time and then imported rather than generated when a module is imported. This should reduce the time it takes to import Dash component libraries, and makes Dash compatible with IDEs.

## 0.22.1 - 2018-08-01
## Fixed
- Raise a more informative error if a non JSON serializable value is returned from a callback [#273](https://github.com/plotly/dash/pull/273)
Expand All@@ -7,6 +11,7 @@
- Assets files & index customization [#286](https://github.com/plotly/dash/pull/286)
- Raise an error if there is no layout present when the server is running [#294](https://github.com/plotly/dash/pull/294)


## 0.21.1 - 2018-04-10
## Added
- `aria-*` and `data-*` attributes are now supported in all dash html components. (#40)
Expand Down
146 changes: 133 additions & 13 deletions dash/development/base_component.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import collections
import copy
import os
import inspect


def is_number(s):
Expand All@@ -18,7 +20,56 @@ def _check_if_has_indexable_children(item):
raise KeyError


def _explicitize_args(func):
# Python 2
if hasattr(func, 'func_code'):
varnames = func.func_code.co_varnames
# Python 3
else:
varnames = func.__code__.co_varnames

def wrapper(*args, **kwargs):
if '_explicit_args' in kwargs.keys():
raise Exception('Variable _explicit_args should not be set.')
kwargs['_explicit_args'] = \
list(
set(
list(varnames[:len(args)]) + [k for k, _ in kwargs.items()]
)
)
if 'self' in kwargs['_explicit_args']:
kwargs['_explicit_args'].remove('self')
return func(*args, **kwargs)

# If Python 3, we can set the function signature to be correct
if hasattr(inspect, 'signature'):
# pylint: disable=no-member
new_sig = inspect.signature(wrapper).replace(
parameters=inspect.signature(func).parameters.values()
)
wrapper.__signature__ = new_sig
return wrapper


class Component(collections.MutableMapping):
class _UNDEFINED(object):
def __repr__(self):
return 'undefined'

def __str__(self):
return 'undefined'

UNDEFINED = _UNDEFINED()

class _REQUIRED(object):
def __repr__(self):
return 'required'

def __str__(self):
return 'required'

REQUIRED = _REQUIRED()

def __init__(self, **kwargs):
# pylint: disable=super-init-not-called
for k, v in list(kwargs.items()):
Expand DownExpand Up@@ -214,9 +265,9 @@ def __len__(self):


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
def generate_class_string(typename, props, description, namespace):
"""
Dynamically generate classes to have nicely formatted docstrings,
Dynamically generate class strings to have nicely formatted docstrings,
keyword arguments, and repr

Inspired by http://jameso.be/2013/08/06/namedtuple.html
Expand All@@ -230,6 +281,7 @@ def generate_class(typename, props, description, namespace):

Returns
-------
string

"""
# TODO _prop_names, _type, _namespace, available_events,
Expand All@@ -250,7 +302,8 @@ def generate_class(typename, props, description, namespace):
# not all component authors will supply those.
c = '''class {typename}(Component):
"""{docstring}"""
def __init__(self, {default_argtext}):
@_explicitize_args
def __init__(self, {default_argtext}, **kwargs):
self._prop_names = {list_of_valid_keys}
self._type = '{typename}'
self._namespace = '{namespace}'
Expand All@@ -261,11 +314,15 @@ def __init__(self, {default_argtext}):
self.available_wildcard_properties =\
{list_of_valid_wildcard_attr_prefixes}

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {{k: _locals[k] for k in _explicit_args if k != 'children'}}

for k in {required_args}:
if k not in kwargs:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')

super({typename}, self).__init__({argtext})

def __repr__(self):
Expand All@@ -290,13 +347,13 @@ def __repr__(self):
return (
'{typename}(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
'''
'''

filtered_props = reorder_props(filter_props(props))
# pylint: disable=unused-variable
list_of_valid_wildcard_attr_prefixes = repr(parse_wildcards(props))
# pylint: disable=unused-variable
list_of_valid_keys = repr(list(filtered_props.keys()))
list_of_valid_keys = repr(list(map(str, filtered_props.keys())))
# pylint: disable=unused-variable
docstring = create_docstring(
component_name=typename,
Expand All@@ -306,19 +363,82 @@ def __repr__(self):

# pylint: disable=unused-variable
events = '[' + ', '.join(parse_events(props)) + ']'
prop_keys = list(props.keys())
if 'children' in props:
default_argtext = 'children=None, **kwargs'
prop_keys.remove('children')
default_argtext = "children=None, "
# pylint: disable=unused-variable
argtext = 'children=children, **kwargs'
argtext = 'children=children, **args'
else:
default_argtext = '**kwargs'
argtext = '**kwargs'
default_argtext = ""
argtext = '**args'
default_argtext += ", ".join(
[('{:s}=Component.REQUIRED'.format(p)
if props[p]['required'] else
'{:s}=Component.UNDEFINED'.format(p))
for p in prop_keys
if not p.endswith("-*") and
p not in ['dashEvents', 'fireEvent', 'setProps']]
)

required_args = required_props(props)
return c.format(**locals())


# pylint: disable=unused-argument
def generate_class_file(typename, props, description, namespace):
"""
Generate a python class file (.py) given a class string

scope = {'Component': Component}
Parameters
----------
typename
props
description
namespace

Returns
-------

"""
import_string =\
"# AUTO GENERATED FILE - DO NOT EDIT\n\n" + \
"from dash.development.base_component import " + \
"Component, _explicitize_args\n\n\n"
class_string = generate_class_string(
typename,
props,
description,
namespace
)
file_name = "{:s}.py".format(typename)

file_path = os.path.join(namespace, file_name)
with open(file_path, 'w') as f:
f.write(import_string)
f.write(class_string)


# pylint: disable=unused-argument
def generate_class(typename, props, description, namespace):
"""
Generate a python class object given a class string

Parameters
----------
typename
props
description
namespace

Returns
-------

"""
string = generate_class_string(typename, props, description, namespace)
scope = {'Component': Component, '_explicitize_args': _explicitize_args}
# pylint: disable=exec-used
exec(c.format(**locals()), scope)
exec(string, scope)
result = scope[typename]
return result

Expand Down
72 changes: 66 additions & 6 deletions dash/development/component_loader.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
import collections
import json
import os
from .base_component import generate_class
from .base_component import generate_class_file


def _get_metadata(metadata_path):
# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
return data


def load_components(metadata_path,
Expand All@@ -20,12 +32,7 @@ def load_components(metadata_path,

components = []

# Start processing
with open(metadata_path) as data_file:
json_string = data_file.read()
data = json\
.JSONDecoder(object_pairs_hook=collections.OrderedDict)\
.decode(json_string)
data = _get_metadata(metadata_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
Expand All@@ -47,3 +54,56 @@ def load_components(metadata_path,
components.append(component)

return components


def generate_classes(namespace, metadata_path='lib/metadata.json'):
"""Load React component metadata into a format Dash can parse,
then create python class files.

Usage: generate_classes()

Keyword arguments:
namespace -- name of the generated python package (also output dir)

metadata_path -- a path to a JSON file created by
[`react-docgen`](https://github.com/reactjs/react-docgen).

Returns:
"""

data = _get_metadata(metadata_path)
imports_path = os.path.join(namespace, '_imports_.py')

# Make sure the file doesn't exist, as we use append write
if os.path.exists(imports_path):
os.remove(imports_path)

# Iterate over each property name (which is a path to the component)
for componentPath in data:
componentData = data[componentPath]

# Extract component name from path
# e.g. src/components/MyControl.react.js
# TODO Make more robust - some folks will write .jsx and others
# will be on windows. Unfortunately react-docgen doesn't include
# the name of the component atm.
name = componentPath.split('/').pop().split('.')[0]
generate_class_file(
name,
componentData['props'],
componentData['description'],
namespace
)

# Add an import statement for this component
with open(imports_path, 'a') as f:
f.write('from .{0:s} import {0:s}\n'.format(name))

# Add the __all__ value so we can import * from _imports_
all_imports = [p.split('/').pop().split('.')[0] for p in data]
with open(imports_path, 'a') as f:
array_string = '[\n'
for a in all_imports:
array_string += ' "{:s}",\n'.format(a)
array_string += ']\n'
f.write('\n\n__all__ = {:s}'.format(array_string))
2 changes: 1 addition & 1 deletion dash/version.py
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.22.1'
__version__ = '0.23.0'
Loading