From 20b6de6aa1217e207e736761326136919c778853 Mon Sep 17 00:00:00 2001 From: casparl Date: Fri, 8 Jul 2022 18:30:53 +0200 Subject: [PATCH 1/4] Fix https://github.com/jupyter-server/jupyter-resource-usage/issues/91 and define _load_jupyter_server_extension for further backwards compatibility (see https://jupyter-server.readthedocs.io/en/latest/developers/extensions.html#migrating-an-extension-to-use-jupyter-server) --- jupyter_resource_usage/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jupyter_resource_usage/__init__.py b/jupyter_resource_usage/__init__.py index 4bb82b3..b948b5d 100644 --- a/jupyter_resource_usage/__init__.py +++ b/jupyter_resource_usage/__init__.py @@ -34,5 +34,6 @@ def _jupyter_nbextension_paths(): } ] - -load_jupyter_server_extension = load_jupyter_server_extension +# For backwards compatibility +_load_jupyter_server_extension = load_jupyter_server_extension +_jupyter_server_extension_paths = _jupyter_server_extension_points From 6175bb43188ef304ed77d010283108ae71d0a8ac Mon Sep 17 00:00:00 2001 From: casparl Date: Fri, 8 Jul 2022 18:31:42 +0200 Subject: [PATCH 2/4] Corrected typo --- jupyter_resource_usage/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter_resource_usage/__init__.py b/jupyter_resource_usage/__init__.py index b948b5d..51a383d 100644 --- a/jupyter_resource_usage/__init__.py +++ b/jupyter_resource_usage/__init__.py @@ -34,6 +34,6 @@ def _jupyter_nbextension_paths(): } ] -# For backwards compatibility +# For backward compatibility _load_jupyter_server_extension = load_jupyter_server_extension _jupyter_server_extension_paths = _jupyter_server_extension_points From 5e5a4a3c0f460a464663bdc3fc8bc82d79d715c0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:34:06 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- jupyter_resource_usage/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/jupyter_resource_usage/__init__.py b/jupyter_resource_usage/__init__.py index 51a383d..64847ee 100644 --- a/jupyter_resource_usage/__init__.py +++ b/jupyter_resource_usage/__init__.py @@ -34,6 +34,7 @@ def _jupyter_nbextension_paths(): } ] + # For backward compatibility _load_jupyter_server_extension = load_jupyter_server_extension _jupyter_server_extension_paths = _jupyter_server_extension_points From b7aa140af587bf2dc717e2b5843fb7e1db43f398 Mon Sep 17 00:00:00 2001 From: casparl Date: Fri, 30 Sep 2022 17:59:01 +0200 Subject: [PATCH 4/4] Test explicitely if cpuPercent is defined. If not, they key 'cpu_percent' didn't exist in 'data'. Previously, the update would _also_ be skipped if cpuPercent was zero, which would result in the CPU usage only begin updated _during_ execution of a cell (when CPU usage is non-zero), and it would never return to zero afterwards. --- jupyter_resource_usage/static/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter_resource_usage/static/main.js b/jupyter_resource_usage/static/main.js index 0a1e6f5..8349037 100644 --- a/jupyter_resource_usage/static/main.js +++ b/jupyter_resource_usage/static/main.js @@ -74,7 +74,7 @@ define([ // Handle CPU display var cpuPercent = data['cpu_percent']; - if (cpuPercent) { + if (cpuPercent !== undefined) { // Remove hide CSS class if the metrics API gives us a CPU percent to display $('#jupyter-resource-usage-display-cpu').removeClass('jupyter-resource-usage-hide'); var maxCpu = data['cpu_count'];