runtimepy 5.14.2__py3-none-any.whl → 5.15.1__py3-none-any.whl

runtimepy/net/server/app/env/tab/html.py

@@ -36,10 +36,18 @@ def channel_color_button(parent: Element, name: str) -> Element:
         parent,
         id=f"{name}-line-color",
         icon="activity",
-        icon_classes=["fs-5"],
+        icon_classes=["border-0", "fs-5"],
         tooltip=f"Change line color for '{name}'.",
     )
-    button.add_class("d-none", "p-1")
+    button.add_class(
+        "d-none",
+        "p-0",
+        "ps-2",
+        "pe-2",
+        "border-top-0",
+        "border-bottom-0",
+        "border-primary-subtle",
+    )
 
     return button
 
@@ -79,7 +87,7 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
 
         div(
             tag="td",
-            class_str="channel-value p-0",
+            class_str="channel-value p-0 pe-2",
             parent=parent,
             title=f"Current value of '{name}'.",
         )
@@ -102,7 +110,7 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
 
         # Add boolean/bit toggle button.
         is_bit = field.width == 1
-        kind_str = f"{'bit' if is_bit else 'bits'} {field.where_str()}"
+        kind_str = f"{'bit ' if is_bit else 'bits'} {field.where_str()}"
 
         name_td = create_name_td(parent)
 
@@ -119,7 +127,7 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
 
         div(
             tag="td",
-            class_str="channel-value p-0",
+            class_str="channel-value p-0 pe-2",
             parent=parent,
             title=f"Current value of '{name}'.",
         )
@@ -131,16 +139,26 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
             text=kind_str,
             parent=parent,
             title=f"Field position for '{name}' within underlying primitive.",
-            class_str="text-info-emphasis text-nowrap p-0 ps-1 pe-1",
+            class_str="text-code text-nowrap p-0 ps-2 pe-1",
         )
 
     def channel_table(self, parent: Element) -> None:
         """Create the channel table."""
 
         table = div(
-            tag="table", parent=div(parent=parent, class_str="table-container")
+            tag="table",
+            parent=div(parent=parent).add_class(
+                "flex-shrink-0",
+                "overflow-x-scroll",
+                "overscroll-behavior-x-none",
+            ),
+        )
+        table.add_class(
+            "table",
+            "table-hover",
+            "mb-0",
+            TEXT,
         )
-        table.add_class("table", TEXT)
 
         header = div(tag="thead", parent=table)
         body = div(tag="tbody", parent=table)
@@ -151,11 +169,8 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
         # Table for channels.
         env = self.command.env
         for name in env.names:
