Skip to content

Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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
jonmmease merged 5 commits into from
Feb 28, 2021
Merged

Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fa6083
Honor plotly figure's template width
jonmmease Feb 27, 2021
42234c3
Set plotGlPixelRatio to 2x the scale factor
jonmmease Feb 27, 2021
eb7dfb8
Refactor to use plotly.py to_json method for json encoding
jonmmease Feb 27, 2021
fa3cd67
Add --single-process chromium arg on AWS Lambda
jonmmease Feb 27, 2021
7be8de8
Update no_output_timeout for windows fetch
jonmmease Feb 28, 2021
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
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
steps:
- checkout
- run: echo $Host.Version
- run: .\repos\win_scripts\fetch_chromium.ps1
- run:
command: .\repos\win_scripts\fetch_chromium.ps1
no_output_timeout: 30m
- persist_to_workspace:
root: ./repos
paths:
Expand Down
3 changes: 0 additions & 3 deletions repos/kaleido/js/src/plotly/constants.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

// config option passed in render step
plotGlPixelRatio: 2.5,

// time [in ms] after which printToPDF errors when image isn't loaded
pdfPageLoadImgTimeout: 20000
}
8 changes: 4 additions & 4 deletions repos/kaleido/js/src/plotly/render.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

// Use parsed export request
info = parsed.result;
const figure = info.figure
const format = info.format
const encoded = info.encoded
const figure = info.figure;
const format = info.format;
const encoded = info.encoded;

// Build default config, and let figure.config override it
const defaultConfig = {
mapboxAccessToken: opts.mapboxAccessToken || null,
plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
plotGlPixelRatio: info.scale * 2
}
if (opts.topojsonURL) {
defaultConfig.topojsonURL = opts.topojsonURL
Expand Down
16 changes: 10 additions & 6 deletions repos/kaleido/py/kaleido/scopes/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
# Subclasses may override to specify a custom JSON encoder for input data
_json_encoder = None

# Tuple of class properties that will be passed as command-line
# flags to configure scope
_scope_flags = ()

# Specify default chromium arguments
_default_chromium_args = (
"--disable-gpu",
"--allow-file-access-from-files",
"--disable-breakpad",
"--disable-dev-shm-usage",
) + (
# Add "--single-process" when running on AWS Lambda. Flag is described
# as for debugging only by the chromium project, but it's the only way to get
# chromium headless working on Lambda
("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
)

_scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
self._chromium_args = tuple(val)
self._shutdown_kaleido()

def _json_dumps(self, val):
return json.dumps(val)

def _perform_transform(self, data, **kwargs):
"""
Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
self._ensure_kaleido()

# Perform export
export_spec = json.dumps(
dict(kwargs, data=data),
cls=self._json_encoder).encode('utf-8')
export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

# Write to process and read result within a lock so that can be
# sure we're reading the response to our request
Expand Down
22 changes: 17 additions & 5 deletions repos/kaleido/py/kaleido/scopes/plotly.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
"""
Scope for transforming Plotly figures to static images
"""
_json_encoder = PlotlyJSONEncoder
_all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
_text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
def scope_name(self):
return "plotly"

def _json_dumps(self, val):
return pio.to_json(val, validate=False, remove_uids=False)

def transform(self, figure, format=None, width=None, height=None, scale=None):
"""
Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
# Get figure layout
layout = figure.get("layout", {})

# Compute default width / height
width = width or layout.get("width", None) or self.default_width
height = height or layout.get("height", None) or self.default_height
# Compute image width / height
width = (
width
or layout.get("width", None)
or layout.get("template", {}).get("layout", {}).get("width", None)
or self.default_width
)
height = (
height
or layout.get("height", None)
or layout.get("template", {}).get("layout", {}).get("height", None)
or self.default_height
)

# Normalize format
original_format = format
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda) by jonmmease · Pull Request #76 · plotly/Kaleido · GitHub
Skip to content
Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)#76

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

jonmmease
merged 5 commits into

from

Feb 28, 2021
 Merged


Various python updates (plotGlPixelRatio, template dimensions, json engine, AWS Lambda)
#76
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
0fa6083

Honor plotly figure's template width


jonmmease Feb 27, 2021
42234c3

Set plotGlPixelRatio to 2x the scale factor


jonmmease Feb 27, 2021
eb7dfb8

Refactor to use plotly.py to_json method for json encoding


jonmmease Feb 27, 2021
fa3cd67

Add --single-process chromium arg on AWS Lambda


jonmmease Feb 27, 2021
7be8de8

Update no_output_timeout for windows fetch


jonmmease Feb 28, 2021

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


