Merge pull request #81 from tcivie/79-fresh-pull-to-collect-new-hardware-models-and-device-modes-router

Removed invalid meshtastic import and used Buf.build import + fixed security issue with cryptography lib

exporter/processor/processor_base.py

@@ -5,16 +5,17 @@ import sys
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from meshtastic.protobuf.mqtt_pb2 import ServiceEnvelope
 
 from exporter.metric.node_configuration_metrics import NodeConfigurationMetrics
 
 try:
     from meshtastic.mesh_pb2 import MeshPacket, Data, HardwareModel
     from meshtastic.portnums_pb2 import PortNum
+    from meshtastic.mqtt_pb2 import ServiceEnvelope
 except ImportError:
     from meshtastic.protobuf.mesh_pb2 import MeshPacket, Data, HardwareModel
     from meshtastic.protobuf.portnums_pb2 import PortNum
+    from meshtastic.protobuf.mqtt_pb2 import ServiceEnvelope
 
 from prometheus_client import CollectorRegistry, Counter, Gauge
 from psycopg_pool import ConnectionPool

requirements.txt

@@ -2,11 +2,14 @@ paho-mqtt~=2.1.0
 python-dotenv~=1.0.1
 prometheus_client~=0.20.0
 unishox2-py3~=1.0.0
-cryptography~=42.0.8
+cryptography~=44.0.1
 psycopg~=3.1.19
 psycopg_pool~=3.2.2
-meshtastic~=2.3.13
 psycopg-binary~=3.1.20
 geopy>=2.4.1
 psycopg-pool>=3.2.2
-APScheduler>=3.10.4
+APScheduler>=3.10.4
+
+# Meshtastic Protocol Buffers
+meshtastic-protobufs-protocolbuffers-python==29.3.0.1.20241006120827+cc36fd21e859
+--extra-index-url https://buf.build/gen/python