From 2cf2c32e312d5747436e67fb53ccea65d3e53a0a Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Thu, 21 Aug 2025 10:30:04 -0700 Subject: [PATCH] Changing the way we load protobuf definitions since meshtastic added a submodule that is not loading properly --- README.md | 5 +-- meshview/templates/chat.html | 2 +- meshview/templates/net.html | 13 +++--- meshview/templates/packet.html | 2 +- requirements.txt | 78 +++++++++++++++++----------------- 5 files changed, 49 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 52f1c1c..d3d352f 100644 --- a/README.md +++ b/README.md @@ -52,12 +52,9 @@ Requires **`python3.11`** or above. Clone the repo from GitHub: ```bash -git clone --recurse-submodules https://github.com/pablorevilla-meshtastic/meshview.git +git clone https://github.com/pablorevilla-meshtastic/meshview.git ``` -> **NOTE** -> It is important to include the `--recurse-submodules` flag or the meshtastic protobufs won't be included. - Create a Python virtual environment: ```bash diff --git a/meshview/templates/chat.html b/meshview/templates/chat.html index 29f7452..f72fbf4 100644 --- a/meshview/templates/chat.html +++ b/meshview/templates/chat.html @@ -56,7 +56,7 @@ {{ packet.payload }} {% if packet.raw_mesh_packet.decoded.reply_id %} - (Replying to: {{ packet.raw_mesh_packet.decoded.reply_id }}) + (Replying to: {{ packet.raw_mesh_packet.decoded.reply_id }}) {% endif %} diff --git a/meshview/templates/net.html b/meshview/templates/net.html index 4c5eeb7..0ce4917 100644 --- a/meshview/templates/net.html +++ b/meshview/templates/net.html @@ -15,13 +15,16 @@ .chat-packet:nth-of-type(even){ background-color: #333333; /* Slightly lighter than the previous #181818 */ } - {% endblock %} -{% block body %} -
{{ site_config["site"]["weekly_net_message"] }}

-
-
+{% block body %} +
+ {{ site_config["site"]["weekly_net_message"] }}

+ +
Number of Check-ins: {{ packets|length }}
+
+ +
{% for packet in packets %}
{{packet.pretty_payload}}
{% endif %} {% if packet.raw_mesh_packet and packet.raw_mesh_packet.decoded and packet.raw_mesh_packet.decoded.reply_id %} - Reply ID: {{ packet.raw_mesh_packet.decoded.reply_id }} + (Replying to: {{ packet.raw_mesh_packet.decoded.reply_id }}) {% endif %} {% if packet.raw_mesh_packet.decoded and packet.raw_mesh_packet.decoded.portnum == 70 %}
    diff --git a/requirements.txt b/requirements.txt index 1a5d9ad..4ce4803 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,46 +1,44 @@ -protobuf~=5.29.3 -aiomqtt~=2.3.0 -sqlalchemy[asyncio]~=2.0.38 -cryptography~=44.0.1 -aiosqlite~=0.21.0 -aiohttp~=3.11.12 -aiodns~=3.2.0 -Jinja2~=3.1.5 -aiohttp-sse -asyncpg~=0.30.0 -seaborn~=0.13.2 -pydot~=3.0.4 -plotly~=6.0.0 +############################# +# Runtime dependencies +############################# -numpy~=2.2.3 -pillow~=11.1.0 -pip~=23.2.1 -attrs~=25.1.0 -cffi~=1.17.1 -paho-mqtt~=2.1.0 -pytz~=2025.1 -idna~=3.10 -multidict~=6.1.0 -propcache~=0.2.1 -typing_extensions~=4.12.2 -pyparsing~=3.2.1 -pycares~=4.5.0 +# Core async + networking +aiohttp~=3.11.12 +aiohttp-sse +aiodns~=3.2.0 +aiomqtt~=2.3.0 +asyncpg~=0.30.0 +aiosqlite~=0.21.0 + +# Database + ORM +sqlalchemy[asyncio]~=2.0.38 + +# Serialization / security +protobuf~=5.29.3 +cryptography~=44.0.1 + +# Templates +Jinja2~=3.1.5 MarkupSafe~=3.0.2 + +# Graphs / diagrams +pydot~=3.0.4 + + +############################# +# Development / Analysis / Debugging +############################# + +# Data science stack +numpy~=2.2.3 pandas~=2.2.3 matplotlib~=3.10.0 -python-dateutil~=2.9.0.post0 -packaging~=24.2 -narwhals~=1.27.1 -yarl~=1.18.3 -aiosignal~=1.3.2 -frozenlist~=1.5.0 -aiohappyeyeballs~=2.4.6 -cycler~=0.12.1 -six~=1.17.0 -greenlet~=3.1.1 +seaborn~=0.13.2 +plotly~=6.0.0 + +# Image support +pillow~=11.1.0 + +# Debugging / profiling psutil~=7.0.0 objgraph~=3.6.2 -contourpy~=1.3.1 -fonttools~=4.56.0 -pycparser~=2.22 -kiwisolver~=1.4.8 \ No newline at end of file