Review

Author: davidbrochart

jupyter_resource_usage/api.py

@@ -1,7 +1,6 @@
 import json
 from concurrent.futures import ThreadPoolExecutor
 
-import ipykernel
 import psutil
 import zmq
 from jupyter_client.jsonutil import date_default
@@ -18,7 +17,12 @@
     from .utils import Callable
 
 
-USAGE_IS_SUPPORTED = version.parse("6.9.0") <= version.parse(ipykernel.__version__)
+try:
+    import ipykernel
+
+    USAGE_IS_SUPPORTED = version.parse("6.9.0") <= version.parse(ipykernel.__version__)
+except ImportError:
+    USAGE_IS_SUPPORTED = False
 
 MAX_RETRIES = 3
 

packages/labextension/src/format.ts

@@ -1,8 +1,12 @@
-// Taken from https://github.com/jupyter-server/jupyter-resource-usage/blob/e6ec53fa69fdb6de8e878974bcff006310658408/packages/labextension/src/memoryUsage.tsx#L272
-
-type MemoryUnit = 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
+/**
+ * The type of unit used for reporting memory usage.
+ */
+export type MemoryUnit = 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
 
-const MEMORY_UNIT_LIMITS: {
+/**
+ * The number of bytes in each memory unit.
+ */
+export const MEMORY_UNIT_LIMITS: {
   readonly [U in MemoryUnit]: number;
 } = {
   B: 1,
@@ -21,9 +25,8 @@ export function formatForDisplay(numBytes: number | undefined): string {
 /**
  * Given a number of bytes, convert to the most human-readable
  * format, (GB, TB, etc).
- * Taken from https://github.com/jupyter-server/jupyter-resource-usage/blob/e6ec53fa69fdb6de8e878974bcff006310658408/packages/labextension/src/memoryUsage.tsx#L272
  */
-function convertToLargestUnit(
+export function convertToLargestUnit(
   numBytes: number | undefined
 ): [number, MemoryUnit] {
   if (!numBytes) {

packages/labextension/src/index.ts

@@ -32,6 +32,7 @@ const extension: JupyterFrontEndPlugin<void> = {
     palette: ICommandPalette,
     notebookTracker: INotebookTracker
   ) => {
+    const trans = translator.load('jupyterlab');
     const item = new MemoryUsage(translator);
 
     statusBar.registerStatusItem(extension.id, {
@@ -58,8 +59,8 @@ const extension: JupyterFrontEndPlugin<void> = {
     }
 
     commands.addCommand(CommandIDs.getKernelUsage, {
-      label: 'Kernel Usage',
-      caption: 'Kernel Usage',
+      label: trans.__('Kernel Usage'),
+      caption: trans.__('Kernel Usage'),
       icon: new LabIcon({
         name: 'jupyterlab-kernel-usage:icon',
         svgstr: tachometer,

packages/labextension/src/memoryUsage.tsx

@@ -19,6 +19,8 @@ import { Poll } from '@lumino/polling';
 
 import React from 'react';
 
+import { MemoryUnit, MEMORY_UNIT_LIMITS, convertToLargestUnit } from './format';
+
 import { resourceItem } from './text';
 
 /**
@@ -188,7 +190,7 @@ export namespace MemoryUsage {
         const memoryLimit = value.limits.memory
           ? value.limits.memory.rss
           : null;
-        const [currentMemory, units] = Private.convertToLargestUnit(numBytes);
+        const [currentMemory, units] = convertToLargestUnit(numBytes);
         const usageWarning = value.limits.memory
           ? value.limits.memory.warn
           : false;
@@ -197,7 +199,7 @@ export namespace MemoryUsage {
         this._currentMemory = currentMemory;
         this._units = units;
         this._memoryLimit = memoryLimit
-          ? memoryLimit / Private.MEMORY_UNIT_LIMITS[units]
+          ? memoryLimit / MEMORY_UNIT_LIMITS[units]
           : null;
         this._warn = usageWarning;
       }
@@ -235,11 +237,6 @@ export namespace MemoryUsage {
       refreshRate: number;
     }
   }
-
-  /**
-   * The type of unit used for reporting memory usage.
-   */
-  export type MemoryUnit = 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
 }
 
 /**
@@ -251,54 +248,6 @@ namespace Private {
    */
   export const DECIMAL_PLACES = 2;
 
-  /**
-   * The number of bytes in each memory unit.
-   */
-  export const MEMORY_UNIT_LIMITS: {
-    readonly [U in MemoryUsage.MemoryUnit]: number;
-  } = {
-    B: 1,
-    KB: 1024,
-    MB: 1048576,
-    GB: 1073741824,
-    TB: 1099511627776,
-    PB: 1125899906842624,
-  };
-
-  /**
-   * Given a number of bytes, convert to the most human-readable
-   * format, (GB, TB, etc).
-   */
-  export function convertToLargestUnit(
-    numBytes: number
-  ): [number, MemoryUsage.MemoryUnit] {
-    if (numBytes < MEMORY_UNIT_LIMITS.KB) {
-      return [numBytes, 'B'];
-    } else if (
-      MEMORY_UNIT_LIMITS.KB === numBytes ||
-      numBytes < MEMORY_UNIT_LIMITS.MB
-    ) {
-      return [numBytes / MEMORY_UNIT_LIMITS.KB, 'KB'];
-    } else if (
-      MEMORY_UNIT_LIMITS.MB === numBytes ||
-      numBytes < MEMORY_UNIT_LIMITS.GB
-    ) {
-      return [numBytes / MEMORY_UNIT_LIMITS.MB, 'MB'];
-    } else if (
-      MEMORY_UNIT_LIMITS.GB === numBytes ||
-      numBytes < MEMORY_UNIT_LIMITS.TB
-    ) {
-      return [numBytes / MEMORY_UNIT_LIMITS.GB, 'GB'];
-    } else if (
-      MEMORY_UNIT_LIMITS.TB === numBytes ||
-      numBytes < MEMORY_UNIT_LIMITS.PB
-    ) {
-      return [numBytes / MEMORY_UNIT_LIMITS.TB, 'TB'];
-    } else {
-      return [numBytes / MEMORY_UNIT_LIMITS.PB, 'PB'];
-    }
-  }
-
   /**
    * Settings for making requests to the server.
    */

setup.cfg

@@ -49,7 +49,6 @@ include_package_data = True
 packages = find:
 python_requires = >=3.6
 install_requires =
-    ipykernel >=6.11.0
 	jupyter_server~=1.0
     prometheus_client
     psutil~=5.6