open-energy.at
/
Fastlane
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sensor_list_report for standalone Piston execution

Browse Source 
Das Script wurde so angepasst, dass es außerhalb der bisherigen Host-Umgebung zuverlässig in Piston läuft. Dazu wurde die HTML-Ausgabe explizit an stdout gebunden, die Generierung robuster gegenüber fehlenden Daten gemacht und potenziell problematische dynamische Inhalte HTML-escaped.
main
mathias.sillhengst 2 weeks ago
parent 6a9e7beeed
commit 277c2126e2
1 changed files with 145 additions and 123 deletions
Show Stats Download Patch File Download Diff File

212
scripts/sensor_list_report.py
Unescape Escape View File

@ -1,9 +1,10 @@
import httpx
import json
import html
from datetime import datetime
# GraphQL Query für alle Sensoren
query = '''
import httpx
QUERY = """
query GetAllSensors {
sensors {
id
@ -17,47 +18,65 @@ query GetAllSensors {
}
}
}
'''
# API Aufruf
with httpx.Client() as client:
response = client.post(
f"{EXTERNAL_BASE_URL}/graphql",
json={"query": query},
headers=AUTH_HEADERS,
timeout=30.0
""".strip()
def escape_text(value, default=""):
text = default if value is None else str(value)
return html.escape(text, quote=True)
def build_error(message):
return (
"<div style='color: var(--color-danger, #dc3545); "
"font-family: Segoe UI, Tahoma, Geneva, Verdana, sans-serif;'>"
f"{escape_text(message)}"
"</div>"
)
def build_report():
with httpx.Client() as client:
response = client.post(
f"{EXTERNAL_BASE_URL}/graphql",
json={"query": QUERY},
headers=AUTH_HEADERS,
timeout=30.0,
)
if response.status_code != 200:
result = f"<div style='color: var(--color-danger);'>Fehler beim Abrufen der Sensoren: {response.status_code}</div>"
else:
data = response.json()
sensors = data.get('data', {}).get('sensors', [])
# Sortiere Sensoren nach MeasureConcept Name
sensors.sort(key=lambda s: (s['measureConcept']['name'].strip() if s['measureConcept']['name'] else '', s['name'].strip()))
# Gruppiere nach MeasureConcept
measure_concepts = {}
for sensor in sensors:
mc_id = sensor['measureConcept']['id']
mc_name = sensor['measureConcept']['name'].strip() if sensor['measureConcept']['name'] else 'Unbekannt'
mc_desc = sensor['measureConcept']['description'] or ''
if mc_id not in measure_concepts:
measure_concepts[mc_id] = {
'name': mc_name,
'description': mc_desc,
'sensors': []
}
measure_concepts[mc_id]['sensors'].append(sensor)
# Statistiken
total_sensors = len(sensors)
total_concepts = len(measure_concepts)
# HTML generieren
html = f'''
return build_error(f"Fehler beim Abrufen der Sensoren: {response.status_code}")
data = response.json()
sensors = data.get("data", {}).get("sensors", [])
sensors.sort(
key=lambda s: (
(s.get("measureConcept") or {}).get("name", "").strip(),
(s.get("name") or "").strip(),
)
)
measure_concepts = {}
for sensor in sensors:
measure_concept = sensor.get("measureConcept") or {}
mc_id = str(measure_concept.get("id") or "unknown")
mc_name = (measure_concept.get("name") or "Unbekannt").strip()
mc_desc = measure_concept.get("description") or ""
if mc_id not in measure_concepts:
measure_concepts[mc_id] = {
"name": mc_name,
"description": mc_desc,
"sensors": [],
}
measure_concepts[mc_id]["sensors"].append(sensor)
total_sensors = len(sensors)
total_concepts = len(measure_concepts)
html_output = f"""
<!DOCTYPE html>
<html>
<head>
@ -257,7 +276,7 @@ with httpx.Client() as client:
<body>
<div class="container">
<div class="header">
<h1>🔧 Sensor Übersicht</h1>
<h1>Sensor Uebersicht</h1>
<div class="stats">
<div class="stat-card">
<div class="number">{total_sensors}</div>
@ -272,115 +291,115 @@ with httpx.Client() as client:
<div class="filters">
<div class="filter-group">
<label for="searchInput">🔍 Sensor suchen:</label>
<label for="searchInput">Sensor suchen:</label>
<input type="text" id="searchInput" placeholder="Sensor-Name, ID oder Beschreibung..." onkeyup="filterSensors()">
</div>
<div class="filter-group">
<label for="conceptFilter">📊 MeasureConcept filtern:</label>
<label for="conceptFilter">MeasureConcept filtern:</label>
<select id="conceptFilter" onchange="filterSensors()">
<option value="">Alle MeasureConcepts anzeigen</option>
'''
"""
# MeasureConcept Options für Filter
for mc_id, mc_data in sorted(measure_concepts.items(), key=lambda x: x[1]['name']):
mc_name = mc_data['name']
sensor_count = len(mc_data['sensors'])
html += f' <option value="{mc_id}">{mc_name} ({sensor_count} Sensoren)</option>\n'
for mc_id, mc_data in sorted(measure_concepts.items(), key=lambda item: item[1]["name"]):
mc_name = escape_text(mc_data["name"], "Unbekannt")
sensor_count = len(mc_data["sensors"])
html_output += (
f' <option value="{escape_text(mc_id)}">'
f"{mc_name} ({sensor_count} Sensoren)</option>\n"
)
html += '''
html_output += """
</select>
</div>
</div>
<div id="sensorsContent">
'''
"""
# MeasureConcepts und Sensoren ausgeben
for mc_id, mc_data in sorted(measure_concepts.items(), key=lambda x: x[1]['name']):
mc_name = mc_data['name']
mc_desc = mc_data['description']
sensors_in_concept = mc_data['sensors']
for mc_id, mc_data in sorted(measure_concepts.items(), key=lambda item: item[1]["name"]):
safe_mc_id = escape_text(mc_id)
mc_name = escape_text(mc_data["name"], "Unbekannt")
mc_desc = escape_text(mc_data["description"])
sensors_in_concept = mc_data["sensors"]
html += f'''
<div class="measure-concept" data-concept-id="{mc_id}">
<div class="concept-header" onclick="toggleConcept('{mc_id}')">
html_output += f"""
<div class="measure-concept" data-concept-id="{safe_mc_id}">
<div class="concept-header" onclick="toggleConcept('{safe_mc_id}')">
<div>
<h3>
📊 {mc_name}
{mc_name}
<span class="sensor-count">{len(sensors_in_concept)} Sensoren</span>
</h3>
'''
if mc_desc:
html += f' <div class="concept-description">{mc_desc}</div>\n'
"""
if mc_desc:
html_output += f' <div class="concept-description">{mc_desc}</div>\n'
html += '''
html_output += f"""
</div>
</div>
<div class="sensors-container" id="sensors-{mc_id}">
<div class="sensors-container" id="sensors-{safe_mc_id}">
<div class="sensor-grid">
'''
"""
for sensor in sensors_in_concept:
sensor_id = sensor['id']
sensor_name = sensor['name'].strip() if sensor['name'] else 'Unbekannter Name'
sensor_extern = sensor.get('nameExtern', '') or ''
sensor_desc = sensor.get('description', '') or ''
for sensor in sensors_in_concept:
sensor_id = escape_text(sensor.get("id"), "Unbekannt")
sensor_name = escape_text((sensor.get("name") or "").strip(), "Unbekannter Name")
sensor_extern = escape_text(sensor.get("nameExtern") or "")
sensor_desc = escape_text(sensor.get("description") or "")
html += f'''
html_output += f"""
<div class="sensor-card" data-sensor-name="{sensor_name}" data-sensor-id="{sensor_id}" data-sensor-desc="{sensor_desc}">
<div class="sensor-id">ID: {sensor_id}</div>
<div class="sensor-name">{sensor_name}</div>
'''
"""
if sensor_extern and sensor_extern.strip() != '-':
html += f' <div class="sensor-extern">Extern: {sensor_extern}</div>\n'
if sensor_extern and sensor_extern != "-":
html_output += f' <div class="sensor-extern">Extern: {sensor_extern}</div>\n'
if sensor_desc:
html += f' <div class="sensor-description">{sensor_desc}</div>\n'
else:
html += ' <div class="sensor-description no-data">Keine Beschreibung verfügbar</div>\n'
if sensor_desc:
html_output += f' <div class="sensor-description">{sensor_desc}</div>\n'
else:
html_output += ' <div class="sensor-description no-data">Keine Beschreibung verfuegbar</div>\n'
html += ' </div>\n'
html_output += " </div>\n"
html += '''
html_output += """
</div>
</div>
</div>
'''
"""
# Timestamp und JavaScript
current_time = datetime.now().strftime('%d.%m.%Y um %H:%M:%S')
html += f'''
current_time = datetime.now().strftime("%d.%m.%Y um %H:%M:%S")
html_output += f"""
</div>
<div class="timestamp">
📅 Erstellt am {current_time}
Erstellt am {current_time}
</div>
</div>
<script>
function toggleConcept(conceptId) {{
const container = document.getElementById('sensors-' + conceptId);
container.classList.toggle('active');
if (container) {{
container.classList.toggle('active');
}}
}}
function filterSensors() {{
const searchTerm = document.getElementById('searchInput').value.toLowerCase();
const conceptFilter = document.getElementById('conceptFilter').value;
const concepts = document.querySelectorAll('.measure-concept');
concepts.forEach(concept => {{
const conceptId = concept.getAttribute('data-concept-id');
let showConcept = false;
// Concept Filter prüfen
if (conceptFilter && conceptFilter !== conceptId) {{
concept.style.display = 'none';
return;
}}
// Sensor Cards filtern
const sensorCards = concept.querySelectorAll('.sensor-card');
sensorCards.forEach(card => {{
const sensorName = card.getAttribute('data-sensor-name').toLowerCase();
@ -402,13 +421,16 @@ with httpx.Client() as client:
}});
}}
// Alle Concepts initial zuklappen
document.querySelectorAll('.sensors-container').forEach(container => {{
container.classList.remove('active');
}});
</script>
</body>
</html>
'''
"""
return html_output
result = html
result = build_report()
print(result)

Write Preview
Loading…
Cancel
Save