-
Notifications
You must be signed in to change notification settings - Fork 3
feat: support kubernetes kernel cr #17
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
from __future__ import annotations | ||
|
||
import logging | ||
from typing import Any | ||
|
||
from dotenv import dotenv_values | ||
from jkclient import CreateKernelRequest, JupyterKernelClient, Kernel | ||
from jupyter_client import AsyncKernelClient, BlockingKernelClient | ||
|
||
from pybox import LocalPyBox | ||
from pybox.base import BasePyBoxManager | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class KubePyBoxManager(BasePyBoxManager): | ||
"""Kubernetes kernel pybox, used to create a custom kernel and connect to it to execute code""" | ||
|
||
def __init__( | ||
self, | ||
incluster: bool, | ||
env_file: str | None = None, | ||
kernel_env: dict[str, Any] | None = None, | ||
): | ||
self.env_file = env_file | ||
self.kernel_env = dotenv_values(env_file) | ||
if kernel_env: | ||
self.kernel_env.update(kernel_env) | ||
|
||
self.client = JupyterKernelClient(incluster=incluster) | ||
|
||
def start(self, kernel_id: str, cwd: str, **kwargs) -> LocalPyBox: | ||
"""Retrieve an existing kernel or create a new one in kubernetes | ||
|
||
Args: | ||
kernel_id (str): kernel_id | ||
cwd (str): kernel_working_dir | ||
|
||
Returns: | ||
LocalPyBox: kubernetes kernel box | ||
""" | ||
env = self.kernel_env.copy() | ||
|
||
if kernel_id: | ||
env["KERNEL_ID"] = kernel_id | ||
if cwd: | ||
env["KERNEL_WORKING_DIR"] = cwd | ||
if username := kwargs.pop("username", None): | ||
env["KERNEL_USERNAME"] = username | ||
|
||
# Create kernel custom resource | ||
kernel_request = CreateKernelRequest(env=env) | ||
kernel: Kernel = self.client.create(kernel_request, **kwargs) | ||
|
||
# New kernel clinet | ||
kernel_client = BlockingKernelClient() | ||
kernel_client.load_connection_info(kernel.conn_info) | ||
|
||
return LocalPyBox(kernel_id=kernel_id, client=kernel_client) | ||
|
||
async def astart(self, kernel_id: str, cwd: str, **kwargs) -> LocalPyBox: | ||
"""Retrieve an existing kernel or create a new one in kubernetes | ||
|
||
Args: | ||
kernel_id (str): kubernetes kernel id | ||
cwd (str): kernel workdir | ||
|
||
Returns: | ||
LocalPyBox: An iPython kernel that executes code. | ||
""" | ||
env = self.kernel_env.copy() | ||
|
||
if kernel_id: | ||
env["KERNEL_ID"] = kernel_id | ||
if cwd: | ||
env["KERNEL_WORKING_DIR"] = cwd | ||
if username := kwargs.pop("username", None): | ||
env["KERNEL_USERNAME"] = username | ||
|
||
# Create kernel custom resource | ||
kernel_request = CreateKernelRequest(env=env) | ||
kernel: Kernel = await self.client.acreate(kernel_request, **kwargs) | ||
|
||
# New kernel clinet | ||
kernel_client = AsyncKernelClient() | ||
kernel_client.load_connection_info(kernel.conn_info) | ||
|
||
return LocalPyBox(kernel_id=kernel_id, client=kernel_client) | ||
|
||
def shutdown(self, kernel_id: str, **kwargs) -> None: | ||
"""Shutdown the kernel in kubernetes. | ||
|
||
Args: | ||
kernel_id (str): kernel_id | ||
""" | ||
self.client.delete_by_kernel_id(kernel_id, **kwargs) | ||
|
||
async def ashutdown(self, kernel_id: str, **kwargs) -> None: | ||
"""Shutdown the kubernetes kernel by kernel id. | ||
|
||
Args: | ||
kernel_id (str): kubernetes kernel id | ||
""" | ||
return await self.client.adelete_by_kernel_id(kernel_id, **kwargs) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
from collections.abc import Iterator | ||
from uuid import uuid4 | ||
|
||
import pytest | ||
from pybox.kube import KubePyBoxManager | ||
|
||
|
||
@pytest.fixture(scope="module") | ||
def kube_manager() -> Iterator[KubePyBoxManager]: | ||
_mng = KubePyBoxManager( | ||
incluster=False, | ||
kernel_env={ | ||
"KERNEL_USERNAME": "tablegpt", | ||
"KERNEL_NAMESPACE": "default", | ||
"KERNEL_IMAGE": "zjuici/tablegpt-kernel:0.1.1", | ||
"KERNEL_WORKING_DIR": "/mnt/data", | ||
"KERNEL_VOLUME_MOUNTS": [ | ||
{"name": "shared-vol", "mountPath": "/mnt/data"}, | ||
{"name": "ipython-profile-vol", "mountPath": "/opt/startup"}, | ||
{ | ||
"name": "kernel-launch-vol", | ||
"mountPath": "/usr/local/bin/bootstrap-kernel.sh", | ||
"subPath": "bootstrap-kernel.sh", | ||
}, | ||
{ | ||
"name": "kernel-launch-vol", | ||
"mountPath": "/usr/local/bin/kernel-launchers/python/scripts/launch_ipykernel.py", | ||
"subPath": "launch_ipykernel.py", | ||
}, | ||
], | ||
"KERNEL_VOLUMES": [ | ||
{ | ||
"name": "shared-vol", | ||
"nfs": { | ||
"server": "10.0.0.29", | ||
"path": "/data/tablegpt-slim-py/data", | ||
}, | ||
}, | ||
{ | ||
"name": "ipython-profile-vol", | ||
"configMap": {"name": "ipython-startup-scripts"}, | ||
}, | ||
{ | ||
"name": "kernel-launch-vol", | ||
"configMap": { | ||
"defaultMode": 0o755, | ||
"name": "kernel-launch-scripts", | ||
}, | ||
}, | ||
], | ||
"KERNEL_STARTUP_SCRIPTS_PATH": "/opt/startup", | ||
"KERNEL_IDLE_TIMEOUT": "1800", | ||
}, | ||
) | ||
yield _mng | ||
|
||
|
||
@pytest.mark.skip(reason="Start kernel cr need kubernetes environment") | ||
def test_start_with_user(kube_manager: KubePyBoxManager) -> None: | ||
|
||
kernel_id = str(uuid4()) | ||
box = kube_manager.start( | ||
kernel_id=kernel_id, | ||
cwd="/mnt/data", | ||
username="dev", | ||
) | ||
assert box.kernel_id == kernel_id | ||
|
||
|
||
@pytest.mark.skip(reason="Start kernel cr need kubernetes environment") | ||
def test_start_without_user(kube_manager: KubePyBoxManager) -> None: | ||
|
||
kernel_id = str(uuid4()) | ||
box = kube_manager.start( | ||
kernel_id=kernel_id, | ||
cwd="/mnt/data", | ||
) | ||
assert box.kernel_id == kernel_id | ||
|
||
|
||
@pytest.mark.skip(reason="Start kernel cr need kubernetes environment") | ||
@pytest.mark.asyncio | ||
async def test_start_async(kube_manager: KubePyBoxManager) -> None: | ||
kernel_id = str(uuid4()) | ||
box = await kube_manager.astart( | ||
kernel_id=kernel_id, | ||
cwd="/mnt/data", | ||
) | ||
assert box.kernel_id == kernel_id | ||
|
||
|
||
@pytest.mark.skip(reason="Shutting down kernel cr need kubernetes environment") | ||
def test_shutdown_w_id(kube_manager: KubePyBoxManager) -> None: | ||
kube_manager.shutdown(kernel_id="1918a836-e941-4332-9e6f-dbfe91e5771a") | ||
|
||
|
||
@pytest.mark.skip(reason="Shutting down kernel cr need kubernetes environment") | ||
@pytest.mark.asyncio | ||
async def test_shutdown_async(kube_manager: KubePyBoxManager) -> None: | ||
await kube_manager.ashutdown(kernel_id="1918a836-e941-4332-9e6f-dbfe91e5771a") | ||
|
||
|
||
if __name__ == "__main__": | ||
pytest.main() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.