DasMoorhuhn/atc_mithermometer_gateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make docker image from 1GB to around 100MB

Browse Source
This commit is contained in:
DasMoorhuhn 2024-06-27 00:42:25 +02:00
parent 72762340ce
commit 9581a3ce2c
16 changed files with 2693 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
__pycache__ __pycache__
devices.yml devices.yml
history.* history.*
data/

6
.idea/git_toolbox_blame.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxBlameSettings">
<option name="version" value="2" />
</component>
</project>

0
vector.py → .media/vector.py
View File

2592
Charts/data.json
View File

File diff suppressed because it is too large Load Diff

205
Charts/index.html
View File

@ -25,30 +25,88 @@
.device-info { .device-info {
margin-bottom: 10px; margin-bottom: 10px;
} }
.datetimepicker-container {
width: 80%;
margin: 20px auto;
display: flex;
justify-content: space-between;
}
.datetimepicker-container input, .datetimepicker-container button {
padding: 10px;
font-size: 16px;
background-color: #1e1e1e;
border: 1px solid #444;
border-radius: 5px;
color: #ffffff;
}
.datetimepicker-container button {
cursor: pointer;
}
</style> </style>
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script> <!-- Lokale Kopie von Chart.js einbinden -->
<script src="chart.js"></script>
</head> </head>
<body> <body>
<h1>Geräte-Diagramme</h1> <h1>Geräte-Diagramme</h1>
<div class="datetimepicker-container">
<input type="date" id="startDate">
<input type="time" id="startTime">
<input type="date" id="endDate">
<input type="time" id="endTime">
<button onclick="applyDateTimeRange()">Anwenden</button>
</div>
<div id="charts"></div> <div id="charts"></div>
<script> <script>
let allData = [];
fetch('data.json') fetch('data.json')
.then(response => response.json()) .then(response => response.json())
.then(jsonData => { .then(jsonData => {
const deviceDataMap = new Map(); allData = jsonData;
jsonData.forEach(entry => { console.log('Loaded data:', allData); // Konsolenausgabe für Debugging
const deviceMac = entry.device.mac; displayCharts(jsonData);
if (!deviceDataMap.has(deviceMac)) {
deviceDataMap.set(deviceMac, {info: entry.device, data: []});
}
deviceDataMap.get(deviceMac).data.push(entry.data);
});
deviceDataMap.forEach((deviceData, deviceMac) => createChart(deviceData));
}) })
.catch(error => console.error('Error loading data:', error)); .catch(error => console.error('Error loading data:', error));
function applyDateTimeRange() {
const startDate = new Date(document.getElementById('startDate').value);
const startTime = document.getElementById('startTime').value;
const endDate = new Date(document.getElementById('endDate').value);
const endTime = document.getElementById('endTime').value;
// Kombinieren von Datum und Zeit zu UTC-Zeit
const startDateTime = new Date(Date.UTC(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(),
parseInt(startTime.substring(0, 2)), parseInt(startTime.substring(3, 5))));
const endDateTime = new Date(Date.UTC(endDate.getFullYear(), endDate.getMonth(), endDate.getDate(),
parseInt(endTime.substring(0, 2)), parseInt(endTime.substring(3, 5))));
const filteredData = allData.filter(entry => {
const entryDate = new Date(entry.data.timestamp);
return entryDate >= startDateTime && entryDate <= endDateTime;
});
console.log('Filtered data:', filteredData); // Konsolenausgabe für Debugging
displayCharts(filteredData);
}
function displayCharts(data) {
document.getElementById('charts').innerHTML = '';
const deviceDataMap = new Map();
data.forEach(entry => {
const deviceMac = entry.device.mac;
if (!deviceDataMap.has(deviceMac)) {
deviceDataMap.set(deviceMac, {info: entry.device, data: []});
}
deviceDataMap.get(deviceMac).data.push(entry.data);
});
console.log('Device data map:', deviceDataMap); // Konsolenausgabe für Debugging
deviceDataMap.forEach((deviceData, deviceMac) => createChart(deviceData));
}
function createChart(deviceData) { function createChart(deviceData) {
const labels = deviceData.data.map(entry => new Date(entry.timestamp).toLocaleTimeString()); const labels = deviceData.data.map(entry => new Date(entry.timestamp).toLocaleTimeString());
const temperatures = deviceData.data.map(entry => entry.temperature); const temperatures = deviceData.data.map(entry => entry.temperature);
@ -68,75 +126,78 @@
document.getElementById('charts').appendChild(container); document.getElementById('charts').appendChild(container);
new Chart(ctx, { // Überprüfen, ob Chart.js geladen ist, bevor das Chart-Objekt erstellt wird
type: 'line', if (typeof Chart !== 'undefined') {
data: { new Chart(ctx, {
labels: labels, type: 'line',
datasets: [ data: {
{ labels: labels,
label: 'Temperatur (°C)', datasets: [
data: temperatures,
borderColor: 'rgba(75, 192, 192, 1)',
backgroundColor: 'rgba(75, 192, 192, 0.2)',
yAxisID: 'y-axis-temp'
},
{
label: 'Feuchtigkeit (%)',
data: humidities,
borderColor: 'rgba(153, 102, 255, 1)',
backgroundColor: 'rgba(153, 102, 255, 0.2)',
yAxisID: 'y-axis-humidity'
}
]
},
options: {
responsive: true,
scales: {
yAxes: [
{ {
id: 'y-axis-temp', label: 'Temperatur (°C)',
type: 'linear', data: temperatures,
position: 'left', borderColor: 'rgba(75, 192, 192, 1)',
ticks: { backgroundColor: 'rgba(75, 192, 192, 0.2)',
beginAtZero: true, yAxisID: 'y-axis-temp'
fontColor: 'white'
},
scaleLabel: {
display: true,
labelString: 'Temperatur (°C)',
fontColor: 'white'
}
}, },
{ {
id: 'y-axis-humidity', label: 'Feuchtigkeit (%)',
type: 'linear', data: humidities,
position: 'right', borderColor: 'rgba(153, 102, 255, 1)',
ticks: { backgroundColor: 'rgba(153, 102, 255, 0.2)',
beginAtZero: true, yAxisID: 'y-axis-humidity'
fontColor: 'white'
},
scaleLabel: {
display: true,
labelString: 'Feuchtigkeit (%)',
fontColor: 'white'
}
}
],
xAxes: [
{
ticks: {
fontColor: 'white'
}
} }
] ]
}, },
legend: { options: {
labels: { responsive: true,
fontColor: 'white' scales: {
yAxes: [
{
id: 'y-axis-temp',
type: 'linear',
position: 'left',
ticks: {
beginAtZero: true,
fontColor: 'white'
},
scaleLabel: {
display: true,
labelString: 'Temperatur (°C)',
fontColor: 'white'
}
},
{
id: 'y-axis-humidity',
type: 'linear',
position: 'right',
ticks: {
beginAtZero: true,
fontColor: 'white'
},
scaleLabel: {
display: true,
labelString: 'Feuchtigkeit (%)',
fontColor: 'white'
}
}
],
xAxes: [{
ticks: {
fontColor: 'white'
}
}]
},
legend: {
labels: {
fontColor: 'white'
}
} }
} }
} });
}); } else {
console.error('Chart.js is not loaded.');
}
} }
</script> </script>
</body> </body>

