dbus2mqtt 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

dbus2mqtt/config/__init__.py

@@ -3,9 +3,9 @@ import uuid
 import warnings
 
 from dataclasses import dataclass, field
-from typing import Annotated, Any, Literal
+from typing import Any, Literal
 
-from pydantic import Field, SecretStr
+from jsonargparse.typing import SecretStr
 
 from dbus2mqtt.template.templating import TemplateEngine
 
@@ -98,10 +98,15 @@ class FlowTriggerMqttMessageConfig:
             return template_engine.render_template(self.filter, bool, trigger_context)
         return True
 
-FlowTriggerConfig = Annotated[
-    FlowTriggerScheduleConfig | FlowTriggerDbusSignalConfig | FlowTriggerBusNameAddedConfig | FlowTriggerBusNameRemovedConfig | FlowTriggerObjectAddedConfig | FlowTriggerObjectRemovedConfig | FlowTriggerMqttMessageConfig,
-    Field(discriminator="type")
-]
+FlowTriggerConfig = (
+    FlowTriggerScheduleConfig
+    | FlowTriggerDbusSignalConfig
+    | FlowTriggerBusNameAddedConfig
+    | FlowTriggerBusNameRemovedConfig
+    | FlowTriggerObjectAddedConfig
+    | FlowTriggerObjectRemovedConfig
+    | FlowTriggerMqttMessageConfig
+)
 
 @dataclass
 class FlowActionContextSetConfig:
@@ -124,10 +129,11 @@ class FlowActionLogConfig:
     type: Literal["log"] = "log"
     level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO"
 
-FlowActionConfig = Annotated[
-    FlowActionMqttPublishConfig | FlowActionContextSetConfig | FlowActionLogConfig,
-    Field(discriminator="type")
-]
+FlowActionConfig = (
+    FlowActionMqttPublishConfig
+    | FlowActionContextSetConfig
+    | FlowActionLogConfig
+)
 
 @dataclass
 class FlowConfig:

dbus2mqtt/config/jsonarparse.py

@@ -1,32 +1,38 @@
+from typing import Any
+
 import jsonargparse
 
+from yaml import YAMLError
 
-def _custom_yaml_load(stream):
-    if isinstance(stream, str):
-        v = stream.strip()
+default_yaml_loader = jsonargparse.get_loader("yaml")
+def _custom_yaml_load(stream: str) -> Any:
 
-        # jsonargparse tries to parse yaml 1.1 boolean like values
-        # Without this, str:"{'PlaybackStatus': 'Off'}" would become dict:{'PlaybackStatus': False}
-        if v in ['on', 'On', 'off', 'Off', 'TRUE', 'FALSE', 'True', 'False']:
-            return stream
+    v = stream.strip()
 
-        # Anoyingly, values starting with {{ and ending with }} are working with the default yaml_loader
-        # from jsonargparse. Somehow its not when we use the custom yaml loader.
-        # This fixes it
-        first_line = v.splitlines()[0].strip()
-        if "#" not in first_line and ("{{" in first_line or first_line.startswith("{%")):
-            return stream
+    # jsonargparse tries to parse yaml 1.1 boolean like values
+    # Without this, str:"{'PlaybackStatus': 'Off'}" would become dict:{'PlaybackStatus': False}
+    if v in ['on', 'On', 'off', 'Off', 'TRUE', 'FALSE', 'True', 'False']:
+        return stream
 
     # Delegate to default yaml loader from jsonargparse
-    yaml_loader = jsonargparse.get_loader("yaml")
-    return yaml_loader(stream)
+    return default_yaml_loader(stream)
 
 def new_argument_parser() -> jsonargparse.ArgumentParser:
 
     # register out custom yaml loader for jsonargparse
-    jsonargparse.set_loader("yaml_custom", _custom_yaml_load)
+    jsonargparse.set_loader(
+        mode="yaml_custom",
+        loader_fn=_custom_yaml_load,
+        exceptions=(YAMLError,),
+        json_superset=True
+    )
 
     # unless specified otherwise, load config from config.yaml
-    parser = jsonargparse.ArgumentParser(default_config_files=["config.yaml"], default_env=True, env_prefix=False, parser_mode="yaml_custom")
+    parser = jsonargparse.ArgumentParser(
+        default_config_files=["config.yaml"],
+        default_env=True,
+        env_prefix=False,
+        parser_mode="yaml_custom"
+    )
 
     return parser

