runtimepy 5.7.9__py3-none-any.whl → 5.7.10__py3-none-any.whl

runtimepy/__init__.py

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

runtimepy/net/arbiter/housekeeping/__init__.py

@@ -21,6 +21,8 @@ TASK_NAME = "housekeeping"
 class ConnectionMetricsPoller(_ArbiterTask):
     """A class that periodically polls connection metrics."""
 
+    processors: list[Awaitable[None]]
+
     def __init__(
         self,
         name: str,
@@ -31,6 +33,7 @@ class ConnectionMetricsPoller(_ArbiterTask):
 
         super().__init__(name, **kwargs)
         self.manager = manager
+        self.processors = []
 
     def _init_state(self) -> None:
         """Add channels to this instance's channel environment."""
@@ -51,7 +54,6 @@ class ConnectionMetricsPoller(_ArbiterTask):
             self.manager.poll_metrics()
 
         # Handle any incoming commands.
-        processors: list[Awaitable[None]] = []
         for mapping in (
             self.app.connections.values(),
             self.app.tasks.values(),
@@ -59,14 +61,15 @@ class ConnectionMetricsPoller(_ArbiterTask):
         ):
             for item in mapping:
                 if isinstance(item, AsyncCommandProcessingMixin):
-                    processors.append(item.process_command_queue())
+                    self.processors.append(item.process_command_queue())
 
         # Service connection tasks. The connection manager should probably do
         # this on its own at some point.
-        processors += list(self.app.conn_manager.connection_tasks)
+        self.processors += list(self.app.conn_manager.connection_tasks)
 
-        if processors:
-            await asyncio.gather(*processors)
+        if self.processors:
+            await asyncio.gather(*self.processors)
+            self.processors.clear()
 
         return True
 

runtimepy/net/server/__init__.py

@@ -11,7 +11,6 @@ from pathlib import Path
 from typing import Any, Optional, TextIO, Union
 
 # third-party
-import aiofiles
 from vcorelib import DEFAULT_ENCODING
 from vcorelib.io import IndentedFileWriter, JsonObject
 from vcorelib.paths import Pathlike, find_file, normalize
@@ -26,7 +25,7 @@ from runtimepy.net.http.response import ResponseHeader
 from runtimepy.net.server.html import HtmlApp, HtmlApps, get_html, html_handler
 from runtimepy.net.server.json import encode_json, json_handler
 from runtimepy.net.tcp.http import HttpConnection
-from runtimepy.util import normalize_root, path_has_part
+from runtimepy.util import normalize_root, path_has_part, read_binary
 
 MIMETYPES_INIT = False
 
@@ -158,10 +157,9 @@ class RuntimepyServerConnection(HttpConnection):
     ) -> bytes:
         """Render a markdown file as HTML and return the result."""
 