107
Charts/script.js
View File

@ -1,107 +0,0 @@
document.addEventListener('DOMContentLoaded', function () {
fetch('data.json')
.then(response => {
if (!response.ok) {
throw new Error('Network response was not ok ' + response.statusText);
}
return response.json();
})
.then(data => {
const devices = {};
data.forEach(entry => {
const mac = entry.device.mac;
if (!devices[mac]) {
devices[mac] = {
temperatureData: [],
humidityData: [],
labels: [],
name: entry.device.name,
room: entry.device.room
};
}
devices[mac].labels.push(new Date(entry.data.timestamp));
devices[mac].temperatureData.push(entry.data.temperature);
devices[mac].humidityData.push(entry.data.humidity);
});
const chartsContainer = document.getElementById('chartsContainer');
Object.keys(devices).forEach(mac => {
const device = devices[mac];
const chartContainer = document.createElement('div');
chartContainer.className = 'chart-container';
const canvas = document.createElement('canvas');
canvas.id = `chart-${mac}`;
const title = document.createElement('h3');
title.textContent = `Device ${device.name} in ${device.room}`;
chartContainer.appendChild(title);
chartContainer.appendChild(canvas);
chartsContainer.appendChild(chartContainer);
const ctx = canvas.getContext('2d');
new Chart(ctx, {
type: 'line',
data: {
labels: device.labels,
datasets: [
{
label: 'Temperatur (°C)',
data: device.temperatureData,
borderColor: 'rgba(255, 99, 132, 1)',
backgroundColor: 'rgba(255, 99, 132, 0.2)',
borderWidth: 1,
yAxisID: 'y1'
},
{
label: 'Luftfeuchtigkeit (%)',
data: device.humidityData,
borderColor: 'rgba(54, 162, 235, 1)',
backgroundColor: 'rgba(54, 162, 235, 0.2)',
borderWidth: 1,
yAxisID: 'y2'
}
]
},
options: {
responsive: true,
scales: {
x: {
type: 'time',
time: {
unit: 'minute',
tooltipFormat: 'll HH:mm'
}
},
y1: {
type: 'linear',
position: 'left',
beginAtZero: true,
title: {
display: true,
text: 'Temperatur (°C)'
}
},
y2: {
type: 'linear',
position: 'right',
beginAtZero: true,
title: {
display: true,
text: 'Luftfeuchtigkeit (%)'
},
grid: {
drawOnChartArea: false
}
}
}
}
});
});
})
.catch(error => console.error('Error loading JSON data:', error));
});

