fix import-related errors

bump version to 2.5.6
Merge pull request #711 from ianmcorvidae/optionalize-deps
2025-12-26 09:27:52 -05:00 · 2024-12-20 14:45:54 -07:00 · 2024-12-20 20:42:21 +00:00 · 2024-12-12 21:19:15 -07:00 · 2024-12-12 21:14:58 -07:00 · 2024-12-12 21:01:38 -07:00
11 changed files with 140 additions and 62 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,9 +24,9 @@ jobs:
          python -m pip install --upgrade pip
          pip3 install poetry

-      - name: Bump version
-        run: >-
-          poetry version patch
+      #- name: Bump version
+      #  run: >-
+      #    poetry version patch

      - name: Get version
        id: get_version
--- a/meshtastic/init.py
+++ b/meshtastic/init.py
@@ -80,7 +80,6 @@ from typing import *

 import google.protobuf.json_format
 import serial # type: ignore[import-untyped]
-from dotmap import DotMap # type: ignore[import-untyped]
 from google.protobuf.json_format import MessageToJson
 from pubsub import pub # type: ignore[import-untyped]
 from tabulate import tabulate
--- a/meshtastic/main.py
+++ b/meshtastic/main.py
@@ -13,13 +13,25 @@ import sys
 import time
 from typing import List, Optional

-import pyqrcode  # type: ignore[import-untyped]
+try:
+    import pyqrcode  # type: ignore[import-untyped]
+except ImportError as e:
+    pyqrcode = None
+
 import yaml
 from google.protobuf.json_format import MessageToDict
 from pubsub import pub  # type: ignore[import-untyped]

-import meshtastic.test
+try:
+    import meshtastic.test
+    have_test = True
+except ImportError as e:
+    have_test = False
+
 import meshtastic.util
+import meshtastic.serial_interface
+import meshtastic.tcp_interface
+
 from meshtastic import BROADCAST_ADDR, mt_config, remote_hardware
 from meshtastic.ble_interface import BLEInterface
 from meshtastic.mesh_interface import MeshInterface
@@ -891,8 +903,11 @@ def onConnected(interface):
            else:
                urldesc = "Primary channel URL"
            print(f"{urldesc}: {url}")
-            qr = pyqrcode.create(url)
-            print(qr.terminal())
+            if pyqrcode is not None:
+                qr = pyqrcode.create(url)
+                print(qr.terminal())
+            else:
+                print("Install pyqrcode to view a QR code printed to terminal.")

        log_set: Optional = None  # type: ignore[annotation-unchecked]
        # we need to keep a reference to the logset so it doesn't get GCed early
@@ -1143,11 +1158,14 @@ def common():
            parser.print_help(sys.stderr)
            meshtastic.util.our_exit("", 1)
        elif args.test:
-            result = meshtastic.test.testAll()
-            if not result:
-                meshtastic.util.our_exit("Warning: Test was not successful.")
+            if not have_test:
+                meshtastic.util.our_exit("Test module could not be important. Ensure you have the 'dotmap' module installed.")
            else:
-                meshtastic.util.our_exit("Test was a success.", 0)
+                result = meshtastic.test.testAll()
+                if not result:
+                    meshtastic.util.our_exit("Warning: Test was not successful.")
+                else:
+                    meshtastic.util.our_exit("Test was a success.", 0)
        else:
            if args.seriallog == "stdout":
                logfile = sys.stdout
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -15,7 +15,11 @@ from decimal import Decimal
 from typing import Any, Callable, Dict, List, Optional, Union

 import google.protobuf.json_format
-import print_color  # type: ignore[import-untyped]
+try:
+    import print_color  # type: ignore[import-untyped]
+except ImportError as e:
+    print_color = None
+
 from pubsub import pub  # type: ignore[import-untyped]
 from tabulate import tabulate

@@ -153,7 +157,7 @@ class MeshInterface:  # pylint: disable=R0902
    @staticmethod
    def _printLogLine(line, interface):
        """Print a line of log output."""
-        if interface.debugOut == sys.stdout:
+        if print_color is not None and interface.debugOut == sys.stdout:
            # this isn't quite correct (could cause false positives), but currently our formatting differs between different log representations
            if "DEBUG" in line:
                print_color.print(line, color="cyan", end=None)
