runtimepy 5.10.0__tar.gz → 5.10.2__tar.gz

{runtimepy-5.10.0/runtimepy.egg-info → runtimepy-5.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.10.0
+Version: 5.10.2
 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: svgen>=0.7.4
-Requires-Dist: websockets
-Requires-Dist: vcorelib>=3.5.1
-Requires-Dist: aiofiles
 Requires-Dist: psutil
+Requires-Dist: aiofiles
+Requires-Dist: vcorelib>=3.5.1
+Requires-Dist: websockets
+Requires-Dist: svgen>=0.7.4
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -42,6 +42,7 @@ Requires-Dist: types-setuptools; extra == "test"
 Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") and extra == "test"
 Dynamic: author
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 
@@ -49,11 +50,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.1.4
-    hash=cbacac02049e2f568e5ebad3cc428033
+    hash=887650b5b88ff596b3ab067e01de6fbd
     =====================================
 -->
 
-# runtimepy ([5.10.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.2](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.10.0 → runtimepy-5.10.2}/README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=cbacac02049e2f568e5ebad3cc428033
+    hash=887650b5b88ff596b3ab067e01de6fbd
     =====================================
 -->
 
-# runtimepy ([5.10.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.2](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.10.0 → runtimepy-5.10.2}/pyproject.toml

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

{runtimepy-5.10.0 → runtimepy-5.10.2}/runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=a9a53fbeb974140d3611fecadbce5da4
+# hash=9114f245a523f60ffbbfdd040548fc7c
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.10.0"
+VERSION = "5.10.2"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

{runtimepy-5.10.0 → runtimepy-5.10.2}/runtimepy/data/static/svg/chip-circle-bootstrap.svg

@@ -1,5 +1,5 @@
 <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <circle r="50.0" cx="50.0" cy="50.0" style="fill: #ADB5BD" />
+  <circle r="50.0" cx="50.0" cy="50.0" style="fill: #6C757D" />
   <rect x="16.666666666666664" y="33.333333333333336" width="16.666666666666668" height="8.333333333333334" rx="4.166666666666667" ry="4.166666666666667" style="fill: #495057" />
   <rect x="16.666666666666664" y="45.833333333333336" width="16.666666666666668" height="8.333333333333334" rx="4.166666666666667" ry="4.166666666666667" style="fill: #495057" />
   <rect x="16.666666666666664" y="58.333333333333336" width="16.666666666666668" height="8.333333333333334" rx="4.166666666666667" ry="4.166666666666667" style="fill: #495057" />

{runtimepy-5.10.0 → runtimepy-5.10.2}/runtimepy/net/arbiter/config/__init__.py

@@ -223,7 +223,11 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
             assert self.factory_process(
                 factory,
                 name,
-                process,
+                # Allow port information to pass through.
+                dict_resolve_env_vars(
+                    process,
+                    env=self._ports,  # type: ignore
+                ),
             ), f"Couldn't register process '{name}' ({factory})!"
 
         # Load initialization methods.

{runtimepy-5.10.0 → runtimepy-5.10.2}/runtimepy/net/server/__init__.py

@@ -24,6 +24,7 @@ from runtimepy.net.http.request_target import PathMaybeQuery
 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.server.markdown import markdown_for_dir
 from runtimepy.net.tcp.http import HttpConnection
 from runtimepy.util import normalize_root, path_has_part, read_binary
 
@@ -177,10 +178,20 @@ class RuntimepyServerConnection(HttpConnection):
 
         result = None
 
-        # Try serving the path as a file.
+        # Keep track of directories encountered.
+        directories: list[Path] = []
+
+        # Build a list of all candidate files to check.
+        candidates: list[Path] = []
         for search in self.paths:
             candidate = search.joinpath(path[0][1:])
+            if candidate.is_dir():
+                directories.append(candidate)
+                candidates.append(candidate.joinpath("index.html"))
+            else:
+                candidates.append(candidate)
 
+        for candidate in candidates:
             # Handle markdown sources.
             if candidate.name:
                 md_candidate = candidate.with_suffix(".md")
@@ -189,6 +200,7 @@ class RuntimepyServerConnection(HttpConnection):
                         md_candidate, response, path[1]
                     )
 