{dbus2mqtt-0.5.0.dist-info → dbus2mqtt-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.5.0
+Version: 0.5.1
 Summary: General purpose DBus to MQTT bridge - expose signals, methods and properties over MQTT - featuring jinja based templating, payload enrichment and MPRIS / BlueZ / Home Assistant ready examples 
 Project-URL: Documentation, https://jwnmulder.github.io/dbus2mqtt
 Project-URL: Source, https://github.com/jwnmulder/dbus2mqtt
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
 Requires-Dist: apscheduler>=3.11.0
@@ -27,7 +28,6 @@ Requires-Dist: jinja2-ansible-filters>=1.3.2
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: jsonargparse>=4.38.0
 Requires-Dist: paho-mqtt>=2.1.0
-Requires-Dist: pydantic>=2.11.3
 Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: pyyaml>=6.0.2
 Description-Content-Type: text/markdown
@@ -122,4 +122,4 @@ See [subscriptions](https://jwnmulder.github.io/dbus2mqtt/subscriptions.html) fo
 
 For more advanced use-cases, dbus2mqtt has support for flows and Jinja2 based templates. A reference of all supported flow triggers and actions can be found on [flows](https://jwnmulder.github.io/dbus2mqtt/flows/index.html)
 
-Jinja templating documentation can be found here: [templating](templating/index.md)
+Jinja templating documentation can be found here: [templating](https://jwnmulder.github.io/dbus2mqtt/templating/index.html)

{dbus2mqtt-0.5.0.dist-info → dbus2mqtt-0.5.1.dist-info}/RECORD

@@ -2,8 +2,8 @@ dbus2mqtt/__init__.py,sha256=VunubKEH4_lne9Ttd2YRpyXjZMIAzyD2eiJ2sfvvTFU,362
 dbus2mqtt/__main__.py,sha256=NAoa3nwgBSQI22eWzzRx61SIDThDwXmUofWWZU3_4-Q,71
 dbus2mqtt/event_broker.py,sha256=8Iw1PNpH4IxQbpcFtNvPDc8_M8kuGarN6Kvz_a2aFfc,1468
 dbus2mqtt/main.py,sha256=Kr2LRVxWcPDtNwCj8Eqz9TxtGLAVrV4q0nizKh1pLXc,4539
-dbus2mqtt/config/__init__.py,sha256=tMAQ3JyoTgm4HziFew82SbdYIHMw7sNuEHN1kh4ZixA,5953
-dbus2mqtt/config/jsonarparse.py,sha256=XK7CrMCGiHZK2tq1IqSpzJ3hdV0gCOixJq3LXUDiEjg,1298
+dbus2mqtt/config/__init__.py,sha256=daqVzuSxNnUNKtMoMYs73AdlkfS6goXUsxF1wnKi7y0,5894
+dbus2mqtt/config/jsonarparse.py,sha256=-wcJW-O-Coqs0uqr5VVvk9mj6DWEm45NylSLkOhCECs,1084
 dbus2mqtt/dbus/dbus_client.py,sha256=PDZiscCF4imn7cxo5bDLmhQ8g9ZL-6RbGu5had1xiso,44832
 dbus2mqtt/dbus/dbus_types.py,sha256=NmPD9um499e49Pk8DWH4IrIPQh1BinHYQgoXllCNiDw,777
 dbus2mqtt/dbus/dbus_util.py,sha256=NUe_9Aohcib_bU8RUa19UPFteDZ0_WsmgCbbnmTUvcY,5814
@@ -17,8 +17,8 @@ dbus2mqtt/flow/actions/mqtt_publish.py,sha256=psNkTvaR3JZwAwpM4AqiZTDnA5UQX9r4CU
 dbus2mqtt/mqtt/mqtt_client.py,sha256=qvhaxtftdE7uS5Vhw-Dvhaicro4pWGtGlk254m2nEtI,8076
 dbus2mqtt/template/dbus_template_functions.py,sha256=oYXJ4HC1XCFGarf_tRzNGhvx2ECXDoT9J4Mz-cxqoJg,2447
 dbus2mqtt/template/templating.py,sha256=QLar09NinZO8rYGbVs9EThX-SOyTeBVCOppueU7VYdo,4483
-dbus2mqtt-0.5.0.dist-info/METADATA,sha256=n1EGYCUprF0KVqifoD1hXN0nwQZa78_qGphx14H2up8,5334
-dbus2mqtt-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbus2mqtt-0.5.0.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
-dbus2mqtt-0.5.0.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
-dbus2mqtt-0.5.0.dist-info/RECORD,,
+dbus2mqtt-0.5.1.dist-info/METADATA,sha256=bvfnVoBAYjKCvTYwqyBpVlX98ObW9gjg1bWhYtfUBWg,5393
+dbus2mqtt-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbus2mqtt-0.5.1.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
+dbus2mqtt-0.5.1.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
+dbus2mqtt-0.5.1.dist-info/RECORD,,