Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
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); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Updated

- The JSON serialization of plotly figures had been accelerated by handling
differently figures with and without NaN and Inf values ([#2880](https://github.com/plotly/plotly.py/pull/2880)).

### Updated

- Updated Plotly.js to version 1.55.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.55.2/CHANGELOG.md) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
- `px.imshow` has a new `binary_string` boolean argument, which passes the
image data as a b64 binary string when True. Using binary strings allow for
Expand Down
8 changes: 6 additions & 2 deletions packages/python/plotly/_plotly_utils/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,14 @@ def encode(self, o):
Note that setting invalid separators will cause a failure at this step.

"""

# this will raise errors in a normal-expected way
encoded_o = super(PlotlyJSONEncoder, self).encode(o)

# Brute force guessing whether NaN or Infinity values are in the string
# We catch false positive cases (e.g. strings such as titles, labels etc.)
# but this is ok since the intention is to skip the decoding / reencoding
# step when it's completely safe
if not ("NaN" in encoded_o or "Infinity" in encoded_o):
return encoded_o

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this for now given your description of the performance characteristics.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check for NaN first, as it feels like that'd appear more frequently?

# now:
# 1. `loads` to switch Infinity, -Infinity, NaN to None
# 2. `dumps` again so you get 'null' instead of extended JSON
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
from __future__ import absolute_import

from inspect import getargspec
from unittest import TestCase

import json as _json

from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
from time import time
import numpy as np
import plotly.graph_objects as go


class TestJSONEncoder(TestCase):
Expand All@@ -19,6 +21,38 @@ def test_invalid_encode_exception(self):
with self.assertRaises(TypeError):
_json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)

def test_fast_track_finite_arrays(self):
# if NaN or Infinity is found in the json dump
# of a figure, it is decoded and re-encoded to replace these values
# with null. This test checks that NaN and Infinity values are
# indeed converted to null, and that the encoding of figures
# without inf or nan is faster (because we can avoid decoding
# and reencoding).
z = np.random.randn(100, 100)
x = np.arange(100.0)
fig_1 = go.Figure(go.Heatmap(z=z, x=x))
t1 = time()
json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
t2 = time()
x[0] = np.nan
x[1] = np.inf
fig_2 = go.Figure(go.Heatmap(z=z, x=x))
t3 = time()
json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
t4 = time()
assert t2 - t1 < t4 - t3
assert "null" in json_str_2
assert "NaN" not in json_str_2
assert "Infinity" not in json_str_2
x = np.arange(100.0)
fig_3 = go.Figure(go.Heatmap(z=z, x=x))
fig_3.update_layout(title_text="Infinity")
t5 = time()
json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
t6 = time()
assert t2 - t1 < t6 - t5
assert "Infinity" in json_str_3


class TestGetByPath(TestCase):
def test_get_by_path(self):
Expand Down