-            row = div(
-                tag="tr",
-                parent=body,
-                id=name,
-                class_str="channel-row border-start border-end",
+            row = div(tag="tr", parent=body, id=name).add_class(
+                "channel-row", "border-start", "border-end"
             )
 
             plot_checkbox(row, name)
@@ -187,9 +202,12 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
     def _compose_plot(self, parent: Element) -> None:
         """Compose plot elements."""
 
-        plot_container = div(
-            parent=parent,
-            class_str="w-100 h-100 border-start position-relative",
+        plot_container = div(parent=parent).add_class(
+            "w-100",
+            "h-100",
+            "border-start",
+            "position-relative",
+            "logo-outline-background",
         )
 
         # Plot.
@@ -227,27 +245,48 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
             parent=container,
             kind="column",
             tag="form",
+            autocomplete="off",
+        )
+        vert_container.add_class(
+            "channel-column",
+            "flex-grow-0",
+            "flex-shrink-0",
+            "collapse",
+            "show",
+            "overflow-y-scroll",
+            "overflow-x-hidden",
+            "overscroll-behavior-none",
         )
-        vert_container.add_class("channel-column", "collapse", "show")
 
-        input_box(
+        _, label, box = input_box(
             vert_container,
-            label="command",
             pattern="help",
             description="Send a string command via this environment.",
+            placement="bottom",
+            label="command",
             id=self.get_id("command"),
+            icon="terminal",
+            spellcheck="false",
         )
 
+        label.add_class("border-top-0")
+        box.add_class("border-top-0")
+
         # Text area.
         logs = div(
             tag="textarea",
             parent=div(parent=vert_container, class_str="form-floating"),
-            class_str=(
-                f"form-control rounded-0 {TEXT} text-body-emphasis text-logs"
-            ),
             id=self.get_id("logs"),
             title=f"Text logs for {self.name}.",
         )
+        logs.add_class(
+            "form-control",
+            "rounded-0",
+            "text-logs",
+            "border-top-0",
+            "p-2",
+            "overscroll-behavior-none",
+        )
         logs.booleans.add("readonly")
 
         self.channel_table(vert_container)
@@ -258,13 +297,16 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
             "border-start",
             "border-top",
             "border-end",
+            "bg-gradient-tertiary-to-bottom",
         )
 
         # Divider.
-        div(
-            id=self.get_id("divider"),
-            parent=container,
-            class_str="vertical-divider border-start bg-dark-subtle",
+        div(id=self.get_id("divider"), parent=container).add_class(
+            "vertical-divider",
+            "flex-grow-0",
+            "flex-shrink-0",
+            "border-start",
+            "bg-dark-subtle",
         )
 
         self._compose_plot(container)

runtimepy/net/server/app/env/widgets.py

@@ -14,6 +14,7 @@ from runtimepy.channel.environment.command.processor import (
     ChannelCommandProcessor,
 )
 from runtimepy.enum import RuntimeEnum
+from runtimepy.net.html.bootstrap import icon_str
 from runtimepy.net.html.bootstrap.elements import (
     flex,
     input_box,
@@ -25,7 +26,9 @@ from runtimepy.net.html.bootstrap.elements import (
 def plot_checkbox(parent: Element, name: str) -> None:
     """Add a checkbox for individual channel plot status."""
 
-    container = div(tag="td", parent=parent, class_str="text-center p-0")
+    container = div(tag="td", parent=parent, class_str="text-center p-0 fs-5")
+
+    title = f"Enable plotting channel '{name}'."
 
     set_tooltip(
         div(
@@ -34,10 +37,11 @@ def plot_checkbox(parent: Element, name: str) -> None:
             value="",
             id=f"plot-{name}",
             allow_no_end_tag=True,
-            parent=container,
-            class_str="form-check-input",
+            parent=div(tag="label", parent=container),
+            class_str="form-check-input rounded-0",
+            title=title,
         ),
-        f"Enable plotting channel '{name}'.",
+        title,
         placement="left",
     )
 
@@ -45,7 +49,10 @@ def plot_checkbox(parent: Element, name: str) -> None:
 def select_element(**kwargs) -> Element:
     """Create a select element."""
 
-    select = div(tag="select", class_str="form-select m-1", **kwargs)
+    select = div(tag="select", **kwargs)
+    select.add_class(
+        "form-select", "rounded-0", "border-top-0", "border-bottom-0"
+    )
     if "title" in kwargs:
         select["aria-label"] = kwargs["title"]
     return select
@@ -53,7 +60,7 @@ def select_element(**kwargs) -> Element:
 
 def enum_dropdown(
     parent: Element, name: str, enum: RuntimeEnum, current: int | bool
-) -> None:
+) -> Element:
     """Implement a drop down for enumeration options."""
 
     select = select_element(
@@ -67,8 +74,10 @@ def enum_dropdown(
         if current == val:
             opt.booleans.add("selected")
 
+    return select
+
 
-TABLE_BUTTON_CLASSES = ("p-1", "pt-2")
+TABLE_BUTTON_CLASSES = ("border-top-0", "border-bottom-0")
 
 
 def channel_table_header(
@@ -78,73 +87,45 @@ def channel_table_header(
 
     env = command.env
 
-    # Add header.
-    header_row = div(
-        tag="tr", parent=parent, class_str="border-start border-end"
-    )
-    for heading, desc in [
-        ("plot", "Toggle plotting for channels."),
-        ("name", "Channel names."),
-        ("value", "Channel values."),
-        ("ctl", "Type-specific channel controls."),
-        ("type", "Channel types."),
-    ]:
-        set_tooltip(
-            div(
-                tag="th",
-                scope="col",
-                parent=header_row,
-                text=heading,
-                class_str="text-secondary p-1",
-            ),
-            desc,
-            placement="left",
-        )
-
     # Add some controls.
-    ctl_row = div(tag="tr", parent=parent, class_str="border-start border-end")
+    ctl_row = div(
+        tag="tr",
+        parent=parent,
+        class_str="bg-body-tertiary border-start border-end",
+    )
 
     # Button for clearing plotted channels.
     toggle_button(
         div(tag="th", parent=ctl_row, class_str="text-center p-0"),
         tooltip="Clear plotted channels.",
         icon="x-lg",
+        placement="left",
         id="clear-plotted-channels",
         title="button for clearing plotted channels",
-    ).add_class("pb-2")
+    ).add_class(*TABLE_BUTTON_CLASSES)
 
-    input_box(
-        div(tag="th", parent=ctl_row, class_str="p-0 pb-1"),
+    _, label, box = input_box(
+        div(tag="th", parent=ctl_row, colspan="2", class_str="p-0"),
         description="Channel name filter.",
+        pattern=".* ! @ $",
+        label="filter",
         id="channel-filter",
+        icon="funnel",
+        spellcheck="false",
     )
+    label.add_class("border-top-0", "border-bottom-0")
+    box.add_class("border-top-0", "border-bottom-0")
 
-    # Button for clearing plot points.
-    toggle_button(
-        div(tag="th", parent=ctl_row, class_str="p-0"),
-        icon="trash",
-        tooltip="Clear all plot points.",
-        id="clear-plotted-points",
-        title="button for clearing plot point data",
-    ).add_class("pb-2")
-
-    cell = flex(tag="th", parent=ctl_row)
-    cell.add_class("p-0")
-
-    # Button for 'reset all defaults' if this tab has more than one channel
-    # with a default value.
-    if env.num_defaults > 1:
-        toggle_button(
-            cell,
-            id="set-defaults",
-            icon="arrow-counterclockwise",
-            tooltip="Reset all channels to their default values.",
-        ).add_class(*TABLE_BUTTON_CLASSES)
+    cell = flex(
+        parent=div(tag="th", parent=ctl_row, colspan="2", class_str="p-0")
+    )
 
     # Add a selection menu for custom commands.
     select = select_element(
         parent=cell, id="custom-commands", title="Custom command selector."
     )
+    select.add_class("border-start-0")
+
     if command.custom_commands:
         for key in command.custom_commands:
             opt = div(tag="option", value=key, text=key, parent=select)
@@ -156,7 +137,8 @@ def channel_table_header(
             cell,
             icon="send",
             id="send-custom-commands",
-            title="Send selected command.",
+            title="send selected command button",
+            tooltip="Send selected command (left dropdown).",
         ).add_class(*TABLE_BUTTON_CLASSES)
     else:
         div(
@@ -167,8 +149,79 @@ def channel_table_header(
         )
         select.booleans.add("disabled")
 
-    # Empty for now.
-    div(tag="th", parent=ctl_row, class_str="p-0")
+    # Button for 'reset all defaults' if this tab has more than one channel
+    # with a default value.
+    if env.num_defaults > 1:
+        toggle_button(
+            cell,
+            id="set-defaults",
+            icon="arrow-counterclockwise",
+            tooltip="Reset all channels to their default values.",
+        ).add_class(*TABLE_BUTTON_CLASSES)
+
+    toggle_button(
+        cell,
+        icon="eye-slash",
+        tooltip="Toggle command channels.",
+        id="toggle-command-channels",
+        title="button for toggling command-channel visibility",
+        icon_classes=["text-info-emphasis"],
+    ).add_class(*TABLE_BUTTON_CLASSES)
+    toggle_button(
+        cell,
+        icon="eye-slash-fill",
+        tooltip="Toggle regular channels.",
+        id="toggle-regular-channels",
+        title="button for toggling regular-channel visibility",
+    ).add_class(*TABLE_BUTTON_CLASSES)
+    toggle_button(
+        cell,
+        icon="trash",
+        tooltip="Clear all plot points.",
+        id="clear-plotted-points",
+        title="button for clearing plot point data",
+    ).add_class("me-auto", *TABLE_BUTTON_CLASSES)
+
+    # Add header.
+    header_row = div(
+        tag="tr",
+        parent=parent,
+        class_str="border-end text-center bg-body-tertiary",
+    )
+    icon_classes = ["text-primary-emphasis"]
+    for heading, desc in [
+        (
+            icon_str("activity", classes=icon_classes) + "?",
+            "Toggle plotting for channels.",
+        ),
+        (
+            icon_str("pen", classes=icon_classes) + " name",
+            "Channel names.",
+        ),
+        (
+            icon_str("database", classes=icon_classes) + " value",
+            "Channel values.",
+        ),
+        (
+            icon_str("controller", classes=icon_classes) + " controls",
+            "Type-specific channel controls.",
+        ),
+        (
+            icon_str("braces", classes=icon_classes) + " type",
+            "Channel types.",
+        ),
+    ]:
+        set_tooltip(
+            div(
+                tag="th",
+                scope="col",
+                parent=header_row,
+                text=heading,
+                class_str="text-secondary p-1 border-start text-nowrap",
+            ),
+            "(column) " + desc,
+            placement="left",
+        )
 
 
 def value_input_box(name: str, parent: Element) -> Element:
@@ -186,15 +239,16 @@ def value_input_box(name: str, parent: Element) -> Element:
         "rounded-0",
         "font-monospace",
         "form-control",
-        "m-1",
         "p-0",
-        "ps-1",
+        "ps-2",
+        "border-0",
+        "text-secondary-emphasis",
     )
     toggle_button(
         input_container,
         icon="send",
         id=name,
         title=f"Send command value for '{name}'.",
-    ).add_class(*TABLE_BUTTON_CLASSES)
+    ).add_class("pt-0", "pb-0", *TABLE_BUTTON_CLASSES)
 
     return input_container

runtimepy/net/server/app/landing_page.py

@@ -20,7 +20,7 @@ def landing_page(
     document: Html,
     request: RequestHeader,
     response: ResponseHeader,
-    request_data: Optional[bytes],
+    request_data: Optional[bytearray],
 ) -> Html:
     """Create a landing page application"""
 

runtimepy/net/server/app/tab.py

@@ -4,7 +4,7 @@ A module implementing an application tab interface.
 
 # built-in
 from io import StringIO
-from typing import cast
+from typing import Iterable, cast
 
 # third-party
 from svgen.element import Element
@@ -29,6 +29,7 @@ class Tab:
         source: str = None,
         subdir: str = "tab",
         icon: str = None,
+        js_uris: Iterable[str] = None,
     ) -> None:
         """Initialize this instance."""
 
@@ -46,6 +47,10 @@ class Tab:
         button_str += self.name
         self.button.text = button_str
 
+        if not js_uris:
+            js_uris = []
+        self.js_uris: list[str] = list(js_uris)
+
         self.init()
 
         self.compose(self.content)
@@ -59,8 +64,12 @@ class Tab:
     def write_js(self, writer: IndentedFileWriter, **kwargs) -> bool:
         """Write JavaScript code for the tab."""
 
-        return write_found_file(
-            writer, kind_url("js", self.source, subdir=self.subdir, **kwargs)
+        return all(
+            write_found_file(writer, uri)
+            for uri in [
+                kind_url("js", self.source, subdir=self.subdir, **kwargs)
+            ]
+            + self.js_uris
         )
 
     def entry(self) -> None:

runtimepy/net/server/html.py

@@ -16,7 +16,7 @@ from runtimepy.net.http.response import ResponseHeader
 from runtimepy.net.tcp.http import HttpConnection
 
 HtmlApp = Callable[
-    [Html, RequestHeader, ResponseHeader, Optional[bytes]], Awaitable[Html]
+    [Html, RequestHeader, ResponseHeader, Optional[bytearray]], Awaitable[Html]
 ]
 HtmlApps = dict[str, HtmlApp]
 
@@ -58,7 +58,7 @@ async def html_handler(
     stream: TextIO,
     request: RequestHeader,
     response: ResponseHeader,
-    request_data: Optional[bytes],
+    request_data: Optional[bytearray],
     default_app: HtmlApp = None,
     **kwargs,
 ) -> bool:

runtimepy/net/server/json.py

@@ -87,7 +87,7 @@ def json_handler(
     stream: TextIO,
     request: RequestHeader,
     response: ResponseHeader,
-    request_data: Optional[bytes],
+    request_data: Optional[bytearray],
     data: JsonObject,
 ) -> None:
     """Create an HTTP response from some JSON object data."""

runtimepy/net/server/markdown.py

@@ -9,13 +9,17 @@ from typing import Iterable, cast
 
 # third-party
 from vcorelib.io.file_writer import IndentedFileWriter
+from vcorelib.math.time import byte_count_str
 from vcorelib.paths import rel
+from vcorelib.paths import stats as _stats
 
 LOGO_MARKDOWN = "[![logo](/static/png/chip-circle-bootstrap/128x128.png)](/)"
+DIR_FILE = "dir.html"
 
 
 def markdown_for_dir(
-    path: Path, base: Path, extra_links: dict[str, Iterable[str]] = None
+    paths_bases: Iterable[tuple[Path, Path]],
+    extra_links: dict[str, Iterable[str]] = None,
 ) -> str:
     """Get markdown data for a directory."""
 
@@ -32,22 +36,35 @@ def markdown_for_dir(
                         for app in apps:
                             writer.write(f"* [{app}]({app})")
 
-        curr_dir = rel(path, base=base)
-        writer.write(f"## `{curr_dir}`")
+        writer.write("## directories")
         writer.empty()
 
-        # Link to go up a directory.
-        if curr_dir != Path():
-            writer.write(f"* [..](/{curr_dir.parent})")
+        for path, base in paths_bases:
+            curr_dir = rel(path, base=base)
+            writer.write(f"### `{base.name}/{curr_dir}`")
+            writer.empty()
 
-        for item in path.iterdir():
-            curr = rel(item, base=base)
+            # Link to go up a directory.
+            if curr_dir != Path():
+                writer.write(f"* [..](/{curr_dir.parent}/{DIR_FILE})")
 
-            name = f"`{curr.name}`"
-            if item.is_dir():
-                name = f"**{name}**"
+            writer.write("| name | size |")
+            writer.write("|------|------|")
+            for item in sorted(path.iterdir()):
+                curr = rel(item, base=base)
 
-            writer.write(f"* [{name}](/{curr})")
+                name = f"`{curr.name}`"
+                if item.is_dir():
+                    name = f"**{name}**"
+
+                stats = _stats(item)
+                assert stats
+                size_str = (
+                    byte_count_str(stats.st_size) if item.is_file() else ""
+                )
+                writer.write(f"| [{name}](/{curr}) | {size_str} |")
+
+            writer.empty()
 
         result: str = cast(StringIO, writer.stream).getvalue()
 

runtimepy/net/server/mux.py

@@ -0,0 +1,29 @@
+"""
+A module implementing an interface for serving a web application that allows
+iframe-based grid multiplexing.
+"""
+
+# built-in
+from typing import Optional
+
+# third-party
+from svgen.element.html import Html
+
+# internal
+from runtimepy.net.http.header import RequestHeader
+from runtimepy.net.http.response import ResponseHeader
+
+
+async def mux_app(
+    document: Html,
+    request: RequestHeader,
+    response: ResponseHeader,
+    request_data: Optional[bytearray],
+) -> Html:
+    """An iframe multiplexing application."""
+
+    del request
+    del response
+    del request_data
+
+    return document

runtimepy/net/stream/__init__.py

@@ -4,10 +4,11 @@ A module aggregating stream-oriented connection interfaces.
 
 # built-in
 from typing import BinaryIO as _BinaryIO
-from typing import Tuple
+
+# third-party
+from vcorelib.io import BinaryMessage
 
 # internal
-from runtimepy.net.connection import BinaryMessage
 from runtimepy.net.stream.base import PrefixedMessageConnection
 from runtimepy.net.stream.string import StringMessageConnection
 from runtimepy.net.tcp.connection import TcpConnection
@@ -34,14 +35,14 @@ class UdpPrefixedMessageConnection(PrefixedMessageConnection, UdpConnection):
     """A UDP implementation for size-prefixed messages."""
 
     async def process_datagram(
-        self, data: bytes, addr: Tuple[str, int]
+        self, data: BinaryMessage, addr: tuple[str, int]
     ) -> bool:
         """Process a datagram."""
 
         return await self.process_binary(data, addr=addr)
 
     def _send_message(
-        self, data: BinaryMessage, addr: Tuple[str, int] = None
+        self, data: BinaryMessage, addr: tuple[str, int] = None
     ) -> None:
         """Underlying data send."""
 
@@ -52,7 +53,7 @@ class EchoMessageConnection(PrefixedMessageConnection):
     """A connection that just echoes what it was sent."""
 
     async def process_single(
-        self, stream: _BinaryIO, addr: Tuple[str, int] = None
+        self, stream: _BinaryIO, addr: tuple[str, int] = None
     ) -> bool:
         """Process a single message."""