From 35827b83a5278d2ed0d80b5513670b9f3872bb05 Mon Sep 17 00:00:00 2001
From: Emre Gezer <21geem1bif@hft-stuttgart.de>
Date: Mon, 21 Apr 2025 14:01:07 +0200
Subject: [PATCH] cleaned project
---
.../lib/mqtt_influx_backend/InfluxDBWriter.py | 20 -----
.../mqtt_influx_backend/MQTTClientHandler.py | 42 -----------
build/lib/mqtt_influx_backend/Main.py | 26 -------
build/lib/mqtt_to_influx.py | 73 -------------------
src/mqtt_influx_backend.egg-info/SOURCES.txt | 8 +-
src/mqtt_influx_backend/mac_to_room.json | 6 +-
6 files changed, 10 insertions(+), 165 deletions(-)
delete mode 100644 build/lib/mqtt_influx_backend/InfluxDBWriter.py
delete mode 100644 build/lib/mqtt_influx_backend/MQTTClientHandler.py
delete mode 100644 build/lib/mqtt_influx_backend/Main.py
delete mode 100644 build/lib/mqtt_to_influx.py
diff --git a/build/lib/mqtt_influx_backend/InfluxDBWriter.py b/build/lib/mqtt_influx_backend/InfluxDBWriter.py
deleted file mode 100644
index 398a7f4..0000000
--- a/build/lib/mqtt_influx_backend/InfluxDBWriter.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from influxdb_client import InfluxDBClient, Point, WritePrecision
-from influxdb_client.client.write_api import SYNCHRONOUS
-
-class InfluxDBWriter:
- def __init__(self, url: str, token: str, org: str, bucket: str):
- self.client = InfluxDBClient(url=url, token=token, org=org)
- self.write_api = self.client.write_api(write_options=SYNCHRONOUS)
- self.bucket = bucket
- self.org = org
-
- def write_point(self, measurement: str, tags: dict, fields: dict, timestamp=None):
- point = Point(measurement)
- for k, v in tags.items():
- point.tag(k, v)
- for k, v in fields.items():
- point.field(k, v)
- if timestamp:
- point.time(timestamp, WritePrecision.NS)
-
- self.write_api.write(bucket=self.bucket, org=self.org, record=point)
diff --git a/build/lib/mqtt_influx_backend/MQTTClientHandler.py b/build/lib/mqtt_influx_backend/MQTTClientHandler.py
deleted file mode 100644
index 2772fee..0000000
--- a/build/lib/mqtt_influx_backend/MQTTClientHandler.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import json
-from datetime import datetime
-import paho.mqtt.client as mqtt
-from mqtt_influx_backend import InfluxDBWriter
-
-class MQTTClientHandler:
- def __init__(self, broker_url: str, topic: str, influx_writer: InfluxDBWriter):
- self.broker_url = broker_url
- self.topic = topic
- self.influx_writer = influx_writer
- self.client = mqtt.Client()
- self.client.on_connect = self.on_connect
- self.client.on_message = self.on_message
-
- def on_connect(self, client, userdata, flags, rc):
- print("Connected with result code " + str(rc))
- client.subscribe(self.topic)
-
- def on_message(self, client, userdata, msg):
- utfMgs = msg.payload.decode("utf-8")
- #dictionary = json.loads(utfMgs)
- print(utfMgs)
- print(utfMgs)
- print(utfMgs)
- data = utfMgs
- try:
-
- value = float(data.get("co2"))
-
- self.influx_writer.write_point(
- measurement="temperature",
- tags={"topic": msg.topic},
- fields={"value": value},
- timestamp=datetime.utcnow()
- )
- print("Wrote to InfluxDB:", value)
- except Exception as e:
- print("Error processing message:", e)
-
- def start(self):
- self.client.connect(self.broker_url)
- self.client.loop_forever()
diff --git a/build/lib/mqtt_influx_backend/Main.py b/build/lib/mqtt_influx_backend/Main.py
deleted file mode 100644
index 4202370..0000000
--- a/build/lib/mqtt_influx_backend/Main.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from dotenv import load_dotenv
-import os
-
-from mqtt_influx_backend.MQTTClientHandler import MQTTClientHandler
-from mqtt_influx_backend.InfluxDBWriter import InfluxDBWriter
-
-load_dotenv()
-
-def main():
- influx_writer = InfluxDBWriter(
- url=os.getenv("INFLUXDB_URL"),
- token=os.getenv("INFLUXDB_TOKEN"),
- org=os.getenv("INFLUXDB_ORG"),
- bucket=os.getenv("INFLUXDB_BUCKET")
- )
-
- mqtt_handler = MQTTClientHandler(
- broker_url=os.getenv("MQTT_BROKER_URL"),
- topic=os.getenv("MQTT_TOPIC"),
- influx_writer=influx_writer
- )
-
- mqtt_handler.start()
-
-if __name__ == "__main__":
- main()
diff --git a/build/lib/mqtt_to_influx.py b/build/lib/mqtt_to_influx.py
deleted file mode 100644
index 5046090..0000000
--- a/build/lib/mqtt_to_influx.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import json
-from datetime import datetime
-
-import influxdb_client, os, time
-from influxdb_client import InfluxDBClient, Point, WritePrecision
-from influxdb_client.client.write_api import SYNCHRONOUS
-
-# InfluxDB config
-INFLUXDB_URL = os.environ.get("INFLUXDB_URL")
-INFLUXDB_TOKEN = os.environ.get("INFLUXDB_TOKEN")
-INFLUXDB_ORG = os.environ.get("INFLUXDB_ORG")
-INFLUXDB_BUCKET = os.environ.get("INFLUXDB_BUCKET")
-
-write_client = influxdb_client.InfluxDBClient(url=INFLUXDB_URL, token=INFLUXDB_TOKEN, org=INFLUXDB_ORG)
-
-bucket="co2-test"
-
-write_api = write_client.write_api(write_options=SYNCHRONOUS)
-
-# MQTT config
-MQTT_BROKER_URL = os.environ.get("MQTT_BROKER_URL")
-MQTT_PUBLISH_TOPIC = os.environ.get("MQTT_TOPIC")
-
-for value in range(5):
- point = (
- Point("measurement1")
- .tag("mac-adress", "22:de:aa:21::a2")
- .field("ppm", value)
- )
- write_api.write(bucket=bucket, org=INFLUXDB_ORG, record=point)
- time.sleep(1) # separate points by 1 second
-
-
-
-
-'''
-def on_connect(client, userdata, flags, rc):
- print("Connected with result code " + str(rc))
- client.subscribe(MQTT_PUBLISH_TOPIC)
-
-def on_message(client, userdata, msg):
- print(msg.topic + " " + str(msg.payload))
-
- try:
- # Decode JSON payload (z. B. {"value": 22.5, "unit": "C"})
- data = json.loads(msg.payload.decode())
- value = float(data.get("value"))
-
- # Create data point
- point = Point("temperature") \
- .tag("topic", msg.topic) \
- .field("value", value) \
- .time(datetime.utcnow())
-
- # Write to InfluxDB
- write_api.write(bucket=INFLUXDB_BUCKET, org=INFLUXDB_ORG, record=point)
- print("Wrote to InfluxDB:", point)
-
- except Exception as e:
- print("Error processing message:", e)
-'''
-
-
-# Start MQTT client
-'''
-mqttc = mqtt.Client()
-mqttc.on_connect = on_connect
-mqttc.on_message = on_message
-
-mqttc.connect(MQTT_BROKER_URL)
-mqttc.loop_forever()
-'''
-
diff --git a/src/mqtt_influx_backend.egg-info/SOURCES.txt b/src/mqtt_influx_backend.egg-info/SOURCES.txt
index 01700c4..7bc7548 100644
--- a/src/mqtt_influx_backend.egg-info/SOURCES.txt
+++ b/src/mqtt_influx_backend.egg-info/SOURCES.txt
@@ -1,8 +1,10 @@
pyproject.toml
-src/mqtt_influx_backend/InfluxDBWriter.py
-src/mqtt_influx_backend/MQTTClientHandler.py
-src/mqtt_influx_backend/Main.py
src/mqtt_influx_backend/__init__.py
+src/mqtt_influx_backend/influxDBWriter.py
+src/mqtt_influx_backend/jsonhandler.py
+src/mqtt_influx_backend/loggingFactory.py
+src/mqtt_influx_backend/mQTTClientHandler.py
+src/mqtt_influx_backend/main.py
src/mqtt_influx_backend.egg-info/PKG-INFO
src/mqtt_influx_backend.egg-info/SOURCES.txt
src/mqtt_influx_backend.egg-info/dependency_links.txt
diff --git a/src/mqtt_influx_backend/mac_to_room.json b/src/mqtt_influx_backend/mac_to_room.json
index d6a303c..3ef29fe 100644
--- a/src/mqtt_influx_backend/mac_to_room.json
+++ b/src/mqtt_influx_backend/mac_to_room.json
@@ -3,5 +3,9 @@
"11:22:33:44:55:66": "K\u00fcche",
"77:88:99:AA:BB:CC": "Schlafzimmer",
"DE:AD:BE:EF:12:34": "",
- "DK:AD:BE:EF:12:34": ""
+ "DK:AD:BE:EF:12:34": "",
+ "EK:AD:BE:EF:12:34": "",
+ "lK:AD:BE:EF:12:34": "",
+ "\u00f6K:AD:BE:EF:12:34": "",
+ "MK:AD:BE:EF:12:34": ""
}
\ No newline at end of file
--
GitLab