20
Charts/styles.css
View File

@ -1,20 +0,0 @@
body {
font-family: Arial, sans-serif;
display: flex;
flex-direction: column;
align-items: center;
background-color: #f4f4f4;
margin: 0;
padding: 20px;
}
.chart-container {
width: 80%;
margin: 20px 0;
}
canvas {
background-color: #ffffff;
border-radius: 8px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}

38
Dockerfile
View File

@ -1,27 +1,35 @@
FROM python:3.12-alpine3.20 AS build_bluepy
RUN apk add \
bluez \
make \
git \glib-dev \
gcc \
build-base \
freetype-dev \
libpng-dev \
openblas-dev
RUN git clone https://github.com/IanHarvey/bluepy.git && \
cd bluepy && \
python3.12 setup.py build && \
python3.12 setup.py install
FROM python:3.12-alpine3.20 FROM python:3.12-alpine3.20
WORKDIR = /src WORKDIR = /src
COPY python/src/ . COPY python/src/ .
COPY python/requierements.txt . COPY python/requierements.txt .
COPY python/docker_entrypoint.sh / COPY python/docker_entrypoint.sh /
RUN mkdir data RUN mkdir data
VOLUME data
# RUN apt-get update && \ RUN apk add sudo bluez
# apt-get install -y bluez sudo
# Copy bluepy from the bluepy build stage
COPY --from=build_bluepy /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=build_bluepy /usr/local/bin /usr/local/bin
RUN apk add --no-cache \ RUN pip3.12 install -r requierements.txt && rm requierements.txt
sudo \
make \
bluez \
bluez-deprecated \
alsa-utils \
alsa-utils-doc \
alsa-lib \
alsaconf
RUN pip3.12 install -r requierements.txt && rm -f requierements.txt
ENTRYPOINT sh /docker_entrypoint.sh ENTRYPOINT sh /docker_entrypoint.sh

5
README.md
View File