-        async with aiofiles.open(path, mode="r") as path_fd:
-            return self.render_markdown(
-                await path_fd.read(), response, **kwargs
-            )
+        return self.render_markdown(
+            (await read_binary(path)).decode(), response, **kwargs
+        )
 
     async def try_file(
         self, path: PathMaybeQuery, response: ResponseHeader
@@ -195,8 +193,7 @@ class RuntimepyServerConnection(HttpConnection):
                 self.logger.info("Serving '%s' (MIME: %s)", candidate, mime)
 
                 # Return the file data.
-                async with aiofiles.open(candidate, mode="rb") as path_fd:
-                    result = await path_fd.read()
+                result = await read_binary(candidate)
 
                 break
 

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

@@ -69,9 +69,7 @@ class ChannelEnvironmentTabMessaging(ChannelEnvironmentTabBase):
             for name in env.names:
                 self._setup_callback(name, state)
         else:
-            # Remove callbacks for primitives.
-            for name, val in state.callbacks.items():
-                state.primitives[name].remove_callback(val)
+            state.clear_telemetry()
 
         # Save current UI state.
         state.latest_ui_values.update(latest)

runtimepy/net/server/websocket/state.py

@@ -53,19 +53,36 @@ class TabState:
 
         return result
 
+    def clear_telemetry(self) -> None:
+        """Clear all telemetry interactions."""
+
+        # Remove callbacks for primitives.
+        for name, val in self.callbacks.items():
+            self.primitives[name].remove_callback(val)
+        self.callbacks.clear()
+        self.primitives.clear()
+
+        # Clear points.
+        self.points.clear()
+
     def clear_loggers(self) -> None:
         """Clear all logging handlers."""
 
+        # Remove handlers.
         for logger in self._loggers:
             logger.removeHandler(self.tab_logger)
+        self._loggers.clear()
+
         self.tab_logger.drain_str()
-        self._loggers = []
+
+        self.clear_telemetry()
 
     def add_logger(self, logger: logging.Logger) -> None:
         """Add a logger."""
 
-        logger.addHandler(self.tab_logger)
-        self._loggers.append(logger)
+        if logger not in self._loggers:
+            logger.addHandler(self.tab_logger)
+            self._loggers.append(logger)
 
     @staticmethod
     def create() -> "TabState":

runtimepy/util.py

@@ -8,11 +8,20 @@ from pathlib import Path
 from typing import Iterator, Union
 
 # third-party
+import aiofiles
 from vcorelib.paths import normalize
 
 ROOT_PATH = Path(sep)
 
 
+async def read_binary(path: Path) -> bytes:
+    """An async wrapper for reading file contents."""
+
+    async with aiofiles.open(path, mode="rb") as path_fd:
+        result = await path_fd.read()
+    return result  # type: ignore
+
+
 def normalize_root(*src_parts: Union[str, Path]) -> Path:
     """Make paths absolute that aren't. Useful for HTTP-request pathing."""
 

{runtimepy-5.7.9.dist-info → runtimepy-5.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 5.7.9
+Version: 5.7.10
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,11 +17,11 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiofiles
-Requires-Dist: svgen >=0.6.8
-Requires-Dist: websockets
 Requires-Dist: vcorelib >=3.4.5
+Requires-Dist: websockets
 Requires-Dist: psutil
+Requires-Dist: aiofiles
+Requires-Dist: svgen >=0.6.8
 Provides-Extra: test
 Requires-Dist: pylint ; extra == 'test'
 Requires-Dist: flake8 ; extra == 'test'
@@ -45,11 +45,11 @@ Requires-Dist: uvloop ; (sys_platform != "win32" and sys_platform != "cygwin") a
     =====================================
     generator=datazen
     version=3.1.4
-    hash=9fbafffa1da655b349a05dfa48addf0b
+    hash=1e8298e9f6423ee6f9836f5ec04cc3ab
     =====================================
 -->
 
-# runtimepy ([5.7.9](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.7.10](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.7.9.dist-info → runtimepy-5.7.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runtimepy/__init__.py,sha256=GL1as0g7a1sU6w4kqUfDAJXvMjjsu7qwNr2fYa4Jpes,390
+runtimepy/__init__.py,sha256=xlFe4KOw9V-9A2MlIEX9gtA5eOEck1Z8uclAZojzciU,391
 runtimepy/__main__.py,sha256=OPAed6hggoQdw-6QAR62mqLC-rCkdDhOq0wyeS2vDRI,332
 runtimepy/app.py,sha256=sTvatbsGZ2Hdel36Si_WUbNMtg9CzsJyExr5xjIcxDE,970
 runtimepy/dev_requirements.txt,sha256=j0dh11ztJAzfaUL0iFheGjaZj9ppDzmTkclTT8YKO8c,230
@@ -7,7 +7,7 @@ runtimepy/mapping.py,sha256=VQK1vzmQVvYYKI85_II37-hIEbvgL3PzNy-WI6TTo80,5091
 runtimepy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/requirements.txt,sha256=ntjU97UnQ5N7tqfwM7ljg77V5MBFFNBTfVuKS_KGwP0,124
 runtimepy/schemas.py,sha256=zTgxPm9DHZ0R_bmmOjNQMTXdtM_Hb1bE-Fog40jDCgg,839
-runtimepy/util.py,sha256=1279Ea7CNHa1U_JvUydGAb2oEI2TxilXkq5V1RseCwU,1437
+runtimepy/util.py,sha256=GuyIHVFGMS02OR6-O3LnlV3DqG5hj4-IUud0QM6WicA,1684
 runtimepy/channel/__init__.py,sha256=pf0RJ5g37_FVV8xoUNgzFGuIfbZEYSBA_cQlJSDTPDo,4774
 runtimepy/channel/registry.py,sha256=nk36qM_Bf6qK6AFR0plaZHR1PU7b4LZqbQ0feJqk4lc,4784
 runtimepy/channel/environment/__init__.py,sha256=0Jj8g7Y4bdDvmWtzpegB9D4milGPhsZokoYxmps5zgU,1612
@@ -159,7 +159,7 @@ runtimepy/net/arbiter/config/util.py,sha256=MezLSil5mEwioI5kxDOZa9y118st1_t0El8D
 runtimepy/net/arbiter/factory/__init__.py,sha256=jC1szUYucH4Us3jbb0mhFgnklHlorya5DYGGw2pqfe4,334
 runtimepy/net/arbiter/factory/connection.py,sha256=uSwnvIWGJcDd2ReK-s9lBx-NcRQ1JH_7VbwkWjE_8zA,3690
 runtimepy/net/arbiter/factory/task.py,sha256=YLRv55dnDBqHRJIMYgO9_uHi0AW-8hwa0n3wHAKyncE,1959
-runtimepy/net/arbiter/housekeeping/__init__.py,sha256=mgrYnDdL1DSP6fXdtk2VU9uqTvtgX2VX5q2Q9EfcJus,3545
+runtimepy/net/arbiter/housekeeping/__init__.py,sha256=-6P2x_qSWp1juml0wKZGJ343c-atrbp8YkDRWn162UA,3622
 runtimepy/net/arbiter/imports/__init__.py,sha256=W7-kkM4B_zDU42Fyh0PmZL56JslS_0_qzvpzUhN6aDU,5041
 runtimepy/net/arbiter/imports/util.py,sha256=d4_HnWphrkiHQkyYr8YJKvSSTXoMf3Bct_7jg_CS9eA,1086
 runtimepy/net/arbiter/struct/__init__.py,sha256=Vr38dp2X0PZOrAbjKsZ9xZdQ1j3z92s4QuvRtYYVuNI,5990
@@ -178,7 +178,7 @@ runtimepy/net/http/request_target.py,sha256=EE1aI5VSARw1h93jyZvP56ir5O5fjd6orYK-
 runtimepy/net/http/response.py,sha256=Sup8W_A0ADNzR5olKrQsVNhsQXUwPOD-eJLlLOgYlAY,2316
 runtimepy/net/http/state.py,sha256=qCMN8aWfCRfU9XP-cIhSOo2RqfljTjbQRCflfcy2bfY,1626
 runtimepy/net/http/version.py,sha256=mp6rgIM7-VUVKLCA0Uw96CmBkL0ET860lDVVEewpZ7w,1098
-runtimepy/net/server/__init__.py,sha256=ZsJGvak5OPHyuGPDThwj9roOj8ZcwqrOrzTD27hJhCo,9621
+runtimepy/net/server/__init__.py,sha256=sYvvt7p3yTFCR2YXf4Qx3bKo_AafW0OjQ_30KKbg2DM,9488
 runtimepy/net/server/html.py,sha256=ufg0PQF_iUE7PT0n3Pn3jTcun7mspZUI6_ooblcNnvI,1217
 runtimepy/net/server/json.py,sha256=a7vM5yfq2er4DexzFqEMnxoMGDeuywKkVH4-uNJBAik,2522
 runtimepy/net/server/app/__init__.py,sha256=beU67t7zoKGlO7aldjQMUwYLm9mSlc78eMQazri-otw,3012
@@ -199,10 +199,10 @@ runtimepy/net/server/app/env/tab/__init__.py,sha256=stTVKyHljLQWnnhxkWPwa7bLdZtj
 runtimepy/net/server/app/env/tab/base.py,sha256=v5-Zbo_NqRqoLuceYclz348oFHcL68T2mbEh4EDWtTg,1162
 runtimepy/net/server/app/env/tab/controls.py,sha256=bifFMvshDNsar3UiqeXOCYi71JGFRlMnyixKXrdLAEI,4728
 runtimepy/net/server/app/env/tab/html.py,sha256=IfKCQ_2qupIRtWIuodIBM8XAal1esSXovht1SeGyvb4,7173
-runtimepy/net/server/app/env/tab/message.py,sha256=OWqBIPRt6UdBHAXk5qvFMbnWuvIRUyp34lzb3GYdthk,4070
+runtimepy/net/server/app/env/tab/message.py,sha256=-J8wBo1KH0XoBi9VcUvl9LXZCaoFAmvFyMf_YFJVF6Q,3945
 runtimepy/net/server/struct/__init__.py,sha256=Zy37r6RLFu-XFr9vsanSq80BJdS6Dxr7zmPzQbb7xdw,1799
 runtimepy/net/server/websocket/__init__.py,sha256=KISuFUUQwNn6BXo8BOMuMOXyoVqE7Jw94ZQiSCQuRQE,5279
-runtimepy/net/server/websocket/state.py,sha256=a5xNeq13VPaz48HCqcIQdf1r3WV1a3iVernXM6w7P9g,1828
+runtimepy/net/server/websocket/state.py,sha256=tClzw_3pOV9fzsiqnmss0FUsZZPhInL2CnDi_jyrayI,2291
 runtimepy/net/stream/__init__.py,sha256=1PNossiE4S9wtPYoiHVsTeAMJFGtiak5vbsoIkVGfZs,2374
 runtimepy/net/stream/base.py,sha256=Dg4vcR0n9y2122AyJ-9W-jkEhNla_EHO-DqJJPfGD4k,1977
 runtimepy/net/stream/string.py,sha256=61mgserU3p6j5gAcK0oe0aKqL6vDh7NtgJvbPoiAUPM,784
@@ -284,9 +284,9 @@ runtimepy/tui/task.py,sha256=nUZo9fuOC-k1Wpqdzkv9v1tQirCI28fZVgcC13Ijvus,1093
 runtimepy/tui/channels/__init__.py,sha256=evDaiIn-YS9uGhdo8ZGtP9VK1ek6sr_P1nJ9JuSET0o,4536
 runtimepy/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/ui/controls.py,sha256=yvT7h3thbYaitsakcIAJ90EwKzJ4b-jnc6p3UuVf_XE,1241
-runtimepy-5.7.9.dist-info/LICENSE,sha256=s2ILEylm2dAJJXL25nM92IWLRKmJW92zQRQe_cfdsHo,1071
-runtimepy-5.7.9.dist-info/METADATA,sha256=n3bYpGmFzA7nS0zhHK2DNNzcTizdlZCfzCC2kRuKQoc,9308
-runtimepy-5.7.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-runtimepy-5.7.9.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
-runtimepy-5.7.9.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
-runtimepy-5.7.9.dist-info/RECORD,,
+runtimepy-5.7.10.dist-info/LICENSE,sha256=s2ILEylm2dAJJXL25nM92IWLRKmJW92zQRQe_cfdsHo,1071
+runtimepy-5.7.10.dist-info/METADATA,sha256=iZiw-hLuQS1VPCwPvhZBTYUy-vmUeqO9Oqak235w63s,9310
+runtimepy-5.7.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+runtimepy-5.7.10.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
+runtimepy-5.7.10.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
+runtimepy-5.7.10.dist-info/RECORD,,