runtimepy 5.8.1__py3-none-any.whl → 5.8.3__py3-none-any.whl

runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=50f22b2d623cea7b3ea3eaf94b419b39
+# hash=b65d0c030290cfc108e2e5e85293e331
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.8.1"
+VERSION = "5.8.3"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

runtimepy/data/css/main.css

@@ -1,5 +1,7 @@
 html {
   height: 100%;
+  width: 100%;
+  position: fixed;
 }
 
 body {

runtimepy/net/arbiter/base.py

@@ -142,6 +142,9 @@ class BaseConnectionArbiter(_NamespaceMixin, _LoggerMixin, TuiMixin):
         self._servers: list[_asyncio.Task[None]] = []
         self._servers_started = _asyncio.Semaphore(0)
 
+        # A copy of named port mappings (loaded via external config).
+        self._ports: dict[str, int] = {}
+
         self._init()
 
     def _init(self) -> None:
@@ -285,6 +288,7 @@ class BaseConnectionArbiter(_NamespaceMixin, _LoggerMixin, TuiMixin):
                 self._namespace,
                 self.stop_sig,
                 config if config is not None else self._config,
+                self._ports,
                 self,
                 tasks,  # type: ignore
                 self.task_manager,

runtimepy/net/arbiter/config/__init__.py

@@ -139,6 +139,8 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
 
         names = set()
 
+        self._ports = config.ports
+
         # Registier factories.
         for factory in config.factories:
             name = factory["name"]
@@ -151,7 +153,7 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
                     *factory.get("namespaces", []),
                     **dict_resolve_env_vars(
                         factory.get("kwargs", {}),
-                        env=config.ports,  # type: ignore
+                        env=self._ports,  # type: ignore
                     ),
                 ), f"Couldn't register factory '{factory}'!"
                 names.add(name)
