-
Notifications
You must be signed in to change notification settings - Fork 102
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.
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
Merge jupyterlab-kernel-usage #163
Merge jupyterlab-kernel-usage #163
Conversation
Tune the panel layout
…not-available Show a message is kernel usage is not available
…rnel Remove old kernel poll
Don't throw timeout exception
…nt-pooling Pool only the active kernel and if the sidebar is visible
I ran the following commands to get the history from https://github.com/Quansight/jupyterlab-kernel-usage: git subtree add --prefix=jupyterlab-kernel-usage https://github.com/Quansight/jupyterlab-kernel-usage.git main
git rm -r jupyterlab-kernel-usage
git commit -m "Remove jupyterlab-kernel-usage" |
Fix too frequent queries from frontend and too long timeout on backend
I merged Quansight/jupyterlab-kernel-usage#24 so that it is easier to include if you would be happy to rebase including that :) |
b920c20
to
6703e02
Compare
OK to merge? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't finished reviewing but sending comments-as is to reply to the question above.
setup.cfg
Outdated
@@ -49,6 +49,7 @@ include_package_data = True | |||
packages = find: | |||
python_requires = >=3.6 | |||
install_requires = | |||
ipykernel >=6.11.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we drop this since this is only required for kernel-usage?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably yes, but then it should be checked at run-time if kernel-usage is used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A runtime check sounds appropriate. Some setups might have jupyter-resource-usage
installed but without ipykernel
and still want the existing memory indicator.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will fix it, but the README says that ipykernel>=6.11.0
is required, while the code checks for ipykernel>6.9.0
. Which one is it?
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
packages/labextension/src/format.ts
Outdated
@@ -0,0 +1,57 @@ | |||
// Taken from https://github.com/jupyter-server/jupyter-resource-usage/blob/e6ec53fa69fdb6de8e878974bcff006310658408/packages/labextension/src/memoryUsage.tsx#L272 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these comments needed now that the files live in the same repo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like memoryUsage.tsx
can now reuse things from format.ts
?
packages/labextension/src/index.ts
Outdated
label: 'Kernel Usage', | ||
caption: 'Kernel Usage', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to pass these strings through the translator.
for more information, see https://pre-commit.ci
@jtpio @krassowski let me know if 9bfbcb5 is fine. I'm not sure about the translation thing. |
Noooo, I merged the wrong PR! |
Let me know if there were outstanding changes, and I will open a follow-up PR 😄 |
Actually, since I squashed, I should revert the commit, right? |
I wanted to force-push to remove the commit, but the branch is protected. |
OK, I removed the protection, force-pushed, and re-created the rule. |
No problem thanks @davidbrochart. |
Looks like it's addressed in #164 now with the use of the |
Closes Quansight/jupyterlab-kernel-usage#22.