From db6a85a703b569de2b67434511d0bdec16fc768d Mon Sep 17 00:00:00 2001 From: Dominic Gundel Date: Mon, 2 Nov 2026 14:03:57 +0100 Subject: [PATCH] =?UTF-8?q?Grotti=203.7.0:=20Treiber=20f=C3=BCr=20Kobra=20?= =?UTF-8?q?4=20und=20Marlin,=20smartere=20Dateien-Auswahl=20und=20einstell?= =?UTF-8?q?bare=20Etiketten.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Senden und Abbruch laufen über den Treiber, Orca-Doppelzeilen und tote Ideen-API fallen weg, Drucker folgen der Datei, Etikettenformat liegt in den Einstellungen. --- CHANGELOG.md | 17 + README.md | 2 +- config.example.json | 5 + docs/Anleitung-Einstellungen.md | 4 + docs/Anleitung-Material.md | 4 - docs/Anleitung-Orca.md | 6 +- docs/internal/Abraeumen.md | 2 - docs/internal/Chargen-Etiketten-Viewer.md | 4 +- docs/internal/Meldung.md | 25 ++ docs/internal/Treiber.md | 42 +++ grotti/anycubic_lan.py | 86 +++++ grotti/config.py | 42 +++ grotti/drivers/__init__.py | 63 ++++ grotti/drivers/anycubic_lan.py | 250 +++++++++++++++ grotti/drivers/marlin.py | 224 +++++++++++++ grotti/drivers/moonraker_drv.py | 44 +++ grotti/jobs.py | 129 +++++++- grotti/library.py | 50 ++- grotti/marlin_daemon.py | 145 +++++++++ grotti/marlin_link.py | 372 ++++++++++++++++++++++ grotti/marlin_supervisor.py | 194 +++++++++++ grotti/meldung.py | 148 +++++++++ grotti/migrations/018_meldungen.sql | 17 + grotti/print_queue.py | 8 +- grotti/printers.py | 35 +- grotti/send_queue.py | 7 + grotti/store.py | 113 +++---- grotti/version.py | 2 +- grotti/watcher.py | 4 +- packaging/build-deb.sh | 4 + packaging/debian/postinst | 8 +- packaging/grotti-marlin.service | 19 ++ packaging/grotti.service | 1 + packaging/sudoers.d/grotti-marlin | 1 + requirements.txt | 1 + scripts/meldung_relay.py | 114 +++++++ scripts/orca_senden.py | 31 +- server.py | 3 + tests/test_drivers.py | 128 ++++++++ tests/test_jobs_spool.py | 2 + tests/test_marlin.py | 125 ++++++++ tests/test_marlin_supervisor.py | 115 +++++++ tests/test_meldung.py | 65 ++++ tests/test_orca_senden.py | 21 +- web/app.py | 128 +++++--- web/templates/_etikett_style.html | 93 ++++++ web/templates/dateien.html | 257 +++++++++++---- web/templates/einstellungen.html | 227 ++++++++++++- web/templates/etikett.html | 90 +----- web/templates/etikett_lauf.html | 82 +---- web/templates/layout.html | 93 +++++- web/templates/material.html | 57 +++- web/templates/protokoll.html | 27 +- web/templates/wand.html | 27 +- 54 files changed, 3379 insertions(+), 384 deletions(-) create mode 100644 docs/internal/Meldung.md create mode 100644 docs/internal/Treiber.md create mode 100644 grotti/drivers/__init__.py create mode 100644 grotti/drivers/anycubic_lan.py create mode 100644 grotti/drivers/marlin.py create mode 100644 grotti/drivers/moonraker_drv.py create mode 100644 grotti/marlin_daemon.py create mode 100644 grotti/marlin_link.py create mode 100644 grotti/marlin_supervisor.py create mode 100644 grotti/meldung.py create mode 100644 grotti/migrations/018_meldungen.sql create mode 100644 packaging/grotti-marlin.service create mode 100644 packaging/sudoers.d/grotti-marlin create mode 100644 scripts/meldung_relay.py create mode 100644 tests/test_drivers.py create mode 100644 tests/test_marlin.py create mode 100644 tests/test_marlin_supervisor.py create mode 100644 tests/test_meldung.py create mode 100644 web/templates/_etikett_style.html diff --git a/CHANGELOG.md b/CHANGELOG.md index ad57142..188cae5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ Alle Änderungen an Grotti. Format nach [Keep a Changelog](https://keepachangelo ## [Unreleased] +## [3.7.0] – 2026-11-02 + +### Neu + +- **Treiber:** Moonraker bleibt der Weg für Kobra 3 und S1 (Rinkhals, kein Firmware-Restart). Kobra 4 spricht die Stock-Firmware über den LAN-Broker (Info, ACE-Plätze, Upload auf `fileUploadurl`, Start per MQTT). Die laufende Farm auf dem Pi bleibt auf Moonraker. +- **Marlin:** Eigener Dienst hält die USB-Leitung. Grotti startet ihn selbst, sobald ein i3 oder Tenlog eingetragen ist, und beendet ihn nicht. Läuft er schon, bleibt er über einen Neustart von Grotti hinweg. Start pro Auftrag als Strom oder SD-Karte (`marlin_mode`: `stream` oder `sd`). Anycubic i3 ein Kopf, Tenlog zwei Köpfe (T0/T1, auf der Wand beide Temperaturen). Kein ACE, kein Heiz-Panel. Auf dem Pi liegt der Prozess in `grotti-marlin.service`. +- **Problem melden:** Knopf in der Kopfzeile. Kopie lokal für den Admin der Installation, dazu Versand an den Empfänger auf git.gundel.dev (Issue). Token nur dort. +- **Etiketten:** Papierformat in den Einstellungen (Standard 70×40 mm, Presets, `@page`). + +### Geändert + +- **Senden:** Upload und Start laufen über den Treiber (Moonraker-Vorbereitung unverändert). Hand-Abbruch in der Warteschlange stoppt Marlin und Kobra 4 ebenfalls. +- **Ideen:** API und Store entfernt; `/ideen` bleibt Weiterleitung auf Aufträge. Tabelle `ideas` bleibt. +- **Dateien:** Beim Wechsel der Datei bleibt der Drucker nur, wenn Familie und Rolle passen — sonst der passende freie. Orca-Upload und Watch-Kopie derselben Datei werden zusammengelegt (`watch_dir_local` in `orca-senden.json`). +- **Live-UI:** Drucker-Ereignisse zeichnen Wand und Zieldrucker nur noch einmal und nur bei geändertem Markup; Karten werden nicht mehr bei jedem Tick umgehängt. +- **Dateien / Wand / Material / Einstellungen:** Familien Kobra 4, i3 und Tenlog. Bettnetz nur bei Moonraker, Strom/SD bei Marlin, Mainsail nur bei Moonraker, Fehler löschen über den Treiber, Platzwahl nach Drucker (ACE / Köpfe / am Drucker), Host-Feld folgt der Familie. + ## [3.6.1] – 2026-11-01 ### Behoben diff --git a/README.md b/README.md index 1bb95c6..324b20f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

- Version 3.6.1 + Version 3.7.0 Python 3.11+ PostgreSQL Moonraker diff --git a/config.example.json b/config.example.json index 7e20e88..12b3939 100644 --- a/config.example.json +++ b/config.example.json @@ -7,6 +7,11 @@ "token": "", "secret_key": "", "fqdn": "", + "etikett": { + "width_mm": 70, + "height_mm": 40 + }, + "meldung_relay": "https://git.gundel.dev/hooks/grotti-meldung", "log_level": "INFO", "auto_queue": true, "auto_retry": true, diff --git a/docs/Anleitung-Einstellungen.md b/docs/Anleitung-Einstellungen.md index dedb8d6..cd4a478 100644 --- a/docs/Anleitung-Einstellungen.md +++ b/docs/Anleitung-Einstellungen.md @@ -31,6 +31,10 @@ Pro Drucker: Name, Host, Familie, **gesperrt**, optional **Start-Zeitfenster**. Öffentliche Basis-URL für QR-Codes auf Spulen-Etiketten. Leer = Host aus dem aktuellen Request. Wichtig, wenn du Etiketten von einem Handy scannst, das nicht `127.0.0.1` kennt. +## Etiketten + +Breite und Höhe in Millimetern für Spulen- und Drucketiketten (Browser-Druck). Standard 70×40 mm; Voreinstellungen z. B. 62×29 mm. Der QR wird auf flacheren Rollen kleiner. Liegt in `config.json` unter `etikett`. + ## Telegram, ntfy und Alerts Telegram: Bot-Token und Chat-ID, pro Ereignisart an/aus, Test-Knopf. **ntfy:** Server, Topic, optional Token — gleiche Meldungen, unabhängig schaltbar, ebenfalls mit Test. Ereignisse stehen auch in der Sidebar unter Alerts. diff --git a/docs/Anleitung-Material.md b/docs/Anleitung-Material.md index f90a94b..fba113e 100644 --- a/docs/Anleitung-Material.md +++ b/docs/Anleitung-Material.md @@ -44,10 +44,6 @@ Auf der **Druckerwand** erscheint je Drucker ein kleines Snapshot-Bild (ca. alle Zeitstrahl: Starts, Schritte, Fertig, Fehler, Abbrüche, offline. Filter nach Drucker, Art, Zeitraum. Ungelesene Alerts sind markiert; in der Sidebar kannst du sie als gelesen setzen. -## Ideen - -`/ideen` — Notizen und Ideen für später. Kein Druckfluss, nur Merkliste. - ## Weiter - [ACE und Spulen](Anleitung-ACE.md) diff --git a/docs/Anleitung-Orca.md b/docs/Anleitung-Orca.md index 0baec36..1e83ab0 100644 --- a/docs/Anleitung-Orca.md +++ b/docs/Anleitung-Orca.md @@ -12,12 +12,14 @@ Stand **25.10.2026**. Nach dem Export landet der G-code in der Bibliothek und Gr { "url": "http://10.10.1.41:8770", "token": "grt_…", - "browser": "app" + "browser": "app", + "watch_dir_local": "D:/Slice" } ``` `url` ist die Adresse des Pi (LAN-IP oder Hostname). -`browser`: `app` (Standard) = eigenes Desktop-Fenster; `tab` = klassischer Browser-Tab. +`browser`: `app` (Standard) = eigenes Desktop-Fenster; `tab` = klassischer Browser-Tab. +`watch_dir_local`: Windows-Pfad desselben Slice-Ordners, den Grotti auf dem Pi beobachtet. Ohne diesen Eintrag lädt das Skript jede Exportdatei zusätzlich hoch — in der Bibliothek erscheint sie dann doppelt (einmal Watch mit Projekt, einmal Upload). 4. Im **Prozessprofil** (Druckqualität, z. B. „0.20mm Standard“): **Sonstiges → Nachbearbeitungsskripte**, eine Zeile: diff --git a/docs/internal/Abraeumen.md b/docs/internal/Abraeumen.md index 4f6dd0b..dd58a70 100644 --- a/docs/internal/Abraeumen.md +++ b/docs/internal/Abraeumen.md @@ -73,8 +73,6 @@ Grotti-Schalter „Trockenlauf / PROBE statt z_push“ noch nicht gebaut — bis ## Backlog (später) -Ideen liegen in Grotti unter **Ideen** (Status „später“), nicht nur hier: - - **Abdeckungen gegen Verkanten** — Führung/Rutsche vorn, damit geschobene Teile nicht an Bettkante, Rahmen oder in der Kiste verkanten und den nächsten Lauf blockieren. - **Kobra S1** — eigener Abräum-Ablauf (geschlossen, Tür). diff --git a/docs/internal/Chargen-Etiketten-Viewer.md b/docs/internal/Chargen-Etiketten-Viewer.md index 75824ca..aa08b5d 100644 --- a/docs/internal/Chargen-Etiketten-Viewer.md +++ b/docs/internal/Chargen-Etiketten-Viewer.md @@ -8,13 +8,13 @@ Jede Spule in Grotti bekommt automatisch eine `chargen_nr` der Form `S-YYYYMMDD- Scannen: auf Material den Code tippen oder per USB-Handscanner (Tastatur + Enter). Lookup `GET /api/v1/spulen/by-code/`. QR auf dem Etikett öffnet `/material?spool=`. -Etikett: `/etikett/`, Druck über den Browser. QR per lokalem `qrcode.min.js` (`web/static/`). Basis-URL für den QR kommt aus Einstellungen → **FQDN** (`config.json` Key `fqdn`); leer = Host der aktuellen Anfrage. Beispiel: `https://grotti.example.de/material?spool=12`. +Etikett: `/etikett/`, Druck über den Browser. QR per lokalem `qrcode.min.js` (`web/static/`). Basis-URL für den QR kommt aus Einstellungen → **FQDN** (`config.json` Key `fqdn`); leer = Host der aktuellen Anfrage. Beispiel: `https://grotti.example.de/material?spool=12`. Format (Breite/Höhe, `@page`) aus Einstellungen → **Etiketten** (`config.json` Key `etikett`, Standard 70×40 mm). ## Druck-Chargen `D-YYYYMMDD-0001` vergibt der Watcher am aktiven Lauf (History-Job, sonst Live). Die nächste Nummer zählt Läufe und schon vergebene Objekt-Etiketten, damit eine Charge nicht doppelt entsteht. `adopt_live_run` übernimmt die Nummer nur auf einen fertigen History-Lauf ohne eigene Charge. Objekt-Etiketten (`D-…-01`) wandern nur mit, wenn der Ziel-Lauf dieselbe Charge behält; sonst fallen sie mit dem Live-Lauf weg und werden unter der verbleibenden Charge neu vergeben. -Druck über `/etikett/lauf/?mode=druck|objekt`. Auf dem Bogen: Charge, **Soll … g** (Slicer-Filamentmenge), Drucker, Material (Abzug oder Send/ACE/Lauf-Spule), QR 20 mm im 70‑mm-Bogen. Wand: Knopf **Etikett** bei Druck/Pause. Urteil Ausschuss ändert die Charge nicht — gedruckte Bögen verwerfen. +Druck über `/etikett/lauf/?mode=druck|objekt`. Auf dem Bogen: Charge, **Soll … g** (Slicer-Filamentmenge), Drucker, Material (Abzug oder Send/ACE/Lauf-Spule), QR proportional zur Etikettenhöhe. Wand: Knopf **Etikett** bei Druck/Pause. Urteil Ausschuss ändert die Charge nicht — gedruckte Bögen verwerfen. ## 3D-Pfad diff --git a/docs/internal/Meldung.md b/docs/internal/Meldung.md new file mode 100644 index 0000000..0f47622 --- /dev/null +++ b/docs/internal/Meldung.md @@ -0,0 +1,25 @@ +# Problem melden + +Stand 2.11.2026. Nutzer melden aus der Grotti-Oberfläche. Du bist oft nicht Admin ihrer Installation. + +## Ablauf + +1. Knopf in der Kopfzeile öffnet einen kurzen Text. +2. Die Installation speichert eine Kopie in PostgreSQL (`meldungen`, offen/erledigt). Der Admin dort sieht die Liste unter Einstellungen. +3. Dieselbe Meldung geht an den Empfänger `meldung_relay` (Standard `https://git.gundel.dev/hooks/grotti-meldung`). +4. Der Empfänger legt ein Issue im Grotti-Repo an. Der Forgejo-Token liegt nur dort, nicht in der Installation und nicht im Browser. + +Mitgeschickt: Text, Version, Seite, Drucker-Host, letzter Fehlertext. Kein Benutzername der fremden Installation. + +Kommt der Empfänger nicht ran, bleibt die lokale Kopie. Der Absender sieht, dass die Meldung bei dir nicht angekommen ist. + +## Empfänger starten + +``` +export FORGEJO_URL=https://git.gundel.dev +export FORGEJO_TOKEN=… +export FORGEJO_REPO=dg/grotti +python scripts/meldung_relay.py +``` + +Reverse-Proxy: `/hooks/grotti-meldung` → `127.0.0.1:8780`. In `config.json` der Installationen optional `"meldung_relay": "https://git.gundel.dev/hooks/grotti-meldung"`. diff --git a/docs/internal/Treiber.md b/docs/internal/Treiber.md new file mode 100644 index 0000000..b3c5eeb --- /dev/null +++ b/docs/internal/Treiber.md @@ -0,0 +1,42 @@ +# Treiber + +Stand 2.11.2026. Die Karte, die Moonraker heute liefert, ist der Vertrag. Ein Treiber füllt, was die Maschine hergibt. + +| Treiber | Wer | Transport | +| --- | --- | --- | +| `moonraker` | Kobra 3, Kobra S1 | Moonraker plus Rinkhals-Richtlinie: kein Firmware-Restart, ACE-Start über MQTT, Kamera unter `/webcam/`, Bettnetz | +| `anycubic_lan` | Kobra 4, Stock-Firmware | MQTTS `:9883`, Upload auf `fileUploadurl`, Plätze über `multiColorBox`. Kamera der Firmware (FLV) zeigt die Wand noch nicht | +| `marlin` | Anycubic i3, Tenlog | Dienst auf dem Rechner mit dem Kabel. Grotti spricht nur `127.0.0.1` | + +## Fähigkeiten + +Wer eine Fähigkeit ändert, ändert diese Liste im selben Schritt wie das Changelog. + +| Drucker | Status | Start | Pause / Abbruch | ACE | Bettnetz | Kamera | Mainsail | Heizen Wand | Ablauf | +| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | +| Kobra 3 | ja | ja | ja | ja | ja | MJPEG | ja | ja | ja | +| Kobra S1 | ja | ja | ja | ja | ja | MJPEG | ja | ja | nein | +| Kobra 4 | ja | ja (LAN) | ja | ja | nein | noch nicht (FLV) | nein | nein | nein | +| Anycubic i3 | ja | Strom oder SD | ja | nein | nein | nein | nein | nein (G-code) | nein | +| Tenlog | ja (2 Köpfe) | Strom oder SD | ja | nein (Köpfe) | nein | nein | nein | nein (G-code) | nein | + +Die Instanz auf `hoe` bleibt auf `master`. Dieser Stand liegt auf dem Branch `treiber` und wird lokal geprüft. + +## Marlin-Dienst + +Grotti startet ihn selbst, sobald ein i3 oder Tenlog in der Liste steht. Lauscht er schon, bleibt der Prozess: Neustart und Absturz von Grotti schicken keinen Abbruch und öffnen die Leitung nicht neu. Grotti beendet den Dienst nicht. + +Lokal ist das ein eigener Prozess (`python -m grotti.marlin_daemon`, Log `data/marlin-dienst.log`). Auf dem Pi ist es die Unit `grotti-marlin.service`, außerhalb von `grotti.service`, damit ein `systemctl restart grotti` den Druck nicht mitnimmt. + +Port `GROTTI_MARLIN_PORT` (8771). `pyserial` öffnet die Leitung. Der Host des Druckers ist die Schnittstelle, Baud optional dahinter: `COM5`, `COM5@250000`, `/dev/ttyUSB0`. In den Einstellungen eintragen, Familie Anycubic i3 oder Tenlog. + +Beim ersten Öffnen setzt USB den Drucker zurück (DTR). Danach bleibt der Port im Dienst. + +Start pro Auftrag, Feld `marlin_mode` am Senden: + +- `stream` — Zeile für Zeile, jede Zeile wartet auf `ok`. Fortschritt ist die Dateiposition. Bricht die Leitung ab, stirbt der Druck. +- `sd` — Datei per `M28`/`M29` auf die Karte (Name 8.3, `TEIL.GCO`), dann `M23`/`M24`. Der Drucker druckt allein, der Dienst fragt `M27` und `M105`. + +`T0` und `T1` gehen unverändert in den Strom. Tenlog (`family: tenlog`) meldet zwei Köpfe unter `tools`, die Wand zeigt beide Temperaturen. `slots` bleibt leer, ein Start verlangt keine ACE-Zuordnung. Pause, Weiter und Abbruch gehen über die Wand. Heizen, Speed und Plätze nicht: das steht im G-code. Pause im Strom hält die nächsten Zeilen an, auf der Karte ist es `M25`/`M24`. Abbruch schaltet die Heizungen aus; auf der Karte zusätzlich `M524`. + +Die Warteschlange „wenn frei“ übergibt den Modus noch nicht, dort gilt Strom. diff --git a/grotti/anycubic_lan.py b/grotti/anycubic_lan.py index 77d5a6c..95ac853 100644 --- a/grotti/anycubic_lan.py +++ b/grotti/anycubic_lan.py @@ -287,6 +287,10 @@ def _mqtt_print(host, request, timeout=30, timeout_message="Timeout bei MQTT-Dru text, code = _report_error(body, "Druckabbruch abgelehnt") state["error"] = text state["code"] = code + elif action in ("pause", "resume") and report in ("failed",): + text, code = _report_error(body, "Druckbefehl abgelehnt") + state["error"] = text + state["code"] = code # start: heating / leveling / printing / preheating = angenommen # stop: stoped / stopped / done = angenommen state["done"] = True @@ -477,6 +481,88 @@ def anycubic_task(host, use_cache=True): return None +def print_action(host, action, timeout=15): + """Pause, Fortsetzen oder Stopp über denselben MQTT-Kanal wie der Start.""" + if action not in ("pause", "resume", "stop"): + raise LanError("Unbekannter Druckbefehl.") + request = { + "type": "print", + "action": action, + "msgid": str(uuid.uuid4()), + "timestamp": int(time.time() * 1000), + "data": {"taskid": "-1"}, + } + report = _mqtt_print( + host, + request, + timeout=timeout, + timeout_message="Timeout beim MQTT-Druckbefehl.", + ) + _INFO_CACHE.pop(host, None) + return {"mqtt": action, "report": report} + + +def mqtt_report(host, channel, typ, action, timeout=8): + """Eine Abfrage auf slicer/…/, liefert den Report-Körper.""" + cred = credentials(host) + model_id = cred["modelId"] + device_id = cred["deviceId"] + topic_query = "anycubic/anycubicCloud/v1/slicer/printer/%s/%s/%s" % ( + model_id, device_id, channel, + ) + topic_report = "anycubic/anycubicCloud/v1/printer/public/%s/%s/%s/report" % ( + model_id, device_id, channel, + ) + payload = json.dumps({ + "type": typ, + "action": action, + "msgid": str(uuid.uuid4()), + "timestamp": int(time.time() * 1000), + "data": None, + }) + state = {"body": None} + + def on_connect(client, userdata, flags, reason_code, properties=None): + if getattr(reason_code, "is_failure", False): + state["body"] = {"state": "failed", "msg": "MQTT-Verbindung abgelehnt."} + return + client.subscribe(topic_report) + client.publish(topic_query, payload=payload, qos=1) + + def on_message(client, userdata, msg): + try: + state["body"] = json.loads(msg.payload.decode("utf-8", "replace")) + except (json.JSONDecodeError, UnicodeError): + return + + client = mqtt.Client( + mqtt.CallbackAPIVersion.VERSION2, + protocol=mqtt.MQTTv311, + client_id="grotti-%s" % uuid.uuid4().hex[:10], + ) + client.username_pw_set(cred["username"], cred["password"]) + client.tls_set(cert_reqs=ssl.CERT_NONE) + client.tls_insecure_set(True) + client.on_connect = on_connect + client.on_message = on_message + try: + client.connect(host, 9883, keepalive=30) + except OSError as exc: + raise LanError("MQTT am Drucker nicht erreichbar (:9883).") from exc + deadline = time.time() + max(3, int(timeout)) + try: + while state["body"] is None and time.time() < deadline: + client.loop(timeout=0.25) + finally: + try: + client.disconnect() + except Exception: + pass + if state["body"] is None: + raise LanError("Timeout bei der Druckerabfrage.") + return state["body"] + + def cancel_print(host, timeout=15): """MQTT-Stop wie Rinkhals Docs: action stop, taskid -1 (Anycubic-Task).""" request = { diff --git a/grotti/config.py b/grotti/config.py index 87488d1..4d604a3 100644 --- a/grotti/config.py +++ b/grotti/config.py @@ -176,6 +176,7 @@ def load(): "secret_key": secret_key, "oauth": _oauth(raw), "fqdn": normalize_fqdn(raw.get("fqdn") or ""), + "etikett": _etikett(raw), "printers_file": printers_file, "log_level": str(raw.get("log_level") or "INFO").strip() or "INFO", "energy": _energy(raw), @@ -233,6 +234,36 @@ def default_watch_suggestion(): return str((ROOT / DEFAULT_WATCH_REL).resolve()) +DEFAULT_ETIKETT = {"width_mm": 70.0, "height_mm": 40.0} +ETIKETT_PRESETS = ( + {"id": "70x40", "label": "70 × 40 mm", "width_mm": 70, "height_mm": 40}, + {"id": "62x29", "label": "62 × 29 mm (Brother)", "width_mm": 62, "height_mm": 29}, + {"id": "50x30", "label": "50 × 30 mm", "width_mm": 50, "height_mm": 30}, + {"id": "100x50", "label": "100 × 50 mm", "width_mm": 100, "height_mm": 50}, +) + + +def _etikett(raw): + src = raw.get("etikett") if isinstance(raw.get("etikett"), dict) else {} + try: + width = float(src.get("width_mm", DEFAULT_ETIKETT["width_mm"])) + except (TypeError, ValueError): + width = DEFAULT_ETIKETT["width_mm"] + try: + height = float(src.get("height_mm", DEFAULT_ETIKETT["height_mm"])) + except (TypeError, ValueError): + height = DEFAULT_ETIKETT["height_mm"] + width = max(20.0, min(200.0, width)) + height = max(15.0, min(200.0, height)) + qr = max(10.0, min(20.0, round(height * 0.5, 1))) + return { + "width_mm": width, + "height_mm": height, + "qr_mm": qr, + "presets": list(ETIKETT_PRESETS), + } + + def settings_public(cfg): tg = cfg.get("telegram") or {} oauth = cfg.get("oauth") or {} @@ -242,6 +273,7 @@ def settings_public(cfg): "auto_queue": bool(cfg.get("auto_queue", True)), "auto_retry": bool(cfg.get("auto_retry", True)), "fqdn": str(cfg.get("fqdn") or ""), + "etikett": _etikett({"etikett": cfg.get("etikett") or {}}), "legacy_token_set": bool(cfg.get("token")), "energy": dict(cfg.get("energy") or {}), "telegram": { @@ -277,6 +309,7 @@ def save_settings( auto_retry=None, fqdn=None, watch_dir=None, + etikett=None, ): """Schreibt Einstellungen zurück nach config.json und aktualisiert cfg.""" with _SETTINGS_LOCK: @@ -290,6 +323,7 @@ def save_settings( auto_retry=auto_retry, fqdn=fqdn, watch_dir=watch_dir, + etikett=etikett, ) @@ -303,6 +337,7 @@ def _save_settings_locked( auto_retry=None, fqdn=None, watch_dir=None, + etikett=None, ): path = cfg.get("_path") or CONFIG_PATH raw = dict(cfg.get("_raw") or {}) @@ -325,6 +360,13 @@ def _save_settings_locked( normalized = normalize_fqdn(fqdn) raw["fqdn"] = normalized cfg["fqdn"] = normalized + if etikett is not None and isinstance(etikett, dict): + parsed = _etikett({"etikett": etikett}) + raw["etikett"] = { + "width_mm": parsed["width_mm"], + "height_mm": parsed["height_mm"], + } + cfg["etikett"] = parsed if energy is not None: raw_energy = { "watts": float(energy.get("watts", 40)), diff --git a/grotti/drivers/__init__.py b/grotti/drivers/__init__.py new file mode 100644 index 0000000..b6b7565 --- /dev/null +++ b/grotti/drivers/__init__.py @@ -0,0 +1,63 @@ +"""Drucker-Treiber. Die Karte ist das, was moonraker.query schon liefert. + +Vorhandene Kobra 3 und S1 bleiben auf Moonraker. Kobra 4 spricht die +Stock-Firmware über den LAN-Broker. i3 und Tenlog gehen an den Marlin-Dienst. +""" + +from grotti.drivers.anycubic_lan import AnycubicLanDriver +from grotti.drivers.marlin import MarlinDriver +from grotti.drivers.moonraker_drv import MoonrakerDriver +from grotti.printers import FAMILY_DRIVER + +_BY_ID = { + "moonraker": MoonrakerDriver(), + "anycubic_lan": AnycubicLanDriver(), + "marlin": MarlinDriver(), +} + + +def for_printer(printer): + family = (printer or {}).get("family") or "" + driver_id = (printer or {}).get("driver") or FAMILY_DRIVER.get(family) or "moonraker" + return _BY_ID.get(driver_id) or _BY_ID["moonraker"] + + +def snapshot(printers): + """Live-Karten in der Reihenfolge der Drucker. Moonraker-Gruppen bleiben ein Aufruf.""" + buckets = {} + order = [] + for printer in printers or []: + drv = for_printer(printer) + key = drv.transport + if key not in buckets: + order.append(key) + buckets[key] = (drv, []) + buckets[key][1].append(printer) + by_host = {} + for key in order: + drv, group = buckets[key] + for card in drv.snapshot(group): + host = card.get("host") + if host: + by_host[host] = card + lives = [] + for printer in printers or []: + host = printer.get("host") + card = by_host.get(host) + if card: + lives.append(card) + continue + lives.append({ + "name": printer.get("name") or host, + "host": host, + "family": printer.get("family") or "", + "family_label": printer.get("family_label") or "", + "ok": False, + "state": "offline", + "message": "Kein Treiber-Ergebnis.", + "filename": "", + "slots": [], + "has_camera": False, + "camera": "", + }) + return lives diff --git a/grotti/drivers/anycubic_lan.py b/grotti/drivers/anycubic_lan.py new file mode 100644 index 0000000..6f855a3 --- /dev/null +++ b/grotti/drivers/anycubic_lan.py @@ -0,0 +1,250 @@ +"""Stock-Firmware über den Anycubic-LAN-Broker. Kein Moonraker. + +Info, Plätze und Druckbefehle laufen über MQTTS :9883. Die Datei geht an +die fileUploadurl aus der Info-Antwort (:18910/gcode_upload). Die Kamera +der Standard-Firmware ist FLV, die Wand zeigt sie noch nicht. +""" + +import uuid +import urllib.error +import urllib.request + +from grotti import anycubic_lan +from grotti.moonraker import PrinterError, safe_upload_name + +_STATE = { + "free": "standby", + "idle": "standby", + "standby": "standby", + "done": "complete", + "complete": "complete", + "finish": "complete", + "finished": "complete", + "printing": "printing", + "busy": "printing", + "heating": "printing", + "preheating": "printing", + "leveling": "printing", + "paused": "paused", + "pause": "paused", + "error": "error", + "failed": "error", +} + + +def _number(value): + if isinstance(value, bool) or not isinstance(value, (int, float)): + return None + return float(value) + + +def card_from_info(info, printer=None): + """LAN-info/report → dieselbe Karte wie moonraker.query, leere Felder bleiben leer.""" + info = info or {} + printer = printer or {} + project = info.get("project") if isinstance(info.get("project"), dict) else {} + raw_state = str(info.get("state") or project.get("print_status") or "").strip().lower() + state = _STATE.get(raw_state, raw_state or "standby") + filename = project.get("filename") or project.get("name") or "" + if isinstance(filename, str): + filename = filename.replace("\\", "/").rsplit("/", 1)[-1] + else: + filename = "" + progress = _number(project.get("progress")) + if progress is None: + progress = 0.0 + elif progress > 1: + progress = progress / 100.0 + progress = max(0.0, min(1.0, progress)) + temp = info.get("temp") if isinstance(info.get("temp"), dict) else {} + host = printer.get("host") or info.get("ip") or "" + return { + "ok": True, + "name": printer.get("name") or info.get("printerName") or host, + "host": host, + "family": printer.get("family") or "", + "family_label": printer.get("family_label") or "", + "state": state, + "message": "", + "filename": filename, + "progress": progress, + "layer": int(_number(project.get("curr_layer")) or 0), + "layers": int(_number(project.get("total_layers") or project.get("total_layer")) or 0), + "remain": int(_number(project.get("remain_time")) or 0), + "nozzle": _number(temp.get("curr_nozzle_temp")), + "nozzle_target": _number(temp.get("target_nozzle_temp")), + "bed": _number(temp.get("curr_hotbed_temp")), + "bed_target": _number(temp.get("target_hotbed_temp")), + "fan": _number(info.get("fan_speed_pct")), + "slots": [], + "has_camera": False, + "camera": "", + "camera_stream": "", + "speed_factor": None, + "extrude_factor": None, + "mesh": None, + } + + +def slots_from_report(data): + """multiColorBox/getInfo → Plätze mit index ab 0, wie Moonraker-Slots.""" + data = data or {} + boxes = data.get("multi_color_box") + if isinstance(boxes, dict): + boxes = boxes.get("slots") or boxes.get("boxes") or [boxes] + if not isinstance(boxes, list): + return [] + found = [] + for box_index, box in enumerate(boxes): + if not isinstance(box, dict): + continue + slots = box.get("slots") + if not isinstance(slots, list): + kind = str(box.get("type") or box.get("material") or "").strip() + if kind: + found.append({"index": box_index, "type": kind, "color": ""}) + continue + for offset, slot in enumerate(slots): + if not isinstance(slot, dict): + continue + kind = str(slot.get("type") or slot.get("material_type") or slot.get("material") or "").strip() + if not kind or kind.lower() == "unknown": + continue + index = slot.get("index") + if isinstance(index, bool) or not isinstance(index, int): + index = box_index * 4 + offset + found.append({"index": index, "type": kind, "color": ""}) + found.sort(key=lambda item: item["index"]) + return found + + +class AnycubicLanDriver: + transport = "anycubic_lan" + rinkhals = False + firmware_restart = False + + def snapshot(self, printers): + cards = [] + for printer in printers or []: + host = printer.get("host") or "" + try: + card = self.query(host) + card["name"] = printer.get("name") or card.get("name") or host + card["host"] = host + card["family"] = printer.get("family") or "" + card["family_label"] = printer.get("family_label") or "" + card["slots"] = self.slots(host) + except PrinterError as exc: + card = { + "name": printer.get("name") or host, + "host": host, + "family": printer.get("family") or "", + "family_label": printer.get("family_label") or "", + "ok": False, + "state": "offline", + "message": exc.message, + "filename": "", + "slots": [], + "has_camera": False, + "camera": "", + } + cards.append(card) + return cards + + def query(self, host): + info = anycubic_lan.print_info(host, timeout=8, use_cache=False) + if not info: + raise PrinterError("Der Drucker ist nicht erreichbar.") + return card_from_info(info, {"host": host}) + + def slots(self, host, status=None): + try: + body = anycubic_lan.mqtt_report(host, "multiColorBox", "multiColorBox", "getInfo") + except anycubic_lan.LanError as exc: + raise PrinterError(exc.message) from exc + data = body.get("data") if isinstance(body, dict) else None + if not isinstance(data, dict): + return [] + return slots_from_report(data) + + def upload(self, host, filename, content, on_progress=None): + filename = safe_upload_name(filename) + info = anycubic_lan.print_info(host, timeout=8, use_cache=False) or {} + url = ((info.get("urls") or {}).get("fileUploadurl") or "").strip() + if "/gcode_upload" not in url: + raise PrinterError("Der Drucker hat keine Upload-Adresse gemeldet.") + body, boundary = _multipart(filename, content) + request = urllib.request.Request( + url, + data=body, + headers={ + "Content-Type": "multipart/form-data; boundary=%s" % boundary, + "Content-Length": str(len(body)), + "X-File-Length": str(len(content)), + "User-Agent": "Grotti", + "X-BBL-Client-Name": "Grotti", + "X-BBL-Client-Type": "slicer", + }, + method="POST", + ) + if on_progress: + on_progress(0, len(content)) + try: + with urllib.request.urlopen(request, timeout=_upload_timeout(len(content))) as response: + response.read() + except urllib.error.HTTPError as exc: + detail = exc.read(400).decode("utf-8", "replace").strip() + raise PrinterError(detail or "Hochladen ist fehlgeschlagen.") from exc + except (urllib.error.URLError, TimeoutError, OSError) as exc: + raise PrinterError("Hochladen ist fehlgeschlagen.") from exc + if on_progress: + on_progress(len(content), len(content)) + return filename + + def start_print(self, host, filename, bed_leveling=False, ams_settings=None): + try: + return anycubic_lan.start_print( + host, + filename, + auto_leveling=bool(bed_leveling), + ams_settings=ams_settings, + ) + except anycubic_lan.LanError as exc: + raise PrinterError(exc.message) from exc + + def command(self, host, action): + mapped = {"pause": "pause", "fortsetzen": "resume", "abbrechen": "stop", "resume": "resume", "cancel": "stop"}.get(action) + if not mapped: + raise PrinterError("Unbekannter Befehl.") + try: + if mapped == "stop": + return anycubic_lan.cancel_print(host) + return anycubic_lan.print_action(host, mapped) + except anycubic_lan.LanError as exc: + raise PrinterError(exc.message) from exc + + def clear_print_error(self, host): + raise PrinterError("Fehler löschen gibt es an der Stock-Firmware in Grotti nicht.") + + def heaters_off(self, host): + return None + + +def _upload_timeout(size): + size = max(0, int(size or 0)) + return max(180, min(600, 90 + size // (80 * 1024))) + + +def _multipart(filename, content): + boundary = "grotti-%s" % uuid.uuid4().hex + sep = ("--%s\r\n" % boundary).encode() + end = ("--%s--\r\n" % boundary).encode() + name = sep + b'Content-Disposition: form-data; name="filename"\r\n\r\n' + filename.encode() + b"\r\n" + payload = ( + sep + + ('Content-Disposition: form-data; name="gcode"; filename="%s"\r\n' % filename).encode() + + b"Content-Type: application/octet-stream\r\n\r\n" + + content + + b"\r\n" + ) + return name + payload + end, boundary diff --git a/grotti/drivers/marlin.py b/grotti/drivers/marlin.py new file mode 100644 index 0000000..72c8d14 --- /dev/null +++ b/grotti/drivers/marlin.py @@ -0,0 +1,224 @@ +"""Marlin-Treiber. Spricht den lokalen Dienst, hält selbst keine Leitung. + +Host ist die Schnittstelle, optional mit Baud: ``COM5`` oder ``COM5@250000``. +Familie ``tenlog`` hat zwei Köpfe (T0, T1). Die Karte führt sie unter ``tools``. +``slots`` bleibt leer, damit ein Start keine ACE-Zuordnung verlangt. +""" + +import json +import os +import urllib.error +import urllib.parse +import urllib.request + +from grotti.marlin_link import split_port +from grotti.moonraker import PrinterError + +_DOWN = "Der Marlin-Dienst läuft nicht." + + +def service_url(): + return (os.environ.get("GROTTI_MARLIN_URL") or "http://127.0.0.1:8771").rstrip("/") + + +def _offline(printer, message): + host = (printer or {}).get("host") or "" + return { + "name": (printer or {}).get("name") or host, + "host": host, + "family": (printer or {}).get("family") or "", + "family_label": (printer or {}).get("family_label") or "", + "ok": False, + "state": "offline", + "message": message, + "filename": "", + "progress": None, + "slots": [], + "tools": [], + "has_camera": False, + "camera": "", + } + + +def heads_for(printer): + family = (printer or {}).get("family") or "" + return 2 if family == "tenlog" else 1 + + +def card_from_status(printer, status): + temps = (status or {}).get("temps") or {} + heads = int((status or {}).get("heads") or heads_for(printer)) + tools = [] + for index in range(heads): + key = "T%d" % index + cur, target = _pair(temps.get(key) or temps.get("T") or [None, None]) + tools.append({ + "index": index, + "name": "Kopf %d" % (index + 1), + "temp": cur, + "target": target, + }) + nozzle = tools[0]["temp"] if tools else None + nozzle_target = tools[0]["target"] if tools else None + bed, bed_target = _pair(temps.get("B") or [None, None]) + host = (printer or {}).get("host") or "" + return { + "name": (printer or {}).get("name") or (status or {}).get("name") or host, + "host": host, + "family": (printer or {}).get("family") or "", + "family_label": (printer or {}).get("family_label") or "", + "ok": bool((status or {}).get("ok")), + "state": (status or {}).get("state") or "offline", + "message": (status or {}).get("message") or "", + "filename": (status or {}).get("filename") or "", + "progress": (status or {}).get("progress"), + "nozzle": nozzle, + "nozzle_target": nozzle_target, + "bed": bed, + "bed_target": bed_target, + "slots": [], + "tools": tools, + "has_camera": False, + "camera": "", + } + + +def _pair(value): + if isinstance(value, (list, tuple)) and len(value) >= 2: + return value[0], value[1] + return None, None + + +class MarlinDriver: + transport = "marlin" + rinkhals = False + firmware_restart = False + + def __init__(self, base=None): + self.base = (base or service_url()).rstrip("/") + + def snapshot(self, printers): + printers = list(printers or []) + if printers: + self._daemon() + cards = [] + for printer in printers: + try: + self._ensure(printer) + device, _baud = split_port(printer.get("host") or "") + status = self._json("GET", "/status?device=%s" % urllib.parse.quote(device)) + cards.append(card_from_status(printer, status)) + except PrinterError as exc: + cards.append(_offline(printer, exc.message)) + return cards + + def query(self, host): + device, _baud = split_port(host) + try: + status = self._json("GET", "/status?device=%s" % urllib.parse.quote(device)) + except PrinterError: + raise + return card_from_status({"host": host}, status) + + def slots(self, host, status=None): + return [] + + def upload(self, host, filename, content, on_progress=None): + device, _baud = split_port(host) + data = content if isinstance(content, bytes) else (content or "").encode("utf-8") + result = self._json( + "POST", + "/datei?device=%s" % urllib.parse.quote(device), + data, + {"X-Dateiname": filename or "druck.gcode", "Content-Type": "application/octet-stream"}, + ) + if on_progress: + on_progress(len(data), len(data) or 1) + return result.get("filename") or filename + + def start_print(self, host, filename, bed_leveling=False, ams_settings=None, mode="stream"): + del bed_leveling, ams_settings + device, _baud = split_port(host) + chosen = (mode or "stream").strip().lower() + if chosen not in ("stream", "sd"): + raise PrinterError("Marlin-Start ist Strom oder SD-Karte.") + result = self._json("POST", "/start", { + "device": device, + "filename": filename, + "mode": chosen, + }) + return result.get("filename") or filename + + def command(self, host, action): + device, _baud = split_port(host) + name = (action or "").strip().lower() + mapped = { + "pause": "pause", + "fortsetzen": "fortsetzen", + "resume": "fortsetzen", + "abbrechen": "abbrechen", + "cancel": "abbrechen", + }.get(name) + if not mapped: + raise PrinterError("Unbekannte Aktion.") + self._json("POST", "/befehl", {"device": device, "action": mapped}) + + def clear_print_error(self, host): + device, _baud = split_port(host) + self._json("POST", "/befehl", {"device": device, "action": "fehler_loeschen"}) + + def heaters_off(self, host): + device, _baud = split_port(host) + self._json("POST", "/befehl", {"device": device, "action": "heizungen_aus"}) + + def attach(self, printer): + self._daemon() + self._ensure(printer) + + def _daemon(self): + try: + from grotti.marlin_supervisor import ensure_if_enabled + ensure_if_enabled() + except Exception: + return + + def _ensure(self, printer): + device, baud = split_port(printer.get("host") or "") + self._json("POST", "/oeffnen", { + "device": device, + "baud": baud, + "heads": heads_for(printer), + "name": printer.get("name") or "", + }) + + def _json(self, method, path, body=None, headers=None): + data = None + hdrs = dict(headers or {}) + if isinstance(body, (dict, list)): + data = json.dumps(body).encode("utf-8") + hdrs.setdefault("Content-Type", "application/json") + elif isinstance(body, bytes): + data = body + request = urllib.request.Request(self.base + path, data=data, headers=hdrs, method=method) + try: + with urllib.request.urlopen(request, timeout=1.5) as response: + raw = response.read() + except urllib.error.HTTPError as exc: + detail = _error_message(exc) + raise PrinterError(detail) from exc + except (urllib.error.URLError, TimeoutError, OSError) as exc: + raise PrinterError(_DOWN) from exc + if not raw: + return {} + try: + return json.loads(raw.decode("utf-8")) + except json.JSONDecodeError as exc: + raise PrinterError("Der Marlin-Dienst hat kein JSON geliefert.") from exc + + +def _error_message(exc): + try: + payload = json.loads(exc.read().decode("utf-8")) + except (OSError, json.JSONDecodeError, UnicodeError): + payload = {} + return payload.get("message") or _DOWN diff --git a/grotti/drivers/moonraker_drv.py b/grotti/drivers/moonraker_drv.py new file mode 100644 index 0000000..909fea3 --- /dev/null +++ b/grotti/drivers/moonraker_drv.py @@ -0,0 +1,44 @@ +"""Moonraker-Treiber. Rinkhals ist eine Richtlinie darauf, kein zweiter Client. + +Kobra 3 und S1: kein Firmware-Restart (steckt in moonraker.steuern), +ACE-Start über MQTT, Kamera als MJPEG unter /webcam/, Bettnetz aus bed_mesh. +""" + +from grotti import moonraker + + +class MoonrakerDriver: + transport = "moonraker" + rinkhals = True + firmware_restart = False + + def snapshot(self, printers): + return moonraker.snapshot(printers) + + def query(self, host): + return moonraker.query(host) + + def slots(self, host, status=None): + return moonraker.slots(host, status) + + def upload(self, host, filename, content, on_progress=None): + return moonraker.upload(host, filename, content, on_progress=on_progress) + + def start_print(self, host, filename, bed_leveling=False, ams_settings=None): + return moonraker.start_print( + host, filename, bed_leveling=bed_leveling, ams_settings=ams_settings, + ) + + def command(self, host, action): + name = (action or "").strip().lower() + if name == "cancel": + name = "abbrechen" + elif name == "resume": + name = "fortsetzen" + return moonraker.command(host, name) + + def clear_print_error(self, host): + return moonraker.clear_print_error(host) + + def heaters_off(self, host): + return moonraker.heaters_off(host) diff --git a/grotti/jobs.py b/grotti/jobs.py index 12761db..3c3a8f0 100644 --- a/grotti/jobs.py +++ b/grotti/jobs.py @@ -9,6 +9,7 @@ from grotti import acm, catalog, eject, library, logutil, moonraker, store, usag from grotti.cost import energy_cost from grotti.errors import GrottiError from grotti.parse import content_has_ace_trailer, prepare_rinkhals_gcode +from grotti.drivers import for_printer from grotti.printers import FAMILY_LABELS TERMINAL = {"completed", "cancelled", "error", "interrupted"} @@ -908,6 +909,105 @@ def prepare_send(conn, file_id, host, confirm, override, spool_id, ace_map=None) return printer, row, chosen +def _send_via_driver( + conn, cfg, drv, printer, row, chosen, host, ace_map, bed_leveling, progress, + marlin_mode="stream", +): + """Start über einen Treiber ohne Moonraker. Die Datei bleibt ohne Rinkhals-Kopf.""" + attach = getattr(drv, "attach", None) + if attach: + try: + attach(printer) + except moonraker.PrinterError as exc: + raise GrottiError(exc.message or "Der Drucker ist nicht erreichbar.", "offline") from exc + try: + live = drv.query(host) + except moonraker.PrinterError as exc: + raise GrottiError(exc.message or "Der Drucker ist nicht erreichbar.", "offline") from exc + if live.get("state") in ("printing", "paused"): + raise GrottiError("Der Drucker druckt schon.", "belegt", 409) + if (live.get("state") or "").lower() == "error": + raise GrottiError( + "Drucker im Fehlerzustand — auf der Wand „Fehler löschen“, dann nochmal starten.", + "fehler", + 409, + ) + try: + slots = live.get("slots") or drv.slots(host) + except moonraker.PrinterError: + slots = live.get("slots") or [] + mapping = acm.normalize_mapping(ace_map) + filaments = list(row.get("filaments") or []) + if slots and not mapping: + raise GrottiError( + "Dieser Drucker hat ACE/MMU-Plätze. Bitte Farbe der Datei einem ACE-Platz zuordnen.", + "ace", + ) + if slots and mapping and not filaments: + filaments = [{"type": "PLA", "color": ""}] + progress("vorbereiten", 30, "Datei vorbereiten…") + filename, content, plate = library.printer_file( + row, conn=conn, data_dir=(cfg or {}).get("data_dir") + ) + filename = moonraker.safe_upload_name(filename) + if slots and mapping: + content, mapping, filaments, _ = acm.align_tools_for_ace(content, mapping, filaments) + ace_payload = acm.build_acm(filaments, mapping, slots) if slots and mapping else None + has_trailer = content_has_ace_trailer(content, kind=row.get("kind") or "", plate=plate) + warnings = [] + if slots and mapping and not has_trailer and not ace_payload: + warnings.append(acm.TRAILER_WARN) + + def upload_progress(sent, total): + if total <= 0: + return + progress( + "hochladen", + 45 + int(min(1.0, sent / total) * 19), + "Hochladen zu %s…" % printer["name"], + ) + + progress("hochladen", 45, "Hochladen zu %s…" % printer["name"]) + try: + stored = drv.upload(host, filename, content, on_progress=upload_progress) + progress("starten", 80, "Druck starten…") + start_kwargs = {} + if drv.transport == "marlin": + start_kwargs["mode"] = marlin_mode if marlin_mode in ("stream", "sd") else "stream" + drv.start_print( + host, + stored, + bed_leveling=bool(bed_leveling), + ams_settings=ace_payload, + **start_kwargs, + ) + except moonraker.PrinterError as exc: + try: + drv.heaters_off(host) + except Exception: + pass + raise GrottiError(exc.message, "drucker") from exc + progress("buchen", 95, "Auftrag speichern…") + store.add_send( + conn, host, stored, row["id"], row["project_id"], chosen, + ace_map=mapping, bed_leveling=bool(bed_leveling), + ) + note = "Gestartet auf %s: %s" % (printer["name"], stored) + if warnings: + note += " · " + " · ".join(warnings) + progress("fertig", 100, note) + return { + "printer": printer["name"], + "filename": stored, + "plate": plate, + "ace": bool(slots and mapping), + "ace_trailer": has_trailer, + "warnings": warnings, + "bed_leveling": bool(bed_leveling), + "bed_leveling_wired": drv.transport == "moonraker", + } + + def send_file( conn, cfg, @@ -921,6 +1021,7 @@ def send_file( ace_map=None, bed_leveling=False, keep_motors=False, + marlin_mode="stream", ): def progress(step, percent, message): if on_progress: @@ -943,6 +1044,12 @@ def send_file( assert_filament_enough(conn, row, chosen, ace_map, host) progress("pruefen", 15, "Drucker prüfen…") + drv = for_printer(printer) + if drv.transport != "moonraker": + return _send_via_driver( + conn, cfg, drv, printer, row, chosen, host, ace_map, bed_leveling, progress, + marlin_mode=marlin_mode, + ) try: live = moonraker.query(host) except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, KeyError, OSError, ValueError) as exc: @@ -1045,16 +1152,16 @@ def send_file( warnings.append(acm.TRAILER_WARN) progress("ace", 42, acm.TRAILER_WARN) try: - stored = moonraker.upload(host, filename, content, on_progress=upload_progress) + stored = drv.upload(host, filename, content, on_progress=upload_progress) if slots and mapping: ace_payload = acm.build_acm(filaments, mapping, slots) if ace_payload: progress("ace", 65, "ACE-Zuordnung hochladen…") body = acm.acm_bytes(ace_payload) for acm_name in acm.acm_upload_names(stored): - moonraker.upload(host, acm_name, body) + drv.upload(host, acm_name, body) progress("starten", 80, "Druck starten…") - moonraker.start_print( + drv.start_print( host, stored, bed_leveling=bool(bed_leveling), @@ -1062,7 +1169,7 @@ def send_file( ) except moonraker.PrinterError as exc: try: - moonraker.heaters_off(host) + drv.heaters_off(host) except Exception: pass raise GrottiError(exc.message, "drucker") from exc @@ -1102,7 +1209,7 @@ def control(conn, host, action): if not printer: raise GrottiError("Diesen Drucker kennt Grotti nicht.", "drucker", 404) try: - moonraker.command(host, action) + for_printer(printer).command(host, action) except moonraker.PrinterError as exc: raise GrottiError(exc.message, "drucker") from exc return {"printer": printer["name"], "action": action} @@ -1112,6 +1219,18 @@ def steuern(conn, host, action, params=None): printer = store.printer_by_host(conn, host) if not printer: raise GrottiError("Diesen Drucker kennt Grotti nicht.", "drucker", 404) + drv = for_printer(printer) + if action == "clear_error": + try: + drv.clear_print_error(host) + except moonraker.PrinterError as exc: + raise GrottiError(exc.message, "drucker") from exc + return {"printer": printer["name"], "action": action} + if drv.transport != "moonraker": + raise GrottiError( + "Heizung und Plätze laufen an diesem Drucker über den G-code.", + "treiber", + ) params = dict(params) if isinstance(params, dict) else {} if action == "slot_setzen": try: diff --git a/grotti/library.py b/grotti/library.py index a87aad7..4d25a24 100644 --- a/grotti/library.py +++ b/grotti/library.py @@ -74,8 +74,13 @@ def sync_watch(conn, cfg, force=False): continue store.forget_missing_watch(conn, seen) link_watch_files_to_projects(conn, cfg) + dropped = drop_upload_watch_duplicates(conn, cfg) _LAST_WATCH_SYNC = now - return {"gelesen": gelesen, "hinweis": ""} + result = {"gelesen": gelesen, "hinweis": ""} + if dropped: + result["duplikate"] = dropped + result["hinweis"] = "%d doppelte Upload-Zeile(n) entfernt." % dropped + return result def _apply_meta(conn, file_id, row, meta): @@ -556,15 +561,56 @@ def delete_project_disk_folder(cfg, folder_rel, force=False): def save_upload(conn, filename, content, cfg, project_id=None): + name = safe_filename(filename) + twin = store.find_watch_twin(conn, name, len(content or b"")) + if twin: + # Orca hat schon in den Slice-Ordner geschrieben — kein zweiter Upload-Eintrag + if project_id and not twin.get("project_id"): + store.set_file_project(conn, twin["id"], project_id) + twin = store.get_file_row(conn, twin["id"]) or twin + return store.file_out(twin, watch_dir=cfg.get("watch_dir"), conn=conn) directory = cfg["data_dir"] / "eingang" directory.mkdir(parents=True, exist_ok=True) - path = unique_path(directory, filename) + path = unique_path(directory, name) path.write_bytes(content) meta = meta_for(path) meta["project_id"] = project_id return store.insert_upload(conn, meta) +def drop_upload_watch_duplicates(conn, cfg): + """Upload-Zeilen entfernen, die dieselbe Datei schon als Watch (mit Projekt) haben.""" + rows = conn.execute( + """ + SELECT u.id AS upload_id, w.id AS watch_id, u.stored_path, u.project_id AS upload_project, + w.project_id AS watch_project + FROM files u + JOIN files w + ON w.source = 'watch' + AND w.name = u.name + AND w.size_bytes = u.size_bytes + WHERE u.source = 'upload' + ORDER BY u.id + """ + ).fetchall() + removed = 0 + for row in rows: + upload_id = row["upload_id"] + watch_id = row["watch_id"] + if row.get("upload_project") and not row.get("watch_project"): + store.set_file_project(conn, watch_id, row["upload_project"]) + store.retarget_file_id(conn, upload_id, watch_id) + stored = row.get("stored_path") or "" + store.delete_file(conn, upload_id) + if stored: + try: + Path(stored).unlink(missing_ok=True) + except OSError: + pass + removed += 1 + return removed + + def ensure_library_gcode(conn, cfg, host, filename): """Wenn die laufende Datei fehlt: einmal vom Drucker nach Grotti ziehen.""" base = (filename or "").replace("\\", "/").split("/")[-1] diff --git a/grotti/marlin_daemon.py b/grotti/marlin_daemon.py new file mode 100644 index 0000000..f38198e --- /dev/null +++ b/grotti/marlin_daemon.py @@ -0,0 +1,145 @@ +"""Marlin-Dienst. Lauscht nur auf dem eigenen Rechner. + +Start:: + + python -m grotti.marlin_daemon + +Port über ``GROTTI_MARLIN_PORT`` (Standard 8771). Die Web-App spricht ihn +unter ``GROTTI_MARLIN_URL`` an. Der Prozess hält die USB-Ports, auch wenn +Grotti neu startet. +""" + +import json +import os +from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer + +from grotti.marlin_link import MarlinError, MarlinService + + +def _read_json(handler): + length = int(handler.headers.get("Content-Length") or 0) + raw = handler.rfile.read(length) if length else b"" + if not raw: + return {} + data = json.loads(raw.decode("utf-8")) + if not isinstance(data, dict): + raise MarlinError("Der Aufruf ist kein Objekt.") + return data + + +def _send(handler, code, payload): + body = json.dumps(payload).encode("utf-8") + handler.send_response(code) + handler.send_header("Content-Type", "application/json; charset=utf-8") + handler.send_header("Content-Length", str(len(body))) + handler.end_headers() + handler.wfile.write(body) + + +class Handler(BaseHTTPRequestHandler): + def log_message(self, fmt, *args): + return + + def do_GET(self): + service = self.server.service + path = self.path.split("?", 1)[0] + try: + if path == "/gesundheit": + _send(self, 200, {"ok": True}) + return + if path == "/status": + device = _query_device(self.path) + _send(self, 200, service.session(device).status()) + return + _send(self, 404, {"message": "Unbekannt."}) + except MarlinError as exc: + _send(self, 404, {"message": exc.message}) + + def do_POST(self): + service = self.server.service + path = self.path.split("?", 1)[0] + try: + if path == "/oeffnen": + data = _read_json(self) + service.connect( + data.get("device") or "", + baud=data.get("baud") or 115200, + heads=data.get("heads") or 1, + name=data.get("name") or "", + ) + _send(self, 200, service.session(data.get("device")).status()) + return + if path == "/datei": + device = _query_device(self.path) + name = self.headers.get("X-Dateiname") or "druck.gcode" + length = int(self.headers.get("Content-Length") or 0) + content = self.rfile.read(length) if length else b"" + stored = service.store_file(device, name, content) + _send(self, 200, {"filename": stored}) + return + if path == "/start": + data = _read_json(self) + shown = service.start( + data.get("device") or "", + data.get("filename") or "", + (data.get("mode") or "stream").strip().lower(), + ) + _send(self, 200, {"filename": shown}) + return + if path == "/befehl": + data = _read_json(self) + _befehl(service.session(data.get("device") or ""), data.get("action") or "") + _send(self, 200, service.session(data.get("device")).status()) + return + _send(self, 404, {"message": "Unbekannt."}) + except MarlinError as exc: + code = 409 if "druckt schon" in exc.message else 400 + _send(self, code, {"message": exc.message}) + except json.JSONDecodeError: + _send(self, 400, {"message": "Der Aufruf ist kein JSON."}) + + +def _query_device(path): + from urllib.parse import parse_qs, urlsplit + + query = parse_qs(urlsplit(path).query) + device = (query.get("device") or [""])[0].strip() + if not device: + raise MarlinError("Die serielle Schnittstelle fehlt.") + return device + + +def _befehl(session, action): + name = (action or "").strip().lower() + if name in ("pause",): + session.pause() + return + if name in ("fortsetzen", "resume"): + session.resume() + return + if name in ("abbrechen", "cancel"): + session.cancel() + return + if name in ("heizungen_aus", "heaters_off"): + session.heaters_off() + return + if name in ("fehler_loeschen", "clear_error"): + session.clear_error() + return + raise MarlinError("Unbekannte Aktion.") + + +def serve(port, service=None): + httpd = ThreadingHTTPServer(("127.0.0.1", int(port)), Handler) + httpd.service = service or MarlinService() + return httpd + + +def main(): + port = int(os.environ.get("GROTTI_MARLIN_PORT") or 8771) + httpd = serve(port) + httpd.serve_forever() + + +if __name__ == "__main__": + main() diff --git a/grotti/marlin_link.py b/grotti/marlin_link.py new file mode 100644 index 0000000..5d2d640 --- /dev/null +++ b/grotti/marlin_link.py @@ -0,0 +1,372 @@ +"""Marlin über eine serielle Leitung. + +Der Dienst hält den Port. Ein Neustart der Web-App schließt ihn nicht. +Start ist Strom (Zeile, dann ``ok``) oder SD-Karte (``M28``/``M29``, dann ``M24``). +Zwei Köpfe, wie am Tenlog, sind T0 und T1. Die Leitung kennt kein ACE. +""" + +import re +import threading +import time +from pathlib import Path + + +class MarlinError(Exception): + def __init__(self, message): + super().__init__(message) + self.message = message + + +_TEMP = re.compile( + r"(? 1 else 1 + self.name = name or device + self.state = "standby" + self.message = "" + self.filename = "" + self.mode = "" + self.progress = None + self.temps = {} + self._pause = threading.Event() + self._stop = False + self._lock = threading.RLock() + self._thread = None + + def alive(self): + return self.port is not None + + def status(self): + return { + "ok": self.state not in ("offline", "error"), + "state": self.state, + "message": self.message, + "filename": self.filename, + "mode": self.mode, + "progress": self.progress, + "temps": {key: [cur, target] for key, (cur, target) in self.temps.items()}, + "heads": self.heads, + "name": self.name, + } + + def transact(self, line, timeout=8): + payload = (line.strip() + "\n").encode("ascii", "replace") + self.port.write(payload) + deadline = time.monotonic() + timeout + while time.monotonic() < deadline: + raw = self.port.readline() + if not raw: + continue + text = raw.decode("utf-8", "replace").strip() + if not text: + continue + low = text.lower() + temps = parse_temps(text) + if temps: + self.temps.update(temps) + done = parse_sd_progress(text) + if done is not None and self.mode == "sd": + self.progress = done + if "done printing file" in low: + self.state = "complete" + self.progress = 1 + if low.startswith("ok"): + return text + if low.startswith("error") or low.startswith("!!") or "unknown command" in low: + raise MarlinError(text) + raise MarlinError("Keine Antwort auf: %s" % line.strip()) + + def handshake(self): + self.transact("M115", timeout=3) + self.transact("M105", timeout=3) + self.state = "standby" + self.message = "" + + def begin(self, filename, lines, mode): + if mode not in ("stream", "sd"): + raise MarlinError("Start ist Strom oder SD-Karte.") + if self.state in ("printing", "paused"): + raise MarlinError("Der Drucker druckt schon.") + if not lines: + raise MarlinError("Die Datei hat keine Druckzeilen.") + self.filename = filename + self.mode = mode + self.progress = 0 + self.message = "" + self._stop = False + self._pause.clear() + self.state = "printing" + self._thread = threading.Thread( + target=self._run, args=(list(lines), mode), name="marlin-%s" % self.device, daemon=True, + ) + self._thread.start() + + def pause(self): + if self.state != "printing": + raise MarlinError("Es läuft kein Druck.") + self._pause.set() + self.state = "paused" + if self.mode == "sd": + with self._lock: + self.transact("M25") + + def resume(self): + if self.state != "paused": + raise MarlinError("Der Druck ist nicht pausiert.") + if self.mode == "sd": + with self._lock: + self.transact("M24") + self._pause.clear() + self.state = "printing" + + def cancel(self): + self._stop = True + self._pause.clear() + with self._lock: + if self.mode == "sd": + try: + self.transact("M524") + except MarlinError: + try: + self.transact("M25") + except MarlinError: + pass + self.heaters_off() + self.state = "standby" + self.filename = "" + self.progress = None + self.mode = "" + self.message = "" + + def heaters_off(self): + with self._lock: + if self.heads > 1: + self.transact("M104 T0 S0") + self.transact("M104 T1 S0") + else: + self.transact("M104 S0") + self.transact("M140 S0") + self.transact("M107") + + def clear_error(self): + with self._lock: + self.transact("M999") + self.state = "standby" + self.message = "" + + def _run(self, lines, mode): + try: + if mode == "sd": + self._run_sd(lines) + else: + self._run_stream(lines) + except MarlinError as exc: + self.state = "error" + self.message = exc.message + + def _wait_if_paused(self): + while self._pause.is_set() and not self._stop: + time.sleep(0.05) + + def _run_stream(self, lines): + total = len(lines) + polled = time.monotonic() + for index, line in enumerate(lines, start=1): + self._wait_if_paused() + if self._stop: + return + with self._lock: + self.transact(line) + if time.monotonic() - polled > 2: + self.transact("M105") + polled = time.monotonic() + self.progress = index / total + if not self._stop: + self.state = "complete" + self.progress = 1 + + def _run_sd(self, lines): + stored = sd_filename(self.filename) + with self._lock: + self.transact("M21") + self.transact("M28 %s" % stored) + for line in lines: + if self._stop: + with self._lock: + self.transact("M29") + return + with self._lock: + self.transact(line) + if self._stop: + return + with self._lock: + self.transact("M29") + self.transact("M23 %s" % stored) + self.transact("M24") + while not self._stop and self.state == "printing": + self._wait_if_paused() + if self._stop or self.state != "printing": + return + time.sleep(2) + with self._lock: + if self._stop or self.state != "printing": + return + text = self.transact("M27") + if self.state == "complete": + return + if "not sd printing" in text.lower() and (self.progress or 0) > 0: + self.state = "complete" + self.progress = 1 + return + self.transact("M105") + + +class MarlinService: + def __init__(self, open_port=None): + self._open_port = open_port or open_pyserial + self.machines = {} + self.files = {} + self._lock = threading.Lock() + + def connect(self, device, baud=115200, heads=1, name=""): + device = (device or "").strip() + if not device: + raise MarlinError("Die serielle Schnittstelle fehlt.") + with self._lock: + current = self.machines.get(device) + if current and current.alive(): + if heads: + current.heads = 2 if int(heads) > 1 else 1 + if name: + current.name = name + return current + port = self._open_port(device, int(baud or 115200)) + session = MarlinSession(device, port, heads=heads, name=name) + try: + session.handshake() + except MarlinError: + session.port.close() + raise + with self._lock: + self.machines[device] = session + return session + + def session(self, device): + with self._lock: + found = self.machines.get((device or "").strip()) + if not found: + raise MarlinError("Dieser Drucker ist am Marlin-Dienst nicht angemeldet.") + return found + + def store_file(self, device, filename, content): + self.session(device) + name = Path(filename or "druck.gcode").name + if not name: + raise MarlinError("Der Dateiname fehlt.") + self.files[(device, name)] = content or b"" + return name + + def start(self, device, filename, mode): + session = self.session(device) + name = Path(filename or "").name + content = self.files.get((device, name)) + if content is None: + raise MarlinError("Die Datei liegt nicht im Marlin-Dienst.") + lines = gcode_lines(content) + shown = sd_filename(name) if mode == "sd" else name + session.begin(shown if mode == "sd" else name, lines, mode) + return shown diff --git a/grotti/marlin_supervisor.py b/grotti/marlin_supervisor.py new file mode 100644 index 0000000..8965399 --- /dev/null +++ b/grotti/marlin_supervisor.py @@ -0,0 +1,194 @@ +"""Startet den Marlin-Dienst und lässt ihn laufen. + +Grotti beendet den Prozess nicht. Ein Neustart oder Absturz der Web-App +schließt die USB-Leitung nicht. Lauscht der Dienst schon, wird kein zweiter +gestartet. +""" + +import os +import shutil +import subprocess +import sys +import threading +import time +import urllib.error +import urllib.request +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +UNIT = "grotti-marlin.service" +_CREATE_BREAKAWAY = 0x01000000 +_DETACHED = 0x00000008 +_NEW_GROUP = 0x00000200 +_NO_WINDOW = 0x08000000 + +_enabled = False +_supervisor = None +_guard = threading.Lock() + + +def service_url(): + return (os.environ.get("GROTTI_MARLIN_URL") or "http://127.0.0.1:8771").rstrip("/") + + +def health_check(url=None): + target = (url or service_url()) + "/gesundheit" + try: + with urllib.request.urlopen(target, timeout=0.4) as response: + return response.status == 200 + except (OSError, urllib.error.URLError): + return False + + +def unit_installed(run=None): + if os.name == "nt" or not shutil.which("systemctl"): + return False + run = run or subprocess.run + try: + probe = run( + ["systemctl", "cat", UNIT], + capture_output=True, + timeout=3, + check=False, + ) + except (OSError, subprocess.SubprocessError): + return False + return getattr(probe, "returncode", 1) == 0 + + +def start_unit(run=None): + """Eigene systemd-Unit, außerhalb von grotti.service. Rückgabe: gestartet versucht.""" + if not unit_installed(run): + return False + systemctl = shutil.which("systemctl") or "systemctl" + run = run or subprocess.run + cmd = [systemctl, "start", UNIT] + if shutil.which("sudo"): + cmd = ["sudo", "-n", *cmd] + try: + run(cmd, capture_output=True, timeout=20, check=False) + except (OSError, subprocess.SubprocessError): + return False + return True + + +def spawn_detached(data_dir, popen=None): + """Prozess ohne Konsole und ohne Sitzung von Grotti. Grotti-Ende lässt ihn leben.""" + folder = Path(data_dir) + folder.mkdir(parents=True, exist_ok=True) + log_path = folder / "marlin-dienst.log" + log_file = open(log_path, "ab", buffering=0) + env = os.environ.copy() + env["PYTHONPATH"] = str(ROOT) + os.pathsep + env.get("PYTHONPATH", "") + env["PYTHONUNBUFFERED"] = "1" + args = [sys.executable, "-m", "grotti.marlin_daemon"] + popen = popen or subprocess.Popen + kwargs = { + "args": args, + "cwd": str(ROOT), + "env": env, + "stdin": subprocess.DEVNULL, + "stdout": log_file, + "stderr": subprocess.STDOUT, + "close_fds": os.name != "nt", + } + try: + if os.name == "nt": + flags = _DETACHED | _NEW_GROUP | _NO_WINDOW + try: + proc = popen(creationflags=flags | _CREATE_BREAKAWAY, **kwargs) + except OSError: + proc = popen(creationflags=flags, **kwargs) + else: + proc = popen(start_new_session=True, **kwargs) + finally: + log_file.close() + return proc.pid + + +def launch(data_dir, run=None, popen=None): + if start_unit(run): + return "systemd" + spawn_detached(data_dir, popen=popen) + return "prozess" + + +class MarlinSupervisor: + def __init__(self, data_dir, healthy=None, start=None, wait_s=4): + self.data_dir = Path(data_dir) + self.healthy = healthy or health_check + self.start = start or (lambda folder: launch(folder)) + self.wait_s = wait_s + self.error = "" + self._last_attempt = 0.0 + self._lock = threading.Lock() + + def status(self): + running = bool(self.healthy()) + if running: + self.error = "" + return {"running": running, "message": "" if running else self.error} + + def ensure(self): + if self.healthy(): + self.error = "" + return {"running": True, "started": False, "message": ""} + with self._lock: + if self.healthy(): + self.error = "" + return {"running": True, "started": False, "message": ""} + now = time.monotonic() + if self._last_attempt and now - self._last_attempt < 8: + return {"running": False, "started": False, "message": self.error} + self._last_attempt = now + try: + self.start(self.data_dir) + except OSError as exc: + self.error = "Der Marlin-Dienst ließ sich nicht starten: %s" % exc + return {"running": False, "started": False, "message": self.error} + if self._wait(): + self.error = "" + return {"running": True, "started": True, "message": ""} + self.error = "Der Marlin-Dienst ist nicht hochgekommen. Log: %s" % ( + self.data_dir / "marlin-dienst.log" + ) + return {"running": False, "started": True, "message": self.error} + + def _wait(self): + deadline = time.monotonic() + self.wait_s + while time.monotonic() < deadline: + if self.healthy(): + return True + time.sleep(0.05) + return bool(self.healthy()) + + +def disable(): + global _enabled, _supervisor + with _guard: + _enabled = False + _supervisor = None + + +def enable(data_dir): + global _enabled, _supervisor + with _guard: + _supervisor = MarlinSupervisor(data_dir) + _enabled = True + return _supervisor + + +def ensure_if_enabled(): + with _guard: + supervisor = _supervisor if _enabled else None + if supervisor: + return supervisor.ensure() + return None + + +def current_status(): + with _guard: + supervisor = _supervisor if _enabled else None + if supervisor: + return supervisor.status() + return {"running": health_check(), "message": ""} diff --git a/grotti/meldung.py b/grotti/meldung.py new file mode 100644 index 0000000..a7cdb59 --- /dev/null +++ b/grotti/meldung.py @@ -0,0 +1,148 @@ +"""Problem-Meldungen: lokal speichern und an den Empfänger auf git.gundel.dev schicken.""" + +from __future__ import annotations + +import json +import urllib.error +import urllib.request + +from grotti.version import __version__ + +DEFAULT_RELAY = "https://git.gundel.dev/hooks/grotti-meldung" + + +def relay_url(cfg): + raw = (cfg or {}).get("_raw") or {} + return (raw.get("meldung_relay") or DEFAULT_RELAY).strip().rstrip("/") + + +def create(conn, cfg, *, text, page="", printer_host="", error_text="", user=None): + body = (text or "").strip() + if not body: + raise ValueError("Bitte beschreiben, was nicht stimmt.") + if len(body) > 4000: + body = body[:4000] + user = user or {} + payload = { + "text": body, + "page": (page or "")[:200], + "version": __version__, + "printer_host": (printer_host or "")[:120], + "error_text": (error_text or "")[:2000], + } + relay_ok, relay_message = send_relay(cfg, payload) + row = conn.execute( + """ + INSERT INTO meldungen ( + text, page, version, printer_host, error_text, + user_id, username, relay_ok, relay_message + ) + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s) + RETURNING * + """, + ( + payload["text"], + payload["page"], + payload["version"], + payload["printer_host"], + payload["error_text"], + user.get("id"), + (user.get("username") or "")[:80], + relay_ok, + (relay_message or "")[:500], + ), + ).fetchone() + return out(row) + + +def send_relay(cfg, payload): + url = relay_url(cfg) + if not url: + return False, "Kein Empfänger konfiguriert." + data = json.dumps({ + "text": payload.get("text") or "", + "page": payload.get("page") or "", + "version": payload.get("version") or "", + "printer_host": payload.get("printer_host") or "", + "error_text": payload.get("error_text") or "", + }).encode("utf-8") + request = urllib.request.Request( + url, + data=data, + headers={"Content-Type": "application/json", "User-Agent": "Grotti/%s" % __version__}, + method="POST", + ) + try: + with urllib.request.urlopen(request, timeout=12) as response: + raw = response.read().decode("utf-8", "replace") + try: + info = json.loads(raw) if raw else {} + except json.JSONDecodeError: + info = {} + issue = info.get("url") or info.get("html_url") or "" + return True, issue or "Empfänger hat die Meldung angenommen." + except urllib.error.HTTPError as exc: + detail = "" + try: + detail = exc.read().decode("utf-8", "replace")[:200] + except OSError: + detail = str(exc) + return False, "Empfänger: HTTP %s %s" % (exc.code, detail) + except (urllib.error.URLError, TimeoutError, OSError) as exc: + return False, "Empfänger nicht erreichbar: %s" % exc + + +def list_rows(conn, status=None, limit=50): + limit = max(1, min(200, int(limit or 50))) + if status in ("offen", "erledigt"): + rows = conn.execute( + """ + SELECT * FROM meldungen + WHERE status = %s + ORDER BY created_at DESC + LIMIT %s + """, + (status, limit), + ).fetchall() + else: + rows = conn.execute( + """ + SELECT * FROM meldungen + ORDER BY created_at DESC + LIMIT %s + """, + (limit,), + ).fetchall() + return [out(row) for row in rows] + + +def close(conn, meldung_id): + row = conn.execute( + """ + UPDATE meldungen + SET status = 'erledigt', closed_at = now() + WHERE id = %s + RETURNING * + """, + (int(meldung_id),), + ).fetchone() + return out(row) if row else None + + +def out(row): + if not row: + return None + return { + "id": row["id"], + "created_at": row["created_at"].isoformat() if row.get("created_at") else "", + "closed_at": row["closed_at"].isoformat() if row.get("closed_at") else "", + "status": row.get("status") or "offen", + "text": row.get("text") or "", + "page": row.get("page") or "", + "version": row.get("version") or "", + "printer_host": row.get("printer_host") or "", + "error_text": row.get("error_text") or "", + "username": row.get("username") or "", + "relay_ok": row.get("relay_ok"), + "relay_message": row.get("relay_message") or "", + } diff --git a/grotti/migrations/018_meldungen.sql b/grotti/migrations/018_meldungen.sql new file mode 100644 index 0000000..e309edd --- /dev/null +++ b/grotti/migrations/018_meldungen.sql @@ -0,0 +1,17 @@ +CREATE TABLE IF NOT EXISTS meldungen ( + id bigserial PRIMARY KEY, + created_at timestamptz NOT NULL DEFAULT now(), + status text NOT NULL DEFAULT 'offen', + text text NOT NULL, + page text NOT NULL DEFAULT '', + version text NOT NULL DEFAULT '', + printer_host text NOT NULL DEFAULT '', + error_text text NOT NULL DEFAULT '', + user_id uuid, + username text NOT NULL DEFAULT '', + relay_ok boolean, + relay_message text NOT NULL DEFAULT '', + closed_at timestamptz +); + +CREATE INDEX IF NOT EXISTS meldungen_status_idx ON meldungen (status, created_at DESC); diff --git a/grotti/print_queue.py b/grotti/print_queue.py index f55ef0b..cc386e8 100644 --- a/grotti/print_queue.py +++ b/grotti/print_queue.py @@ -11,6 +11,7 @@ import time from datetime import datetime, timezone from grotti import acm, eject, jobs, logutil, moonraker, notify, store +from grotti.drivers import for_printer from grotti.db import connect from grotti.errors import GrottiError from grotti import time_window @@ -127,7 +128,8 @@ class PrintQueueDispatcher: age = self.watcher.age_s() if cached and age is not None and age <= 30: return cached - return {row["host"]: row for row in moonraker.snapshot(printers)} + from grotti.drivers import snapshot + return {row["host"]: row for row in snapshot(printers)} def _auto_enabled(self): return bool((self.cfg or {}).get("auto_queue", True)) @@ -459,7 +461,7 @@ class PrintQueueDispatcher: current = store.get_print_queue_row(wconn, item_id) if current and (current.get("status") or "") in ("cancelled", "dismissed"): try: - moonraker.command(host, "cancel") + for_printer(printer_copy).command(host, "cancel") except Exception: pass return @@ -1052,7 +1054,7 @@ class PrintQueueDispatcher: row = store.get_print_queue_row(wconn, item_id) or item if (row.get("status") or "") in ("cancelled", "dismissed"): try: - moonraker.command(printer_copy["host"], "cancel") + for_printer(printer_copy).command(printer_copy["host"], "cancel") except Exception: pass return diff --git a/grotti/printers.py b/grotti/printers.py index 8ef1197..6a0f1ac 100644 --- a/grotti/printers.py +++ b/grotti/printers.py @@ -1,21 +1,52 @@ """Die Drucker: Familie aus dem Namen, die Liste selbst liegt in PostgreSQL.""" -FAMILY_LABELS = {"kobra_s1": "Kobra S1", "kobra_3": "Kobra 3"} +FAMILY_LABELS = { + "kobra_s1": "Kobra S1", + "kobra_3": "Kobra 3", + "kobra_4": "Kobra 4", + "anycubic_i3": "Anycubic i3", + "tenlog": "Tenlog", +} + +# Vorhandene Farm bleibt Moonraker/Rinkhals. Stock und Marlin sind eigene Treiber. +FAMILY_DRIVER = { + "kobra_s1": "moonraker", + "kobra_3": "moonraker", + "kobra_4": "anycubic_lan", + "anycubic_i3": "marlin", + "tenlog": "marlin", +} def family_from_name(name): - low = name.lower() + low = (name or "").lower() + if "kobra 4" in low or "kobra4" in low: + return "kobra_4" if "s1" in low: return "kobra_s1" if "kobra 3" in low or "kobra3" in low: return "kobra_3" + if "tenlog" in low: + return "tenlog" + if "i3" in low: + return "anycubic_i3" return "" def family_from_text(text): low = (text or "").lower() + if "kobra 4" in low or "kobra4" in low: + return "kobra_4" if "kobra s1" in low: return "kobra_s1" if "kobra 3" in low or "kobra3" in low: return "kobra_3" + if "tenlog" in low: + return "tenlog" + if "anycubic i3" in low or re_i3(low): + return "anycubic_i3" return "" + + +def re_i3(low): + return " i3" in low or low.startswith("i3") diff --git a/grotti/send_queue.py b/grotti/send_queue.py index 6205e78..57bf18b 100644 --- a/grotti/send_queue.py +++ b/grotti/send_queue.py @@ -57,6 +57,7 @@ class SendQueue: spool_id, ace_map=None, bed_leveling=False, + marlin_mode="stream", ): jobs_out = self.enqueue_many( conn, @@ -67,6 +68,7 @@ class SendQueue: spool_id, {host: ace_map or []} if ace_map else {}, bed_leveling=bed_leveling, + marlin_mode=marlin_mode, ) return jobs_out[0] @@ -80,6 +82,7 @@ class SendQueue: spool_id, ace_maps=None, bed_leveling=False, + marlin_mode="stream", ): if not confirm: raise GrottiError("Start braucht eine Bestätigung.", "bestaetigung") @@ -96,6 +99,7 @@ class SendQueue: ace_maps = ace_maps if isinstance(ace_maps, dict) else {} # Eine Batch-Option für alle Drucker im Multi-Send (nicht pro Host). want_level = bool(bed_leveling) + mode = marlin_mode if marlin_mode in ("stream", "sd") else "stream" created = [] for host in unique: # Mapping zuerst, damit Materialprüfung die ACE-Spulen sieht. @@ -120,6 +124,7 @@ class SendQueue: "override_machine": bool(override), "ace_map": mapping, "bed_leveling": want_level, + "marlin_mode": mode, "result": None, "error": None, "created_at": time.time(), @@ -137,6 +142,7 @@ class SendQueue: "spool_id": chosen, "ace_map": mapping, "bed_leveling": want_level, + "marlin_mode": mode, } ) created.append(self.snapshot(job_id)) @@ -207,6 +213,7 @@ class SendQueue: prepared=True, ace_map=item.get("ace_map"), bed_leveling=bool(item.get("bed_leveling")), + marlin_mode=item.get("marlin_mode") or "stream", ) conn.commit() done_msg = "Gestartet auf %s: %s" % (result["printer"], result["filename"]) diff --git a/grotti/store.py b/grotti/store.py index 6d3db6d..a53d443 100644 --- a/grotti/store.py +++ b/grotti/store.py @@ -1112,6 +1112,64 @@ def file_by_name(conn, filename): ).fetchone() +def find_watch_twin(conn, name, size_bytes): + """Watch-Datei mit gleichem Namen und gleicher Größe (Orca-Doppel ohne Upload).""" + base = (name or "").replace("\\", "/").rsplit("/", 1)[-1] + if not base: + return None + try: + size = int(size_bytes or 0) + except (TypeError, ValueError): + return None + if size <= 0: + return None + return conn.execute( + """ + SELECT * FROM files + WHERE source = 'watch' AND name = %s AND size_bytes = %s + ORDER BY mtime DESC, id DESC + LIMIT 1 + """, + (base, size), + ).fetchone() + + +def retarget_file_id(conn, old_id, new_id): + """Verweise von einer Datei auf eine andere umhängen (vor dem Löschen).""" + if not old_id or not new_id or int(old_id) == int(new_id): + return + old_id = int(old_id) + new_id = int(new_id) + conn.execute("UPDATE print_queue SET file_id = %s WHERE file_id = %s", (new_id, old_id)) + for row in conn.execute( + "SELECT id, steps FROM print_queue WHERE steps IS NOT NULL AND steps::text LIKE %s", + ('%%"file_id": %d%%' % old_id,), + ).fetchall(): + steps = row.get("steps") or [] + if isinstance(steps, str): + try: + steps = json.loads(steps) + except json.JSONDecodeError: + continue + if not isinstance(steps, list): + continue + changed = False + for step in steps: + if isinstance(step, dict) and step.get("file_id") == old_id: + step["file_id"] = new_id + changed = True + if changed: + conn.execute( + "UPDATE print_queue SET steps = %s WHERE id = %s", + (Json(steps), row["id"]), + ) + for table in ("sends", "runs", "order_items"): + conn.execute( + "UPDATE %s SET file_id = %%s WHERE file_id = %%s" % table, + (new_id, old_id), + ) + + def add_send(conn, printer_host, filename, file_id, project_id, spool_id, ace_map=None, bed_leveling=False): conn.execute( """ @@ -2960,61 +3018,6 @@ def statistics(conn, since=None, until=None, host="", material="", brand="", col } -def idea_out(row): - return { - "id": row["id"], - "title": row["title"], - "body": row["body"], - "status": row["status"], - "created_at": iso(row["created_at"]), - } - - -def list_ideas(conn): - rows = conn.execute( - """ - SELECT * FROM ideas - ORDER BY CASE status WHEN 'offen' THEN 0 WHEN 'spaeter' THEN 1 ELSE 2 END, created_at DESC - """ - ).fetchall() - return [idea_out(row) for row in rows] - - -def create_idea(conn, title, body, status): - row = conn.execute( - """ - INSERT INTO ideas (title, body, status) - VALUES (%s, %s, %s) - RETURNING * - """, - (title, body, status), - ).fetchone() - return idea_out(row) - - -def update_idea(conn, idea_id, fields): - sets = [] - values = [] - for key in ("title", "body", "status"): - if key in fields: - sets.append("%s = %%s" % key) - values.append(fields[key]) - if not sets: - row = conn.execute("SELECT * FROM ideas WHERE id = %s", (idea_id,)).fetchone() - return idea_out(row) if row else None - values.append(idea_id) - row = conn.execute( - "UPDATE ideas SET %s WHERE id = %%s RETURNING *" % ", ".join(sets), - values, - ).fetchone() - return idea_out(row) if row else None - - -def delete_idea(conn, idea_id): - row = conn.execute("DELETE FROM ideas WHERE id = %s RETURNING id", (idea_id,)).fetchone() - return bool(row) - - def printer_out(row): family = row["family"] or "" sw = row.get("start_window") or {} diff --git a/grotti/version.py b/grotti/version.py index 908b093..7ab1eb4 100644 --- a/grotti/version.py +++ b/grotti/version.py @@ -1,3 +1,3 @@ """Version von Grotti (SemVer). Bei jeder Änderung CHANGELOG.md mitführen.""" -__version__ = "3.6.1" +__version__ = "3.7.0" diff --git a/grotti/watcher.py b/grotti/watcher.py index ce940f9..76d96ec 100644 --- a/grotti/watcher.py +++ b/grotti/watcher.py @@ -6,7 +6,7 @@ import threading import time from datetime import datetime, timezone -from grotti import jobs, logutil, moonraker, notify, store, usage +from grotti import drivers, jobs, logutil, moonraker, notify, store, usage from grotti.events_bus import publish as publish_live from grotti.db import connect @@ -87,7 +87,7 @@ class StateWatcher: if not printers: conn.commit() return - lives = moonraker.snapshot(printers) + lives = drivers.snapshot(printers) with self._lock: self.latest = lives self._updated_at = time.monotonic() diff --git a/packaging/build-deb.sh b/packaging/build-deb.sh index f851c24..f3b43d1 100644 --- a/packaging/build-deb.sh +++ b/packaging/build-deb.sh @@ -47,6 +47,10 @@ echo '[]' > "$STAGE/usr/lib/grotti/drucker.json" cp "$ROOT/packaging/config.pi.json" "$STAGE/usr/share/grotti/config.pi.json" cp "$ROOT/packaging/config.pi.json" "$STAGE/etc/grotti/config.json" cp "$ROOT/packaging/grotti.service" "$STAGE/lib/systemd/system/grotti.service" +cp "$ROOT/packaging/grotti-marlin.service" "$STAGE/lib/systemd/system/grotti-marlin.service" +mkdir -p "$STAGE/etc/sudoers.d" +cp "$ROOT/packaging/sudoers.d/grotti-marlin" "$STAGE/etc/sudoers.d/grotti-marlin" +chmod 440 "$STAGE/etc/sudoers.d/grotti-marlin" cp "$ROOT/docs/Anleitung-Installation-Pi.md" "$STAGE/usr/share/doc/grotti/" cp "$ROOT/CHANGELOG.md" "$STAGE/usr/share/doc/grotti/changelog" gzip -9 -f "$STAGE/usr/share/doc/grotti/changelog" diff --git a/packaging/debian/postinst b/packaging/debian/postinst index dd318f0..94136fe 100644 --- a/packaging/debian/postinst +++ b/packaging/debian/postinst @@ -34,9 +34,15 @@ configure) _pg psql -c "GRANT ALL PRIVILEGES ON DATABASE grotti TO grotti;" >/dev/null 2>&1 || true fi + if getent group dialout >/dev/null 2>&1; then + usermod -aG dialout grotti || true + fi + if command -v systemctl >/dev/null 2>&1; then systemctl daemon-reload || true - systemctl enable grotti.service || true + systemctl enable grotti.service grotti-marlin.service || true + # start, nicht restart: ein laufender USB-Druck bleibt. + systemctl start grotti-marlin.service || true systemctl restart grotti.service || true fi ;; diff --git a/packaging/grotti-marlin.service b/packaging/grotti-marlin.service new file mode 100644 index 0000000..2d89fce --- /dev/null +++ b/packaging/grotti-marlin.service @@ -0,0 +1,19 @@ +[Unit] +Description=Grotti Marlin über USB +After=network.target + +[Service] +Type=simple +User=grotti +Group=grotti +SupplementaryGroups=dialout +WorkingDirectory=/usr/lib/grotti +Environment=PYTHONUNBUFFERED=1 +Environment=PYTHONPATH=/usr/lib/grotti +ExecStart=/usr/lib/grotti/venv/bin/python -m grotti.marlin_daemon +Restart=on-failure +RestartSec=2 +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/packaging/grotti.service b/packaging/grotti.service index ad0f3e2..58ff7f7 100644 --- a/packaging/grotti.service +++ b/packaging/grotti.service @@ -15,6 +15,7 @@ Environment=PYTHONUNBUFFERED=1 ExecStart=/usr/lib/grotti/venv/bin/python /usr/lib/grotti/server.py Restart=on-failure RestartSec=5 +# USB-Marlin liegt in grotti-marlin.service und bleibt bei einem Neustart hier stehen. # Stopp nicht 90 s hängen: nach TimeoutStopSec folgt SIGKILL TimeoutStopSec=20 KillMode=mixed diff --git a/packaging/sudoers.d/grotti-marlin b/packaging/sudoers.d/grotti-marlin new file mode 100644 index 0000000..bd5e971 --- /dev/null +++ b/packaging/sudoers.d/grotti-marlin @@ -0,0 +1 @@ +grotti ALL=(root) NOPASSWD: /usr/bin/systemctl start grotti-marlin.service, /bin/systemctl start grotti-marlin.service diff --git a/requirements.txt b/requirements.txt index 4b93454..ccd24c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ cryptography==50.0.2 markdown==3.11.1 mcp==2.0.0 waitress==3.0.2 +pyserial==3.5 diff --git a/scripts/meldung_relay.py b/scripts/meldung_relay.py new file mode 100644 index 0000000..d7e04cb --- /dev/null +++ b/scripts/meldung_relay.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python3 +"""Empfänger für Grotti-Meldungen → Issue auf Forgejo/Gitea. + +Läuft getrennt von den Installationen. Der Token bleibt hier. + + export FORGEJO_URL=https://git.gundel.dev + export FORGEJO_TOKEN=... + export FORGEJO_REPO=dg/grotti + python scripts/meldung_relay.py + +Port über RELAY_PORT (Standard 8780). Vor Forgejo mit Reverse-Proxy unter +/hooks/grotti-meldung legen. +""" + +from __future__ import annotations + +import json +import os +import urllib.error +import urllib.request +from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer + + +def env(name, default=""): + return (os.environ.get(name) or default).strip() + + +def create_issue(title, body): + base = env("FORGEJO_URL", "https://git.gundel.dev").rstrip("/") + repo = env("FORGEJO_REPO", "dg/grotti") + token = env("FORGEJO_TOKEN") + if not token: + raise RuntimeError("FORGEJO_TOKEN fehlt.") + url = "%s/api/v1/repos/%s/issues" % (base, repo) + payload = json.dumps({"title": title[:120], "body": body}).encode("utf-8") + request = urllib.request.Request( + url, + data=payload, + headers={ + "Content-Type": "application/json", + "Authorization": "token %s" % token, + }, + method="POST", + ) + with urllib.request.urlopen(request, timeout=20) as response: + data = json.loads(response.read().decode("utf-8")) + return data.get("html_url") or data.get("url") or "" + + +def issue_body(data): + lines = [ + data.get("text") or "", + "", + "---", + "Version: %s" % (data.get("version") or "—"), + "Seite: %s" % (data.get("page") or "—"), + "Drucker: %s" % (data.get("printer_host") or "—"), + ] + err = (data.get("error_text") or "").strip() + if err: + lines.extend(["", "Fehlertext:", "```", err[:2000], "```"]) + return "\n".join(lines) + + +class Handler(BaseHTTPRequestHandler): + def log_message(self, fmt, *args): + return + + def do_GET(self): + if self.path.split("?", 1)[0] in ("/", "/gesundheit", "/hooks/grotti-meldung"): + self._json(200, {"ok": True}) + return + self._json(404, {"message": "Unbekannt."}) + + def do_POST(self): + path = self.path.split("?", 1)[0] + if path not in ("/", "/hooks/grotti-meldung"): + self._json(404, {"message": "Unbekannt."}) + return + length = int(self.headers.get("Content-Length") or 0) + raw = self.rfile.read(length) if length else b"{}" + try: + data = json.loads(raw.decode("utf-8")) + except (UnicodeError, json.JSONDecodeError): + self._json(400, {"message": "Kein JSON."}) + return + if not isinstance(data, dict) or not (data.get("text") or "").strip(): + self._json(400, {"message": "text fehlt."}) + return + title = "Grotti: %s" % ((data.get("text") or "").strip().splitlines()[0][:80]) + try: + url = create_issue(title, issue_body(data)) + except Exception as exc: + self._json(502, {"message": str(exc)}) + return + self._json(201, {"ok": True, "url": url}) + + def _json(self, code, payload): + body = json.dumps(payload).encode("utf-8") + self.send_response(code) + self.send_header("Content-Type", "application/json; charset=utf-8") + self.send_header("Content-Length", str(len(body))) + self.end_headers() + self.wfile.write(body) + + +def main(): + port = int(env("RELAY_PORT", "8780") or 8780) + httpd = ThreadingHTTPServer(("127.0.0.1", port), Handler) + httpd.serve_forever() + + +if __name__ == "__main__": + main() diff --git a/scripts/orca_senden.py b/scripts/orca_senden.py index 69c6c75..76abb53 100644 --- a/scripts/orca_senden.py +++ b/scripts/orca_senden.py @@ -94,7 +94,14 @@ def load_config(path: Path = CONFIG_PATH) -> dict[str, str]: browser = str(data.get("browser") or "app").strip().lower() or "app" if browser not in ("app", "tab"): browser = "app" - return {"url": url, "token": token, "browser": browser} + # Windows-Pfad des Slice-Ordners, wenn Grotti auf dem Pi läuft (dort anderer Pfad) + watch_local = str(data.get("watch_dir_local") or data.get("watch_dir") or "").strip() + return { + "url": url, + "token": token, + "browser": browser, + "watch_dir_local": watch_local, + } def is_gcode_path(path: Path) -> bool: @@ -287,6 +294,16 @@ def fetch_watch_dir(base_url: str, token: str) -> Path | None: return path if path.is_dir() else None +def resolve_watch_dir(config: dict) -> Path | None: + """Lokaler Slice-Ordner: Config zuerst, sonst der Pfad von Grotti (gleiche Maschine).""" + local = str(config.get("watch_dir_local") or "").strip() + if local: + path = Path(local) + if path.is_dir(): + return path + return fetch_watch_dir(config["url"], config["token"]) + + def under_watch(watch_dir: Path, target: Path) -> tuple[str, str] | None: """(folder_relativ, dateiname) wenn target unter watch_dir liegt.""" try: @@ -450,9 +467,11 @@ def open_browser( webbrowser.open(url) -def deliver(base_url: str, token: str, src: Path) -> int: +def deliver(config: dict, src: Path) -> int: """Datei in Slice-Unterordner legen oder hochladen; gibt file_id zurück.""" - watch = fetch_watch_dir(base_url, token) + base_url = config["url"] + token = config["token"] + watch = resolve_watch_dir(config) target = output_target() if watch is not None and target is not None: placed = under_watch(watch, target) @@ -482,10 +501,10 @@ def main(argv: list[str] | None = None) -> int: path = find_gcode_arg(argv) write_debug( argv, - "chosen=%s\nupload_as=%s\noutput=%s" - % (path, upload_name_for(path), output_target() or ""), + "chosen=%s\nupload_as=%s\noutput=%s\nwatch_local=%s" + % (path, upload_name_for(path), output_target() or "", config.get("watch_dir_local") or ""), ) - file_id = deliver(config["url"], config["token"], path) + file_id = deliver(config, path) name = upload_name_for(path) write_debug(argv, "file_id=%s\nupload_as=%s" % (file_id, name)) mode = str(config.get("browser") or "app").strip().lower() diff --git a/server.py b/server.py index dca16da..da431e3 100644 --- a/server.py +++ b/server.py @@ -8,6 +8,7 @@ import time from waitress import serve from grotti import db, jobs, library, logutil, store +from grotti.marlin_supervisor import enable as enable_marlin from grotti.config import load from web.app import create_app @@ -63,6 +64,7 @@ def main(): watcher = app.extensions["watcher"] dispatcher = app.extensions["print_queue"] send_queue = app.extensions["send_queue"] + enable_marlin(cfg["data_dir"]) watcher.start() dispatcher.start() if hasattr(send_queue, "start"): @@ -102,6 +104,7 @@ def main(): except Exception: pass db.close_pool() + # Der Marlin-Dienst bleibt. Ein Stopp hier würde den Druck abbrechen. atexit.register(shutdown) for sig in (signal.SIGINT, signal.SIGTERM): diff --git a/tests/test_drivers.py b/tests/test_drivers.py new file mode 100644 index 0000000..cf1d1b8 --- /dev/null +++ b/tests/test_drivers.py @@ -0,0 +1,128 @@ +"""Treiberwahl und die LAN-Karte. Kein echter Drucker.""" + +import sys +import unittest +from pathlib import Path +from unittest import mock + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT)) + +from grotti.drivers import for_printer +from grotti.drivers.anycubic_lan import card_from_info, slots_from_report +from grotti.moonraker import PrinterError +from grotti.printers import family_from_name + + +class FamilyTests(unittest.TestCase): + def test_existing_names_stay_moonraker(self): + for name, family in ( + ("Kobra 3 A1", "kobra_3"), + ("Kobra S1", "kobra_s1"), + ): + self.assertEqual(family_from_name(name), family) + drv = for_printer({"name": name, "family": family, "host": "10.0.0.1"}) + self.assertEqual(drv.transport, "moonraker") + self.assertTrue(drv.rinkhals) + self.assertFalse(drv.firmware_restart) + + def test_kobra_4_is_lan(self): + self.assertEqual(family_from_name("Kobra 4"), "kobra_4") + drv = for_printer({"family": "kobra_4", "host": "10.0.0.4"}) + self.assertEqual(drv.transport, "anycubic_lan") + self.assertFalse(drv.rinkhals) + + def test_i3_is_marlin(self): + self.assertEqual(family_from_name("Anycubic i3 Mega"), "anycubic_i3") + drv = for_printer({"family": "anycubic_i3", "host": "usb"}) + self.assertEqual(drv.transport, "marlin") + + def test_tenlog_is_marlin_with_two_heads(self): + self.assertEqual(family_from_name("Tenlog"), "tenlog") + drv = for_printer({"family": "tenlog", "host": "COM5"}) + self.assertEqual(drv.transport, "marlin") + self.assertFalse(drv.rinkhals) + + +class LanCardTests(unittest.TestCase): + def test_busy_with_file_is_printing(self): + card = card_from_info({ + "state": "busy", + "temp": {"curr_nozzle_temp": 210, "curr_hotbed_temp": 60}, + "project": {"filename": "teil.gcode", "progress": 40, "curr_layer": 3, "total_layers": 10}, + }) + self.assertEqual(card["state"], "printing") + self.assertEqual(card["filename"], "teil.gcode") + self.assertAlmostEqual(card["progress"], 0.4) + self.assertEqual(card["nozzle"], 210) + self.assertEqual(card["layer"], 3) + self.assertFalse(card["has_camera"]) + self.assertIsNone(card["mesh"]) + + def test_free_is_standby(self): + card = card_from_info({"state": "free", "project": None}) + self.assertEqual(card["state"], "standby") + self.assertEqual(card["filename"], "") + + def test_slots_from_boxes(self): + slots = slots_from_report({ + "multi_color_box": [{ + "slots": [ + {"type": "PETG"}, + {"type": "PLA"}, + {"type": ""}, + {"type": "ABS"}, + ], + }], + }) + self.assertEqual([item["type"] for item in slots], ["PETG", "PLA", "ABS"]) + self.assertEqual([item["index"] for item in slots], [0, 1, 3]) + + +class LanUploadTests(unittest.TestCase): + def test_posts_filename_and_gcode(self): + captured = {} + + class Response: + def __enter__(self): + return self + + def __exit__(self, *args): + return False + + def read(self): + return b"{}" + + def fake_urlopen(request, timeout=0): + captured["url"] = request.full_url + captured["body"] = request.data + captured["length"] = request.headers["X-file-length"] + return Response() + + info = {"urls": {"fileUploadurl": "http://10.0.0.4:18910/gcode_upload?s=token"}} + drv = for_printer({"family": "kobra_4", "host": "10.0.0.4"}) + with mock.patch("grotti.anycubic_lan.print_info", return_value=info), \ + mock.patch("urllib.request.urlopen", fake_urlopen): + name = drv.upload("10.0.0.4", "teil.gcode", b"G1 X1") + self.assertEqual(name, "teil.gcode") + self.assertIn("/gcode_upload", captured["url"]) + self.assertIn(b'name="filename"', captured["body"]) + self.assertIn(b'name="gcode"', captured["body"]) + self.assertIn(b"G1 X1", captured["body"]) + self.assertEqual(captured["length"], "5") + + def test_missing_url(self): + drv = for_printer({"family": "kobra_4"}) + with mock.patch("grotti.anycubic_lan.print_info", return_value={"urls": {}}): + with self.assertRaises(PrinterError): + drv.upload("10.0.0.4", "teil.gcode", b"G1") + + +class MarlinStubTests(unittest.TestCase): + def test_start_says_service_missing(self): + drv = for_printer({"family": "anycubic_i3", "name": "i3", "host": "COM3"}) + cards = drv.snapshot([{"name": "i3", "host": "COM3", "family": "anycubic_i3"}]) + self.assertEqual(cards[0]["state"], "offline") + self.assertIn("läuft nicht", cards[0]["message"]) + with self.assertRaises(PrinterError): + drv.start_print("COM3", "teil.gcode") diff --git a/tests/test_jobs_spool.py b/tests/test_jobs_spool.py index 2288262..1678768 100644 --- a/tests/test_jobs_spool.py +++ b/tests/test_jobs_spool.py @@ -119,6 +119,8 @@ class HostValidationTests(unittest.TestCase): self.assertEqual(validate_printer_host("10.10.1.60"), "10.10.1.60") self.assertEqual(validate_printer_host("kobra.local:80"), "kobra.local:80") + self.assertEqual(validate_printer_host("COM5@250000"), "COM5@250000") + self.assertEqual(validate_printer_host("/dev/ttyUSB0"), "/dev/ttyUSB0") with self.assertRaises(GrottiError): validate_printer_host("http://evil") with self.assertRaises(GrottiError): diff --git a/tests/test_marlin.py b/tests/test_marlin.py new file mode 100644 index 0000000..a29681c --- /dev/null +++ b/tests/test_marlin.py @@ -0,0 +1,125 @@ +"""Marlin-Dienst mit einer Leitung aus dem Test. Kein USB-Gerät.""" + +import sys +import threading +import unittest +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT)) + +from grotti.drivers.marlin import MarlinDriver +from grotti.marlin_daemon import serve +from grotti.marlin_link import MarlinService, gcode_lines, sd_filename, split_port +from grotti.moonraker import PrinterError + + +class ScriptedPort: + def __init__(self): + self.written = [] + self._queue = [] + + def write(self, data): + text = data.decode().strip() + self.written.append(text) + if text.startswith("M27"): + self._queue.append(b"Done printing file\n") + self._queue.append(b"ok\n") + elif text.startswith("M105"): + self._queue.append( + b"ok T:200.0 /210.0 T0:200.0 /210.0 T1:190.0 /180.0 B:60.0 /60.0\n" + ) + else: + self._queue.append(b"ok\n") + + def readline(self): + if self._queue: + return self._queue.pop(0) + return b"" + + def close(self): + pass + + +GCODE = b"; Kommentar\nT0\nM109 S210\nT1\nM109 S180\nG1 X1\n" + + +class MarlinTests(unittest.TestCase): + def setUp(self): + self.port = ScriptedPort() + self.service = MarlinService(open_port=lambda device, baud: self.port) + self.httpd = serve(0, self.service) + self.thread = threading.Thread(target=self.httpd.serve_forever, daemon=True) + self.thread.start() + base = "http://127.0.0.1:%s" % self.httpd.server_address[1] + self.drv = MarlinDriver(base=base) + self.printer = { + "name": "Tenlog", + "host": "COM5@250000", + "family": "tenlog", + "family_label": "Tenlog", + } + + def tearDown(self): + self.httpd.shutdown() + self.httpd.server_close() + + def test_split_and_short_name(self): + self.assertEqual(split_port("COM5@250000"), ("COM5", 250000)) + self.assertEqual(sd_filename("teil drucken.gcode"), "TEILDRUC.GCO") + self.assertEqual(gcode_lines(GCODE), ["T0", "M109 S210", "T1", "M109 S180", "G1 X1"]) + + def test_two_heads_and_stream(self): + card = self.drv.snapshot([self.printer])[0] + self.assertTrue(card["ok"]) + self.assertEqual(card["state"], "standby") + self.assertEqual(card["slots"], []) + self.assertEqual(len(card["tools"]), 2) + self.assertEqual(card["tools"][1]["temp"], 190.0) + self.assertEqual(card["host"], "COM5@250000") + stored = self.drv.upload("COM5@250000", "teil.gcode", GCODE) + self.drv.start_print("COM5@250000", stored, mode="stream") + self.service.session("COM5")._thread.join(3) + sent = self.port.written + self.assertIn("T0", sent) + self.assertIn("T1", sent) + self.assertNotIn("M28 teil.gcode", sent) + status = self.service.session("COM5").status() + self.assertEqual(status["state"], "complete") + self.assertEqual(status["progress"], 1) + + def test_sd_writes_then_starts(self): + self.drv.attach(self.printer) + stored = self.drv.upload("COM5", "teil.gcode", GCODE) + shown = self.drv.start_print("COM5@250000", stored, mode="sd") + self.assertEqual(shown, "TEIL.GCO") + self.service.session("COM5")._thread.join(5) + sent = self.port.written + self.assertIn("M28 TEIL.GCO", sent) + self.assertIn("M29", sent) + self.assertIn("M23 TEIL.GCO", sent) + self.assertIn("M24", sent) + self.assertLess(sent.index("M28 TEIL.GCO"), sent.index("T0")) + self.assertLess(sent.index("M29"), sent.index("M24")) + + def test_pause_and_cancel_two_heaters(self): + self.drv.attach(self.printer) + session = self.service.session("COM5") + session.state = "printing" + session.mode = "sd" + self.drv.command("COM5", "pause") + self.assertIn("M25", self.port.written) + self.assertEqual(session.state, "paused") + session.cancel() + self.assertIn("M104 T0 S0", self.port.written) + self.assertIn("M104 T1 S0", self.port.written) + self.assertIn("M140 S0", self.port.written) + self.assertEqual(session.state, "standby") + + def test_without_service_stays_offline(self): + drv = MarlinDriver(base="http://127.0.0.1:9") + card = drv.snapshot([{"name": "i3", "host": "COM9", "family": "anycubic_i3"}])[0] + self.assertFalse(card["ok"]) + self.assertEqual(card["state"], "offline") + with self.assertRaises(PrinterError): + drv.start_print("COM9", "a.gcode") diff --git a/tests/test_marlin_supervisor.py b/tests/test_marlin_supervisor.py new file mode 100644 index 0000000..f4bfcc8 --- /dev/null +++ b/tests/test_marlin_supervisor.py @@ -0,0 +1,115 @@ +"""Marlin-Dienst starten, ohne ihn zu beenden. Kein echtes USB-Gerät.""" + +import sys +import tempfile +import threading +import unittest +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT)) + +from grotti import marlin_supervisor as sup + + +class SupervisorTests(unittest.TestCase): + def tearDown(self): + sup.disable() + + def test_running_service_is_not_started_again(self): + starts = [] + service = sup.MarlinSupervisor( + Path("."), + healthy=lambda: True, + start=lambda folder: starts.append(folder), + wait_s=0.1, + ) + result = service.ensure() + self.assertTrue(result["running"]) + self.assertFalse(result["started"]) + self.assertEqual(starts, []) + + def test_starts_once_when_down(self): + state = {"up": False} + starts = [] + + def healthy(): + return state["up"] + + def start(folder): + starts.append(folder) + state["up"] = True + + service = sup.MarlinSupervisor(Path("."), healthy=healthy, start=start, wait_s=0.2) + first = service.ensure() + second = service.ensure() + self.assertTrue(first["started"]) + self.assertEqual(len(starts), 1) + self.assertFalse(second["started"]) + self.assertTrue(second["running"]) + + def test_failed_start_does_not_repeat_immediately(self): + starts = [] + service = sup.MarlinSupervisor( + Path("."), + healthy=lambda: False, + start=lambda folder: starts.append(1), + wait_s=0.05, + ) + service.ensure() + service.ensure() + self.assertEqual(len(starts), 1) + + def test_parallel_ensure_starts_once(self): + gate = threading.Event() + starts = [] + + def start(folder): + starts.append(1) + gate.wait(1) + + service = sup.MarlinSupervisor( + Path("."), + healthy=lambda: False, + start=start, + wait_s=0.05, + ) + threads = [threading.Thread(target=service.ensure) for _ in range(4)] + for thread in threads: + thread.start() + gate.set() + for thread in threads: + thread.join(2) + self.assertEqual(len(starts), 1) + + def test_spawn_is_detached_and_runs_the_module(self): + seen = {} + + class Proc: + pid = 42 + + def popen(**kwargs): + seen.update(kwargs) + if kwargs.get("creationflags", 0) & sup._CREATE_BREAKAWAY: + raise OSError("breakaway") + return Proc() + + with tempfile.TemporaryDirectory() as folder: + pid = sup.spawn_detached(folder, popen=popen) + self.assertEqual(pid, 42) + self.assertEqual(seen["args"][1:], ["-m", "grotti.marlin_daemon"]) + self.assertIs(seen["stdin"], sup.subprocess.DEVNULL) + if sup.os.name == "nt": + flags = seen["creationflags"] + self.assertTrue(flags & sup._DETACHED) + self.assertFalse(flags & sup._CREATE_BREAKAWAY) + else: + self.assertTrue(seen["start_new_session"]) + + def test_enable_reuses_a_live_daemon(self): + sup.enable(Path(".")) + sup._supervisor.healthy = lambda: True + sup._supervisor.start = lambda folder: (_ for _ in ()).throw(AssertionError("gestartet")) + result = sup.ensure_if_enabled() + self.assertTrue(result["running"]) + self.assertFalse(result["started"]) diff --git a/tests/test_meldung.py b/tests/test_meldung.py new file mode 100644 index 0000000..b3aff1e --- /dev/null +++ b/tests/test_meldung.py @@ -0,0 +1,65 @@ +"""Problem-Meldungen: Relay und Antwort, ohne echten Forgejo.""" + +import json +import sys +import unittest +from pathlib import Path +from unittest import mock +from urllib.error import HTTPError, URLError + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT)) + +from grotti import meldung + + +class RelayTests(unittest.TestCase): + def test_relay_ok(self): + cfg = {"_raw": {"meldung_relay": "http://127.0.0.1/hooks/grotti-meldung"}} + + class Resp: + def read(self): + return b'{"url":"https://git.example/issues/1"}' + + def __enter__(self): + return self + + def __exit__(self, *args): + return False + + with mock.patch("urllib.request.urlopen", return_value=Resp()) as opener: + ok, message = meldung.send_relay(cfg, {"text": "kaputt", "version": "1"}) + self.assertTrue(ok) + self.assertIn("issues/1", message) + request = opener.call_args[0][0] + body = json.loads(request.data.decode("utf-8")) + self.assertEqual(body["text"], "kaputt") + self.assertNotIn("username", body) + + def test_relay_down(self): + cfg = {"_raw": {"meldung_relay": "http://127.0.0.1:9/hooks"}} + with mock.patch("urllib.request.urlopen", side_effect=URLError("down")): + ok, message = meldung.send_relay(cfg, {"text": "x"}) + self.assertFalse(ok) + self.assertIn("nicht erreichbar", message) + + def test_relay_http_error(self): + cfg = {"_raw": {"meldung_relay": "http://example/hooks"}} + + class Fake(HTTPError): + def __init__(self): + pass + + def read(self): + return b"nope" + + code = 502 + + with mock.patch("urllib.request.urlopen", side_effect=Fake()): + ok, message = meldung.send_relay(cfg, {"text": "x"}) + self.assertFalse(ok) + self.assertIn("502", message) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_orca_senden.py b/tests/test_orca_senden.py index a178cd4..78503e9 100644 --- a/tests/test_orca_senden.py +++ b/tests/test_orca_senden.py @@ -155,12 +155,31 @@ class OrcaSendenHelpersTest(unittest.TestCase): with tempfile.TemporaryDirectory() as tmp: path = Path(tmp) / "orca-senden.json" path.write_text( - json.dumps({"url": "http://127.0.0.1:8770/", "token": "grt_abc"}), + json.dumps({ + "url": "http://127.0.0.1:8770/", + "token": "grt_abc", + "watch_dir_local": "D:/Slice", + }), encoding="utf-8", ) cfg = orca.load_config(path) self.assertEqual(cfg["url"], "http://127.0.0.1:8770") self.assertEqual(cfg["token"], "grt_abc") + self.assertEqual(cfg["watch_dir_local"], "D:/Slice") + + def test_resolve_watch_dir_prefers_local(self): + with tempfile.TemporaryDirectory() as tmp: + local = Path(tmp) / "slice" + local.mkdir() + cfg = { + "url": "http://127.0.0.1:8770", + "token": "grt_x", + "watch_dir_local": str(local), + } + with patch.object(orca, "fetch_watch_dir") as fetch: + resolved = orca.resolve_watch_dir(cfg) + self.assertEqual(resolved, local) + fetch.assert_not_called() def test_load_config_missing(self): with tempfile.TemporaryDirectory() as tmp: diff --git a/web/app.py b/web/app.py index 69b5ee7..07cdefd 100644 --- a/web/app.py +++ b/web/app.py @@ -40,10 +40,13 @@ DOCS_DIR = TOOL_ROOT / "docs" PROJECT_STATUS = {"idee", "bereit", "druckt", "fertig"} VERDICTS = {"", "gut", "ausschuss"} VERDICT_REASONS = sorted(grotti_verdict.VERDICT_REASONS) -IDEA_STATUS = {"offen", "spaeter", "erledigt"} PRINTER_FAMILIES = set(FAMILY_LABELS) | {""} UPLOAD_SUFFIXES = (".gcode", ".3mf", ".gcode.3mf") HOST_RE = re.compile(r"^[A-Za-z0-9.\-]+(?::\d{1,5})?$") +SERIAL_RE = re.compile( + r"^(?:COM\d+|/dev/tty(?:USB|ACM)\d+|/dev/serial/by-id/[A-Za-z0-9._\-]+)(?:@\d{3,7})?$", + re.IGNORECASE, +) TOKEN_QUERY_PATHS = ( "/api/v1/kamera", "/api/v1/kamera/stream", @@ -59,13 +62,11 @@ STEER_ACTIONS = { def validate_printer_host(host): host = (host or "").strip() - if not host or not HOST_RE.fullmatch(host): + if not host or ".." in host or not (HOST_RE.fullmatch(host) or SERIAL_RE.fullmatch(host)): raise GrottiError( - "Host nur als Hostname oder IP, optional mit Port (z. B. 10.10.1.60).", + "Host als IP, Hostname, COM-Port (COM5 oder COM5@250000) oder /dev/tty…", "host", ) - if ".." in host: - raise GrottiError("Ungültiger Host.", "host") return host @@ -732,6 +733,7 @@ def create_app(cfg): token="", spool=spool, qr_url=qr_url, + etikett=cfg.get("etikett") or grotti_config._etikett({}), ) @app.get("/protokoll") @@ -792,6 +794,7 @@ def create_app(cfg): sheets=sheets, spools=spools, target_g=target_g, + etikett=cfg.get("etikett") or grotti_config._etikett({}), ) @app.get("/ideen") @@ -879,6 +882,7 @@ def create_app(cfg): auto_retry = data.get("auto_retry") if "auto_retry" in data else None fqdn = data.get("fqdn") if "fqdn" in data else None watch_dir = data.get("watch_dir") if "watch_dir" in data else None + etikett = data.get("etikett") if isinstance(data.get("etikett"), dict) else None return jsonify(grotti_config.save_settings( cfg, energy=energy, @@ -889,6 +893,7 @@ def create_app(cfg): auto_retry=auto_retry, fqdn=fqdn, watch_dir=watch_dir, + etikett=etikett, )) @app.post("/api/v1/telegram/test") @@ -931,8 +936,12 @@ def create_app(cfg): by_id = {row["host"]: row for row in rows} if request.args.get("live", "1") == "0": + from grotti.drivers import for_printer for row in rows: - row["mainsail"] = "http://%s/" % row["host"] + if for_printer(row).transport == "moonraker": + row["mainsail"] = "http://%s/" % row["host"] + else: + row["mainsail"] = "" attach(row) return jsonify(rows) # Eine Live-Quelle: Watcher. Frischer als 60 s, sonst einmal selbst abfragen. @@ -940,7 +949,8 @@ def create_app(cfg): cached = watcher.by_host() age = watcher.age_s() if not cached or age is None or age > 60: - lives = moonraker.snapshot(rows) + from grotti.drivers import snapshot + lives = snapshot(rows) else: lives = [] for row in rows: @@ -955,7 +965,11 @@ def create_app(cfg): item = dict(row) item["ok"] = False item["state"] = "offline" - item["mainsail"] = "http://%s/" % row["host"] + from grotti.drivers import for_printer as _for_printer + if _for_printer(row).transport == "moonraker": + item["mainsail"] = "http://%s/" % row["host"] + else: + item["mainsail"] = "" lives.append(item) for live in lives: meta = by_id.get(live.get("host") or "") or {} @@ -963,6 +977,53 @@ def create_app(cfg): attach(live) return jsonify(lives) + @app.get("/api/v1/marlin-dienst") + def marlin_dienst(): + from grotti.marlin_supervisor import current_status, ensure_if_enabled + + ensure_if_enabled() + return jsonify(current_status()) + + @app.post("/api/v1/meldungen") + def meldung_create(): + from grotti import meldung as grotti_meldung + + require_role("operator") + data = body() + try: + row = grotti_meldung.create( + conn(), + cfg, + text=data.get("text") or "", + page=data.get("page") or "", + printer_host=data.get("printer_host") or "", + error_text=data.get("error_text") or "", + user=g.user, + ) + conn().commit() + except ValueError as exc: + raise GrottiError(str(exc), "meldung") from exc + return jsonify(row), 201 + + @app.get("/api/v1/meldungen") + def meldung_list(): + from grotti import meldung as grotti_meldung + + require_role("admin") + status = (request.args.get("status") or "").strip() or None + return jsonify(grotti_meldung.list_rows(conn(), status=status)) + + @app.post("/api/v1/meldungen//erledigt") + def meldung_close(meldung_id): + from grotti import meldung as grotti_meldung + + require_role("admin") + row = grotti_meldung.close(conn(), meldung_id) + if not row: + raise GrottiError("Die Meldung fehlt.", "meldung", 404) + conn().commit() + return jsonify(row) + @app.post("/api/v1/drucker") def printer_create(): data = body() @@ -1555,6 +1616,7 @@ def create_app(cfg): optional_id(data.get("spool_id")), ace_maps, bed_leveling=bool(data.get("bed_leveling")), + marlin_mode=(data.get("marlin_mode") or "stream"), ) return jsonify({"jobs": created, "count": len(created), "mode": "now"}), 202 @@ -1973,8 +2035,13 @@ def create_app(cfg): # laufenden Druck auf dem Host best-effort stoppen if was_running and row.get("host"): try: - moonraker.command(row["host"], "abbrechen") - stopped = ", Druck gestoppt" + from grotti.drivers import for_printer + printer = store.printer_by_host(conn(), row["host"]) + if printer: + for_printer(printer).command(row["host"], "abbrechen") + stopped = ", Druck gestoppt" + else: + stopped = ", Druck nicht gestoppt" except Exception: stopped = ", Druck nicht gestoppt" store.add_event( @@ -2142,47 +2209,6 @@ def create_app(cfg): def color_list_api(): return jsonify(color_catalog()) - @app.get("/api/v1/ideen") - def idea_list(): - return jsonify(store.list_ideas(conn())) - - @app.post("/api/v1/ideen") - def idea_create(): - data = body() - title = (data.get("title") or "").strip() - if not title: - raise GrottiError("Die Idee braucht einen Titel.", "titel") - status = data.get("status") or "offen" - if status not in IDEA_STATUS: - raise GrottiError("Unbekannter Status.", "status") - return jsonify(store.create_idea(conn(), title, (data.get("body") or "").strip(), status)), 201 - - @app.patch("/api/v1/ideen/") - def idea_patch(idea_id): - data = body() - fields = {} - if "title" in data: - title = (data.get("title") or "").strip() - if not title: - raise GrottiError("Die Idee braucht einen Titel.", "titel") - fields["title"] = title - if "body" in data: - fields["body"] = (data.get("body") or "").strip() - if "status" in data: - if data.get("status") not in IDEA_STATUS: - raise GrottiError("Unbekannter Status.", "status") - fields["status"] = data.get("status") - row = store.update_idea(conn(), idea_id, fields) - if not row: - raise GrottiError("Die Idee fehlt.", "idee", 404) - return jsonify(row) - - @app.delete("/api/v1/ideen/") - def idea_delete(idea_id): - if not store.delete_idea(conn(), idea_id): - raise GrottiError("Die Idee fehlt.", "idee", 404) - return "", 204 - @app.get("/api/v1/kunden") def kunden_list(): return jsonify(grotti_orders.list_customers(conn())) diff --git a/web/templates/_etikett_style.html b/web/templates/_etikett_style.html new file mode 100644 index 0000000..252c060 --- /dev/null +++ b/web/templates/_etikett_style.html @@ -0,0 +1,93 @@ +{# Gemeinsames Druck-CSS für Spulen- und Lauf-Etiketten. Maße aus Einstellungen. #} +{% set w = etikett.width_mm if etikett is defined else 70 %} +{% set h = etikett.height_mm if etikett is defined else 40 %} +{% set qr = etikett.qr_mm if etikett is defined else 20 %} + diff --git a/web/templates/dateien.html b/web/templates/dateien.html index 55cb430..afc3abe 100644 --- a/web/templates/dateien.html +++ b/web/templates/dateien.html @@ -32,6 +32,9 @@ + + + Bettnetz vor dem Druck messen + + +

@@ -168,7 +179,12 @@ diff --git a/web/templates/etikett_lauf.html b/web/templates/etikett_lauf.html index 3a820a4..896d275 100644 --- a/web/templates/etikett_lauf.html +++ b/web/templates/etikett_lauf.html @@ -4,83 +4,10 @@ {{ title }} +{% include "_etikett_style.html" %} @@ -111,14 +38,15 @@ {% endfor %} diff --git a/web/templates/layout.html b/web/templates/layout.html index 5fe5206..f6c21cf 100644 --- a/web/templates/layout.html +++ b/web/templates/layout.html @@ -107,6 +107,7 @@ {% endif %}
+ {% if current_user %} @@ -163,6 +164,22 @@ {% endif %}
+ +
+

Problem melden

+

Kurz beschreiben. Grotti hängt Version und Seite an und speichert eine Kopie hier. Zusätzlich geht die Meldung an den Entwickler.

+
+ + +
+ +
+ + +
+

+
+