runtimepy 5.4.2__tar.gz → 5.4.4__tar.gz

{runtimepy-5.4.2/runtimepy.egg-info → runtimepy-5.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 5.4.2
+Version: 5.4.4
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,9 +17,9 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: vcorelib>=3.3.1
 Requires-Dist: websockets
 Requires-Dist: psutil
+Requires-Dist: vcorelib>=3.3.1
 Requires-Dist: svgen>=0.6.8
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
@@ -44,11 +44,11 @@ Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") an
     =====================================
     generator=datazen
     version=3.1.4
-    hash=4f8a71a6066638ed1a90f375188f0578
+    hash=dbac0e58214ea7e4abbe7161a3c64749
     =====================================
 -->
 
-# runtimepy ([5.4.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.4.4](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.4.2 → runtimepy-5.4.4}/README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=4f8a71a6066638ed1a90f375188f0578
+    hash=dbac0e58214ea7e4abbe7161a3c64749
     =====================================
 -->
 
-# runtimepy ([5.4.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.4.4](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.4.2 → runtimepy-5.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "5.4.2"
+version = "5.4.4"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.11"

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=e6970089f5f2935c496cb3e9bb06b774
+# hash=5a37b52aedb2af82fb174fbea8ce0c1f
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.4.2"
+VERSION = "5.4.4"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/commands/tftp.py

@@ -8,13 +8,12 @@ import asyncio
 from pathlib import Path
 from socket import getaddrinfo
 
-from vcorelib.args import CommandFunction
-
 # third-party
+from vcorelib.args import CommandFunction
 from vcorelib.asyncio import run_handle_stop
 
 # internal
-from runtimepy.net.udp.tftp import tftp_read, tftp_write
+from runtimepy.net.udp.tftp import TFTP_PORT, tftp_read, tftp_write
 from runtimepy.net.udp.tftp.base import DEFAULT_TIMEOUT_S, REEMIT_PERIOD_S
 from runtimepy.net.udp.tftp.enums import DEFAULT_MODE
 
@@ -53,7 +52,7 @@ def add_tftp_cmd(parser: argparse.ArgumentParser) -> CommandFunction:
         "-p",
         "--port",
         type=int,
-        default=69,
+        default=TFTP_PORT,
         help="port to message (default: %(default)s)",
     )
 

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/data/css/bootstrap_extra.css

@@ -40,6 +40,10 @@
   width: auto;
 }
 