+            # Handle files.
             if candidate.is_file():
                 mime, encoding = mimetypes.guess_type(candidate, strict=False)
 
@@ -203,9 +215,18 @@ class RuntimepyServerConnection(HttpConnection):
 
                 # Return the file data.
                 result = await read_binary(candidate)
-
                 break
 
+        # Handle a directory as a last resort.
+        if not result and directories:
+            result = self.render_markdown(
+                markdown_for_dir(
+                    directories[0], {"applications": self.apps.keys()}
+                ),
+                response,
+                path[1],
+            )
+
         return result
 
     def handle_command(
@@ -278,7 +299,7 @@ class RuntimepyServerConnection(HttpConnection):
                     return self.favicon_data
 
                 # Try serving a file and handling redirects.
-                for handler in [self.try_file, self.try_redirect]:
+                for handler in [self.try_redirect, self.try_file]:
                     result = await handler(
                         request.target.origin_form, response
                     )

runtimepy-5.10.2/runtimepy/net/server/markdown.py

@@ -0,0 +1,53 @@
+"""
+A module implementing web server markdown interfaces.
+"""
+
+# built-in
+from io import StringIO
+from pathlib import Path
+from typing import Iterable, cast
+
+# third-party
+from vcorelib.io.file_writer import IndentedFileWriter
+from vcorelib.paths import rel
+
+LOGO_MARKDOWN = (
+    "[![logo](https://libre-embedded.com/static/"
+    "png/chip-circle-bootstrap/128x128.png)](https://libre-embedded.com)"
+)
+
+
+def markdown_for_dir(
+    path: Path, extra_links: dict[str, Iterable[str]] = None
+) -> str:
+    """Get markdown data for a directory."""
+
+    with IndentedFileWriter.string() as writer:
+        writer.write(f"# Directory {LOGO_MARKDOWN} Viewer")
+        with writer.padding():
+            writer.write("---")
+
+        if extra_links:
+            for category, apps in extra_links.items():
+                writer.write(f"## {category}")
+                with writer.padding():
+                    for app in apps:
+                        writer.write(f"* [{app}]({app})")
+
+        writer.write(f"## `{path}`")
+        writer.empty()
+
+        writer.write("* [..](..)")
+
+        for item in path.iterdir():
+            curr = rel(item, base=path)
+
+            name = f"`{curr}`"
+            if item.is_dir():
+                name = f"**{name}**"
+
+            writer.write(f"* [{name}]({curr})")
+
+        result: str = cast(StringIO, writer.stream).getvalue()
+
+    return result

{runtimepy-5.10.0 → runtimepy-5.10.2/runtimepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.10.0
+Version: 5.10.2
 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: svgen>=0.7.4
-Requires-Dist: websockets
-Requires-Dist: vcorelib>=3.5.1
-Requires-Dist: aiofiles
 Requires-Dist: psutil
+Requires-Dist: aiofiles
+Requires-Dist: vcorelib>=3.5.1
+Requires-Dist: websockets
+Requires-Dist: svgen>=0.7.4
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -42,6 +42,7 @@ Requires-Dist: types-setuptools; extra == "test"
 Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") and extra == "test"
 Dynamic: author
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 
@@ -49,11 +50,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.1.4
-    hash=cbacac02049e2f568e5ebad3cc428033
+    hash=887650b5b88ff596b3ab067e01de6fbd
     =====================================
 -->
 
-# runtimepy ([5.10.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.2](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.10.0 → runtimepy-5.10.2}/runtimepy.egg-info/SOURCES.txt

@@ -191,6 +191,7 @@ runtimepy/net/http/version.py
 runtimepy/net/server/__init__.py
 runtimepy/net/server/html.py
 runtimepy/net/server/json.py
+runtimepy/net/server/markdown.py
 runtimepy/net/server/app/__init__.py
 runtimepy/net/server/app/base.py
 runtimepy/net/server/app/create.py