fps_akernel_task 0.1.7__tar.gz → 0.2.0__tar.gz

fps_akernel_task-0.2.0/.gitignore

@@ -0,0 +1,2 @@
+__pycache__/
+.ipynb_checkpoints/

{fps_akernel_task-0.1.7 → fps_akernel_task-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fps_akernel_task
-Version: 0.1.7
+Version: 0.2.0
 Summary: An FPS plugin for the kernel task API
 Project-URL: Homepage, https://github.com/davidbrochart/akernel
 Author-email: David Brochart <david.brochart@gmail.com>
@@ -8,7 +8,7 @@ License: MIT
 License-File: LICENSE
 Keywords: fastapi,jupyter,plugins,server
 Requires-Python: >=3.10
-Requires-Dist: akernel>=0.3.4
+Requires-Dist: akernel>=0.4.0
 Requires-Dist: anyio
 Requires-Dist: jupyverse-api<0.16.0,>=0.15.0
 Description-Content-Type: text/markdown
@@ -16,3 +16,15 @@ Description-Content-Type: text/markdown
 # fps-akernel-task
 
 An FPS plugin for the kernel task API.
+
+## Development installation
+
+Install both packages from the repository root, in the environment running Jupyverse:
+
+```bash
+python -m pip install -e . -e plugins/akernel_task
+```
+
+Installing only the plugin can resolve its `akernel` dependency from PyPI instead
+of this checkout. While working on unreleased kernel API changes, the plugin and
+kernel must come from the same checkout. Restart Jupyverse after reinstalling.

fps_akernel_task-0.2.0/README.md

@@ -0,0 +1,15 @@
+# fps-akernel-task
+
+An FPS plugin for the kernel task API.
+
+## Development installation
+
+Install both packages from the repository root, in the environment running Jupyverse:
+
+```bash
+python -m pip install -e . -e plugins/akernel_task
+```
+
+Installing only the plugin can resolve its `akernel` dependency from PyPI instead
+of this checkout. While working on unreleased kernel API changes, the plugin and
+kernel must come from the same checkout. Restart Jupyverse after reinstalling.

{fps_akernel_task-0.1.7 → fps_akernel_task-0.2.0}/fps_akernel_task/akernel_task.py

@@ -2,14 +2,15 @@ from __future__ import annotations
 
 from anyio import TASK_STATUS_IGNORED, create_task_group, sleep_forever
 from anyio.abc import TaskStatus
-from jupyverse_api.kernel import Kernel as _Kernel
+from jupyverse_kernel import Kernel as _Kernel
 
 from akernel.kernel import Kernel
 
 
 class AKernelTask(_Kernel):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, execute_in_thread: bool = False, **kwargs):
         super().__init__()
+        self.execute_in_thread = execute_in_thread
 
     async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED) -> None:
         async with (
@@ -37,6 +38,7 @@ class AKernelTask(_Kernel):
                 self._to_stdin_receive_stream,
                 self._from_stdin_send_stream,
                 self._from_iopub_send_stream,
+                execute_in_thread=self.execute_in_thread,
             )
             self.task_group.start_soon(self.kernel.start)
             task_status.started()
@@ -47,4 +49,4 @@ class AKernelTask(_Kernel):
         self.task_group.cancel_scope.cancel()
 
     async def interrupt(self) -> None:
-        pass
+        self.kernel.interrupt()

fps_akernel_task-0.2.0/fps_akernel_task/main.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from functools import partial
+
+from fps import Module
+from jupyverse_kernel import KernelFactory
+from jupyverse_kernels import Kernels
+
+from .akernel_task import AKernelTask
+from .models import KernelConfig
+
+
+class AKernelTaskModule(Module):
+    def __init__(self, *args, execute_in_thread: bool = False, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self.execute_in_thread = KernelConfig(execute_in_thread=execute_in_thread).execute_in_thread
+
+    async def prepare(self) -> None:
+        kernels = await self.get(Kernels)
+        kernels.register_kernel_factory(
+            "akernel", KernelFactory(partial(AKernelTask, execute_in_thread=self.execute_in_thread))
+        )
+
+
+class AKernelThreadTaskModule(Module):
+    async def prepare(self) -> None:
+        kernels = await self.get(Kernels)
+        kernels.register_kernel_factory(
+            "akernel-thread", KernelFactory(partial(AKernelTask, execute_in_thread=True))
+        )

fps_akernel_task-0.2.0/fps_akernel_task/models.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class KernelConfig(BaseModel):
+    execute_in_thread: bool

{fps_akernel_task-0.1.7 → fps_akernel_task-0.2.0}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_akernel_task"
-version = "0.1.7"
+version = "0.2.0"
 description = "An FPS plugin for the kernel task API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.10"
 dependencies = [
     "jupyverse-api >=0.15.0,<0.16.0",
     "anyio",
-    "akernel >=0.3.4",
+    "akernel >=0.4.0",
 ]
 
 [[project.authors]]
@@ -29,5 +29,5 @@ text = "MIT"
 Homepage = "https://github.com/davidbrochart/akernel"
 
 [project.entry-points]
-"fps.modules"       = {akernel_task = "fps_akernel_task.main:AKernelTaskModule"}
-"jupyverse.modules" = {akernel_task = "fps_akernel_task.main:AKernelTaskModule"}
+"fps.modules"       = {akernel_task = "fps_akernel_task.main:AKernelTaskModule", akernelthread_task = "fps_akernel_task.main:AKernelThreadTaskModule"}
+"jupyverse.modules" = {akernel_task = "fps_akernel_task.main:AKernelTaskModule", akernelthread_task = "fps_akernel_task.main:AKernelThreadTaskModule"}

fps_akernel_task-0.1.7/README.md

@@ -1,3 +0,0 @@
-# fps-akernel-task
-
-An FPS plugin for the kernel task API.

fps_akernel_task-0.1.7/fps_akernel_task/main.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from fps import Module
-
-from jupyverse_api.kernel import KernelFactory
-from jupyverse_api.kernels import Kernels
-
-from .akernel_task import AKernelTask
-
-
-class AKernelTaskModule(Module):
-    async def prepare(self) -> None:
-        kernels = await self.get(Kernels)
-        kernels.register_kernel_factory("akernel", KernelFactory(AKernelTask))