From 9de5db355c7bbeb4882c0d73e590d3a62abb7737 Mon Sep 17 00:00:00 2001
From: Atilla <oomenatilla@gmail.com>
Date: Tue, 12 Mar 2024 20:57:53 +0100
Subject: [PATCH] De echte 'clean' versie!!!!

---
 mqtt/__init__.py                             |   0
 mqtt/__pycache__/mqtt_client.cpython-311.pyc | Bin 1074 -> 1074 bytes
 mqtt/publisher.py                            |  16 ++++-----
 script/devices.py                            |  31 +++++------------
 script/par_events.py                         |  33 ++++++++++---------
 script/relative_humidity_events.py           |  27 +++++----------
 script/soil_electric_conductivity_events.py  |  27 +++++----------
 script/soil_relative_permittivity_events.py  |  27 +++++----------
 script/soil_temperature_events.py            |  27 +++++----------
 9 files changed, 64 insertions(+), 124 deletions(-)
 delete mode 100644 mqtt/__init__.py

diff --git a/mqtt/__init__.py b/mqtt/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/mqtt/__pycache__/mqtt_client.cpython-311.pyc b/mqtt/__pycache__/mqtt_client.cpython-311.pyc
index 73f1b198c8713c3106e8fb97de0f1815d1b50a36..df2d9b3347e5a07a1562f57b0a5981077bcbf996 100644
GIT binary patch
delta 41
wcmdnQv5A9sIWI340}%XQ`XP18M&1jIjLe(wG1@UQa!;0JKEZfn@-t>101opFh5!Hn

delta 41
wcmdnQv5A9sIWI340}$|9en>sGk@o^4Bg^J{jCPESJd<UaPcS~1{EXQL0P6h=L;wH)

diff --git a/mqtt/publisher.py b/mqtt/publisher.py
index 282b6ba..a324c5e 100644
--- a/mqtt/publisher.py
+++ b/mqtt/publisher.py
@@ -1,9 +1,10 @@
 import requests
 import time
+import json
 
 from mqtt_client import create_client, start_loop  
 
-publish_interval = 300  # Secondes om een aanvraag te doen
+publish_interval = 30  # Secondes om een aanvraag te doen - MOET ~300 ZIJN!!!!!!!!!
 
 api_endpoints = [
     {"url": "https://garden.inajar.nl/api/devices/", "topic": "goodgarden/devices"},
@@ -24,16 +25,13 @@ def on_message(client, userdata, msg):
 client = create_client("publisher1", on_connect, on_message)  # Gebruik een unieke client ID
 
 def publish_to_mqtt(topic, data):
-    """
-    Publiceer de opgehaalde data naar een MQTT-topic.
-    """
-    client.publish(topic, str(data))
+
+    json_data = json.dumps(data)  # Serialiseer de data naar een JSON-string
+    client.publish(topic, json_data)
     print(f"Data published to MQTT topic {topic}.")
 
 def fetch_and_publish_data():
-    """
-    Haal data op van alle endpoints en publiceer naar MQTT.
-    """
+
     for endpoint in api_endpoints:
         url = endpoint["url"]
         mqtt_topic = endpoint["topic"]
@@ -54,6 +52,6 @@ if __name__ == "__main__":
     client.loop_start()  # Start de niet-blokkerende loop
     while True:
         fetch_and_publish_data()
-        print("Waiting for the next retrieval action...")
+        print("Wachten, wachten en nog eens wachten...")
         time.sleep(publish_interval)
     client.loop_stop()
diff --git a/script/devices.py b/script/devices.py
index b00096c..b26fe50 100644
--- a/script/devices.py
+++ b/script/devices.py
@@ -1,28 +1,13 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-# Voeg het pad naar de 'root' directory toe aan sys.path
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
-
-# Lijst waarop je je wil subscriben
-mqtt_topic = "goodgarden/devices"
-
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
-
-def on_message(client, userdata, msg):
-    # Decodeer de payload van bytes naar string
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
-    # Hier kun je code toevoegen om iets te doen met het ontvangen bericht
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"  # Zorg voor een unieke client ID, zodat meerdere subscribers kunnen runnen
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/devices"
+    subscribe.callback(on_message, topic)
\ No newline at end of file
diff --git a/script/par_events.py b/script/par_events.py
index f754603..a5cda5e 100644
--- a/script/par_events.py
+++ b/script/par_events.py
@@ -1,24 +1,25 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
+    device_322_value = None
+    device_256_value = None
 
-mqtt_topic = "goodgarden/par_events"
+    for key in data["results"]:
+        if key["device"] == 322:
+            device_322_value = key["value"]
+        elif key["device"] == 256:
+            device_256_value = key["value"]
 
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
+    print(f"Device 322 value: {device_322_value}")
+    print(f"Device 256 value: {device_256_value}")
 
-def on_message(client, userdata, msg):
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/par_events"
+    subscribe.callback(on_message, topic)
\ No newline at end of file
diff --git a/script/relative_humidity_events.py b/script/relative_humidity_events.py
index fb53109..4b71813 100644
--- a/script/relative_humidity_events.py
+++ b/script/relative_humidity_events.py
@@ -1,24 +1,13 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
-
-mqtt_topic = "goodgarden/relative_humidity"
-
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
-
-def on_message(client, userdata, msg):
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/relative_humidity"
+    subscribe.callback(on_message, topic)
\ No newline at end of file
diff --git a/script/soil_electric_conductivity_events.py b/script/soil_electric_conductivity_events.py
index f3a79f2..69f0960 100644
--- a/script/soil_electric_conductivity_events.py
+++ b/script/soil_electric_conductivity_events.py
@@ -1,24 +1,13 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
-
-mqtt_topic = "goodgarden/soil_electric_conductivity"
-
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
-
-def on_message(client, userdata, msg):
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/soil_electric_conductivity"
+    subscribe.callback(on_message, topic)
\ No newline at end of file
diff --git a/script/soil_relative_permittivity_events.py b/script/soil_relative_permittivity_events.py
index 0c3e584..ce0cb25 100644
--- a/script/soil_relative_permittivity_events.py
+++ b/script/soil_relative_permittivity_events.py
@@ -1,24 +1,13 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
-
-mqtt_topic = "goodgarden/soil_relative_permittivity"
-
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
-
-def on_message(client, userdata, msg):
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/soil_relative_permittivity"
+    subscribe.callback(on_message, topic)
\ No newline at end of file
diff --git a/script/soil_temperature_events.py b/script/soil_temperature_events.py
index d28a2ff..89b7116 100644
--- a/script/soil_temperature_events.py
+++ b/script/soil_temperature_events.py
@@ -1,24 +1,13 @@
-import sys
-import uuid
+import json
 
-from os.path import dirname, abspath, join
+from paho.mqtt import subscribe
 
-root_dir = dirname(dirname(abspath(__file__)))
-sys.path.append(root_dir)
+def on_message(client, userdata, message):
+    payload_str = message.payload.decode("utf-8")
+    data = json.loads(payload_str)
 
-from mqtt.mqtt_client import create_client, start_loop
-
-mqtt_topic = "goodgarden/soil_temperature"
-
-def on_connect(client, userdata, flags, rc):
-        client.subscribe(mqtt_topic)
-        print(f"Subscribed to {mqtt_topic}")
-
-def on_message(client, userdata, msg):
-    message = msg.payload.decode()
-    print(f"Message received on topic {msg.topic}: {message}")
+    print(f"Message received on topic {message.topic}: {data}")
 
 if __name__ == "__main__":
-    unique_client_id = f"subscriber_{uuid.uuid4()}"
-    client = create_client(unique_client_id, on_connect, on_message)
-    start_loop(client)
\ No newline at end of file
+    topic = "goodgarden/soil_temperature"
+    subscribe.callback(on_message, topic)
\ No newline at end of file