Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
T4rk1n merged 7 commits into from
Jan 23, 2019
Merged

Fix assets blueprint path management #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adcae27
:construction: Fix assets blueprint path management.
T4rk1n Jan 20, 2019
4e98c6c
:rotating_light: Fix test_configs.test_pathname_prefix_assets
T4rk1n Jan 20, 2019
f4c4e6a
:rotating_light: Fix test_assets
T4rk1n Jan 20, 2019
936d024
:ok_hand: Fix use self._assets_folder
ned2 Jan 21, 2019
88fa20b
:ok_hand: Remove assets_blueprint_name kwargs
T4rk1n Jan 21, 2019
ac84592
:hocho: Remove name from server if server argument is provided.
T4rk1n Jan 23, 2019
5abb1d4
:pencil: Update changelog
T4rk1n Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down
5 changes: 1 addition & 4 deletions dash/_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
requests_pathname,
routes_pathname,
asset_path,
asset_url_path):
i = requests_pathname.rfind(routes_pathname)
req = requests_pathname[:i]

return '/'.join([
# Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
asset_url_path,
asset_path
])
Expand Down
31 changes: 20 additions & 11 deletions dash/dash.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
name='__main__',
server=None,
static_folder='static',
assets_folder=None,
assets_folder='assets',
assets_url_path='/assets',
assets_ignore='',
include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
See https://github.com/plotly/dash/issues/141 for details.
''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
flask.helpers.get_root_path(name),
assets_folder,
)
self._assets_url_path = assets_url_path

# allow users to supply their own flask server
self.server = server or Flask(name, static_folder=static_folder)

if 'assets' not in self.server.blueprints:
self.server.register_blueprint(
flask.Blueprint('assets', 'assets',
static_folder=self._assets_folder,
static_url_path=assets_url_path))

env_configs = _configs.env_configs()

url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
env_configs, 2678400))
})

assets_blueprint_name = '{}{}'.format(
self.config.routes_pathname_prefix.replace('/', '_'),
'dash_assets'
)

self.server.register_blueprint(
flask.Blueprint(
assets_blueprint_name, name,
static_folder=self._assets_folder,
static_url_path='{}{}'.format(
self.config.routes_pathname_prefix,
assets_url_path.lstrip('/')
)
)
)

# list of dependencies
self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
def get_asset_url(self, path):
asset = _get_asset_path(
self.config.requests_pathname_prefix,
self.config.routes_pathname_prefix,
path,
self._assets_url_path.lstrip('/')
)
Expand Down
10 changes: 4 additions & 6 deletions tests/test_configs.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

def test_pathname_prefix_assets(self):
req = '/'
routes = '/'
path = get_asset_path(req, routes, 'reset.css', 'assets')
path = get_asset_path(req, 'reset.css', 'assets')
self.assertEqual('/assets/reset.css', path)

req = '/requests/'
path = get_asset_path(req, routes, 'reset.css', 'assets')
path = get_asset_path(req, 'reset.css', 'assets')
self.assertEqual('/requests/assets/reset.css', path)

req = '/requests/routes/'
routes = '/routes/'
path = get_asset_path(req, routes, 'reset.css', 'assets')
self.assertEqual('/requests/assets/reset.css', path)
path = get_asset_path(req, 'reset.css', 'assets')
self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down
1 change: 0 additions & 1 deletion tests/test_integration.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

