Update to try and use newer file structure

.idea/meshtastic-metrics-exporter.iml

@@ -4,7 +4,10 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.12 (meshtastic-metrics-exporter)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="PackageRequirementsSettings">
+    <option name="versionSpecifier" value="Greater or equal (&gt;=x.y.z)" />
+  </component>
 </module>

exporter/client_details.py

@@ -1,5 +1,9 @@
-from meshtastic.config_pb2 import Config
-from meshtastic.mesh_pb2 import HardwareModel
+try:
+    from meshtastic.config_pb2 import Config
+    from meshtastic.mesh_pb2 import HardwareModel
+except ImportError:
+    from meshtastic.protobuf.config_pb2 import Config
+    from meshtastic.protobuf.mesh_pb2 import HardwareModel
 
 
 class ClientDetails:

exporter/processor_base.py

@@ -3,8 +3,14 @@ import os
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from meshtastic.mesh_pb2 import MeshPacket, Data, HardwareModel
-from meshtastic.portnums_pb2 import PortNum
+
+try:
+    from meshtastic.mesh_pb2 import MeshPacket, Data, HardwareModel
+    from meshtastic.portnums_pb2 import PortNum
+except ImportError:
+    from meshtastic.protobuf.mesh_pb2 import MeshPacket, Data, HardwareModel
+    from meshtastic.protobuf.portnums_pb2 import PortNum
+
 from prometheus_client import CollectorRegistry, Counter, Histogram, Gauge
 from psycopg_pool import ConnectionPool
 

exporter/processors.py

@@ -4,14 +4,28 @@ from venv import logger
 
 import psycopg
 import unishox2
-from meshtastic.admin_pb2 import AdminMessage
-from meshtastic.mesh_pb2 import Position, User, HardwareModel, Routing, Waypoint, RouteDiscovery, NeighborInfo
-from meshtastic.mqtt_pb2 import MapReport
-from meshtastic.paxcount_pb2 import Paxcount
-from meshtastic.portnums_pb2 import PortNum
-from meshtastic.remote_hardware_pb2 import HardwareMessage
-from meshtastic.storeforward_pb2 import StoreAndForward
-from meshtastic.telemetry_pb2 import Telemetry, DeviceMetrics, EnvironmentMetrics, AirQualityMetrics, PowerMetrics
+
+try:
+    from meshtastic.admin_pb2 import AdminMessage
+    from meshtastic.mesh_pb2 import Position, User, HardwareModel, Routing, Waypoint, RouteDiscovery, NeighborInfo
+    from meshtastic.mqtt_pb2 import MapReport
+    from meshtastic.paxcount_pb2 import Paxcount
+    from meshtastic.portnums_pb2 import PortNum
+    from meshtastic.remote_hardware_pb2 import HardwareMessage
+    from meshtastic.storeforward_pb2 import StoreAndForward
+    from meshtastic.telemetry_pb2 import Telemetry, DeviceMetrics, EnvironmentMetrics, AirQualityMetrics, PowerMetrics
+except ImportError:
+    from meshtastic.protobuf.admin_pb2 import AdminMessage
+    from meshtastic.protobuf.mesh_pb2 import Position, User, HardwareModel, Routing, Waypoint, RouteDiscovery, \
+        NeighborInfo
+    from meshtastic.protobuf.mqtt_pb2 import MapReport
+    from meshtastic.protobuf.paxcount_pb2 import Paxcount
+    from meshtastic.protobuf.portnums_pb2 import PortNum
+    from meshtastic.protobuf.remote_hardware_pb2 import HardwareMessage
+    from meshtastic.protobuf.storeforward_pb2 import StoreAndForward
+    from meshtastic.protobuf.telemetry_pb2 import Telemetry, DeviceMetrics, EnvironmentMetrics, AirQualityMetrics, \
+        PowerMetrics
+
 from prometheus_client import CollectorRegistry
 from psycopg_pool import ConnectionPool
 

main.py

@@ -4,8 +4,14 @@ from datetime import datetime
 
 import paho.mqtt.client as mqtt
 from dotenv import load_dotenv
-from meshtastic.mesh_pb2 import MeshPacket
-from meshtastic.mqtt_pb2 import ServiceEnvelope
+
+try:
+    from meshtastic.mesh_pb2 import MeshPacket
+    from meshtastic.mqtt_pb2 import ServiceEnvelope
+except ImportError:
+    from meshtastic.protobuf.mesh_pb2 import MeshPacket
+    from meshtastic.protobuf.mqtt_pb2 import ServiceEnvelope
+
 from paho.mqtt.enums import CallbackAPIVersion
 from prometheus_client import CollectorRegistry, start_http_server
 from psycopg_pool import ConnectionPool

requirements.txt

@@ -1,8 +1,8 @@
 paho-mqtt~=2.1.0
 python-dotenv~=1.0.1
-meshtastic~=2.3.11
 prometheus_client~=0.20.0
 unishox2-py3~=1.0.0
 cryptography~=42.0.8
 psycopg~=3.1.19
-psycopg_pool~=3.2.2
+psycopg_pool~=3.2.2
+meshtastic>=2.3.13