--- a/meshtastic/protobuf/config_pb2.py
+++ b/meshtastic/protobuf/config_pb2.py
--- a/meshtastic/protobuf/config_pb2.pyi
+++ b/meshtastic/protobuf/config_pb2.pyi
@@ -1202,6 +1202,18 @@ class Config(google.protobuf.message.Message):
            """
            Singapore 923mhz
            """
+            PH_433: Config.LoRaConfig._RegionCode.ValueType  # 19
+            """
+            Philippines 433mhz
+            """
+            PH_868: Config.LoRaConfig._RegionCode.ValueType  # 20
+            """
+            Philippines 868mhz
+            """
+            PH_915: Config.LoRaConfig._RegionCode.ValueType  # 21
+            """
+            Philippines 915mhz
+            """

        class RegionCode(_RegionCode, metaclass=_RegionCodeEnumTypeWrapper): ...
        UNSET: Config.LoRaConfig.RegionCode.ValueType  # 0
@@ -1280,6 +1292,18 @@ class Config(google.protobuf.message.Message):
        """
        Singapore 923mhz
        """
+        PH_433: Config.LoRaConfig.RegionCode.ValueType  # 19
+        """
+        Philippines 433mhz
+        """
+        PH_868: Config.LoRaConfig.RegionCode.ValueType  # 20
+        """
+        Philippines 868mhz
+        """
+        PH_915: Config.LoRaConfig.RegionCode.ValueType  # 21
+        """
+        Philippines 915mhz
+        """

        class _ModemPreset:
            ValueType = typing.NewType("ValueType", builtins.int)
--- a/meshtastic/protobuf/module_config_pb2.py
+++ b/meshtastic/protobuf/module_config_pb2.py
--- a/meshtastic/protobuf/module_config_pb2.pyi
+++ b/meshtastic/protobuf/module_config_pb2.pyi
@@ -837,6 +837,7 @@ class ModuleConfig(google.protobuf.message.Message):
        POWER_SCREEN_ENABLED_FIELD_NUMBER: builtins.int
        HEALTH_MEASUREMENT_ENABLED_FIELD_NUMBER: builtins.int
        HEALTH_UPDATE_INTERVAL_FIELD_NUMBER: builtins.int
+        HEALTH_SCREEN_ENABLED_FIELD_NUMBER: builtins.int
        device_update_interval: builtins.int
        """
        Interval in seconds of how often we should try to send our
@@ -872,18 +873,16 @@ class ModuleConfig(google.protobuf.message.Message):
        """
        power_measurement_enabled: builtins.bool
        """
-        Interval in seconds of how often we should try to send our
-        air quality metrics to the mesh
+        Enable/disable Power metrics
        """
        power_update_interval: builtins.int
        """
        Interval in seconds of how often we should try to send our
-        air quality metrics to the mesh
+        power metrics to the mesh
        """
        power_screen_enabled: builtins.bool
        """
-        Interval in seconds of how often we should try to send our
-        air quality metrics to the mesh
+        Enable/Disable the power measurement module on-device display
        """
        health_measurement_enabled: builtins.bool
        """
@@ -895,6 +894,10 @@ class ModuleConfig(google.protobuf.message.Message):
        Interval in seconds of how often we should try to send our
        health metrics to the mesh
        """
+        health_screen_enabled: builtins.bool
+        """
+        Enable/Disable the health telemetry module on-device display
+        """
        def __init__(
            self,
            *,
@@ -910,8 +913,9 @@ class ModuleConfig(google.protobuf.message.Message):
            power_screen_enabled: builtins.bool = ...,
            health_measurement_enabled: builtins.bool = ...,
            health_update_interval: builtins.int = ...,
+            health_screen_enabled: builtins.bool = ...,
        ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["air_quality_enabled", b"air_quality_enabled", "air_quality_interval", b"air_quality_interval", "device_update_interval", b"device_update_interval", "environment_display_fahrenheit", b"environment_display_fahrenheit", "environment_measurement_enabled", b"environment_measurement_enabled", "environment_screen_enabled", b"environment_screen_enabled", "environment_update_interval", b"environment_update_interval", "health_measurement_enabled", b"health_measurement_enabled", "health_update_interval", b"health_update_interval", "power_measurement_enabled", b"power_measurement_enabled", "power_screen_enabled", b"power_screen_enabled", "power_update_interval", b"power_update_interval"]) -> None: ...