4 changes: 3 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,7 +280,9 @@ jobs:
 steps:
 - checkout
 - run: echo $Host.Version
 - run: .\repos\win_scripts\fetch_chromium.ps1
 - run:
 command: .\repos\win_scripts\fetch_chromium.ps1
 no_output_timeout: 30m
 - persist_to_workspace:
 root: ./repos
 paths:
Expand Down

3 changes: 0 additions & 3 deletions
repos/kaleido/js/src/plotly/constants.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,6 @@ module.exports = {

 mathJaxConfigQuery: '?config=TeX-AMS-MML_SVG',

 // config option passed in render step
 plotGlPixelRatio: 2.5,

 // time [in ms] after which printToPDF errors when image isn't loaded
 pdfPageLoadImgTimeout: 20000
}

8 changes: 4 additions & 4 deletions
repos/kaleido/js/src/plotly/render.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,14 @@ function render (info, mapboxAccessToken, topojsonURL) {

 // Use parsed export request
 info = parsed.result;
 const figure = info.figure
 const format = info.format
 const encoded = info.encoded
 const figure = info.figure;
 const format = info.format;
 const encoded = info.encoded;

 // Build default config, and let figure.config override it
 const defaultConfig = {
 mapboxAccessToken: opts.mapboxAccessToken || null,
 plotGlPixelRatio: opts.plotGlPixelRatio || cst.plotGlPixelRatio
 plotGlPixelRatio: info.scale * 2
 }
 if (opts.topojsonURL) {
 defaultConfig.topojsonURL = opts.topojsonURL
Expand Down

16 changes: 10 additions & 6 deletions
repos/kaleido/py/kaleido/scopes/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,21 @@


class BaseScope(object):
 # Subclasses may override to specify a custom JSON encoder for input data
 _json_encoder = None

 # Tuple of class properties that will be passed as command-line
 # flags to configure scope
 _scope_flags = ()

 # Specify default chromium arguments
 _default_chromium_args = (
 "--disable-gpu",
 "--allow-file-access-from-files",
 "--disable-breakpad",
 "--disable-dev-shm-usage",
 ) + (
 # Add "--single-process" when running on AWS Lambda. Flag is described
 # as for debugging only by the chromium project, but it's the only way to get
 # chromium headless working on Lambda
 ("--single-process",) if os.environ.get("LAMBDA_RUNTIME_DIR", None) else ()
 )

 _scope_chromium_args = ()
Expand DownExpand Up@@ -274,6 +277,9 @@ def chromium_args(self, val):
 self._chromium_args = tuple(val)
 self._shutdown_kaleido()

 def _json_dumps(self, val):
 return json.dumps(val)

 def _perform_transform(self, data, **kwargs):
 """
 Transform input data using the current scope, returning dict response with error code
Expand All@@ -287,9 +293,7 @@ def _perform_transform(self, data, **kwargs):
 self._ensure_kaleido()

 # Perform export
 export_spec = json.dumps(
 dict(kwargs, data=data),
 cls=self._json_encoder).encode('utf-8')
 export_spec = self._json_dumps(dict(kwargs, data=data)).encode('utf-8')

 # Write to process and read result within a lock so that can be
 # sure we're reading the response to our request
Expand Down

22 changes: 17 additions & 5 deletions
repos/kaleido/py/kaleido/scopes/plotly.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
from kaleido.scopes.base import BaseScope, which
from _plotly_utils.utils import PlotlyJSONEncoder
import plotly.io as pio
import base64
import os
from pathlib import Path
Expand All@@ -10,7 +10,6 @@ class PlotlyScope(BaseScope):
 """
 Scope for transforming Plotly figures to static images
 """
 _json_encoder = PlotlyJSONEncoder
 _all_formats = ("png", "jpg", "jpeg", "webp", "svg", "pdf", "eps", "json")
 _text_formats = ("svg", "json", "eps")

Expand DownExpand Up@@ -73,6 +72,9 @@ def _initialize_mathax(self, mathjax=None):
 def scope_name(self):
 return "plotly"

 def _json_dumps(self, val):
 return pio.to_json(val, validate=False, remove_uids=False)

 def transform(self, figure, format=None, width=None, height=None, scale=None):
 """
 Convert a Plotly figure into a static image
Expand DownExpand Up@@ -115,9 +117,19 @@ def transform(self, figure, format=None, width=None, height=None, scale=None):
 # Get figure layout
 layout = figure.get("layout", {})

 # Compute default width / height
 width = width or layout.get("width", None) or self.default_width
 height = height or layout.get("height", None) or self.default_height
 # Compute image width / height
 width = (
 width
 or layout.get("width", None)
 or layout.get("template", {}).get("layout", {}).get("width", None)
 or self.default_width
 )
 height = (
 height
 or layout.get("height", None)
 or layout.get("template", {}).get("layout", {}).get("height", None)
 or self.default_height
 )

 # Normalize format
 original_format = format
Expand Down