@ -63,3 +63,8 @@ sudo sh run_docker.sh
### MicroPython for MicroController ### MicroPython for MicroController
Coming when I develop it... Coming when I develop it...
# Resources
- https://pythonspeed.com/articles/alpine-docker-python this article is nuts :D
- https://docs.docker.com/build/building/multi-stage/

2
docker-compose.yml
View File

@ -2,6 +2,6 @@ version: '3'
services: services:
atc_mithermometer_gateway: atc_mithermometer_gateway:
image: atc-mithermometer-gateway:develop image: dasmoorhuhn/atc-mithermometer-gateway:develop-alpine
container_name: ATC_MiThermometer_Gateway container_name: ATC_MiThermometer_Gateway
build: . build: .

13
log_to_json.py
View File

@ -1,13 +0,0 @@
import json
with open('history.txt', 'r') as file:
content = file.readlines()
lines = []
for line in content:
line = json.loads(line.strip())
lines.append(line)
with open('history.json', 'w') as file:
file.write(json.dumps(lines))

6
python/docker_entrypoint.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
service dbus start # service dbus start
bluetoothd & # bluetoothd &
/bin/bash /bin/sh
sudo python3 main.py sudo python3 main.py

1
python/requierements.txt
View File

@ -1,4 +1,3 @@
bluepy
pyyaml pyyaml
bs4 bs4
lxml lxml

37
python/src/log_data.py
View File

@ -6,21 +6,30 @@ from devices import Device
workdir, filename = os.path.split(os.path.abspath(__file__)) workdir, filename = os.path.split(os.path.abspath(__file__))
def log_to_txt(devices): def log_to_json(devices):
with open(f'{workdir}{os.sep}history.json', 'r') as file: for device in devices:
data = json.load(file) dev, data_obj, from_config = device
data_obj: Data
from_config: Device
file_name = f'{workdir}{os.sep}data{os.sep}{str(data_obj.mac).replace(":", "-")}.json'
with open(f'{workdir}{os.sep}history.json', 'w') as file: try:
for device in devices: with open(file_name, 'r') as file: data = json.load(file)
dev, data_obj, from_config = device except:
data_obj:Data with open(file_name, 'w') as file: file.write("[]")
from_config:Device data = []
data.append({
"data": data_obj.to_json(), data.append({
"device": from_config.to_json() "timestamp": data_obj.timestamp,
}) "temperature": data_obj.temperature,
final_data = {"measurements": data} "humidity": data_obj.humidity,
file.write(json.dumps(data, indent=2)) "battery_percent": data_obj.battery_percent,
"battery_volt": data_obj.battery_volt,
"name": from_config.name,
"room": from_config.room
})
with open(file_name, 'w') as file: file.write(json.dumps(data, indent=2))
def log_to_mongodb(data): def log_to_mongodb(data):

4
python/src/main.py
View File

@ -1,7 +1,7 @@
from discovery import start_discovery from discovery import start_discovery
from loop import start_loop from loop import start_loop
from log_data import log_to_txt from log_data import log_to_json
devices = start_discovery() devices = start_discovery()
log_to_txt(devices) log_to_json(devices)

9
run_docker.sh
View File

@ -1,9 +1,12 @@
TAG=develop-alpine
CONTAINER=dasmoorhuhn/atc-mithermometer-gateway:$TAG
sudo killall -9 bluetoothd sudo killall -9 bluetoothd
docker stop atc-mithermometer-gateway:develop docker stop $CONTAINER > /dev/null 2>&1
docker run \ docker run \
--cap-add=SYS_ADMIN \ --cap-add=SYS_ADMIN \
--cap-add=NET_ADMIN \ --cap-add=NET_ADMIN \
--net=host \ --net=host \
-v /var/run/dbus/:/var/run/dbus/ \ -v /var/run/dbus/:/var/run/dbus/ \
-v /path/to/data:/src/data \ -v ./data:/src/data \
atc-mithermometer-gateway:develop $CONTAINER