+        def ClearField(self, field_name: typing.Literal["air_quality_enabled", b"air_quality_enabled", "air_quality_interval", b"air_quality_interval", "device_update_interval", b"device_update_interval", "environment_display_fahrenheit", b"environment_display_fahrenheit", "environment_measurement_enabled", b"environment_measurement_enabled", "environment_screen_enabled", b"environment_screen_enabled", "environment_update_interval", b"environment_update_interval", "health_measurement_enabled", b"health_measurement_enabled", "health_screen_enabled", b"health_screen_enabled", "health_update_interval", b"health_update_interval", "power_measurement_enabled", b"power_measurement_enabled", "power_screen_enabled", b"power_screen_enabled", "power_update_interval", b"power_update_interval"]) -> None: ...

    @typing.final
    class CannedMessageConfig(google.protobuf.message.Message):
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.

 [[package]]
 name = "altgraph"
@@ -834,7 +834,37 @@ description = "A faster version of dbus-next"
 optional = false
 python-versions = "<4.0,>=3.8"
 files = [
+    {file = "dbus_fast-2.24.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4640feb97e3b992052eb075a5dd606e0ba54ae3ce702d6d15d90b479da561547"},
+    {file = "dbus_fast-2.24.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9b0fd863108be7494cab3570b76aac68fbd54290d7edea9063afa33815d76015"},
    {file = "dbus_fast-2.24.4-cp310-cp310-manylinux_2_31_x86_64.whl", hash = "sha256:8bf8037e190071f02e01b2133effb1715b884bbbf5bd5e6dcf0998a6f7972d23"},
+    {file = "dbus_fast-2.24.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:590f2767e3b8a9e66c7fb0500d439fe95793933682e525e3518f414d83a454bf"},
+    {file = "dbus_fast-2.24.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:cf9aba8ed59ef8c0026b321710442b8ccc876a37c883490fb2900bc009d7bd70"},
+    {file = "dbus_fast-2.24.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d97063b1000d8a28e76f80f016ec794637df507fbc26a0211053045c2a14958"},
+    {file = "dbus_fast-2.24.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09eb824358c9e23405320e4430e6384eb750fd7c3aafe9fe1ed76341de50c276"},
+    {file = "dbus_fast-2.24.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8f0726f01de87dc5db543c4f2cfa6334f2ec159465ba891c538e2f63ed3ac265"},
+    {file = "dbus_fast-2.24.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7d8177f35a504651788f4a03bb81e92d90f26eaa3e5384085631a521a6d8a146"},
+    {file = "dbus_fast-2.24.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f02b734948b9d70c943e694a0fca5ab323a516dc2d453365c70fbe4d5e0a731"},
+    {file = "dbus_fast-2.24.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a1d215d9a62964a0df56ddb27f09f315903e5756920832fccb5b7990894ceb8"},
+    {file = "dbus_fast-2.24.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:99f98f15543063806350c12b0304616660c34ad6e7d252cb3b8f74dd6a7ebc52"},
+    {file = "dbus_fast-2.24.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ef4c70d965787215717e150d961a30e8414e0822d9c070baf5d4f166fa4996ad"},
+    {file = "dbus_fast-2.24.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c74cf8283678ccbcc73c136eddbd60187775283c75372bcdfa62affdc787bc11"},
+    {file = "dbus_fast-2.24.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5bf5d2ccc43b1072493f5b916c7f55aad9e773438c0ef1fdba563f6c8c0f281"},
+    {file = "dbus_fast-2.24.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:800066f870bf980939b14fa0a6eb262bf00d46f2436a47180686ea945900418e"},
+    {file = "dbus_fast-2.24.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9b94f0421451196e769bbd4c32c88b575bf6d639733311870d7698d142961d7b"},
+    {file = "dbus_fast-2.24.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:556c6d5378aa990d935eba24160b1af09e79f3382ba5aea484cac348d318d62c"},
+    {file = "dbus_fast-2.24.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a17d91b75d7ad6dea9c81f3f006ba64232d71080a20832c8dd55f22cd72f07fc"},
+    {file = "dbus_fast-2.24.4-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:6eb0266c95f7d7d58d2cbaaa87be881ec431eab027a14376ceabfe190c4c63f3"},
+    {file = "dbus_fast-2.24.4-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:ee00b91fdb7ff439ac90aa8944c2bf781d4406d9d96d79d4e4aa211d165b4cad"},
+    {file = "dbus_fast-2.24.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fad2bfd7a7f9370cbc30fc91d82e7978a337d51de22c17bed4afa425c60cf0dc"},
+    {file = "dbus_fast-2.24.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6fa6e61c1b1c7059928af1d0fab864cb34d463a07c1f7df3b20c8a7a94e9d45"},
+    {file = "dbus_fast-2.24.4-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:64b901364fe5351033784a87e6d4fbdc6684656e89e701bbd01be76fc8e852a6"},
+    {file = "dbus_fast-2.24.4-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:0150b93244fc36f97ce166f0d671251e657fbd12e0c5e179507958f1845ba232"},
+    {file = "dbus_fast-2.24.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:837b1cd3fb445454f812f33f61e4657568a57d0ebaabe196f61484aff865a457"},
+    {file = "dbus_fast-2.24.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux_2_5_x86_64.manylinux1_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3e2338e8d06488ed9ec764c53a25c041322dd94ee6cd519fc028c8880666909"},
+    {file = "dbus_fast-2.24.4-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8cb67a94f9a9c27e18bb7dffd7e6cf6e16bce80a8850ca2d172e9ccb5d79f941"},
+    {file = "dbus_fast-2.24.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux_2_5_x86_64.manylinux1_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c5361ee5726237f3308c57a4f09eaea242a3b9cb3125b0481f9e922a000fe5e"},
+    {file = "dbus_fast-2.24.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d980c6214e3fdf9402bc3ac81af21b3808de29e41a65256ad4e36a590d5e47b6"},
+    {file = "dbus_fast-2.24.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux_2_5_x86_64.manylinux1_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6b54971d1a02c753e62bc78431f59ee5db2f2049e9262880be92117cb7419fc"},
    {file = "dbus_fast-2.24.4.tar.gz", hash = "sha256:58f97e8342d6cd11ebb2c8ac959c5bb342eb83e29180528690b323a5a5def41c"},
 ]