+.table-container {
+  overflow-x: scroll;
+}
+
 .channel-column {
   overflow-y: scroll;
   overflow-x: hidden;

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/net/server/app/env/tab/html.py

@@ -134,7 +134,9 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
     def channel_table(self, parent: Element) -> None:
         """Create the channel table."""
 
-        table = div(tag="table", parent=parent)
+        table = div(
+            tag="table", parent=div(parent=parent, class_str="table-container")
+        )
         table.add_class("table", TEXT)
 
         header = div(tag="thead", parent=table)
@@ -248,7 +250,7 @@ class ChannelEnvironmentTabHtml(ChannelEnvironmentTabControls):
         # table doesn't take up full vertical space, few channels).
         under_construction(
             vert_container,
-            class_str="border-start border-end",
+            class_str="border-start border-top border-end",
             note="unused space",
         )
 

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/net/udp/tftp/__init__.py

@@ -21,6 +21,7 @@ from runtimepy.net.udp.tftp.base import (
     DEFAULT_TIMEOUT_S,
     REEMIT_PERIOD_S,
     BaseTftpConnection,
+    TftpErrorHandler,
 )
 from runtimepy.net.udp.tftp.enums import DEFAULT_MODE
 from runtimepy.util import PossiblePath, as_path
@@ -194,6 +195,9 @@ class TftpConnection(BaseTftpConnection):
         return result
 
 
+TFTP_PORT = 69
+
+
 @asynccontextmanager
 async def tftp(
     addr: Union[IpHost, tuple[str, int]],
@@ -201,6 +205,7 @@ async def tftp(
     connection_kwargs: dict[str, Any] = None,
     timeout_s: float = DEFAULT_TIMEOUT_S,
     reemit_period_s: float = REEMIT_PERIOD_S,
+    error_handler: TftpErrorHandler = None,
 ) -> AsyncIterator[TftpConnection]:
     """Use a tftp connection as a managed context."""
 
@@ -215,6 +220,11 @@ async def tftp(
     conn = await TftpConnection.create_connection(
         remote_addr=(addr.name, addr.port), **connection_kwargs
     )
+
+    # Add error handlers.
+    if error_handler is not None:
+        conn.error_handlers.append(error_handler)
+
     async with conn.process_then_disable(**process_kwargs):
         # Set parameters.
         conn.endpoint_timeout.value = timeout_s
@@ -232,6 +242,7 @@ async def tftp_write(
     connection_kwargs: dict[str, Any] = None,
     timeout_s: float = DEFAULT_TIMEOUT_S,
     reemit_period_s: float = REEMIT_PERIOD_S,
+    error_handler: TftpErrorHandler = None,
 ) -> bool:
     """Attempt to perform a tftp write."""
 
@@ -241,6 +252,7 @@ async def tftp_write(
         connection_kwargs=connection_kwargs,
         timeout_s=timeout_s,
         reemit_period_s=reemit_period_s,
+        error_handler=error_handler,
     ) as conn:
         # Perform tftp interaction.
         result = await conn.request_write(
@@ -259,6 +271,7 @@ async def tftp_read(
     connection_kwargs: dict[str, Any] = None,
     timeout_s: float = DEFAULT_TIMEOUT_S,
     reemit_period_s: float = REEMIT_PERIOD_S,
+    error_handler: TftpErrorHandler = None,
 ) -> bool:
     """Attempt to perform a tftp read."""
 
@@ -268,6 +281,7 @@ async def tftp_read(
         connection_kwargs=connection_kwargs,
         timeout_s=timeout_s,
         reemit_period_s=reemit_period_s,
+        error_handler=error_handler,
     ) as conn:
         result = await conn.request_read(
             destination, filename, mode=mode, addr=addr

{runtimepy-5.4.2 → runtimepy-5.4.4}/runtimepy/net/udp/tftp/base.py

@@ -8,7 +8,7 @@ from contextlib import AsyncExitStack
 from io import BytesIO
 import logging
 from pathlib import Path
-from typing import BinaryIO, Union
+from typing import BinaryIO, Callable, Union
 
 # third-party
 from vcorelib.math import metrics_time_ns
@@ -30,6 +30,8 @@ from runtimepy.primitives import Double, Uint16
 REEMIT_PERIOD_S = 0.20
 DEFAULT_TIMEOUT_S = 1.0
 
+TftpErrorHandler = Callable[[TftpErrorCode, str, tuple[str, int]], None]
+
 
 class BaseTftpConnection(UdpConnection):
     """A class implementing a basic tftp interface."""
@@ -73,6 +75,7 @@ class BaseTftpConnection(UdpConnection):
 
         self.error_code = Uint16(time_source=metrics_time_ns)
         self.env.channel("error_code", self.error_code, enum="TftpErrorCode")
+        self.error_handlers: list[TftpErrorHandler] = []
 
         self.endpoint_period = Double(value=REEMIT_PERIOD_S)
         self.env.channel(
@@ -346,10 +349,14 @@ class BaseTftpConnection(UdpConnection):
         """Handle an error message."""
 
         # Update underlying primitive.
-        error_code = self.error_code.from_stream(stream)
-        self.endpoint(addr).handle_error(
-            TftpErrorCode(error_code), stream.read().decode()
-        )
+        error_code = TftpErrorCode(self.error_code.from_stream(stream))
+        message = stream.read().decode()
+
+        # Call extra error handlers.
+        for handler in self.error_handlers:
+            handler(error_code, message, addr)
+
+        self.endpoint(addr).handle_error(error_code, message)
 
     async def process_datagram(
         self, data: bytes, addr: tuple[str, int]

{runtimepy-5.4.2 → runtimepy-5.4.4/runtimepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 5.4.2
+Version: 5.4.4
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,9 +17,9 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: vcorelib>=3.3.1
 Requires-Dist: websockets
 Requires-Dist: psutil
+Requires-Dist: vcorelib>=3.3.1
 Requires-Dist: svgen>=0.6.8
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
@@ -44,11 +44,11 @@ Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") an
     =====================================
     generator=datazen
     version=3.1.4
-    hash=4f8a71a6066638ed1a90f375188f0578
+    hash=dbac0e58214ea7e4abbe7161a3c64749
     =====================================
 -->
 
-# runtimepy ([5.4.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.4.4](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)