Switch to Asphalt v5.0

plugins/cell/txl_cell/components.py

@@ -3,7 +3,7 @@
 from functools import partial
 from importlib.metadata import entry_points
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from pycrdt import Doc, Map, MapEvent, Text
 from rich.text import Text as RichText
 from textual.containers import Container
@@ -291,17 +291,14 @@ def __init__(self, show_execution_count: bool = True, show_border: bool = True):
         self.show_execution_count = show_execution_count
         self.show_border = show_border
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        contents = await ctx.request_resource(Contents)
-        widgets = await ctx.request_resource(Widgets)
+    async def start(self) -> None:
+        contents = await request_resource(Contents)
+        widgets = await request_resource(Widgets)
         cell_factory = partial(
             _Cell,
             contents=contents,
             widgets=widgets,
             show_execution_count=self.show_execution_count,
             show_border=self.show_border,
         )
-        ctx.add_resource(cell_factory, types=CellFactory)
+        await add_resource(cell_factory, types=CellFactory)

plugins/console/txl_console/components.py

@@ -2,7 +2,7 @@
 from importlib.metadata import entry_points
 from typing import Any
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource_factory, request_resource
 from pycrdt import ArrayEvent, Doc
 from textual.containers import VerticalScroll
 from textual.events import Event
@@ -126,19 +126,16 @@ def current_cell(self):
 
 
 class ConsoleComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        main_area = await ctx.request_resource(MainArea)
-        kernels = await ctx.request_resource(Kernels)
-        kernelspecs = await ctx.request_resource(Kernelspecs)
-        cell_factory = await ctx.request_resource(CellFactory)
-        launcher = await ctx.request_resource(Launcher)
+    async def start(self) -> None:
+        main_area = await request_resource(MainArea)
+        kernels = await request_resource(Kernels)
+        kernelspecs = await request_resource(Kernelspecs)
+        cell_factory = await request_resource(CellFactory)
+        launcher = await request_resource(Launcher)
 
         _kernelspecs = await kernelspecs.get()
 
         console_factory = partial(_Console, kernels, _kernelspecs, cell_factory, main_area)
 
         launcher.register("console", console_factory)
-        ctx.add_resource_factory(console_factory, types=Console)
+        await add_resource_factory(console_factory, types=Console)

plugins/editors/txl_editors/components.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from textual.containers import Container
 
 from txl.base import Editor, Editors, FileOpenEvent, Footer, Header, MainArea
@@ -57,12 +57,9 @@ async def on_open(self, event: FileOpenEvent) -> None:
 
 
 class EditorsComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        header = await ctx.request_resource(Header)
-        footer = await ctx.request_resource(Footer)
-        main_area = await ctx.request_resource(MainArea)
+    async def start(self) -> None:
+        header = await request_resource(Header)
+        footer = await request_resource(Footer)
+        main_area = await request_resource(MainArea)
         editors = _Editors(header, footer, main_area)
-        ctx.add_resource(editors, types=Editors)
+        await add_resource(editors, types=Editors)

plugins/file_browser/txl_file_browser/components.py

@@ -4,14 +4,14 @@
 from dataclasses import dataclass
 from typing import ClassVar
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from rich.style import Style
 from rich.text import Text, TextType
 from textual._types import MessageTarget
 from textual.message import Message
 from textual.widgets._tree import TOGGLE_STYLE, Tree, TreeNode
 
-from txl.base import Contents, FileBrowser
+from txl.base import Contents, FileBrowser, FileOpenEvent
 
 
 @dataclass
@@ -144,22 +144,19 @@ async def on_tree_node_expanded(self, event: Tree.NodeSelected) -> None:
             if not dir_entry.loaded:
                 await self.load_directory(event.node)
         else:
-            self.open_file_signal.dispatch(dir_entry.path)
+            await self.open_file_signal.dispatch(dir_entry.path)
 
-    def on_tree_node_selected(self, event: Tree.NodeSelected) -> None:
+    async def on_tree_node_selected(self, event: Tree.NodeSelected) -> None:
         event.stop()
         dir_entry = event.node.data
         if dir_entry is None:
             return
         if not dir_entry.is_dir:
-            self.open_file_signal.dispatch(dir_entry.path)
+            await self.open_file_signal.dispatch(FileOpenEvent(path=dir_entry.path))
 
 
 class FileBrowserComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        contents = await ctx.request_resource(Contents)
+    async def start(self) -> None:
+        contents = await request_resource(Contents)
         file_browser = DirectoryTree(".", contents, id="browser-view")
-        ctx.add_resource(file_browser, types=FileBrowser)
+        await add_resource(file_browser, types=FileBrowser)

plugins/image_viewer/txl_image_viewer/components.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from PIL import Image
 from textual.widget import Widget
 from textual_imageview.viewer import ImageViewer
@@ -57,18 +57,15 @@ def __init__(self, register: bool = True):
         super().__init__()
         self.register = register
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        contents = await ctx.request_resource(Contents)
+    async def start( self) -> None:
+        contents = await request_resource(Contents)
 
         def image_viewer_factory():
             return _ImageViewer(contents)
 
         if self.register:
-            editors = await ctx.request_resource(Editors)
+            editors = await request_resource(Editors)
             editors.register_editor_factory(image_viewer_factory, [".png", ".jpg", ".jpeg"])
         else:
             image_viewer = image_viewer_factory()