@@ -914,7 +944,7 @@ profile = ["gprof2dot (>=2022.7.29)"]
 name = "dotmap"
 version = "1.3.30"
 description = "ordered, dynamically-expandable dot-access dictionary"
-optional = false
+optional = true
 python-versions = "*"
 files = [
    {file = "dotmap-1.3.30-py3-none-any.whl", hash = "sha256:bd9fa15286ea2ad899a4d1dc2445ed85a1ae884a42effb87c89a6ecce71243c6"},
@@ -2145,7 +2175,7 @@ files = [
 name = "mypy-protobuf"
 version = "3.6.0"
 description = "Generate mypy stub files from protobuf specs"
-optional = true
+optional = false
 python-versions = ">=3.8"
 files = [
    {file = "mypy-protobuf-3.6.0.tar.gz", hash = "sha256:02f242eb3409f66889f2b1a3aa58356ec4d909cdd0f93115622e9e70366eca3c"},
@@ -2675,7 +2705,7 @@ pyserial = "*"
 name = "print-color"
 version = "0.4.6"
 description = "A simple package to print in color to the terminal"
-optional = false
+optional = true
 python-versions = ">=3.7,<4.0"
 files = [
    {file = "print_color-0.4.6-py3-none-any.whl", hash = "sha256:494bd1cdb84daf481f0e63bd22b3c32f7d52827d8f5d9138a96bb01ca8ba9299"},
@@ -3064,7 +3094,7 @@ files = [
 name = "pyqrcode"
 version = "1.2.1"
 description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output."
-optional = false
+optional = true
 python-versions = "*"
 files = [
    {file = "PyQRCode-1.2.1.tar.gz", hash = "sha256:fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5"},
@@ -4302,9 +4332,10 @@ type = ["pytest-mypy"]

 [extras]
 analysis = ["dash", "dash-bootstrap-components", "pandas", "pandas-stubs"]
+cli = ["dotmap", "print-color", "pyqrcode"]
 tunnel = ["pytap2"]

 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9,<3.14"
-content-hash = "baf2466db0ce7b0975a738b847d8b36e3c5c377a9a122a22c4bbd1ab1c06dc3a"
+content-hash = "fa490a41df9742f691c43a4915f7751b6adbded7605c3f0936f74681c1da5244"
--- a/2
+++ b/2
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meshtastic"
-version = "2.5.5"
+version = "2.5.6post1"
 description = "Python API & client shell for talking to Meshtastic devices"
 authors = ["Meshtastic Developers <contact@meshtastic.org>"]
 license = "GPL-3.0-only"
@@ -10,18 +10,15 @@ readme = "README.md"
 python = "^3.9,<3.14"                                               # 3.9 is needed for pandas, bleak requires <3.14
 pyserial = "^3.5"
 protobuf = ">=4.21.12"
-dotmap = "^1.3.30"
-pexpect = "^4.9.0"
-pyqrcode = "^1.2.1"
 tabulate = "^0.9.0"
-webencodings = "^0.5.1"
 requests = "^2.31.0"
-pyparsing = "^3.1.2"
 pyyaml = "^6.0.1"
 pypubsub = "^4.0.3"
 bleak = "^0.22.3"
 packaging = "^24.0"
-print-color = "^0.4.6"
+pyqrcode = { version = "^1.2.1", optional = true }
+dotmap = { version = "^1.3.30", optional = true }
+print-color = { version = "^0.4.6", optional = true }
 dash = { version = "^2.17.1", optional = true }
 pytap2 = { version = "^2.3.0", optional = true }
 dash-bootstrap-components = { version = "^1.6.0", optional = true }
@@ -37,7 +34,7 @@ autopep8 = "^2.1.0"
 pylint = "^3.2.3"
 pyinstaller = "^6.8.0"
 mypy = "^1.10.0"
-mypy-protobuf = { version = "^3.3.0", optional = true }
+mypy-protobuf = "^3.3.0"
 types-protobuf = "^5.26.0.20240422"
 types-tabulate = "^0.9.0.20240106"
 types-requests = "^2.31.0.20240406"
@@ -67,6 +64,7 @@ ipywidgets = "^8.1.3"
 jupyterlab-widgets = "^3.0.11"

 [tool.poetry.extras]
+cli = ["pyqrcode", "print-color", "dotmap"]
 tunnel = ["pytap2"]
 analysis = ["dash", "dash-bootstrap-components", "pandas", "pandas-stubs"]
Author	SHA1	Message	Date
Ian McEwen	d66b8fa9dd	fix import-related errors	2024-12-20 14:45:54 -07:00
github-actions	01ffd83d64	bump version to 2.5.6	2024-12-20 20:42:21 +00:00
Ian McEwen	7c89e231bd	Merge pull request #711 from ianmcorvidae/optionalize-deps Make several dependencies optional (dotmap, print_color, and pyqrcode)	2024-12-12 21:19:15 -07:00
Ian McEwen	4673824236	Add the newly optional dependencies to an extras group	2024-12-12 21:14:58 -07:00
Ian McEwen	d87eddfd33	Make pyqrcode optional	2024-12-12 21:01:38 -07:00
Ian McEwen	31f322f1c2	Make dotmap (via meshtastic.test) and print_color optional	2024-12-12 20:59:22 -07:00
Ian McEwen	89b41c1a19	Remove pexpect too	2024-12-12 20:40:59 -07:00
Ian McEwen	1a5ca789c2	Remove pyparsing and webencodings dependencies, unsure why they're here at all	2024-12-12 19:48:29 -07:00
Ian McEwen	03ac322583	reset mypy-protobuf to non-optional, hopefully without breaking stuff	2024-11-26 14:35:48 -07:00
Ian McEwen	c63814358a	prep 2.5.6a0 & protobufs	2024-11-26 14:31:33 -07:00