@@ -163,17 +165,17 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
 
             # Resolve any port variables that may have been used.
             args = list_resolve_env_vars(
-                client.get("args", []), env=config.ports  # type: ignore
+                client.get("args", []), env=self._ports  # type: ignore
             )
             kwargs = dict_resolve_env_vars(
-                client.get("kwargs", {}), env=config.ports  # type: ignore
+                client.get("kwargs", {}), env=self._ports  # type: ignore
             )
             kwargs.setdefault("markdown", client.get("markdown"))
 
             assert await self.factory_client(
                 factory,
                 name,
-                *fix_args(args, config.ports),
+                *fix_args(args, self._ports),
                 defer=client["defer"],
                 # Perform some known fixes for common keyword arguments.
                 **fix_kwargs(kwargs),
@@ -186,10 +188,10 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
             assert await self.factory_server(
                 factory,
                 *list_resolve_env_vars(
-                    server.get("args", []), env=config.ports  # type: ignore
+                    server.get("args", []), env=self._ports  # type: ignore
                 ),
                 **dict_resolve_env_vars(
-                    server.get("kwargs", {}), env=config.ports  # type: ignore
+                    server.get("kwargs", {}), env=self._ports  # type: ignore
                 ),
             ), f"Couldn't register a '{factory}' server!"
 

runtimepy/net/arbiter/info.py

@@ -160,6 +160,7 @@ class AppInfo(_LoggerMixin):
 
     # Configuration data that may be specified in a configuration file.
     config: _JsonObject
+    ports: dict[str, int]
 
     tui: TuiMixin
 
@@ -186,6 +187,7 @@ class AppInfo(_LoggerMixin):
             self.names,
             self.stop,
             self.config,
+            self.ports,
             self.tui,
             self.tasks,
             self.task_manager,

{runtimepy-5.8.1.dist-info → runtimepy-5.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 5.8.1
+Version: 5.8.3
 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: vcorelib>=3.4.7
 Requires-Dist: psutil
-Requires-Dist: aiofiles
 Requires-Dist: websockets
+Requires-Dist: aiofiles
 Requires-Dist: svgen>=0.7.4
+Requires-Dist: vcorelib>=3.4.7
 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") an
     =====================================
     generator=datazen
     version=3.1.4
-    hash=de150fbd8ea83f317f485e01380215e6
+    hash=a0578deccfc29186901fc54d3849b52b
     =====================================
 -->
 
-# runtimepy ([5.8.1](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.8.3](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.8.1.dist-info → runtimepy-5.8.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runtimepy/__init__.py,sha256=8olHidbM5qotaGKM8DOOAisxMfRw3tSbzSxQWpIh4p8,390
+runtimepy/__init__.py,sha256=x_JJlvfTSZKskKnwxa2e-ZI9vcdDIWnwHFudFegBx8U,390
 runtimepy/__main__.py,sha256=OPAed6hggoQdw-6QAR62mqLC-rCkdDhOq0wyeS2vDRI,332
 runtimepy/app.py,sha256=sTvatbsGZ2Hdel36Si_WUbNMtg9CzsJyExr5xjIcxDE,970
 runtimepy/dev_requirements.txt,sha256=j0dh11ztJAzfaUL0iFheGjaZj9ppDzmTkclTT8YKO8c,230
@@ -53,7 +53,7 @@ runtimepy/data/server_dev.yaml,sha256=nQsPh7LuQig3pzHfdg_aD3yOUiCj1sKKfI-WwW3hXm
 runtimepy/data/tftp_server.yaml,sha256=-bFOWJSagI-fEQQcT8k7eDMJVfSPm2XAxLVG3dqUTa4,204
 runtimepy/data/css/bootstrap_extra.css,sha256=kJLOp8j-vRxnWzQOf_eOz4kL8Mbrwxuwk3YNh90HgWM,1907
 runtimepy/data/css/font.css,sha256=Pe82E66rNi-cwlQ-_1GHAuhPGu5L4x5KqgV0dbDe51w,977
-runtimepy/data/css/main.css,sha256=OSg5g7FYbjsHY7QNbFCTPAD1MlypeoYfaOyAfvnT2kI,680
+runtimepy/data/css/main.css,sha256=kdqSsltzP78dgbiAQCTtsvK9p3kpbtQ809PD5tK9LVE,714
 runtimepy/data/js/DataConnection.js,sha256=DnX8FMehjJXqmI62UMYXSvl_XdfQMzq3XUDFbLu2GgI,98
 runtimepy/data/js/JsonConnection.js,sha256=rclZrbmWc_zSs6I_JhOgxnVPFIyPMo5WdjAe8alyZ3o,2729
 runtimepy/data/js/audio.js,sha256=bLkBqbeHMiGGidfL3iXjmVoF9seK-ZeZ3kwgOrcpgk4,1092
@@ -147,13 +147,13 @@ runtimepy/net/ssl.py,sha256=dj9uECPKDT5k-5vlR5I3Z7Go3WWZhbaJ9nb0rC3kJvg,854
 runtimepy/net/util.py,sha256=P6WnH4n8JJkEfKwepk1eP4lGPxWjqcFv0yL3N0mvtrw,5897
 runtimepy/net/apps/__init__.py,sha256=vjo7e19QXtJwe6V6B-QGvYiJveYobnYIfpkKZrnS17w,710
 runtimepy/net/arbiter/__init__.py,sha256=ptKF995rYKvkm4Mya92vA5QEDqcFq5NRD0IYGqZ6_do,740
-runtimepy/net/arbiter/base.py,sha256=w5IFDRU1Zfw7sfg0eS8hj7_Ip6bHHYQ4S212Ic-Kj-c,14817
-runtimepy/net/arbiter/info.py,sha256=tlzfbn3soyejArxfZ4lrLbaBVOjiz4nX52wa6XMfXuo,9684
+runtimepy/net/arbiter/base.py,sha256=hggbHBWkuJaEkBTenlI2eCtTywhicvUpAIeI-PPYUkY,14958
+runtimepy/net/arbiter/info.py,sha256=aMo4LvRAO7_4x1ff13yZCiI5qOUdzAk1yZZAbrQIOAc,9734
 runtimepy/net/arbiter/result.py,sha256=PHZo5qj4SI08ZeWPFk_8OZ1umI6L0dp5nJpjjS8QUpM,2871
 runtimepy/net/arbiter/task.py,sha256=APcc5QioAG8uueIzxJU-vktIn8Ys3yJd_CFlRWb6Ieo,795
 runtimepy/net/arbiter/udp.py,sha256=-ecHJs-utcsiTfr5wSb73hUUuYFBeRVT_D1znYp5q6A,893
 runtimepy/net/arbiter/websocket.py,sha256=vYTDA7sXMUTTqW3i1zTWUdaxGKxfrQcQoVSYZtmCvfQ,1524
-runtimepy/net/arbiter/config/__init__.py,sha256=m7g7nrOQuMuzc0qShJpqJ3fW55HpAuZl4Jn6D0etWBM,8475
+runtimepy/net/arbiter/config/__init__.py,sha256=MuMeWKt_MqpQmMLpmugtvGFLpmZtXrNXlPKbMsjqZmI,8505
 runtimepy/net/arbiter/config/codec.py,sha256=TQj8UXEb1EvhiCqRdyq5BkeubMytEZAs9B4E5ZYsEuY,2511
 runtimepy/net/arbiter/config/util.py,sha256=MezLSil5mEwioI5kxDOZa9y118st1_t0El8DYH6hFU8,1254
 runtimepy/net/arbiter/factory/__init__.py,sha256=jC1szUYucH4Us3jbb0mhFgnklHlorya5DYGGw2pqfe4,334
@@ -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.8.1.dist-info/LICENSE,sha256=s2ILEylm2dAJJXL25nM92IWLRKmJW92zQRQe_cfdsHo,1071
-runtimepy-5.8.1.dist-info/METADATA,sha256=WcxigwsMCvTZAqJdUAdpYsDRt5qMvxyEbIoAN9ipIoA,9288
-runtimepy-5.8.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-runtimepy-5.8.1.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
-runtimepy-5.8.1.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
-runtimepy-5.8.1.dist-info/RECORD,,
+runtimepy-5.8.3.dist-info/LICENSE,sha256=s2ILEylm2dAJJXL25nM92IWLRKmJW92zQRQe_cfdsHo,1071
+runtimepy-5.8.3.dist-info/METADATA,sha256=RanCiw2Z1cm7teWHWhcO0-UoTJeuLPeI19RLru_yfnc,9288
+runtimepy-5.8.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+runtimepy-5.8.3.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
+runtimepy-5.8.3.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
+runtimepy-5.8.3.dist-info/RECORD,,