def test_assets(self):
app = dash.Dash(__name__,
assets_folder='tests/assets',
assets_ignore='.*ignored.*')
app.index_string = '''
<!DOCTYPE html>
Expand Down
, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down

, '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
Fix assets blueprint path management#547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

T4rk1n
merged 7 commits into

from

Jan 23, 2019
 Merged


Fix assets blueprint path management
#547
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
adcae27

:construction: Fix assets blueprint path management.


T4rk1n Jan 20, 2019
4e98c6c

:rotating_light: Fix test_configs.test_pathname_prefix_assets


T4rk1n Jan 20, 2019
f4c4e6a

:rotating_light: Fix test_assets


T4rk1n Jan 20, 2019
936d024

:ok_hand: Fix use self._assets_folder


ned2 Jan 21, 2019
88fa20b

:ok_hand: Remove assets_blueprint_name kwargs


T4rk1n Jan 21, 2019
ac84592

:hocho: Remove name from server if server argument is provided.


T4rk1n Jan 23, 2019
5abb1d4

:pencil: Update changelog


T4rk1n Jan 23, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
## [UNRELEASED] - 2019-01-23
## Fixed
- Asset blueprint takes routes prefix into it's static path. [#547](https://github.com/plotly/dash/pull/547)
- Asset url path no longer strip routes from requests. [#547](https://github.com/plotly/dash/pull/547)

## Changed
- `assets_folder` argument now default to 'assets' [#547](https://github.com/plotly/dash/pull/547)
- The assets folder is now always relative to the given root path of `name` argument, the default of `__main__` will get the `cwd`. [#547](https://github.com/plotly/dash/pull/547)
- No longer coerce the name argument from the server if the server argument is provided. [#547](https://github.com/plotly/dash/pull/547)

## [0.35.2] - 2019-01-11
## Fixed
- Fix typo in some exception names [#522](https://github.com/plotly/dash/pull/522)
Expand Down

5 changes: 1 addition & 4 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,15 +29,12 @@ def generate_hash():

def get_asset_path(
 requests_pathname,
 routes_pathname,
 asset_path,
 asset_url_path):
 i = requests_pathname.rfind(routes_pathname)
 req = requests_pathname[:i]

 return '/'.join([
 # Only take the first part of the pathname
req,
requests_pathname.rstrip('/'),
 asset_url_path,
 asset_path
 ])
Expand Down

31 changes: 20 additions & 11 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ def __init__(
 name='__main__',
 server=None,
 static_folder='static',
 assets_folder=None,
 assets_folder='assets',
 assets_url_path='/assets',
 assets_ignore='',
 include_assets_files=True,
Expand All@@ -102,21 +102,15 @@ def __init__(
 See https://github.com/plotly/dash/issues/141 for details.
 ''', DeprecationWarning)

name = name if server is None else server.name
self._assets_folder = assets_folder or os.path.join(
flask.helpers.get_root_path(name), 'assets'
self._assets_folder = os.path.join(
 flask.helpers.get_root_path(name),
assets_folder,
 )
 self._assets_url_path = assets_url_path

 # allow users to supply their own flask server
 self.server = server or Flask(name, static_folder=static_folder)

 if 'assets' not in self.server.blueprints:
 self.server.register_blueprint(
 flask.Blueprint('assets', 'assets',
 static_folder=self._assets_folder,
 static_url_path=assets_url_path))

 env_configs = _configs.env_configs()

 url_base_pathname, routes_pathname_prefix, requests_pathname_prefix = \
Expand DownExpand Up@@ -146,6 +140,22 @@ def __init__(
 env_configs, 2678400))
 })

 assets_blueprint_name = '{}{}'.format(
 self.config.routes_pathname_prefix.replace('/', '_'),
 'dash_assets'
 )

 self.server.register_blueprint(
 flask.Blueprint(
 assets_blueprint_name, name,
 static_folder=self._assets_folder,
 static_url_path='{}{}'.format(
 self.config.routes_pathname_prefix,
 assets_url_path.lstrip('/')
 )
 )
 )

 # list of dependencies
 self.callback_map = {}

Expand DownExpand Up@@ -1056,7 +1066,6 @@ def _serve_default_favicon(self):
 def get_asset_url(self, path):
 asset = _get_asset_path(
 self.config.requests_pathname_prefix,
 self.config.routes_pathname_prefix,
 path,
 self._assets_url_path.lstrip('/')
 )
Expand Down

10 changes: 4 additions & 6 deletions
tests/test_configs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,18 +91,16 @@ def test_pathname_prefix_environ_requests(self):

 def test_pathname_prefix_assets(self):
 req = '/'
 routes = '/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/assets/reset.css', path)

 req = '/requests/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)

 req = '/requests/routes/'
 routes = '/routes/'
 path = get_asset_path(req, routes, 'reset.css', 'assets')
 self.assertEqual('/requests/assets/reset.css', path)
 path = get_asset_path(req, 'reset.css', 'assets')
 self.assertEqual('/requests/routes/assets/reset.css', path)


if __name__ == '__main__':
Expand Down

1 change: 0 additions & 1 deletion
tests/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -361,7 +361,6 @@ def test_index_customization(self):

 def test_assets(self):
 app = dash.Dash(__name__,
 assets_folder='tests/assets',
 assets_ignore='.*ignored.*')
 app.index_string = '''
 <!DOCTYPE html>
Expand Down