Skip to content

Commit cfe4033

Browse files
authored
Merge pull request jupyter-server#13 from Quansight/fix/kernel-usage-not-available
Show a message is kernel usage is not available
2 parents 9f8d62b + 82a8389 commit cfe4033

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

src/widget.tsx

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,63 +131,73 @@ const KernelUsage = (props: {
131131
);
132132

133133
if (kernelId) {
134-
const kernelPoll = kernelPools.get(kernelId);
135-
if (kernelPoll) {
136-
return (
134+
const kernelPool = kernelPools.get(kernelId);
135+
if (kernelPool && kernelPool.usage) {
136+
return !kernelPool.usage.hostname ? (
137137
<>
138-
<h3 className="jp-KernelUsage-section-separator">Kernel Usage</h3>
138+
<h3 className="jp-KernelUsage-section-separator">
139+
Kernel usage details are not available
140+
</h3>
141+
<div className="jp-KernelUsage-section-separator">
142+
Please check with your system administrator that you running
143+
IPyKernel version 6.10.0 or above.
144+
</div>
145+
</>
146+
) : (
147+
<>
148+
<h3 className="jp-KernelUsage-section-separator">Kernel usage</h3>
139149
<div className="jp-KernelUsage-separator">
140-
Kernel Host: {kernelPoll.usage?.hostname}
150+
Kernel Host: {kernelPool.usage.hostname}
141151
</div>
142152
<div className="jp-KernelUsage-separator">
143-
Notebook: {kernelPoll.path}
153+
Notebook: {kernelPool.path}
144154
</div>
145155
<div className="jp-KernelUsage-separator">Kernel ID: {kernelId}</div>
146156
<div className="jp-KernelUsage-separator">
147-
Timestamp: {kernelPoll.usage?.timestamp?.toLocaleString()}
157+
Timestamp: {kernelPool.usage.timestamp?.toLocaleString()}
148158
</div>
149159
<div className="jp-KernelUsage-separator">
150-
CPU: {kernelPoll.usage?.kernel_cpu}
160+
CPU: {kernelPool.usage.kernel_cpu}
151161
</div>
152162
<div className="jp-KernelUsage-separator">
153-
Memory: {formatForDisplay(kernelPoll.usage?.kernel_memory)}
163+
Memory: {formatForDisplay(kernelPool.usage.kernel_memory)}
154164
</div>
155165
<hr className="jp-KernelUsage-section-separator"></hr>
156166
<h4 className="jp-KernelUsage-section-separator">Host CPU</h4>
157167
<div className="jp-KernelUsage-separator">
158-
Percentage {kernelPoll.usage?.host_cpu_percent.toFixed(1)}
168+
Percentage {kernelPool.usage.host_cpu_percent.toFixed(1)}
159169
</div>
160170
<h4 className="jp-KernelUsage-section-separator">
161171
Host Virtual Memory
162172
</h4>
163173
<div className="jp-KernelUsage-separator">
164174
Active:{' '}
165-
{formatForDisplay(kernelPoll.usage?.host_virtual_memory.active)}
175+
{formatForDisplay(kernelPool.usage.host_virtual_memory.active)}
166176
</div>
167177
<div className="jp-KernelUsage-separator">
168178
Available:{' '}
169-
{formatForDisplay(kernelPoll.usage?.host_virtual_memory.available)}
179+
{formatForDisplay(kernelPool.usage.host_virtual_memory.available)}
170180
</div>
171181
<div className="jp-KernelUsage-separator">
172-
Free: {formatForDisplay(kernelPoll.usage?.host_virtual_memory.free)}
182+
Free: {formatForDisplay(kernelPool.usage.host_virtual_memory.free)}
173183
</div>
174184
<div className="jp-KernelUsage-separator">
175185
Inactive:{' '}
176-
{formatForDisplay(kernelPoll.usage?.host_virtual_memory.inactive)}
186+
{formatForDisplay(kernelPool.usage.host_virtual_memory.inactive)}
177187
</div>
178188
<div className="jp-KernelUsage-separator">
179-
Percent: {kernelPoll.usage?.host_virtual_memory.percent.toFixed(1)}
189+
Percent: {kernelPool.usage.host_virtual_memory.percent.toFixed(1)}
180190
</div>
181191
<div className="jp-KernelUsage-separator">
182192
Total:{' '}
183-
{formatForDisplay(kernelPoll.usage?.host_virtual_memory.total)}
193+
{formatForDisplay(kernelPool.usage.host_virtual_memory.total)}
184194
</div>
185195
<div className="jp-KernelUsage-separator">
186-
Used: {formatForDisplay(kernelPoll.usage?.host_virtual_memory.used)}
196+
Used: {formatForDisplay(kernelPool.usage.host_virtual_memory.used)}
187197
</div>
188198
<div className="jp-KernelUsage-separator">
189199
Wired:{' '}
190-
{formatForDisplay(kernelPoll.usage?.host_virtual_memory.wired)}
200+
{formatForDisplay(kernelPool.usage.host_virtual_memory.wired)}
191201
</div>
192202
</>
193203
);

0 commit comments

Comments
 (0)