-            ctx.add_resource(image_viewer, types=Editor)
+            await add_resource(image_viewer, types=Editor)

plugins/jpterm/txl_jpterm/components.py

@@ -1,4 +1,4 @@
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource, start_background_task
 from textual.app import App, ComposeResult
 from textual.containers import Container
 from textual.reactive import var
@@ -52,20 +52,24 @@ def __init__(self, driver_class=None):
         super().__init__()
         self.driver_class = driver_class
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
+    async def start(self) -> None:
         header = _Header()
         footer = _Footer()
         main_area = _MainArea()
-        ctx.add_resource(header, types=Header)
-        ctx.add_resource(footer, types=Footer)
-        ctx.add_resource(main_area, types=MainArea)
-        file_browser = await ctx.request_resource(FileBrowser)
-        editors = await ctx.request_resource(Editors)
-        file_browser.open_file_signal.connect(editors.on_open)
-        launcher = await ctx.request_resource(Launcher)
+        await add_resource(header, types=Header)
+        await add_resource(footer, types=Footer)
+        await add_resource(main_area, types=MainArea)
+        file_browser = await request_resource(FileBrowser)
+        editors = await request_resource(Editors)
+
+        async def open_file():
+            async with file_browser.open_file_signal.stream_events() as stream:
+                async for event in stream:
+                    await editors.on_open(event)
+
+        await start_background_task(open_file, name="File browser open file")
+
+        launcher = await request_resource(Launcher)
         jpterm = Jpterm(
             header,
             footer,
@@ -75,4 +79,4 @@ async def start(
             launcher,
             driver_class=self.driver_class,
         )
-        ctx.add_resource(jpterm, types=App)
+        await add_resource(jpterm, types=App)

plugins/launcher/txl_launcher/components.py

@@ -1,4 +1,4 @@
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from textual.widget import Widget
 from textual.widgets import Button
 
@@ -40,10 +40,7 @@ async def on_button_pressed(self, event: Button.Pressed) -> None:
 
 
 class LauncherComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        main_area = await ctx.request_resource(MainArea)
+    async def start(self) -> None:
+        main_area = await request_resource(MainArea)
         launcher = _Launcher(main_area)
-        ctx.add_resource(launcher, types=Launcher)
+        await add_resource(launcher, types=Launcher)

plugins/local_contents/txl_local_contents/components.py

@@ -4,7 +4,7 @@
 from typing import List, Union
 
 from anyio import Path
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource
 from pycrdt import Doc
 
 from txl.base import Contents
@@ -50,9 +50,6 @@ async def save(
 
 
 class LocalContentsComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
+    async def start(self) -> None:
         contents = LocalContents()
-        ctx.add_resource(contents, types=Contents)
+        await add_resource(contents, types=Contents)

plugins/local_kernels/txl_local_kernels/components.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Any
 
-from asphalt.core import Component, Context, context_teardown
+from asphalt.core import Component, add_resource, context_teardown
 from pycrdt import Map
 
 from txl.base import Kernels, Kernelspecs
@@ -35,11 +35,8 @@ async def get(self) -> dict[str, Any]:
 
 class LocalKernelsComponent(Component):
     @context_teardown
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        ctx.add_resource(LocalKernels, types=Kernels)
+    async def start(self) -> None:
+        await add_resource(LocalKernels, types=Kernels)
 
         yield
 
@@ -48,9 +45,6 @@ async def start(
 
 
 class LocalKernelspecsComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
+    async def start(self) -> None:
         kernelspecs = LocalKernelspecs()
-        ctx.add_resource(kernelspecs, types=Kernelspecs)
+        await add_resource(kernelspecs, types=Kernelspecs)

plugins/local_terminals/txl_local_terminals/components.py

@@ -1,6 +1,6 @@
 import os
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 
 from txl.base import Header, Launcher, TerminalFactory, Terminals
 
@@ -11,16 +11,13 @@
 
 
 class LocalTerminalsComponent(Component):
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        header = await ctx.request_resource(Header)
-        terminal = await ctx.request_resource(TerminalFactory)
-        launcher = await ctx.request_resource(Launcher)
+    async def start(self) -> None:
+        header = await request_resource(Header)
+        terminal = await request_resource(TerminalFactory)
+        launcher = await request_resource(Launcher)
 
         def terminals_factory():
             return LocalTerminals(header, terminal)
 
         launcher.register("terminal", terminals_factory)
-        ctx.add_resource(terminals_factory, types=Terminals)
+        await add_resource(terminals_factory, types=Terminals)

plugins/markdown_viewer/txl_markdown_viewer/components.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from asphalt.core import Component, Context
+from asphalt.core import Component, add_resource, request_resource
 from textual.containers import Container
 from textual.widgets import MarkdownViewer as TextualMarkdownViewer
 
@@ -42,18 +42,15 @@ def __init__(self, register: bool = True):
         super().__init__()
         self.register = register
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
-        contents = await ctx.request_resource(Contents)
+    async def start(self) -> None:
+        contents = await request_resource(Contents)
 
         def markdown_viewer_factory():
             return MarkdownViewer(contents)
 
         if self.register:
-            editors = await ctx.request_resource(Editors)
+            editors = await request_resource(Editors)
             editors.register_editor_factory(markdown_viewer_factory, [".md"])
         else:
             markdown_viewer = markdown_viewer_factory()
-            ctx.add_resource(markdown_viewer, types=Editor)
+            await add_resource(markdown_viewer, types=Editor)