runtimepy 5.15.0__tar.gz → 5.15.1__tar.gz

{runtimepy-5.15.0/runtimepy.egg-info → runtimepy-5.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.15.0
+Version: 5.15.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/libre-embedded/runtimepy
 Author: Libre Embedded
@@ -17,11 +17,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil
+Requires-Dist: vcorelib>=3.6.2
 Requires-Dist: svgen>=0.8.0
-Requires-Dist: aiofiles
 Requires-Dist: websockets
-Requires-Dist: vcorelib>=3.6.2
+Requires-Dist: aiofiles
+Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -51,11 +51,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.2.3
-    hash=db8f45762873863c99d4d7d8f996d2fb
+    hash=21dc494ffe783ac9edf7769c4d5aa21e
     =====================================
 -->
 
-# runtimepy ([5.15.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.15.1](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.15.0 → runtimepy-5.15.1}/README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.2.3
-    hash=db8f45762873863c99d4d7d8f996d2fb
+    hash=21dc494ffe783ac9edf7769c4d5aa21e
     =====================================
 -->
 
-# runtimepy ([5.15.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.15.1](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.15.0 → runtimepy-5.15.1}/pyproject.toml

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

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.2.3
-# hash=58f166da9bc0561c671ef04c334d585d
+# hash=7da25db9f79bc00e444a7898020e2a26
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.15.0"
+VERSION = "5.15.1"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy/data/dummy_load.yaml

@@ -85,6 +85,9 @@ structs:
 
   - name: example.struct3
     factory: sample_struct
+    config:
+      js_uris:
+        - package://runtimepy/js/sample.js
 
 # Sample peer processes.
 processes:

runtimepy-5.15.1/runtimepy/data/js/sample.js

@@ -0,0 +1 @@
+console.log(`sample.js included (${tab.name})`);

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy/net/connection.py

@@ -250,9 +250,9 @@ class Connection(
             await backoff.sleep()
             if await self.restart():
                 self._set_enabled(True)
-                self._restarts.raw.value += 1
+                self._restarts.increment()
 
-            self._restart_attempts.raw.value += 1
+            self._restart_attempts.increment()
 
     @asynccontextmanager
     async def process_then_disable(self, **kwargs) -> AsyncIterator[None]:

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy/net/server/app/env/__init__.py

@@ -40,6 +40,7 @@ def populate_tabs(app: AppInfo, tabs: TabbedContent) -> None:
             tabs,
             icon="arrow-repeat",
             markdown=task.markdown,
+            js_uris=task.config.get("js_uris", []),
         ).entry()
 
     # Struct tabs.
@@ -51,6 +52,7 @@ def populate_tabs(app: AppInfo, tabs: TabbedContent) -> None:
             tabs,
             icon="bucket",
             markdown=struct.markdown,
+            js_uris=struct.config.get("js_uris", []),
         ).entry()
 
     # Subprocess tabs.

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy/net/server/app/env/tab/base.py

@@ -28,12 +28,13 @@ class ChannelEnvironmentTabBase(Tab, LoggerMixin, MarkdownMixin):
         tabs: TabbedContent,
         icon: str = "alarm",
         markdown: str = None,
+        **kwargs,
     ) -> None:
         """Initialize this instance."""
 
         self.command = command
         self.set_markdown(markdown=markdown, package=PKG_NAME)
-        super().__init__(name, app, tabs, source="env", icon=icon)
+        super().__init__(name, app, tabs, source="env", icon=icon, **kwargs)
 
         # Logging.
         LoggerMixin.__init__(self, logger=self.command.logger)

{runtimepy-5.15.0 → runtimepy-5.15.1}/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-5.15.0 → runtimepy-5.15.1}/runtimepy/net/server/markdown.py

@@ -9,7 +9,9 @@ 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"
@@ -46,6 +48,8 @@ def markdown_for_dir(
             if curr_dir != Path():
                 writer.write(f"* [..](/{curr_dir.parent}/{DIR_FILE})")
 
+            writer.write("| name | size |")
+            writer.write("|------|------|")
             for item in sorted(path.iterdir()):
                 curr = rel(item, base=base)
 
@@ -53,7 +57,14 @@ def markdown_for_dir(
                 if item.is_dir():
                     name = f"**{name}**"
 
-                writer.write(f"* [{name}](/{curr})")
+                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-5.15.0 → runtimepy-5.15.1}/runtimepy/net/websocket/connection.py

@@ -29,6 +29,7 @@ from websockets.asyncio.server import serve as _serve
 from websockets.exceptions import ConnectionClosed as _ConnectionClosed
 
 # internal
+from runtimepy.net import normalize_host as _normalize_host
 from runtimepy.net import sockname as _sockname
 from runtimepy.net.connection import Connection
 from runtimepy.net.connection import EchoConnection as _EchoConnection
@@ -64,7 +65,13 @@ class WebsocketConnection(Connection):
         """Initialize this connection."""
 
         self.protocol = protocol
-        super().__init__(self.protocol.logger, **kwargs)
+        super().__init__(
+            _getLogger(
+                f"W {_normalize_host(*self.protocol.local_address)} -> "
+                f"{_normalize_host(*self.protocol.remote_address)}"
+            ),
+            **kwargs,
+        )
 
         # Store connection-instantiation arguments (for connection restarting).
         self._uri: str = ""

{runtimepy-5.15.0 → runtimepy-5.15.1/runtimepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.15.0
+Version: 5.15.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/libre-embedded/runtimepy
 Author: Libre Embedded
@@ -17,11 +17,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil
+Requires-Dist: vcorelib>=3.6.2
 Requires-Dist: svgen>=0.8.0
-Requires-Dist: aiofiles
 Requires-Dist: websockets
-Requires-Dist: vcorelib>=3.6.2
+Requires-Dist: aiofiles
+Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -51,11 +51,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.2.3
-    hash=db8f45762873863c99d4d7d8f996d2fb
+    hash=21dc494ffe783ac9edf7769c4d5aa21e
     =====================================
 -->
 
-# runtimepy ([5.15.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.15.1](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.15.0 → runtimepy-5.15.1}/runtimepy.egg-info/SOURCES.txt

@@ -73,6 +73,7 @@ runtimepy/data/js/events.js
 runtimepy/data/js/init.js
 runtimepy/data/js/main.js
 runtimepy/data/js/markdown_page.js
+runtimepy/data/js/sample.js
 runtimepy/data/js/util.js
 runtimepy/data/js/worker.js
 runtimepy/data/js/classes/App.js