Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dominic Gundel
|
5081212212 | ||
|
Dominic Gundel
|
2b1e36634a | ||
|
Dominic Gundel
|
d1eb87ba25 | ||
|
Dominic Gundel
|
5166ed6530 | ||
|
Dominic Gundel
|
f034c5e626 | ||
|
Dominic Gundel
|
f1f79c2ce2 | ||
|
Dominic Gundel
|
4ffe1dcfc6 | ||
|
Dominic Gundel
|
dd0e7ebc6b | ||
|
Dominic Gundel
|
67a89d1794 |
No files matched your search
@@ -10,3 +10,8 @@ slice/*
|
||||
__pycache__/
|
||||
*.pyc
|
||||
_tmp_*
|
||||
%s
|
||||
|
||||
# gebaute .deb (Skript legt sie hier ab)
|
||||
packaging/dist/*
|
||||
!packaging/dist/.gitkeep
|
||||
+141
@@ -4,6 +4,147 @@ Alle Änderungen an Grotti. Format nach [Keep a Changelog](https://keepachangelo
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [3.6.1] – 2026-11-01
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Abbruch fehlt nach Neustart:** Der History-Abgleich hat den Live-Lauf übernommen und gelöscht, das Ereignis „Druck abgebrochen“ zeigte noch auf diese Zeile. Der Fremdschlüssel hat den ganzen Watcher-Tick zurückgerollt, der Abbruch kam nie ins Protokoll, und der neue Druck hat dieselbe Zeile weiterbenutzt. Das Ereignis hängt sich an den überlebenden Lauf. Wechselt die Datei, wird der offene Lauf geschlossen statt umbenannt. Ein Live-Lauf einer anderen Datei wird nicht mehr übernommen.
|
||||
- **Spulenwechsel:** Nach Filamentpause kein vorzeitiger Spulenabzug mehr (`watcher_resume`). Beim Zurücknehmen eines Abzugs wird der letzte Abschnitt wieder geöffnet; der Messwert wird anteilig nach mm verteilt. Beim Einlegen während des Drucks entsteht der erste Abschnitt auch dann (0→jetzt), wenn die alte Rolle schon im Regal ist oder ACE ohne Start-Abschnitt lief. Fallback slot-genau (Platz / ACE-Map / letzter Abschnitt). ACE-Start öffnet Abschnitte für gemappte Plätze mit Spule — ohne Wechsel bleibt Anteil-Split.
|
||||
|
||||
### Geändert
|
||||
|
||||
- **systemd:** `TimeoutStopSec=20` und `KillMode=mixed`, damit ein hängender Stopp nicht 90 s blockiert.
|
||||
- **Orca:** Anleitung und Empfehlung zeigen auf Grotti am Pi (`http://10.10.1.41:8770/`), nicht mehr lokal.
|
||||
- **Dateien:** Unveränderte Watch-Dateien werden beim Sync nur per Größe/mtime geprüft, nicht erneut geöffnet. `ace_trailer` liegt in der Datenbank; die Dateiliste öffnet die Datei nur noch einmal, wenn der Wert fehlt. Wand zeigt Drucker sofort, die Bibliothek lädt im Hintergrund. Pi-Paket: `http_threads` 8.
|
||||
- **3D-Pfad:** Ungespeicherte Bahnen werden nacheinander gebaut, nicht parallel. `http_threads` begrenzt die Request-Threads. Sonst liest die Vorschau mehrere G-codes gleichzeitig und füllt auf einem Pi mit 2 GB den Speicher.
|
||||
- **UI:** Wärmeres Orange-Licht (App und Login), Warten-Status in Amber statt Knopf-Orange, Druckerwand mit heller Kartenkante, größerer Prozentzahl und atmendem Druck-Streifen.
|
||||
|
||||
## [3.6.0] – 2026-10-25
|
||||
|
||||
### Neu
|
||||
|
||||
- **Projekte:** Kennzahlen (Läufe, Zeit, Filament, Kosten), Tab Läufe, Einreihen / Alle einreihen, Filter Aktiv/Fertig, Deep-Link `#id`. API: `GET …/laeufe`, `POST …/einreihen`.
|
||||
- **Wand-Cockpit:** Block „Als Nächstes“ — Nochmal, Queue-Hinweis, passende Dateien (Start oder Anpassen unter Dateien).
|
||||
- **Querverlinkung:** Datei/Projekt/Spule/Auftrag/Drucker verlinkt in Protokoll, Bericht, Warteschlange, Aufträge, Material, Statistik (Projektfilter), Dateien.
|
||||
- **API für Apps:** `POST /auth/token`, QR bei Token-Erzeugung, Server-Filter für Dateien/Queue/Spulen (`limit`/`offset`, `X-Total-Count`), `?token=` für Datei-Vorschau und Assets, `/version` mit `api`/`features`, Aktions-Alias `resume`/`cancel`. Doku: `docs/internal/API.md`, `openapi.yaml`.
|
||||
- **Pi:** Umzugsanleitung Windows→Pi, Skript `scripts/pfade_umziehen.py` im `.deb`.
|
||||
- **Protokoll Verbinden:** Verdachtspaare nach Runout manuell zusammenlegen (`POST /laeufe/<id>/verbinden`). Liste zeigt Rollenwechsel, mehrere Spulen und Pausendauer.
|
||||
- **Reparatur:** `scripts/laeufe_reparieren.py` findet Alt-Paare und verwaiste Live-Läufe (Probelauf standardmäßig). Orphan-Übernahme nur bei gleicher Datei und wenn der Live-Lauf wirklich verschwindet; kein Host-Fallback auf fremde offene Drucke.
|
||||
|
||||
### Geändert
|
||||
|
||||
- **Projekte / Aufträge:** Liste zuerst (volle Breite); Formular und Detail nur bei Neu, Auswahl oder Bearbeiten — wie Material. Aufträge: Positionen ohne `prompt()`, Kopf-Button „Neuer Auftrag“.
|
||||
- **Layout:** `.edit-split.is-idle`, Split/Panel ab 1080px einspaltig; Pfad-Ellipsis in Tabellen; Protokoll-Hilfe einklappbar; Queue-Aktionen mit Textlabels; Jetzt-Seite zeigt „Alles erledigt“; Aktivität Drucker-Filter als Select; Statistik-Filter unter „Weitere Filter“; Nav Aufträge = Clipboard-Icon; Mobile-Mehr gruppiert.
|
||||
- **Material-Routing:** PLA ist PLA. Meta, Matte, Silk und die Marke halten die Queue nicht mehr an; liegt die genannte Sorte am Drucker, wird sie weiter bevorzugt. Ein anderer Typ (PETG statt PLA) bleibt ein Wartegrund.
|
||||
- **mcp** auf `2.0.0` gepinnt.
|
||||
- **Lauf-Identität:** Zusammenlegen nur mit Beweis (`print_duration` fortgesetzt + Lücke ≤ 5 s, oder Watcher „druckt weiter“). Leere History-Hüllen werden nicht gespeichert. `sync_history` unter Advisory-Lock; Abzug atomar. Doku: `docs/internal/Lauf-Identitaet.md`.
|
||||
- **Queue `print_active`:** Nur `complete` = fertig. `cancelled`/`standby` werden entprellt; echter Abbruch heißt „Druck abgebrochen“, nicht „Fertig.“. Kein Auto-Retry nach Abbruch. Worker respektiert Abbruch während Upload. `print_queue.run_id` + höchstens ein `running` pro Host.
|
||||
- **Wand Runout:** Hinweis nennt ACE-Platz und verlinkt Material mit vorausgefülltem Drucker/Platz.
|
||||
- **Live-UI:** SSE `queue`/`drucker` aktualisiert Warteschlange und Protokoll.
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Legacy-Kameras-Seite:** totes Template entfernt (Route leitete schon auf die Wand um).
|
||||
- **Laufende Charge bleibt am History-Job:** Kommt die Moonraker-Job-ID, übernimmt dieser Lauf die Nummer. Sie fällt nicht weg, nur weil der Druck noch läuft.
|
||||
- **Alte History-Jobs verbrauchen die Charge von heute:** Eine Filament-Pause öffnet eine zweite Job-ID. Bleibt die ohne Ende und ohne Dauer in der History stehen, hing Grotti sie als neuen Druck an den heutigen Tag und buchte das Filament noch einmal ab. Die Job-ID bleibt am ursprünglichen Lauf, eine leere Hülle überschreibt ihn nicht, und die Charge trägt das Startdatum des Drucks.
|
||||
- **Kontaktverlust spaltet den Druck:** Zwei fehlende Polls melden den Drucker offline, lassen den Lauf aber offen und ziehen nichts ab. Dieselbe Charge läuft weiter, wenn derselbe Auftrag wieder da ist. Erst fertig, Abbruch, Fehler oder ein anderer Auftrag schließt den Lauf.
|
||||
- **Queue bleibt auf „Druckstart kann eine Minute dauern“, während der Drucker längst druckt:** Der Abschluss hat `await_print` erst geprüft, wenn der Drucker wieder frei war, und den laufenden Druck dann als Start-Timeout gewertet.
|
||||
- **Strombericht ohne Düse/Bett nach Pause:** Beim Zusammenlegen zweier History-Jobs bleiben Temperatur- und ED-Proben am Lauf. Vorher wurden die Proben des Folgejobs gelöscht, der Bericht fiel auf die Grundlast zurück.
|
||||
- **Filament-Pause spaltet das Protokoll:** Setzt Anycubic nach dem Fortsetzen eine neue History-Job-ID, bleibt es ein Lauf. Der Abbruch-Teil wird nicht noch einmal als ganzer Druck abgezogen.
|
||||
- **Materialwechsel öffnet trotzdem einen zweiten Auftrag:** Moonraker liefert die History neueste zuerst. Die Fortsetzung kam vor dem abgebrochenen Teil an die Reihe, fand keinen Vorgänger und wurde ein eigener Lauf; der alte Teil wurde als Abbruch abgezogen. Der Abgleich geht jetzt pro Drucker von alt nach neu. Eine eingeklappte Job-ID setzt den laufenden Druck nicht mehr auf „Abgebrochen“ zurück, und der zusammengelegte Lauf hat kein Ende, solange er druckt.
|
||||
- **Fertig vor History bucht doppelt:** Live-Lauf wird geschlossen ohne Abzug; History bucht. Fallback nach 10 min ohne History.
|
||||
- **Abbruch + schnelles Nochmal:** Frischer Neustart (Dauer nahe 0) wird nicht mehr als Filament-Fortsetzung zusammengelegt.
|
||||
- **Alter Lauf auf der neuen Spule:** Der History-Abgleich zieht einen Druck nur von Rollen ab, die vor dem Druckende schon existierten. Die Rolle, die gerade im ACE liegt, bekommt keine alten Jobs.
|
||||
- **Projektfilter leer neben „Wurzel“:** Ein gewähltes Projekt hebt den Ordnerfilter „Wurzel“ auf. Ein Ordner zeigt auch die Dateien in seinen Unterordnern.
|
||||
|
||||
## [3.5.2] – 2026-10-21
|
||||
|
||||
### Geändert
|
||||
|
||||
- **Wenig Rest:** ACE oder Spule unter dem Dateigewicht warnt unter Dateien, bricht Start und Warteschlange nicht mehr ab. Falsche Sorte bleibt ein Wartegrund.
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Queue „Nochmal — Start abgebrochen (Neustart)“ während der Drucker anläuft:** Nach dem Upload bleibt der Auftrag in `await_print`, bis Moonraker druckt. Die 45-Sekunden-Regel gilt nur noch, wenn der Upload-Thread weg ist. Wand und Seitenleiste zeigen „startet“ und dass es etwa eine Minute dauern kann.
|
||||
|
||||
## [3.5.1] – 2026-10-20
|
||||
|
||||
### Geändert
|
||||
|
||||
- **MCP:** Server-Anweisung für Clients (Ablauf, confirm, Filament-Pause, Platten-Quittung, kein G-code), damit der Agent die Tools in der richtigen Reihenfolge nutzt.
|
||||
- **Wand:** „Aus der Warteschlange“-Strip nur noch bei Ablauf (mit Schritten); einfacher Queue-Druck zeigt nur DRUCKT.
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Queue zu früh „Fertig.“:** Nach Start bleibt Phase `starting`, bis Moonraker `printing` meldet — alter `complete`/`standby` schließt den Job nicht mehr.
|
||||
|
||||
## [3.5.0] – 2026-10-19
|
||||
|
||||
### Neu
|
||||
|
||||
- **Doku:** interne Makro-Referenz `docs/internal/Makros-Kobra.md` (Nicht-tun, Vanilla-Klipper-Alltag, ACE, LeviQ/Wipe für S1 und K3).
|
||||
- **Pagination:** Dateien, Protokoll, Material, Aufträge, Warteschlange, Aktivität, Projekte — max. 40 Zeilen pro Seite (Zurück/Weiter).
|
||||
- **Logging:** `log_level` in der Config; Kernpfade schreiben nach stdout (unter systemd → `journalctl -u grotti`).
|
||||
- **Debian-Paket:** `packaging/build-deb.sh` baut `.deb` mit venv, systemd-Unit und PostgreSQL-`postinst` (Peer-Auth). Anleitung: `docs/Anleitung-Installation-Pi.md`.
|
||||
|
||||
### Geändert
|
||||
|
||||
- **Config:** `GROTTI_CONFIG` bzw. `/etc/grotti/config.json` für Paket-Install; sonst Repo-`config.json`.
|
||||
- **README:** Banner, Badges, Feature-Übersicht und Community-Screenshots oben; Setup/API darunter; Pi-`.deb`-Hinweis.
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Queue „braucht Eryone PLA Lite“ trotz PLA-Spule:** Basis-Profil (ohne Meta/Matte/Silk) matcht nach Typ; Slice-Hex-Farbe (`#26A69A`) blockiert Lagerfarbe „Grau“ nicht mehr.
|
||||
- **Dateien Info-Popup:** Details-Popup wird nicht mehr vom Bibliothek-Scroll abgeschnitten; Position fixed mit Flip nach oben, besserer Kontrast.
|
||||
|
||||
## [3.4.0] – 2026-10-18
|
||||
|
||||
### Neu
|
||||
|
||||
- **Dateien:** Umbenennen in der Bibliothek (Stift-Icon; Endung bleibt erhalten).
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Queue „druckt schon“ bei Folgejobs:** Einfach-Druck bleibt `running` bis Moonraker fertig — nicht mehr sofort `done` nach Start (sonst startete der nächste Job zu früh).
|
||||
- **Bedarf „443 g fehlen“ trotz voller Spulen:** Slice-Farbe `#26A69A` matchte nicht Lagerfarbe „Grau“ → Rest 0. Bei Hex-Farbe zählt jetzt der Rest gleicher Sorte; archivierte Spulen nicht.
|
||||
- **Falsches „Material nachlegen“ bei manueller Pause:** Anycubic meldet `active_filament.empty=true` auch ohne Runout (`tool`/`gate` = −1). Heuristik nur noch bei Meldung/`reason_for_pause`/10107, aktivem Tool + differenziertem `gate_status`, oder G-code-Store.
|
||||
- **gklib 10111 nach Einfarbig-Upload:** Orca-Zeile `; filament_colour_type` wird beim Senden entfernt (nur Einfarbig; Multicolor unangetastet).
|
||||
- **Protokoll „druckt“ nach Offline:** Live-Läufe werden bei anhaltendem Offline als `interrupted` geschlossen (z. B. gklib-Shutdown).
|
||||
- **Sorte „Sunlu PLA“ vs. Eryone PLA:** Basis-Profil ohne Meta/Matte/Silk matcht nach Material-Typ (Marke egal); Varianten bleiben streng.
|
||||
|
||||
## [3.3.0] – 2026-10-18
|
||||
|
||||
### Neu
|
||||
|
||||
- **Projekte** `/projekte`: Arbeitsmappe mit Ordner unter dem Slice-Pfad (`projects.folder`); G-code-Zuordnung per Sync; Upload weiterer Dateien (STEP/STL/PDF/…); Nav unter Verwalten.
|
||||
- **Dateien:** Uploads in Slice-Ordner verschieben (werden Watch); Löschen für Upload und Watch (nur unter Slice/`eingang`); kompaktere Bibliothek-Filter.
|
||||
- **Material:** Filter Sorte/Farbe; leere/archivierte Spulen ausgeblendet (Filter **Archiv**); Buttons **Leer**, **Archivieren**, **Wiederherstellen** (`archived_at`).
|
||||
- **Wand:** kleines Kamera-Snapshot-Thumb auf jeder Karte (nie Stream); Menüpunkt Kameras entfernt, `/kameras` → Wand.
|
||||
|
||||
### Geändert
|
||||
|
||||
- **Technik-Cockpit:** kompakte Fact-Chips; Steuerung in Gruppen Heizung / Druck / ACE-Plätze.
|
||||
- **Protokoll:** kurze Dateinamen, festere Spaltenbreiten.
|
||||
- **Statistik:** kompakte Filter inkl. Farbe, Auto-Laden, KPI Primär/Sekundär.
|
||||
- **Orca-Login:** Session 30 Tage (überlebt App-Fenster schließen); kein zweites Chrome mit demselben Profil (sonst erneutes Anmelden).
|
||||
- **Druckbericht:** Kosten-Torte und Tabelle inkl. Filament (nicht nur Strom); Summe = Material + Energie.
|
||||
- **Dateien:** Starten / Einreihen / Ablauf mit einem Klick (kein Zwei-Klick mehr). API weiter mit `confirm: true`.
|
||||
- **Senden:** Zwei Start-Modi statt drei — **Dieser Drucker** (frei → sofort, sonst Warteschlange) und **Nächster passender** (Grotti wählt nach Sorte).
|
||||
- **Material-Routing:** Match auf Katalog-Sorte aus Orca-`filament_settings_id` (PLA Meta ≠ Matte ≠ Silk); falsche Variante wartet mit Grund. Farbe bleibt soft. Bei Auto-Wahl baut Grotti die ACE-Map aus den Spulen am Claim-Drucker. Bestehende Dateien: **Dateien neu lesen**.
|
||||
- **Wand:** Bei Filament-Pause Hinweis, die neue Rolle unter Material dem Drucker zuzuweisen — sonst zählt der Verbrauch weiter zur alten Spule.
|
||||
- Anleitung Material/ACE: Rollenwechsel während Pause klargestellt.
|
||||
|
||||
### Behoben
|
||||
|
||||
- **Orca/Anycubic öffnet zwei Browserfenster:** Nachbearbeitung läuft oft 2× — Debounce (~25 s) öffnet nur noch eines. Deep-Link lädt fehlende `paint_index` nach (ACE zeigt sonst fälschlich T0/T1).
|
||||
- **Dateien-Tab hängt nach Orca:** 3D-Pfad erst nach ACE/Senden (Idle); Debounce ignoriert Anycubic-Zeitstempel im Dateinamen; erneuter Export aktualisiert den offenen Tab statt ein zweites Fenster.
|
||||
- **Orca/Anycubic → Desktop-Fenster:** `orca_senden` öffnet Grotti als Chrome/Edge-App (`browser: app`). Anycubic-Dialog nur vermeiden durch **G-code exportieren**, nicht Remote Print / Aufgabe starten.
|
||||
- Anleitung Orca: Grotti unter **Gerät** per Device-UI-URL (`http://127.0.0.1:8770/`); Upload-zum-Host weiter meiden.
|
||||
- **ACE-Map mit Lücken-T (Bambu/Anycubic):** UI behält Slicer-`Tn` (z. B. T1+T10). Beim Senden verdichtet Grotti auf T0…n und schreibt passende `.acm` — sonst gklib **10011700 invalid filament id** bzw. Hang bei Map-Mismatch. Senden prüft Map gegen T-Befehle. Bestehende Dateien: **Dateien neu lesen**.
|
||||
- **10011700 trotz dichter UI-Map:** Verdichtung hängt am G-code (`T1`/`T10`), nicht daran, ob die Map schon 0/1 zeigt — sonst blieb T10 auf dem Drucker. Grotti neu starten, Clip erneut senden.
|
||||
- **Abräumen ließ Lauf offen:** Urteil und Platte waren quittiert, der Live-Lauf blieb `in_progress` (Moonraker-History oft ohne Endzeit). Abräumen und Watcher (`printing`→`complete`) schließen den Lauf jetzt als `completed` inkl. Materialabzug.
|
||||
- **Rollenwechsel während Pause:** Einlegen hängt Abschnitte/Ereignisse auch an offene History-Jobs (nicht nur `live:`). Send-Spule und Lauf-Spule werden mitgezogen; Abzug bevorzugt die Rolle am Drucker statt eines veralteten Send-Hints.
|
||||
|
||||
## [3.2.0] – 2026-10-18
|
||||
|
||||
### Neu
|
||||
|
||||
@@ -1,120 +1,156 @@
|
||||
# Grotti
|
||||
<p align="center">
|
||||
<img src="docs/brand/readme-banner.png" alt="Grotti" width="720">
|
||||
</p>
|
||||
|
||||
Steuert die 3D-Drucker im Haus von einer Weboberfläche aus: Live-Zustand, Dateien senden, Warteschlange, Abläufe für den Kobra 3 (drucken, abkühlen, abschieben, prüfen), Material, Projekte und ein Protokoll, was wann passiert ist.
|
||||
<p align="center">
|
||||
<strong>Farm-Manager für Moonraker-Drucker</strong><br>
|
||||
Eine Oberfläche für die ganze Farm: Wand, Warteschlange, Material, Abläufe und Protokoll.<br>
|
||||
<em>Benannt nach der Mühle Grotti — sie mahlt ohne Pause, was man ihr aufträgt.</em>
|
||||
</p>
|
||||
|
||||
Der Name kommt von der Mühle Grotti: sie mahlt ohne Pause, was man ihr aufträgt.
|
||||
<p align="center">
|
||||
<a href="https://git.gundel.dev/dg/grotti"><img src="https://img.shields.io/badge/Version-3.6.1-e85d04?style=flat-square" alt="Version 3.6.1"></a>
|
||||
<img src="https://img.shields.io/badge/Python-3.11+-3776AB?style=flat-square&logo=python&logoColor=white" alt="Python 3.11+">
|
||||
<img src="https://img.shields.io/badge/PostgreSQL-14+-4169E1?style=flat-square&logo=postgresql&logoColor=white" alt="PostgreSQL">
|
||||
<img src="https://img.shields.io/badge/Moonraker-Klipper-2ecc71?style=flat-square" alt="Moonraker">
|
||||
<img src="https://img.shields.io/badge/UI-Deutsch-111827?style=flat-square" alt="UI Deutsch">
|
||||
<img src="https://img.shields.io/badge/Self--hosted-lokal-6b7280?style=flat-square" alt="Self-hosted">
|
||||
</p>
|
||||
|
||||
Die Drucker laufen mit Rinkhals (Kobra 3, Kobra S1). Grotti spricht sie über Moonraker an.
|
||||
<p align="center">
|
||||
<a href="#features">Features</a> ·
|
||||
<a href="#screenshots">Screenshots</a> ·
|
||||
<a href="#schnellstart">Schnellstart</a> ·
|
||||
<a href="#api">API</a> ·
|
||||
<a href="CHANGELOG.md">Changelog</a> ·
|
||||
<a href="docs/community/README.md">Community</a>
|
||||
</p>
|
||||
|
||||
Aktuelle Version: siehe `grotti/version.py`, Änderungen in [CHANGELOG.md](CHANGELOG.md).
|
||||
---
|
||||
|
||||
## Voraussetzungen
|
||||
<p align="center">
|
||||
<img src="docs/community/01-druckerwand.png" alt="Druckerwand" width="900">
|
||||
</p>
|
||||
|
||||
- Python 3.11
|
||||
- PostgreSQL (eine leere Datenbank `grotti` reicht, das Schema legt Grotti selbst an)
|
||||
- Drucker im selben Netz mit Moonraker auf Port 80
|
||||
## Features
|
||||
|
||||
## Einrichten
|
||||
| | |
|
||||
| --- | --- |
|
||||
| **Druckerwand & Cockpit** | Live-Status, Temps, Pause/Cancel, Farm-ETA |
|
||||
| **Warteschlange** | Priorität, „nächster freier“, Material-Match, ACE-Map |
|
||||
| **Dateien & Projekte** | Slice-Watch, Senden, Umbenennen, Projektordner |
|
||||
| **Kobra-3-Ablauf** | Druck → Abkühlen → Schieben → Tasten |
|
||||
| **Material** | Spulen, Restgewicht, Bedarf, Chargen |
|
||||
| **Aufträge & Statistik** | Kunden, Lieferschein, Kosten (€ Material+Strom) |
|
||||
| **Betrieb** | Auth (Session/`grt_…`), Telegram/ntfy, PWA |
|
||||
|
||||
Stack: **Python · Flask · PostgreSQL · Moonraker** (Rinkhals auf Kobra 3 / S1).
|
||||
|
||||
## Screenshots
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/community/06-jetzt.png" alt="Jetzt-Liste" width="440">
|
||||
|
||||
<img src="docs/community/02-warteschlange.png" alt="Warteschlange" width="440">
|
||||
</p>
|
||||
<p align="center">
|
||||
<img src="docs/community/09-dateien.png" alt="Dateien" width="440">
|
||||
|
||||
<img src="docs/community/03-material.png" alt="Material" width="440">
|
||||
</p>
|
||||
<p align="center">
|
||||
<img src="docs/community/05-statistik.png" alt="Statistik" width="440">
|
||||
|
||||
<img src="docs/community/07-cockpit.png" alt="Cockpit" width="440">
|
||||
</p>
|
||||
|
||||
Weitere Bilder und Post-Text: [`docs/community/`](docs/community/README.md).
|
||||
|
||||
## Schnellstart
|
||||
|
||||
**Voraussetzungen:** Python 3.11, PostgreSQL (leere DB `grotti`), Drucker mit Moonraker im LAN.
|
||||
|
||||
```powershell
|
||||
cd D:\Projekte\Grotti
|
||||
python -m venv .venv
|
||||
.\.venv\Scripts\pip install -r requirements.txt
|
||||
copy config.example.json config.json
|
||||
```
|
||||
|
||||
`config.json` anpassen:
|
||||
|
||||
| Schlüssel | Bedeutung |
|
||||
| --- | --- |
|
||||
| `host`, `port` | Wo die Oberfläche lauscht. Standard `127.0.0.1:8770`. |
|
||||
| `database_url` | PostgreSQL-Verbindung. |
|
||||
| `data_dir` | Uploads, Vorschaubilder, Cache. Standard `data`. |
|
||||
| `watch_dir` | Slice-Ordner (unter Einstellungen setzen). Leer = nur Upload. |
|
||||
| `token` | Wenn gesetzt, braucht die API `Authorization: Bearer <token>`. |
|
||||
| `fqdn` | Öffentliche Basis-URL für Spulen-Etiketten-QR. Leer = Request-Host. |
|
||||
| `energy` | Watt und Strompreis für die Kosten im Protokoll. |
|
||||
| `telegram`, `alerts` | Bot und welche Ereignisse als Nachricht kommen. |
|
||||
| `auto_queue` | Wenn `false`, startet die Warteschlange nichts Neues. |
|
||||
|
||||
Die Drucker stehen beim ersten Start in `drucker.json` und landen dann in der Datenbank. Danach werden sie unter Einstellungen gepflegt.
|
||||
|
||||
Schema-Änderungen laufen beim Start über `grotti/migrations/` (Tabelle `schema_version`). Vor Major-Updates die Datenbank sichern (`pg_dump`).
|
||||
|
||||
```json
|
||||
[{ "name": "Kobra 3 da26", "host": "10.10.1.60" }]
|
||||
```
|
||||
|
||||
Die Familie (Kobra 3 oder S1) liest Grotti aus dem Namen.
|
||||
|
||||
## Starten
|
||||
|
||||
```powershell
|
||||
.\.venv\Scripts\python.exe server.py
|
||||
```
|
||||
|
||||
Dann <http://127.0.0.1:8770/> öffnen. Bedienungsanleitung mit Screenshots in der Oberfläche unter **Doku** (Kapitel `Anleitung-*`), Technik-Notizen darunter.
|
||||
Dann <http://127.0.0.1:8770/>. Bedienung unter **Doku** in der App (`docs/Anleitung-*.md`).
|
||||
|
||||
`config.json` und `data/` sind lokal und nicht im Git.
|
||||
### Raspberry Pi (`.deb`)
|
||||
|
||||
Auf dem Pi (arm64 / Bookworm) bauen und installieren — PostgreSQL und systemd-Dienst werden mit eingerichtet:
|
||||
|
||||
```bash
|
||||
bash packaging/build-deb.sh
|
||||
sudo apt install ./packaging/dist/grotti_*_arm64.deb
|
||||
journalctl -u grotti -f
|
||||
```
|
||||
|
||||
Details: [docs/Anleitung-Installation-Pi.md](docs/Anleitung-Installation-Pi.md). Öffentliches apt-Repo folgt später.
|
||||
|
||||
`config.json` und `data/` bleiben lokal (nicht im Git). Drucker zuerst in `drucker.json`, danach unter Einstellungen.
|
||||
|
||||
| Schlüssel | Bedeutung |
|
||||
| --- | --- |
|
||||
| `host`, `port` | Oberfläche (Standard `127.0.0.1:8770`) |
|
||||
| `database_url` | PostgreSQL |
|
||||
| `watch_dir` | Slice-Ordner (oder leer = nur Upload) |
|
||||
| `energy` / `telegram` / `alerts` | Kosten und Benachrichtigungen |
|
||||
|
||||
Schema-Migrationen laufen beim Start (`grotti/migrations/`). Vor Major-Updates: `pg_dump`.
|
||||
|
||||
## Ordner
|
||||
|
||||
| Pfad | Inhalt |
|
||||
| --- | --- |
|
||||
| `server.py` | Start, Datenbank vorbereiten, Hintergrund-Threads |
|
||||
| `grotti/` | Kern: Moonraker, Warteschlange (`print_queue.py`), Senden (`send_queue.py`), Abräumen (`eject.py`), Zustandswächter (`watcher.py`), Ereignisse und Telegram (`notify.py`), Datenbank (`store.py`, `schema.sql`) |
|
||||
| `web/` | Flask-App (`app.py`), Seiten (`templates/`), CSS und JS (`static/`) |
|
||||
| `docs/` | Bedienungsanleitung (`Anleitung-*.md`) unter `/doku`; Technik unter `docs/internal/` (nicht in der App) |
|
||||
| `web/static/doku/` | Screenshots für die Anleitung |
|
||||
| `CHANGELOG.md` | Änderungen je Version |
|
||||
| `server.py` | Start, DB, Hintergrund-Threads |
|
||||
| `grotti/` | Moonraker, Queue, Senden, Abräumen, Watcher, Store |
|
||||
| `web/` | Flask, Templates, CSS/JS, Branding |
|
||||
| `docs/` | Anleitungen (`/doku`), Community-Screens, Technik unter `internal/` |
|
||||
| `CHANGELOG.md` | Versionen |
|
||||
|
||||
## API
|
||||
|
||||
Alles unter `/api/v1`, JSON. Auth: Session-Cookie (UI) oder `Authorization: Bearer grt_…` (API-Token unter Einstellungen). Optional noch Shared-`token` in der Config (Migrationsbrücke).
|
||||
Alles unter `/api/v1`, JSON. Auth: Session oder `Authorization: Bearer grt_…` (kein CSRF). Referenz: [`docs/internal/API.md`](docs/internal/API.md), OpenAPI-Skizze [`docs/internal/openapi.yaml`](docs/internal/openapi.yaml).
|
||||
|
||||
| Methode und Pfad | Zweck |
|
||||
| --- | --- |
|
||||
| `POST /auth/setup`, `/auth/login`, `/auth/logout` | Ersten Admin, Login, Logout |
|
||||
| `POST /auth/setup`, `/auth/login`, `/auth/token`, `/auth/logout` | Admin, Session-Login, App-Token, Logout |
|
||||
| `GET /me`, `/users`, `/tokens` | Konto, Benutzer (Admin), API-Tokens |
|
||||
| `GET /version` | Version |
|
||||
| `GET`/`PATCH /einstellungen`, `POST /telegram/test` | Config und Telegram-Probe |
|
||||
| `GET /drucker?live=1` | Drucker mit Live-Zustand, laufendem und wartendem Auftrag |
|
||||
| `POST /drucker` · `PATCH`/`DELETE /drucker/<id>` | Drucker anlegen/ändern (Admin) |
|
||||
| `POST /drucker/<host>/<aktion>` | Pause, Fortsetzen, Abbrechen, Fehler löschen |
|
||||
| `POST /drucker/<host>/steuern` | Temperatur, Speed, Flow, Lüfter, ACE |
|
||||
| `GET /version` | Version, `api`, `features` |
|
||||
| `GET`/`PATCH /einstellungen`, `POST /telegram/test`, `/ntfy/test` | Config und Push-Probe |
|
||||
| `GET /drucker?live=1` | Drucker mit Live-Zustand |
|
||||
| `POST /drucker/<host>/<aktion>` | `pause`, `fortsetzen`/`resume`, `abbrechen`/`cancel` |
|
||||
| `POST /drucker/<host>/steuern` | Temperatur, Speed, Flow, Lüfter, ACE, `clear_error`, E-Stop |
|
||||
| `POST /drucker/<host>/abraeumen` | Platte geräumt (`confirm`) |
|
||||
| `GET /kamera/<host>`, `/vorschau/<host>` | Snapshot / Job-Thumbnail |
|
||||
| `GET`/`POST /dateien`, `PATCH`/`DELETE /dateien/<id>` | Bibliothek, Upload, Metadaten |
|
||||
| `POST /dateien/neu-lesen`, `/dateien/ordner`, `/dateien/<id>/verschieben` | Watch-Sync, Ordner, Verschieben |
|
||||
| `POST /senden`, `GET /sende-auftraege` | Sofort senden (`confirm`), Fortschritt |
|
||||
| `GET`/`POST /druck-queue`, `PATCH /druck-queue/<id>` | Warteschlange (`confirm` beim Einreihen) |
|
||||
| `GET /laeuft`, `/aufgaben` | Direktstarts und Platte-belegt |
|
||||
| `POST /ablauf`, `/schieben-testen` | Ablauf Kobra 3 / Schieben-Test |
|
||||
| `GET /spulen`, `POST /spulen`, `POST /spulen/<id>/einlegen` | Spulen und Einlegen |
|
||||
| `GET /spulen/<id>/akte`, `/spulen/by-code` | Spulenakte, Scan `S-…` |
|
||||
| `GET`/`POST /materialien`, `/farben` | Sorten und Farbpalette |
|
||||
| `GET /laeufe`, `/laeufe/aktuell`, `/laeufe/<id>` | Protokoll und Druckbericht |
|
||||
| `GET /statistik`, `/statistik.csv` | Auslastung und CSV |
|
||||
| `GET`/`POST /projekte`, `/ideen` | Projekte und Ideen-Backlog |
|
||||
| `GET /ereignisse`, `POST /ereignisse/gelesen` | Aktivität und Alerts |
|
||||
| `POST /kalkulation` | Vorkalkulation Material+Strom |
|
||||
| `GET`/`POST /dateien`, `PATCH`/`DELETE /dateien/<id>` | Bibliothek (Filter `family`, `material`, `project_id`, …) |
|
||||
| `POST /senden`, `GET`/`POST /druck-queue` | Senden und Warteschlange (`confirm`) |
|
||||
| `GET`/`POST /projekte`, `…/einreihen`, Assets | Projekte |
|
||||
| `GET /spulen`, `POST /spulen/<id>/einlegen` | Material |
|
||||
| `GET /laeufe`, `/statistik`, `/ereignisse`, `/stream` | Protokoll, Statistik, SSE |
|
||||
|
||||
MCP: `python -m grotti.mcp_server` mit `GROTTI_URL` und `GROTTI_TOKEN` (siehe `docs/internal/MCP.md`).
|
||||
MCP: `python -m grotti.mcp_server` mit `GROTTI_URL` / `GROTTI_TOKEN` → `docs/internal/MCP.md`.
|
||||
|
||||
## Sicherheit
|
||||
|
||||
- Login Pflicht (Setup legt den ersten Admin an). Rollen: Admin, Operator.
|
||||
- Druckstarts brauchen `confirm: true`. Die Oberfläche fragt per Zwei-Klick.
|
||||
- Keine freie G-code-Konsole; Firmware-Neustart über Grotti ist gesperrt.
|
||||
- Für Internet: Reverse Proxy mit TLS; nicht den Entwickler-Server öffentlich freigeben.
|
||||
- Login Pflicht. Rollen: Admin, Operator.
|
||||
- Druckstarts brauchen `confirm: true` (Zwei-Klick in der UI).
|
||||
- Keine freie G-code-Konsole; kein `FIRMWARE_RESTART` über Grotti.
|
||||
- Nach außen: Reverse Proxy mit TLS.
|
||||
|
||||
## Versionen und Changelog
|
||||
## Versionen
|
||||
|
||||
- Versionierung nach [SemVer](https://semver.org/lang/de/): Patch für Fehlerbehebung, Minor für neue Funktion, Major für Bruch an API oder Datenbankschema.
|
||||
- Jede Änderung kommt in `CHANGELOG.md` unter `[Unreleased]` (Neu, Geändert, Behoben).
|
||||
- Beim Release: Version in `grotti/version.py` setzen, `[Unreleased]` in `[x.y.z] – Datum` umbenennen, Git-Tag `vX.Y.Z`.
|
||||
- Ändert sich `web/static/grotti.css` oder `api.js`, in `layout.html` den `?v=` hochzählen.
|
||||
- SemVer in `grotti/version.py`, Einträge in [CHANGELOG.md](CHANGELOG.md).
|
||||
- Release: `[Unreleased]` → `[x.y.z] – Datum`, Tag `vX.Y.Z`.
|
||||
- CSS/JS-Cache: `?v=` in `layout.html` mitziehen.
|
||||
|
||||
## Repo
|
||||
---
|
||||
|
||||
Eigenes Repository: <https://git.gundel.dev/dg/grotti>. Doku zum Tool gehört nach `docs/`.
|
||||
<p align="center">
|
||||
<img src="web/static/brand/logo.png" alt="" width="72"><br>
|
||||
<sub>Repo: <a href="https://git.gundel.dev/dg/grotti">git.gundel.dev/dg/grotti</a></sub>
|
||||
</p>
|
||||
@@ -7,6 +7,7 @@
|
||||
"token": "",
|
||||
"secret_key": "",
|
||||
"fqdn": "",
|
||||
"log_level": "INFO",
|
||||
"auto_queue": true,
|
||||
"auto_retry": true,
|
||||
"oauth": {
|
||||
|
||||
+18
-4
@@ -1,6 +1,6 @@
|
||||
# ACE und Spulen
|
||||
|
||||
Stand **18.10.2026**. Mehrfarb-Drucke brauchen vor dem Start eine Zuordnung Datei-Farbe → ACE-Platz und eine passende Spule am Drucker.
|
||||
Stand **21.10.2026**. Mehrfarb-Drucke brauchen vor dem Start eine Zuordnung Datei-Farbe → ACE-Platz und eine passende Spule am Drucker.
|
||||
|
||||
|
||||
|
||||
@@ -12,27 +12,41 @@ Stand **18.10.2026**. Mehrfarb-Drucke brauchen vor dem Start eine Zuordnung Date
|
||||
|
||||
Es gibt **kein freies Spulen-Dropdown** beim Start: Grotti nimmt die Rolle(n), die am Ziel-Drucker liegen. Material-Mismatch oder zu wenig Rest → Warnung vor dem Start.
|
||||
|
||||
### Rollenwechsel während Pause
|
||||
|
||||
Während Druck oder Pause die neue Spule unter Material dem Drucker zuweisen und speichern. Grotti schließt den Abschnitt der alten Rolle und öffnet einen neuen — im Druckbericht erscheinen dann zwei Spulenzeilen und Ereignisse. Nur Filament am Gerät laden ohne Zuweisung: Abzug und Protokoll bleiben bei der alten Rolle.
|
||||
|
||||
Wenn Moonraker den Druck nach Filament-Pause als neuen History-Job führt, übernimmt Grotti die neu zugewiesene Rolle für den fortgesetzten Teil (Send- und Lauf-Spule werden beim Einlegen aktualisiert). Die beiden Job-IDs bleiben **ein** Protokoll-Lauf, wenn die Druckdauer fortgesetzt wird oder die Wand „druckt weiter“ gesehen hat.
|
||||
|
||||
Etiketten mit QR: [Material und mehr](Anleitung-Material.md).
|
||||
|
||||
## ACE-Map beim Senden
|
||||
|
||||
Unter **Dateien → Optionen → ACE-Zuordnung**:
|
||||
|
||||
- Jede Farbe aus der Datei (`paint_index`) einem **ACE-Platz** zuordnen
|
||||
- Liegt unter Material eine Spule auf dem Platz, zeigt die Liste Name, Farbe und Restgramm mit
|
||||
- Jede Farbe aus der Datei (`Tn` / Slicer-`paint_index`) einem **ACE-Platz** zuordnen
|
||||
- Bei Bambu-/Anycubic-Dateien sind die Nummern oft **nicht 0–3** (z. B. T1 und T10 bei 16 Slots) — Grotti zeigt `T…`, verdichtet beim Senden aber auf T0…n (sonst Fehler **invalid filament id**)
|
||||
- Liegt unter Material eine Spule auf dem Platz, zeigt die Liste Name, Farbe und Restgramm mit — Vorauswahl bevorzugt die **Katalog-Sorte** aus dem Orca-Profil (Meta/Matte …)
|
||||
- Ohne passende Map schreibt der Drucker oft **„cannot parse the file“** und startet nicht
|
||||
- Grotti legt die Sidecar `*.gcode.acm` an und schickt sie mit
|
||||
|
||||
Bei **Nächster passender** (kein Drucker gewählt) baut Grotti die Map erst beim Claim aus den Spulen am gewählten Drucker. Passt der Typ nicht (PETG statt PLA) → Wartegrund in der Queue. Meta/Matte/Silk halten nicht an; die genannte Sorte wird nur bevorzugt.
|
||||
|
||||
Externe Spule / keine ACE-Slots: keine `.acm` nötig.
|
||||
|
||||
Nach einem Grotti-Update mit ACE-Farben: unter Dateien **neu lesen**, damit alte Einträge die echten `Tn` bekommen.
|
||||
|
||||
## Typische Fehler
|
||||
|
||||
| Symptom | Check |
|
||||
| --- | --- |
|
||||
| „cannot parse the file“ | ACE-Zuordnung vollständig? Farben richtig? |
|
||||
| „T… fehlt in der Map“ | Datei neu lesen, Zuordnung erneut setzen (Slicer-T ≠ ACE-Platz) |
|
||||
| **invalid filament id** (10011700) | Alte Grotti-Version ohne T-Verdichtung, oder Map nicht neu gesetzt. Grotti neu starten, Datei neu lesen, nochmal senden. |
|
||||
| Material-Warnung | Eingelegte Sorte ≠ Datei. Der Start geht trotzdem. PA12-CF steht in Grotti so, an den ACE geht PA6-CF. |
|
||||
| Rest zu gering | Andere Spule oder leichteres Teil |
|
||||
| Rest zu gering | Warnung unter Dateien („nur … g, Datei braucht … g“). Der Start geht trotzdem; leer pausiert der Drucker. |
|
||||
| ACE blinkt nicht / kein Wechsel | Spule und Platz prüfen, ggf. Druck neu starten |
|
||||
| Drucker hängt kurz nach Multi-Color-Start | Oft falsche Map (T10 gemappt als Platz 0). Neu lesen + Zuordnung. |
|
||||
|
||||
## Weiter
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ Im Auftrag **Lieferschein** öffnen: Positionen, Chargen `D-…`, druckbar. Dana
|
||||
|
||||
## Weiter
|
||||
|
||||
- [Projekte](Anleitung-Projekte.md) (Arbeitsmappe / Konstruktion — nicht dasselbe wie Auftrag)
|
||||
- [Warteschlange](Anleitung-Warteschlange.md)
|
||||
- [Material](Anleitung-Material.md)
|
||||
- [Protokoll / Bericht](Anleitung-Oberflaeche.md)
|
||||
@@ -1,31 +1,34 @@
|
||||
# Dateien senden
|
||||
|
||||
Stand **17.10.2026**. Seite `/dateien` — Bibliothek links, Senden rechts.
|
||||
Stand **18.10.2026**. Seite `/dateien` — Bibliothek links, Senden rechts.
|
||||
|
||||
|
||||
|
||||
## Bibliothek
|
||||
|
||||
- Suche nach Name, Material und Projekt
|
||||
- Kompakte Filterleiste: Suche, Maschine, Projekt, Material, Ordner, Sortierung
|
||||
- Filter: Maschine, Projekt, Material, Ordner (Unterordner unter dem Slice-Ordner; Uploads als „Upload“)
|
||||
- Sortierung: Neueste, Name, Material, Ordner, Druckzeit, Gewicht — bei Material/Ordner mit Gruppenköpfen
|
||||
- Auswahl der Filter bleibt im Browser merken
|
||||
- Vorschaubild, Material, Zeit, Gewicht, Schichthöhe
|
||||
- Info-Popup mit Slice-Metadaten (Kopf und Footer)
|
||||
- **Hochladen** per Knopf oder Drag & Drop
|
||||
- Mit gesetztem Slice-Ordner ([Einstellungen](Anleitung-Einstellungen.md)): **Ordner anlegen**, Watch-Dateien per Auswahl **verschieben** (Datei bleibt in der Bibliothek dieselbe, inkl. Projekt)
|
||||
- Mit gesetztem Slice-Ordner ([Einstellungen](Anleitung-Einstellungen.md)): **Ordner anlegen**; Watch- **und** Upload-Dateien per Auswahl **verschieben** (Upload wird zur Watch-Datei im Slice-Ordner)
|
||||
- **Umbenennen** (Stift-Icon) — Datei auf der Platte und in der Bibliothek; Endung `.gcode`/`.3mf` bleibt, wenn du sie weglässt
|
||||
- **Löschen** (Papierkorb, Zwei-Klick) für jede Bibliotheksdatei — entfernt Eintrag und Datei auf der Platte (nur unter Slice-Ordner oder `eingang`)
|
||||
- **Ordner neu lesen**, wenn unter Einstellungen ein Slice-Ordner gesetzt ist
|
||||
|
||||
Ohne Slice-Ordner geht nur manueller Upload — das reicht für den Alltag. Uploads liegen flach unter „Upload“ und lassen sich in der Bibliothek nicht in Slice-Ordner schieben.
|
||||
Ohne Slice-Ordner geht nur manueller Upload; Verschieben in Ordner braucht den Slice-Pfad.
|
||||
|
||||
Projekte mit eigenem Ordner: [Projekte](Anleitung-Projekte.md).
|
||||
|
||||
## Senden: drei Schritte
|
||||
|
||||
1. **Datei** wählen (Klick in der Liste).
|
||||
2. **Drucker** wählen — Kacheln zeigen Live-Zustand und eingelegte Rolle. Passt die Maschine nicht, ist die Kachel blass.
|
||||
3. **Wann:**
|
||||
- **Jetzt** — sofort senden und starten (Zwei-Klick)
|
||||
- **Wenn frei** — in die Warteschlange für diesen Drucker
|
||||
- **Nächster freier** — erster passender freier Drucker
|
||||
3. **Start:**
|
||||
- **Dieser Drucker** — frei und Platte klar → sofort starten; sonst Warteschlange für diesen Drucker
|
||||
- **Nächster passender** — Grotti wählt den nächsten freien Drucker mit passendem Typ (PLA, PETG, …). Die genannte Sorte (Meta, Matte) wird bevorzugt, wenn sie liegt; sonst reicht derselbe Typ.
|
||||
|
||||
Auswahl merkt sich der Browser (`localStorage`).
|
||||
|
||||
@@ -44,7 +47,7 @@ Große Dateien brauchen oft **eine Minute**. In der Sidebar unter **Senden** sie
|
||||
## Nach dem Start
|
||||
|
||||
- Fortschritt auf der [Wand](Anleitung-Wand.md) und in der Sidebar **Läuft jetzt**
|
||||
- Bei „Wenn frei“: Eintrag unter [Warteschlange](Anleitung-Warteschlange.md)
|
||||
- Bei Warteschlange / Nächster passender: Eintrag unter [Warteschlange](Anleitung-Warteschlange.md)
|
||||
- Später unter **Protokoll** mit **Nochmal** (inkl. gespeicherter ACE-Map)
|
||||
|
||||
## Aus Orca
|
||||
@@ -53,6 +56,7 @@ Nach dem G-code-Export kann Orca die Datei direkt nach Grotti laden und diese Se
|
||||
|
||||
## Weiter
|
||||
|
||||
- [Projekte](Anleitung-Projekte.md)
|
||||
- [Orca an Grotti](Anleitung-Orca.md)
|
||||
- [ACE und Spulen](Anleitung-ACE.md)
|
||||
- [Warteschlange](Anleitung-Warteschlange.md)
|
||||
@@ -1,6 +1,6 @@
|
||||
# Einrichtung
|
||||
|
||||
Stand **15.10.2026**. Grotti auf dem Haus-PC installieren und den Browser öffnen. Die Drucker brauchen vorher Moonraker (Rinkhals auf Kobra 3 und S1).
|
||||
Stand **24.10.2026**. Grotti auf dem Haus-PC oder Raspberry Pi installieren und den Browser öffnen. Die Drucker brauchen vorher Moonraker (Rinkhals auf Kobra 3 und S1).
|
||||
|
||||
## Was du brauchst
|
||||
|
||||
@@ -54,10 +54,12 @@ Dann <http://127.0.0.1:8770/> öffnen. Beim ersten Start legst du den Admin-Benu
|
||||
|
||||
## Sicherheit
|
||||
|
||||
- Druckstart nur mit Bestätigung (Zwei-Klick in der UI bzw. `confirm: true` in der API).
|
||||
- Druckstart über die API nur mit `confirm: true` (Dateien-UI: ein Klick).
|
||||
- Keine freie G-code-Konsole; Firmware-Neustart über Grotti ist gesperrt.
|
||||
- Benutzer und API-Tokens unter Einstellungen. Für Zugriff aus dem Internet: Reverse Proxy mit TLS, nicht den Entwickler-Server öffentlich freigeben.
|
||||
- Benutzer und API-Tokens unter Einstellungen. App-Kopplung: Token erzeugen und QR scannen, oder `POST /api/v1/auth/token` mit Benutzer/Passwort. Push aufs Handy: **ntfy** (kein FCM). API-Referenz: intern `docs/internal/API.md`.
|
||||
- Für Zugriff aus dem Internet: Reverse Proxy mit TLS, nicht den Entwickler-Server öffentlich freigeben.
|
||||
- `config.json` und `data/` bleiben lokal, nicht im Git.
|
||||
- Raspberry Pi: [Installation auf dem Pi](Anleitung-Installation-Pi.md) (`.deb`, Umzug Windows→Pi).
|
||||
|
||||
## Weiter
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Stand **18.10.2026**. Seite `/einstellungen` — Drucker, Automatik, Anzeige, Te
|
||||
|
||||
## Automatik
|
||||
|
||||
Checkbox **Automatik-Warteschlange** (`auto_queue`). Aus = keine neuen „wenn frei“-Starts. Laufende Abläufe und manuelle „Jetzt“-Starts bleiben möglich.
|
||||
Checkbox **Automatik-Warteschlange** (`auto_queue`). Aus = keine neuen Queue-Starts. Laufende Abläufe und manuelle Sofort-Starts bleiben möglich.
|
||||
|
||||
## Slice-Ordner
|
||||
|
||||
@@ -37,7 +37,7 @@ Telegram: Bot-Token und Chat-ID, pro Ereignisart an/aus, Test-Knopf. **ntfy:** S
|
||||
|
||||
## Benutzer und API-Tokens
|
||||
|
||||
Unter **Benutzer** (nur Admin) legst du Konten mit Rolle Admin oder Operator an. Unter **API-Tokens** erzeugst du Schlüssel für Home-Automation, App oder MCP — der Klartext erscheint nur einmal (`Authorization: Bearer grt_…`). Ein Shared-`token` in der Config-Datei gilt nicht mehr.
|
||||
Unter **Benutzer** (nur Admin) legst du Konten mit Rolle Admin oder Operator an. Unter **API-Tokens** erzeugst du Schlüssel für Home-Automation, App oder MCP — der Klartext erscheint nur einmal (`Authorization: Bearer grt_…`), dazu ein QR mit Server-URL und Token zum Scannen. Alternativ stellt die App `POST /api/v1/auth/token` mit Benutzer/Passwort aus. Ein Shared-`token` in der Config-Datei gilt nicht mehr.
|
||||
|
||||
MCP (optional): Token erzeugen, dann `python -m grotti.mcp_server` mit `GROTTI_URL` und `GROTTI_TOKEN`. Für nur Lesen: `GROTTI_MCP_READ_ONLY=1`.
|
||||
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
# Installation auf dem Raspberry Pi
|
||||
|
||||
Stand **18.10.2026**. Phase 1: Installation per `.deb`-Datei. Ein öffentliches apt-Repository kommt später.
|
||||
|
||||
## Voraussetzungen
|
||||
|
||||
- Raspberry Pi OS **Bookworm** (64-Bit / arm64), Pi 4 oder 5 empfohlen
|
||||
- Netz zu den Druckern (Moonraker/Rinkhals)
|
||||
- ca. 1 GB freier Speicher für Paket + PostgreSQL
|
||||
|
||||
## Paket bauen (auf dem Pi oder arm64-Host)
|
||||
|
||||
Im geklonten Repo:
|
||||
|
||||
```bash
|
||||
sudo apt install -y python3-venv rsync dpkg-dev
|
||||
bash packaging/build-deb.sh
|
||||
```
|
||||
|
||||
Ergebnis: `packaging/dist/grotti_<version>_arm64.deb`
|
||||
|
||||
## Installieren
|
||||
|
||||
```bash
|
||||
sudo apt install ./packaging/dist/grotti_*_arm64.deb
|
||||
```
|
||||
|
||||
Das zieht **PostgreSQL** mit, legt Benutzer `grotti`, Datenbank `grotti` und den Dienst an.
|
||||
|
||||
- Oberfläche: `http://<pi-ip>:8770/`
|
||||
- Config: `/etc/grotti/config.json` (wird bei Updates nicht überschrieben)
|
||||
- Daten: `/var/lib/grotti/`
|
||||
- Slice-Ordner: `/var/lib/grotti/slice` (unter Einstellungen änderbar)
|
||||
|
||||
Beim ersten Aufruf Admin-Konto anlegen (wie gewohnt).
|
||||
|
||||
## Logging
|
||||
|
||||
Logs gehen nach **journald**:
|
||||
|
||||
```bash
|
||||
journalctl -u grotti -f
|
||||
journalctl -u grotti --since "1h ago"
|
||||
journalctl -u grotti -n 200
|
||||
```
|
||||
|
||||
Log-Level in `/etc/grotti/config.json`:
|
||||
|
||||
```json
|
||||
"log_level": "INFO"
|
||||
```
|
||||
|
||||
Werte: `DEBUG`, `INFO`, `WARNING`, `ERROR`. Danach:
|
||||
|
||||
```bash
|
||||
sudo systemctl restart grotti
|
||||
```
|
||||
|
||||
## Dienst
|
||||
|
||||
```bash
|
||||
sudo systemctl status grotti
|
||||
sudo systemctl restart grotti
|
||||
sudo systemctl stop grotti
|
||||
```
|
||||
|
||||
## Update
|
||||
|
||||
Neue `.deb` bauen bzw. holen, dann erneut:
|
||||
|
||||
```bash
|
||||
sudo apt install ./packaging/dist/grotti_*_arm64.deb
|
||||
```
|
||||
|
||||
Config und `/var/lib/grotti` bleiben erhalten.
|
||||
|
||||
## Deinstallieren
|
||||
|
||||
```bash
|
||||
sudo apt remove grotti # Dienst weg, Daten bleiben
|
||||
sudo apt purge grotti # zusätzlich /etc/grotti
|
||||
# optional Datenbank:
|
||||
# sudo -u postgres dropdb grotti
|
||||
# sudo -u postgres dropuser grotti
|
||||
# sudo rm -rf /var/lib/grotti
|
||||
```
|
||||
|
||||
## Umzug Windows → Pi
|
||||
|
||||
1. **Backup auf dem alten Rechner** (Einstellungen → Backup) oder `pg_dump` der PostgreSQL-Datenbank.
|
||||
2. Auf dem Pi Grotti per `.deb` installieren (oben).
|
||||
3. Backup einspielen (Einstellungen → Backup wiederherstellen) **oder** `pg_restore` in die DB `grotti`.
|
||||
4. Slice-Ordner nach `/var/lib/grotti/slice` kopieren (rsync/scp).
|
||||
5. Absolute Windows-Pfade in der DB umschreiben (Dry-Run zuerst):
|
||||
|
||||
```bash
|
||||
sudo -u grotti /opt/grotti/venv/bin/python /opt/grotti/scripts/pfade_umziehen.py \
|
||||
--database-url 'postgresql:///grotti?host=/var/run/postgresql' \
|
||||
--from 'D:/dein/slice' --to /var/lib/grotti/slice
|
||||
# prüfen, dann mit --apply
|
||||
```
|
||||
|
||||
(Alternativ aus dem Repo-Clone mit derselben DB-URL.)
|
||||
|
||||
6. Unter Einstellungen: `watch_dir` = `/var/lib/grotti/slice`, ggf. `fqdn` auf die Pi-URL.
|
||||
7. In Orca „Senden an Grotti“ auf `http://<pi-ip>:8770/` umstellen.
|
||||
8. `sudo systemctl restart grotti` und unter **Dateien → Ordner neu lesen**.
|
||||
|
||||
## Last auf dem Pi
|
||||
|
||||
- Watcher und Toolpath-Cache liegen unter `/var/lib/grotti/`. Bei wenig Speicher Toolpath-Cache-Ordner (`data/toolpath`) gelegentlich leeren.
|
||||
- Wenige SSE-Clients sind unkritisch; viele offene Browser-Tabs mit Kamera-Stream belasten CPU/Netz.
|
||||
- Empfohlen: Pi 4/5 mit SSD oder schneller SD, nicht parallel schwere Builds auf demselben Gerät.
|
||||
|
||||
## Hinweise
|
||||
|
||||
- Standard lauscht auf `0.0.0.0:8770` (LAN). Für Internet: Reverse Proxy mit TLS.
|
||||
- Drucker unter **Einstellungen** anlegen (kein vorgefülltes `drucker.json` nötig).
|
||||
- Öffentliches `apt install grotti` ohne Datei: kommt mit dem Repo-Server (Phase 2).
|
||||
- `.deb` auf dem Ziel-Pi bauen (`bash packaging/build-deb.sh`), damit arm64-Wheels (`psycopg`, `cryptography`) passen.
|
||||
@@ -1,6 +1,6 @@
|
||||
# Material und mehr
|
||||
|
||||
Stand **18.10.2026**. Spulen, Etiketten, Aufträge, Protokoll, Statistik, Kameras, Aktivität.
|
||||
Stand **18.10.2026**. Spulen, Etiketten, Aufträge, Protokoll, Statistik, Aktivität.
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Zwei Reiter: **Spulen** und **Sorten**.
|
||||
|
||||
Oben die Karte **Bedarf aus Warteschlange**, wenn wartende Jobs Filament brauchen: Queue-Gewicht vs. Spulenrest je Sorte/Farbe. Fehlmengen erscheinen auch in der Sidebar und als Chip in der Warteschlange.
|
||||
|
||||
**Spulen:** Filter Alle / Am Drucker / Regal / Wenig Rest. Formular bei Auswahl oder „Neue Spule“. Ort = Drucker · ACE/extern oder Regal. Scan-Feld im Seitenkopf (QR vom Etikett). Unter der ausgewählten Spule die **Akte**: verdruckte Gramm, Ausschuss, Leer-in.
|
||||
**Spulen:** Filter Alle / Am Drucker / Regal / Wenig Rest / Archiv; zusätzlich Sorte und Farbe. Leere und archivierte Spulen sind standardmäßig ausgeblendet — **Archiv** zeigt sie. Formular bei Auswahl oder „Neue Spule“. **Leer** setzt Rest auf 0, legt die Rolle ins Regal und archiviert; **Archivieren** / **Wiederherstellen** ohne Restzwang. Ort = Drucker · ACE/extern oder Regal. Scan-Feld im Seitenkopf (QR vom Etikett). Unter der ausgewählten Spule die **Akte**: verdruckte Gramm, Ausschuss, Leer-in.
|
||||
|
||||
**Sorten:** Profile (Dichte, Preis, Maschinen). „Spule damit anlegen“ wechselt zum Spulen-Reiter.
|
||||
|
||||
@@ -26,9 +26,9 @@ Unter **Aufträge** Kunden, Positionen und Fortschritt. Dateien lassen sich eine
|
||||
|
||||
## Protokoll und Statistik
|
||||
|
||||
Abgeschlossene Läufe: Dauer, Ist-Gramm, Kosten, Urteil. Zeile öffnet den **Druckbericht** (Soll/Ist, Spulen, Temperaturverlauf, Strom-Aufschlüsselung mit Tortendiagramm, Charge). **Nochmal** startet denselben Job inkl. gespeicherter ACE-Map und Bettnetz-Option.
|
||||
Abgeschlossene Läufe: Dauer, Ist-Gramm, Kosten, Urteil. Zeile öffnet den **Druckbericht** (Soll/Ist, Spulen, Temperaturverlauf, Kosten-Aufschlüsselung Filament + Strom mit Tortendiagramm, Charge). **Nochmal** startet denselben Job inkl. gespeicherter ACE-Map und Bettnetz-Option (nicht während der Druck noch läuft).
|
||||
|
||||
Nach Filament-Ende: neue Spule vom Regal dem Drucker/ACE-Platz zuweisen, am Gerät laden, an der Wand **Weiter**.
|
||||
Nach Filament-Ende: neue Spule unter **Material** dem Drucker/ACE-Platz zuweisen (Ort setzen und speichern — das legt den Rollenwechsel im Lauf an), am Gerät laden, an der Wand **Weiter**. Nur physisch nachlegen reicht nicht. Die Zuweisung gilt auch, wenn Moonraker den Druck nach der Pause als neuen Job zählt — Grotti hält das als **einen** Lauf (gleiche Charge). Im Protokoll siehst du bei Rollenwechsel die Spulennamen; falls doch zwei Zeilen stehen, **Läufe holen** oder **Verbinden**.
|
||||
|
||||
Unter **Statistik** KPIs, Balkendiagramme (Druckzeit je Drucker, Verbrauch je Material), Tabellen und CSV-Export. Zeitraum per Knopf oder Von/Bis.
|
||||
|
||||
@@ -38,7 +38,7 @@ Abzug nach dem Druck nimmt das Ist aus `filament_used` (Abbruch nur anteilig). M
|
||||
|
||||
## Kameras
|
||||
|
||||
`/kameras` — alle Kameras nebeneinander mit Live-Zustand. Oben **Snapshot** oder **Stream** wählbar (gilt für diesen Browser, auch im Cockpit). Stream ist flüssiger, hält aber je sichtbarer Kamera eine Verbindung.
|
||||
Auf der **Druckerwand** erscheint je Drucker ein kleines Snapshot-Bild (ca. alle 3 s), wenn eine Webcam erreichbar ist. Klick öffnet das Cockpit — dort gilt weiter die Einstellung Snapshot/Stream unter Einstellungen → Dieser Browser. Die frühere Seite `/kameras` leitet auf die Wand um.
|
||||
|
||||
## Aktivität
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ Stand **18.10.2026**. Wie die App aufgebaut ist — Menü, Jetzt-Liste, Desktop
|
||||
|
||||
## Navigation
|
||||
|
||||
Links (Desktop), gruppiert: **Live** (Drucker, Dateien, Kameras, Warteschlange, Aufträge), **Rückschau** (Protokoll, Statistik, Aktivität), **Verwalten** (Material, Wartung). Darüber im Inhaltsbereich die **Topbar**: Suche, Live-Chips, Einstellungen, Doku und Benutzer-Menü (Abmelden, Version).
|
||||
Links (Desktop), gruppiert: **Live** (Drucker, Dateien, Warteschlange, Aufträge), **Rückschau** (Protokoll, Statistik, Aktivität), **Verwalten** (Projekte, Material, Wartung). Darüber im Inhaltsbereich die **Topbar**: Suche, Live-Chips, Einstellungen, Doku und Benutzer-Menü (Abmelden, Version).
|
||||
|
||||
Unter ca. 760 px: untere Leiste (Drucker, Dateien, Warteschlange, **Jetzt**, Mehr) plus **Mehr**-Sheet (inkl. Aktivität und Abmelden). Das Seitenmenü lässt sich zur Icon-Rail einklappen.
|
||||
|
||||
@@ -36,7 +36,7 @@ Unter **Einstellungen → Dieser Browser**:
|
||||
- **Regal (Touch)** — größere Bedienelemente, Sidebar oft eingeklappt; auf schmalem Viewport die untere Leiste. Alle Menüpunkte bleiben in der Sidebar sichtbar.
|
||||
- **Darstellung** — Dunkel, Hell oder System
|
||||
- **Zeitzone** — Browser oder fest (z. B. Europe/Berlin) für Uhrzeiten in Protokoll und Bericht
|
||||
- **Kamera** — Snapshot (schonend, alle paar Sekunden) oder Stream (flüssig, hält eine Verbindung je Kamera). Auch umschaltbar unter Kameras.
|
||||
- **Kamera** — Snapshot (schonend, alle paar Sekunden) oder Stream (flüssig, hält eine Verbindung). Gilt für das Cockpit; Wand-Thumbs sind immer Snapshot.
|
||||
|
||||
Shortcut in der URL: `?shelf=1` bzw. `?shelf=0`. Nur dieser Browser (`localStorage`).
|
||||
|
||||
@@ -46,3 +46,4 @@ Drucker-Cockpit: Alltag (Job, ETA, Rolle, Steuerung der Aktionen) oben; **Techni
|
||||
|
||||
- [Druckerwand](Anleitung-Wand.md)
|
||||
- [Dateien senden](Anleitung-Dateien.md)
|
||||
- [Projekte](Anleitung-Projekte.md)
|
||||
+42
-13
@@ -1,21 +1,23 @@
|
||||
# Orca an Grotti
|
||||
|
||||
Stand **17.10.2026**. Nach dem Export in OrcaSlicer landet der G-code in der Bibliothek und die Seite [Dateien senden](Anleitung-Dateien.md) öffnet sich mit der Datei schon gewählt. Drucker, ACE-Platz und Einreihen wählst du dort wie gewohnt.
|
||||
Stand **25.10.2026**. Nach dem Export landet der G-code in der Bibliothek und Grotti öffnet sich als **eigenes Fenster** (Chrome/Edge-App auf dem Desktop). Drucker, ACE-Platz und Einreihen wählst du dort. Ziel ist die Instanz auf dem Pi (`http://10.10.1.41:8770/`), nicht mehr lokal.
|
||||
|
||||
## Einmal einrichten
|
||||
|
||||
1. Grotti starten und im Browser anmelden (die Session bleibt für die Senden-Seite).
|
||||
1. Grotti auf dem Pi erreichbar machen und im Browser anmelden (die Session bleibt für die Senden-Seite).
|
||||
2. Unter **Einstellungen → API-Token** ein Token anlegen (Rolle Operator reicht). Den Wert `grt_…` nur einmal sichtbar.
|
||||
3. Datei `data/orca-senden.json` anlegen (gleicher Ordner wie `config.json`):
|
||||
3. Datei `data/orca-senden.json` anlegen (im Grotti-Repo unter Windows, gleicher Ordner wie lokal `config.json`):
|
||||
|
||||
```json
|
||||
{
|
||||
"url": "http://127.0.0.1:8770",
|
||||
"token": "grt_…"
|
||||
"url": "http://10.10.1.41:8770",
|
||||
"token": "grt_…",
|
||||
"browser": "app"
|
||||
}
|
||||
```
|
||||
|
||||
`url` ist die Adresse, unter der du Grotti im Browser öffnest.
|
||||
`url` ist die Adresse des Pi (LAN-IP oder Hostname).
|
||||
`browser`: `app` (Standard) = eigenes Desktop-Fenster; `tab` = klassischer Browser-Tab.
|
||||
|
||||
4. Im **Prozessprofil** (Druckqualität, z. B. „0.20mm Standard“): **Sonstiges → Nachbearbeitungsskripte**, eine Zeile:
|
||||
|
||||
@@ -25,13 +27,31 @@ D:\Projekte\Grotti\.venv\Scripts\python.exe D:\Projekte\Grotti\scripts\orca_send
|
||||
|
||||
Gilt für **OrcaSlicer** und **AnycubicSlicerNext**. Pfade anpassen. Der Slicer hängt den Export-Pfad selbst an.
|
||||
|
||||
Unter **Gerät / Drucker** keinen Print-Host (Moonraker) eintragen — sonst geht der Job am Grotti-Senden vorbei.
|
||||
### Gerät-Reiter = Grotti (nur OrcaSlicer)
|
||||
|
||||
## Ablauf
|
||||
Damit unter **Gerät** die Grotti-Oberfläche erscheint:
|
||||
|
||||
1. In Orca slicen und **G-code exportieren** (Platte schreiben). Als Ziel den Slice-Ordner wählen — **Unterordner** (z. B. `slice\Gridfinity\…`) gehen: Grotti legt die Datei dort ab und liest den Watch neu. Export außerhalb des Slice-Ordners landet als Upload (ohne Ordner-Verschieben).
|
||||
2. Der Browser öffnet `/dateien?file=…` mit der neuen Datei.
|
||||
3. Drucker wählen, unter Optionen Farbe → ACE-Platz, **Jetzt** / **Wenn frei** / **Nächster freier**, dann **Starten**.
|
||||
1. Orca → Drucker-Dropdown → **Physikalischer Drucker** (Verbindung/Stecker-Symbol).
|
||||
2. **Host-Typ:** z. B. `Octo/Klipper` (egal, solange du nicht „Drucken“ an den Host schickst).
|
||||
3. **Hostname / API:** leer lassen — oder nur eine Dummy-Adresse. **Nicht** die Moonraker-IP eines Kobras eintragen.
|
||||
4. **Device UI / Web-UI-URL:** `http://10.10.1.41:8770/` (Grotti auf dem Pi).
|
||||
5. Speichern → Reiter **Gerät** öffnen → einmal bei Grotti anmelden.
|
||||
|
||||
Wichtig: Den Orca-Button **Drucken / Upload zum Host** nicht nutzen — der spricht Moonraker/OctoPrint und umgeht ACE-Zuordnung in Grotti. Weiterhin **G-code exportieren** + Nachbearbeitungsskript.
|
||||
|
||||
In **AnycubicSlicerNext** steckt unter Gerät/Arbeitsfläche die Anycubic-Cloud — dort lässt sich Grotti so nicht einbinden.
|
||||
|
||||
## Ablauf (wichtig bei Anycubic)
|
||||
|
||||
**Nicht** „Remote Print“ / „Aufgabe starten“ / Cloud-Dialog — der Anycubic-Dialog lässt sich von Grotti nicht abschalten.
|
||||
|
||||
Stattdessen:
|
||||
|
||||
1. Slicen, dann **G-code exportieren** / **Platte schreiben** (Ziel: Slice-Ordner; Unterordner ok).
|
||||
2. Das Nachbearbeitungsskript lädt die Datei nach Grotti und öffnet das Grotti-Fenster.
|
||||
3. Drucker wählen, unter Optionen Farbe → ACE-Platz, **Dieser Drucker** oder **Nächster passender**, dann **Starten**.
|
||||
|
||||
Erstes App-Fenster: einmal bei Grotti anmelden (eigenes Profil unter `data/grotti-app-profile`). Die Session hält **30 Tage** und überlebt das Schließen des Fensters. Läuft das Fenster noch, startet Orca kein zweites Chrome (sonst leeres Profil → erneutes Login) — die neue Datei wird im offenen Fenster ausgewählt.
|
||||
|
||||
Test ohne Orca:
|
||||
|
||||
@@ -43,11 +63,20 @@ D:\Projekte\Grotti\.venv\Scripts\python.exe D:\Projekte\Grotti\scripts\orca_send
|
||||
|
||||
| Symptom | Check |
|
||||
| --- | --- |
|
||||
| Anycubic-Dialog trotz Grotti | Du hast Remote Print / Aufgabe starten genutzt → nur **G-code exportieren** |
|
||||
| Meldungsfenster „Config fehlt“ | `data/orca-senden.json` anlegen |
|
||||
| „Grotti nicht erreichbar“ | Server läuft? `url` stimmt? |
|
||||
| „Token fehlt oder stimmt nicht“ | Token neu anlegen, in der JSON eintragen |
|
||||
| Browser ohne Datei / Login | Einmal anmelden; Deep-Link behält `?file=` nach dem Login |
|
||||
| Skript läuft nicht | Export wirklich speichern; Zeile im **Druckerprofil**; Python-Pfad prüfen |
|
||||
| App-Fenster will Login | Einmal anmelden (Session 30 Tage). Profil: `data/grotti-app-profile`. Zweites Chrome-Fenster schließen, nur eines offen lassen. Grotti neu starten nach Update. |
|
||||
| Browser-Tab statt Fenster | In `orca-senden.json` `"browser": "app"` setzen (oder Chrome/Edge fehlt) |
|
||||
| Zwei Fenster / Tab hängt | Debounce (~25 s); erneuter Export aktualisiert den offenen Tab. 3D-Pfad lädt verzögert |
|
||||
| ACE zeigt T0/T1 statt T1/T10 | Seite neu laden oder **Ordner neu lesen**; Deep-Link zieht `paint_index` nach |
|
||||
| Skript läuft nicht | Export wirklich speichern; Zeile im **Prozessprofil**; Python-Pfad prüfen |
|
||||
|
||||
## Was Grotti nicht kann
|
||||
|
||||
- Den **Anycubic-Cloud-/Aufgabe-Dialog** unterdrücken (liegt im Slicer, nicht im Skript).
|
||||
- Sich in Anycubics Reiter **Arbeitsfläche** einbetten. In **Orca** dagegen: Device-UI-URL → Grotti unter **Gerät** (siehe oben).
|
||||
|
||||
## Weiter
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
# Projekte
|
||||
|
||||
Stand **24.10.2026**. Arbeitsmappen unter `/projekte` — getrennt von Kunden-[Aufträgen](Anleitung-Auftraege.md).
|
||||
|
||||
## Wozu
|
||||
|
||||
Ein **Projekt** bündelt Konstruktion und Druckdateien in einem Ordner unter dem [Slice-Pfad](Anleitung-Einstellungen.md), z. B. `Projekte/2609_002`.
|
||||
|
||||
| | Projekt | Auftrag |
|
||||
| --- | --- | --- |
|
||||
| Zweck | Konstruktion + Slice-Dateien | Kunde, Menge, Lieferschein |
|
||||
| Ort | Ordner auf der Platte | nur in der Datenbank |
|
||||
| Seite | `/projekte` | `/auftraege` |
|
||||
|
||||
## Anlegen
|
||||
|
||||
**Neues Projekt** — Name, Status, optional Ordner (Standard: `Projekte/<Kurzname>`). Mit gesetztem Slice-Ordner legt Grotti den Ordner an.
|
||||
|
||||
Filter **Aktiv** / **Fertig** / **Alle** in der Liste. G-code und 3MF in diesem Ordner (oder dorthin [verschoben](Anleitung-Dateien.md)) werden dem Projekt zugeordnet und erscheinen in der Druck-Bibliothek.
|
||||
|
||||
## Detail
|
||||
|
||||
Im Projekt siehst du Kennzahlen (Läufe, Druckzeit, Filament, Kosten) und drei Tabs:
|
||||
|
||||
- **Druckdateien** — Link zur Bibliothek (`?file=` / `?project=`), **Einreihen** pro Datei oder **Alle einreihen** (Warteschlange, mit Bestätigung)
|
||||
- **Läufe** — letzte Drucke mit Link zum Protokoll / Bericht
|
||||
- **Weitere Dateien** — STEP, STL, PDF, SolidWorks usw. (nicht in der Druck-Bibliothek)
|
||||
|
||||
Wenn jede Datei mindestens einmal ok gedruckt wurde, schlägt Grotti vor, den Status auf **fertig** zu setzen.
|
||||
|
||||
Deep-Link: `/projekte#<id>`.
|
||||
|
||||
## Löschen
|
||||
|
||||
Projekt löschen (Zwei-Klick) entfernt den Datensatz und den Ordner **inkl. Inhalt** (`force`). Druckdateien in der Bibliothek verlieren nur die Projekt-Zuordnung, wenn sie woanders liegen; Dateien im Projektordner sind mit dem Ordner weg.
|
||||
|
||||
## Weiter
|
||||
|
||||
- [Dateien](Anleitung-Dateien.md)
|
||||
- [Aufträge](Anleitung-Auftraege.md)
|
||||
- [Einstellungen](Anleitung-Einstellungen.md)
|
||||
@@ -49,6 +49,10 @@ Oft noch Verarbeitung auf dem Drucker. In der Sidebar unter **Senden** den Forts
|
||||
|
||||
Oft Dateinamen mit Nicht-ASCII-Zeichen (z. B. Chinesisch). Grotti normalisiert den Namen beim Senden auf ASCII. Nochmal senden; in der Bibliothek darf der Originalname bleiben.
|
||||
|
||||
## Drucker „heruntergefahren“ / 10111 / 506 nach Upload
|
||||
|
||||
Oft **Einfarbig**-G-code mit `; filament_colour_type` (Orca) — gklib stürzt ab. Grotti entfernt die Zeile beim Senden nur bei Einfarbig. Multicolor bleibt unverändert. Betroffene Drucker: Display-Reboot oder Strom aus/an, dann in Grotti ggf. **Fehler löschen**.
|
||||
|
||||
## Wo nachschauen
|
||||
|
||||
- Sidebar: Alerts, Läuft, Wartet, Senden
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Druckerwand
|
||||
|
||||
Stand **18.10.2026**. Startseite `/` — eine Karte je Drucker. Klick öffnet das Cockpit.
|
||||
Stand **24.10.2026**. Startseite `/` — eine Karte je Drucker. Klick öffnet das Cockpit.
|
||||
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ Stand **18.10.2026**. Startseite `/` — eine Karte je Drucker. Klick öffnet da
|
||||
Pro Drucker siehst du:
|
||||
|
||||
- Zustand (Chip), Fertig-Uhrzeit, Fortschrittsbalken
|
||||
- Kleines Kamerabild (Snapshot ca. alle 3 s), wenn eine Webcam erreichbar ist — Klick öffnet das Cockpit
|
||||
- Restzeit, Schicht, Laufzeit
|
||||
- Temperaturen Düse/Bett (mit Ziel)
|
||||
- Dateiname, bei ACE oft Farb-Swatches
|
||||
@@ -18,7 +19,7 @@ Aktionen auf der Karte brauchen oft **zwei Klicks** (erster Klick „scharf“,
|
||||
|
||||
| Aktion | Wann |
|
||||
| --- | --- |
|
||||
| **Pause** / **Weiter** | Während des Drucks; nach Materialwechsel Spule in Grotti an den Drucker hängen, dann **Weiter** |
|
||||
| **Pause** / **Weiter** | Während des Drucks; nach Materialwechsel gelber Hinweis mit ACE-Platz → Link zu Material (Drucker/Platz vorausgefüllt), Speichern, dann **Weiter**. Dieselbe Charge läuft weiter. |
|
||||
| **Abbrechen** | Druck oder Pause |
|
||||
| **Fehler löschen** | Zustand Fehler — räumt den hängenden Fehler, Heizung aus |
|
||||
| **Platte geräumt** | Nach Fertig, wenn die Platte wieder frei ist |
|
||||
@@ -34,11 +35,12 @@ URL mit Hash: `/#<host>` (z. B. nach Klick auf die Karte).
|
||||
|
||||
Inhalt:
|
||||
|
||||
- **Kamera** — nur wenn eine Webcam erreichbar ist; sonst bleibt der Platz weg. Modus Snapshot/Stream unter Einstellungen → Dieser Browser (oder Kameras-Seite)
|
||||
- **Kamera** — nur wenn eine Webcam erreichbar ist; sonst bleibt der Platz weg. Modus Snapshot/Stream unter Einstellungen → Dieser Browser (gilt nur im Cockpit; die Wand-Thumbs sind immer Snapshot)
|
||||
- Status, Temps inkl. Bauraum wo verfügbar, Lüfter
|
||||
- **Steuerung:** Zieltemperaturen, Speed, Flow, Fan — fest vorgegebene Befehle, keine freie Konsole. Mit ACE zusätzlich Trockner (Temp, Dauer, Start/Stopp) und pro bestücktem Platz **an den Drucker** (Sorte und Farbe aus der Grotti-Spule)
|
||||
- **E-Stop** nur bei printing/paused/heating (Zwei-Klick). Danach oft Strom aus/an
|
||||
- **Verlauf** Temperatur und ED des aktuellen oder letzten Drucks; Link zum Druckbericht (dort Strom nach Grundlast/Düse/Bett)
|
||||
- **Verlauf** Temperatur und ED des aktuellen oder letzten Drucks; Links zu Datei und Druckbericht (dort Kosten: Filament + Grundlast/Düse/Bett)
|
||||
- **Als Nächstes** (nur wenn der Drucker frei und die Platte quittiert ist): **Nochmal** der letzten Datei, Hinweis zur Warteschlange, passende Dateien nach Familie/Material — Start mit Standardwerten oder **Anpassen…** unter Dateien
|
||||
- **3D-Pfad** der laufenden oder gewählten Datei; Objekte ausschließen (mit Bestätigung)
|
||||
- **Bettnetz**-Heatmap, wenn vorhanden
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Warteschlange und Ablauf
|
||||
|
||||
Stand **18.10.2026**. Aufträge „wenn frei“, Priorität, und der Kobra-3-Ablauf (drucken → abkühlen → schieben → tasten).
|
||||
Stand **18.10.2026**. Aufträge in der Warteschlange (Dieser Drucker / Nächster passender), Priorität, und der Kobra-3-Ablauf (drucken → abkühlen → schieben → tasten).
|
||||
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 126 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
@@ -1,6 +1,8 @@
|
||||
# Grotti — Community-Vorstellung
|
||||
|
||||
Screenshots aus dem laufenden Betrieb (v3.2.0, Okt. 2026). Zielgruppe: mittlere bis große Printfarmen.
|
||||
Screenshots aus dem laufenden Betrieb (v3.4.0, Okt. 2026). Zielgruppe: mittlere bis große Printfarmen.
|
||||
|
||||
Logo und Repo-Banner: [`docs/brand/`](../brand/). Haupt-README: [`../../README.md`](../../README.md).
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
# Grotti HTTP-API (`/api/v1`)
|
||||
|
||||
Stand für Android/App-Clients und Integrationen. Nutzer-Anleitungen bleiben unter `docs/Anleitung-*.md`.
|
||||
|
||||
## Auth
|
||||
|
||||
| Weg | Header / Cookie | CSRF |
|
||||
| --- | --- | --- |
|
||||
| Session | Cookie nach `POST /auth/login` | `X-CSRF-Token` bei mutierenden API-Calls |
|
||||
| Bearer | `Authorization: Bearer grt_…` | nicht nötig |
|
||||
|
||||
**Token ausstellen**
|
||||
|
||||
- Eingeloggt: `POST /tokens` `{name, role?}` → Klartext einmalig in `token`
|
||||
- Ohne Session (App): `POST /auth/token` `{username, password, device_name?, role?}` → `201` mit `token` + `user` (Rate-Limit wie Login)
|
||||
|
||||
Öffentlich ohne Login: `/auth/status`, `/auth/login`, `/auth/token`, `/auth/setup`, `/version`.
|
||||
|
||||
Rollen: `operator` ≤ `admin`. Admin-only u. a. Benutzer, Backup, volle Einstellungen, Drucker anlegen.
|
||||
|
||||
**Medien mit Query-Token** (nur GET): `?token=grt_…` für Kamera, Live-Vorschau, Datei-Vorschau (`/dateien/<id>/vorschau`), Projekt-Assets.
|
||||
|
||||
## Fehler
|
||||
|
||||
```json
|
||||
{"error": "Text", "code": "kurzcode"}
|
||||
```
|
||||
|
||||
HTTP-Status: 400/401/403/404/409/429/503. Bild-Endpunkte liefern bei fehlendem Bild ebenfalls dieses JSON (nicht nur leeren 404).
|
||||
|
||||
## Pagination
|
||||
|
||||
Listen akzeptieren `limit` / `offset` wo sinnvoll. Antwort bleibt ein **JSON-Array**; Gesamtzahl im Header `X-Total-Count`.
|
||||
|
||||
Ohne `limit` liefern `/dateien` und `/spulen` die volle Liste (Web-UI).
|
||||
|
||||
## Bestätigung
|
||||
|
||||
Mutierende Druckaktionen brauchen oft `"confirm": true`:
|
||||
|
||||
- `POST /senden`, `POST /druck-queue`, `POST /ablauf`
|
||||
- `POST /projekte/<id>/einreihen`, `POST /auftraege/<id>/einreihen`
|
||||
- `POST /drucker/<host>/abraeumen`
|
||||
- `steuern` mit `emergency_stop`, `clear_error`, `exclude_object`
|
||||
|
||||
## Server-Info
|
||||
|
||||
`GET /version` → `{name, version, api: 1, features: [...]}`.
|
||||
|
||||
## SSE Live
|
||||
|
||||
`GET /stream` (Session-Cookie oder Bearer). Events:
|
||||
|
||||
| Event | Bedeutung |
|
||||
| --- | --- |
|
||||
| `ping` | Keepalive (~15 s), Payload `{}` |
|
||||
| `drucker` | Live-Zustand der Drucker geändert |
|
||||
| `queue` | Druckwarteschlange geändert |
|
||||
| `senden` | Sende-Auftrag geändert |
|
||||
| `ereignis` | Neues Ereignis / Aktivität |
|
||||
| `aufgaben` | Offene Aufgaben (Platte …) |
|
||||
|
||||
Ohne Stream: Client pollt `/drucker?live=1`, `/jetzt`, `/druck-queue`.
|
||||
|
||||
## Push an Geräte
|
||||
|
||||
Grotti sendet **kein** FCM. Empfohlen: **ntfy** (Topic unter Einstellungen). Die App kann denselben Topic abonnieren; Secrets (ntfy-Token) bleiben serverseitig.
|
||||
|
||||
## Wichtige Ressourcen
|
||||
|
||||
| Bereich | Pfade |
|
||||
| --- | --- |
|
||||
| Drucker | `GET /drucker?live=1`, `POST /drucker/<host>/pause\|fortsetzen\|abbrechen` (Alias `resume`/`cancel`), `…/steuern`, `…/abraeumen` |
|
||||
| Dateien | `GET /dateien?family=&material=&project_id=&host=&q=&limit=&offset=`, Upload multipart, `…/vorschau`, `…/pfad` |
|
||||
| Senden / Queue | `POST /senden`, `GET /senden-zuletzt?host=&file_id=`, `GET\|POST /druck-queue?host=&status=`, `POST /ablauf` |
|
||||
| Projekte | `GET\|POST /projekte`, `GET /projekte/<id>`, `…/laeufe`, `POST …/einreihen`, Assets |
|
||||
| Aufträge | `GET\|POST /auftraege`, Positionen, `…/einreihen` |
|
||||
| Material | `GET /spulen?aktiv=1`, Akte, Einlegen |
|
||||
| Protokoll | `GET /laeufe`, `GET /laeufe/<id>`, `GET /statistik?project_id=` |
|
||||
| Kamera | `GET /kamera?host=`, `…/stream` |
|
||||
|
||||
Pfadnamen sind überwiegend **deutsch**. Aktionen: deutsch + englische Alias für Pause/Resume/Cancel.
|
||||
|
||||
## MCP
|
||||
|
||||
`python -m grotti.mcp_server` nutzt dieselbe REST-API (Teilmenge). Siehe `docs/internal/MCP.md`.
|
||||
@@ -6,7 +6,7 @@ Nach dem Druck kann Grotti auf der **Kobra 3** Bett und Düse abkühlen und die
|
||||
|
||||
## Quittierung vs. Schieben
|
||||
|
||||
- **Wand „Platte geräumt“:** Nur Quittierung. Tabelle `bed_status`, API `POST /api/v1/drucker/<host>/abraeumen` mit `confirm`. Fährt keine Bahn. `needs_clear` setzt der Watcher beim Live-Übergang Druckende/Abbruch/Fehler (nicht schon beim Start; nicht blind beim ersten Blick nach Neustart). Solange gesetzt, startet „wenn frei“ den nächsten Job nicht.
|
||||
- **Wand „Platte geräumt“:** Quittierung + optional Urteil. Tabelle `bed_status`, API `POST /api/v1/drucker/<host>/abraeumen` mit `confirm`. Fährt keine Bahn. Offener Live-Lauf wird als `completed` geschlossen (History von Moonraker oft ohne Endzeit). `needs_clear` setzt der Watcher beim Live-Übergang Druckende/Abbruch/Fehler (nicht schon beim Start; nicht blind beim ersten Blick nach Neustart). Solange gesetzt, startet „wenn frei“ den nächsten Job nicht.
|
||||
- **Ablauf (Dateien):** Drucken → Abkühlen → Schieben → Tasten, dann der nächste Druck mit LeviQ. Eine Bestätigung beim Einreihen; Schieben läuft ohne zweite Rückfrage. Nach erfolgreichem Schieben ist die Platte automatisch quittiert.
|
||||
- **Normale Drucke** und „Nochmal“ schieben nicht — nach dem Druck muss man auf der Wand quittieren.
|
||||
|
||||
|
||||
@@ -134,8 +134,23 @@ Ohne Map: Rinkhals füllt oft Identity T0→Platz0 … — deshalb Grotti bei ei
|
||||
| Slots anzeigen | Moonraker `mmu` (Rinkhals) | `mmu_ace.py` |
|
||||
| Kein Firmware-Restart | abgelehnt | Rinkhals #32, `patch_klipper_restart` |
|
||||
|
||||
## History nach Filament-Pause
|
||||
|
||||
Runout, Rolle tauschen, Fortsetzen: Anycubic schließt den History-Job als `cancelled` und öffnet eine neue Job-ID. Beobachtet am 2026-10-25 auf Kobra 3 A1 (`000040` → `000041`):
|
||||
|
||||
- Der neue `start_time` liegt etwa 0,04 s nach dem `end_time` des alten.
|
||||
- `print_duration` und `total_duration` sind an beiden Einträgen gleich und laufen weiter. Der Zähler beginnt nicht bei 0.
|
||||
- `/server/history/list` liefert neueste zuerst. Grotti sortiert pro Drucker nach `start_time`, sonst kommt die Fortsetzung vor ihrem Vorgänger dran (`jobs.history_in_order`).
|
||||
- Nach dem Zusammenlegen hängt die alte Job-ID in `run_jobs` am Lauf. `store.history_job_retired` überspringt sie, sonst schreibt sie `cancelled` zurück.
|
||||
- Zusammenlegen nur mit Beweis: `print_duration` fortgesetzt und Lücke ≤ 5 s, oder Watcher `paused→printing` (`docs/internal/Lauf-Identitaet.md`).
|
||||
|
||||
## Offene Grenzen
|
||||
|
||||
- Quellcode von **gkapi** (Task-State-Machine, exakte 10101-Bedingungen) ist nicht öffentlich.
|
||||
- Deadlock in **FIRMWARE_RESTART** ist beobachtet und in Rinkhals abgefangen, Root Cause im Binary nicht freigelegt.
|
||||
- Kobra X / K4-Stack ist ein anderes System (C++-Klipper), nicht GoKlipper — für unsere Drucker irrelevant.
|
||||
|
||||
## Siehe auch
|
||||
|
||||
- [Makros-Kobra](Makros-Kobra.md) — Nicht-tun, Vanilla-Alltag, ACE, LeviQ/Wipe je Druckertyp
|
||||
|
||||
@@ -14,7 +14,7 @@ In der Bibliothek gespeichert:
|
||||
|
||||
| Feld | Bedeutung |
|
||||
|------|-----------|
|
||||
| `filaments` | Typ/Farbe (`paint_info` oder `filament_type`/`filament_colour`) |
|
||||
| `filaments` | Typ/Farbe (`paint_info` oder `filament_type`/`filament_colour`) plus `profile` aus `filament_settings_id` (Sorte, z. B. Sunlu PLA Meta) |
|
||||
| `weight_g` / `estimated_s` | Filamentgewicht und Druckzeit |
|
||||
| `printer_family` | aus `printer_model` |
|
||||
| `slice_meta` | jsonb: `layer_height`, `layers`, `max_z_mm`, `nozzle_mm`, `temp_nozzle`, `temp_bed`, `slicer` |
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Grotti: Alltag und Oberfläche
|
||||
|
||||
Stand **18.10.2026**, v3.2.0.
|
||||
Stand **18.10.2026**, v3.3.0.
|
||||
|
||||
## Design
|
||||
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
# Lauf-Identität: ein physischer Druck = ein Lauf
|
||||
|
||||
## Regel
|
||||
|
||||
Zusammengelegt wird nur mit **Beweis**, nicht nur wegen Zeit und Dateiname:
|
||||
|
||||
1. Der neue Moonraker-Job hat `print_duration` ≥ Dauer des Vorgängers − 30 s, und die Lücke `end→start` ist höchstens 5 s (Anycubic setzt `end_time` erst beim Fortsetzen).
|
||||
2. Oder der Watcher hat `paused → printing` bei gleicher Datei gesehen (`watcher_resume`, `printers.active_run_id`).
|
||||
|
||||
Ein Neustart mit `print_duration` ≤ 60 s wird nie zusammengelegt.
|
||||
|
||||
Ein Live-Lauf wird nur übernommen, wenn der Dateiname übereinstimmt (eine noch namenlose Hülle zählt zum neuen Druck). Ein Abbruch-Ereignis auf eine bereits gelöschte Zeile rollt den Abgleich nicht zurück.
|
||||
|
||||
## Pfade
|
||||
|
||||
| Pfad | Datei |
|
||||
| --- | --- |
|
||||
| Beweis | `jobs.is_filament_resume` |
|
||||
| Fold | `jobs.fold_filament_resume` |
|
||||
| Abgleich | `jobs.sync_history` (Advisory-Lock) |
|
||||
| Job-Aliase | `run_jobs` + `history_job_retired` |
|
||||
| Leere Hülle | übersprungen in `_sync_one_job` |
|
||||
| Live-Abzug | erst History; Fallback nach 10 min (`LIVE_DEDUCT_FALLBACK_S`) |
|
||||
| Manuell | `POST /api/v1/laeufe/<id>/verbinden` |
|
||||
|
||||
## Queue
|
||||
|
||||
In `print_active` heißt nur `complete` fertig. `cancelled`/`standby` werden entprellt (`TERMINAL_CONFIRM_HITS`). Echter Abbruch → Status `cancelled`, nicht „Fertig.“.
|
||||
|
||||
## Reparatur
|
||||
|
||||
`scripts/laeufe_reparieren.py` (Probelauf standardmäßig, `--apply` nach Freigabe).
|
||||
Verwaiste `live:`-Läufe nur an offenen History-Jobs **derselben Datei**; `adopt_live_run` greift geschlossene Live-Läufe nur ≤ 2 h.
|
||||
@@ -1,6 +1,8 @@
|
||||
# MCP-Server
|
||||
|
||||
Stand **15.10.2026**. Agenten steuern Grotti nur über die HTTP-API mit einem API-Token.
|
||||
Stand **19.10.2026**. Agenten steuern Grotti nur über die HTTP-API mit einem API-Token.
|
||||
|
||||
Beim Connect bekommt der Client die Server-Anweisung aus `grotti/mcp_server.py` (`INSTRUCTIONS`): Deutsch antworten, Host und Datei-id nachschlagen, erst lesen dann schreiben, `confirm=true` nur auf klaren Wunsch, Warteschlange vor Sofortstart, Filament-Pause nicht blind fortsetzen, `clear_bed` ist nur eine Quittung, kein G-code und kein Firmware-Restart.
|
||||
|
||||
## Start
|
||||
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
# Makros und G-code: Kobra S1 und Kobra 3
|
||||
|
||||
Stand **19.10.2026**. Interne Referenz — nicht unter `/doku`. Messwerte und Bettnetz-Story: `D:\Projekte\3DP\FDM\Wissen\Drucker\` (`Kobra S1.md`, `Kobra 3.md`). Stack: [Anycubic-Stack](Anycubic-Stack.md).
|
||||
|
||||
Quellen: `printer/gcode/help` (11.10. auf den Maschinen), GoKlipper/`extras_ace.go`, Rinkhals-RE `GOKLIPPER_ACE_GCODE_COMMANDS.md`, Grotti-Policy.
|
||||
|
||||
---
|
||||
|
||||
## Nicht tun
|
||||
|
||||
| Nicht | Warum | Stattdessen |
|
||||
| --- | --- | --- |
|
||||
| `FIRMWARE_RESTART` / `RESTART` | gklib Deadlock bis Power-Cycle (Rinkhals #32) | Display-Reboot oder Strom; hängenden Job: **Fehler löschen** (`SDCARD_RESET_FILE`) |
|
||||
| `LEVIQ` / `LEVIQ2` aus Mainsail | Heizung + volle Nivellierfolge, fährt unerwartet | Am Display Auto-Level; Einzelschritte nur bewusst |
|
||||
| `SAVE_CONFIG` aus Mainsail | schreibt u. a. Z-Offset mit | Dauerhaft nur gezielt / nach Display-Nivellieren |
|
||||
| Nur Moonraker-Cancel | Anycubic-Task bleibt → Start-Code **10101** | Cancel + MQTT-stop (Grotti `abbrechen`) |
|
||||
| Community-`ACE_SET_SLOT` / manuelles `G9111` als Grotti-Pfad | Grotti mappt über `.acm` + MQTT | Map in der App; Slice-`G9111` im Start-G-code belassen |
|
||||
| `minimum_cruise_ratio` auf **0** (S1) | Moonraker hängt auf dieser Firmware | bei **0,05** belassen |
|
||||
| `G28 Y` mit Teilen auf dem Bett (K3) | Sensorless-Home nach **vorn** über die Teile | Bett leeren; Abräumen ohne `G28 Z` |
|
||||
| Blind `FEED` / `FEED_FILAMENT` ohne Unwind | Blockade bis Neustart (RE-Doku) | Unload/Unwind-Sequenz einhalten |
|
||||
| `SET_KINEMATIC_POSITION` mit erfundener Z nach Stepper-aus | Portal sackt → Null daneben, Probe „No trigger“ oder Crash | echte letzte XYZ; oder Bett leer + `G28` |
|
||||
| Freie G-code-Konsole in Grotti für Experimente | Policy | nur bekannte, bestätigte Scripts |
|
||||
| Abräumen-Makro in `printer.cfg` pflegen | Rinkhals schreibt Config neu | Grotti schickt Scripts per Moonraker |
|
||||
|
||||
---
|
||||
|
||||
## Vanilla-Klipper-Alltag (beide Typen)
|
||||
|
||||
Befehl → was er macht. Anycubic-Hinweis nur wo nötig.
|
||||
|
||||
### Homes und Bewegung
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `G28` | Homed die genannten Achsen (ohne Argument: alle). **K3:** Y-Home fährt nach vorn — Bett muss leer sein. |
|
||||
| `G0` / `G1` | Lineare Bewegung / Extrusion. Absolute/relative Modi wie üblich (`G90`/`G91`, `M82`/`M83`). |
|
||||
| `M400` | Wartet, bis alle Moves fertig sind. |
|
||||
| `SET_VELOCITY_LIMIT` | Limits für Speed/Accel zur Laufzeit. |
|
||||
| `SET_KINEMATIC_POSITION` | Setzt die interne Position ohne zu fahren. Nach `M84`/Leerlauf riskant — siehe „Nicht tun“. |
|
||||
| `SET_IDLE_TIMEOUT` | Idle-Zeit bis Stepper aus. Abräumen hält Idle bewusst länger. |
|
||||
| `M84` / `M18` | Stepper aus → Achsen unhomed. Slice-Ende K3 macht das oft; Abräumen entfernt es beim Upload. |
|
||||
|
||||
### Heizen
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `M104` / `M109` | Düse Soll / warten bis erreicht. |
|
||||
| `M140` / `M190` | Bett Soll / warten. |
|
||||
| `TURN_OFF_HEATERS` | Düse und Bett aus. |
|
||||
| `PID_CALIBRATE` | PID für Extruder oder Bett kalibrieren. Danach oft `SAVE_CONFIG` — auf diesen Maschinen vorsichtig. |
|
||||
| `M106` / `M107` | Teilkühlung an / aus. |
|
||||
|
||||
### Drucklauf
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `PAUSE` / `RESUME` / `CANCEL_PRINT` | Rinkhals-Makros um Pause/Weiter/Abbruch. Moonraker-Cancel allein räumt den Anycubic-Task nicht. |
|
||||
| `SDCARD_RESET_FILE` | Löscht hängenden virtual-sdcard-/Druckstatus („Fehler löschen“ in Grotti). |
|
||||
| `PRINT_STATS` | Status des laufenden/letzten Jobs (Objekt auch über Moonraker). |
|
||||
|
||||
### Bettnetz und Probe
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `BED_MESH_CALIBRATE` | Tastet das Netz und schaltet es aktiv. |
|
||||
| `BED_MESH_OUTPUT` | Gibt die Punkte aus, ohne zu fahren. |
|
||||
| `BED_MESH_MAP` | Schreibt das interpolierte Netz in die Konsole. |
|
||||
| `BED_MESH_CLEAR` | Schaltet die Korrektur aus. |
|
||||
| `BED_MESH_OFFSET` | Verschiebt das Netz in X/Y. |
|
||||
| `BED_MESH_PROFILE` | `LOAD` / `SAVE` / `REMOVE` für Profile. Dauerhaft erst mit `SAVE_CONFIG`. |
|
||||
| `PROBE` | Ein Tastpunkt an der aktuellen Position. |
|
||||
| `PROBE_ACCURACY` | Mehrfach tasten, Streuung ausgeben. |
|
||||
| `PROBE_CALIBRATE` | Sensor kalibrieren (nicht der Z-Regler am Display). |
|
||||
| `Z_OFFSET_APPLY_PROBE` | Laufenden G-code-Offset in `probe.z_offset` schreiben. |
|
||||
| `SET_GCODE_OFFSET` | Offset nur für den aktuellen Auftrag. |
|
||||
| `SAVE_CONFIG` | Schreibt Config dauerhaft — **nicht** blind aus Mainsail. |
|
||||
|
||||
### Diagnose
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `QUERY_ENDSTOPS` / `M119` | Endstop-Zustände. |
|
||||
| `GET_POSITION` / `M114` | Toolhead-/Stepper-Position. |
|
||||
| `QUERY_ADC` | ADC-Werte (z. B. Thermistoren). |
|
||||
| `DUMP_TMC` | TMC-Register (Stepper nennen). |
|
||||
|
||||
### Slice-Start Anycubic
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `G9111` | Vorheizen aus dem Slicer: typisch `bedTemp=…` und `extruderTemp=…`. Steht im Maschinen-Start-G-code. Grotti ersetzt das nicht und startet auch nicht darüber. |
|
||||
|
||||
---
|
||||
|
||||
## ACE (gemeinsam)
|
||||
|
||||
Zwei Namenswelten:
|
||||
|
||||
1. **Open-Source** GoKlipper `extras_ace.go` (BunnyACE-Stil): `ACE_CHANGE_TOOL`, `ACE_FEED`, `ACE_RETRACT`, `ACE_SET_SLOT`, `ACE_QUERY_SLOTS`, `ACE_START_DRYING` / `ACE_STOP_DRYING`, Feed-Assist, Endless Spool, …
|
||||
2. **Ausgeliefertes Binary** (Rinkhals-RE): u. a. `FEED_FILAMENT`, `UNWIND_FILAMENT`, `UNWIND_ALL_FILAMENT`, `SET_CURRENT_FILAMENT`, `ACE_INFO`, `ACE_STATUS`, Cutter-/Pipe-Befehle.
|
||||
|
||||
Grotti nutzt **keine** Community-Makros `ACE_SET_SLOT` / manuelles Tool-Mapping per G-code. Zuordnung: Sidecar `.acm` + MQTT `ams_settings` ([Senden-Queue](Senden-Queue.md), [ACE-Live](ACE-Live.md)). Slots anzeigen: Moonraker-Objekt `mmu` (Rinkhals). Trocknen: Moonraker `POST /server/filament_hub/start_drying` (nicht zwingend der G-code).
|
||||
|
||||
| Befehl (Auswahl) | Funktion |
|
||||
| --- | --- |
|
||||
| `ACE_CHANGE_TOOL` / Tool-Macros `T0`… | Werkzeugwechsel über ACE. |
|
||||
| `ACE_FEED` / `FEED_FILAMENT` | Filament vom Gate zur Düse laden. **Vorher unloaden.** |
|
||||
| `ACE_RETRACT` / `UNWIND_FILAMENT` | Zurückziehen / parkieren. |
|
||||
| `ACE_SET_SLOT` | Inventar Slot setzen — Grotti meidet das. |
|
||||
| `ACE_START_DRYING` / `ACE_STOP_DRYING` | Trockner; alternativ `filament_hub`-API. |
|
||||
| `ACE_ENABLE_ENDLESS_SPOOL` / `…_DISABLE` / `…_STATUS` | Endless Spool. |
|
||||
|
||||
Details und Parameter: Rinkhals `docs/GOKLIPPER_ACE_GCODE_COMMANDS.md` (lokal unter `D:\Projekte\_ref\Rinkhals\`).
|
||||
|
||||
---
|
||||
|
||||
## Kobra S1 — Anycubic-Makros
|
||||
|
||||
Config-Sektion heißt `[leviQ3]`, die Befehle auf dem Gerät heißen **`LEVIQ2`**. Stecken in GoKlipper. Hilfe gelesen 11.10. über `printer/gcode/help`.
|
||||
|
||||
### LeviQ2
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `LEVIQ2` | Ganze Nivellierfolge: heizen, wischen, antasten. **Nicht** aus Mainsail. `SYNC=enable` startet danach neu. |
|
||||
| `LEVIQ2_PREHEATING` | Vorheizen: Bett 55 °C, Düse 170 °C, dann `HOME_XY`. `S` = Düsentemp, `E` = Temp nach dem Wischen. |
|
||||
| `LEVIQ2_WIPING` | Wischen: Netz löschen, Düse auf 140 °C, intern `G9112`, dann `G28 Z`. |
|
||||
| `LEVIQ2_PROBE` | Antasten: `BED_MESH_CALIBRATE`, Lüfter/Bett aus, Z auf 20 mm, `HOME_XY`, Düse aus. |
|
||||
| `LEVIQ_SET_ZERO` | Z-Basis und Home-Position auf 0. |
|
||||
| `LEVIQ2_AUTO_ZOFFSET` | Löscht laut Hilfe den Koeffizienten K. |
|
||||
| `LEVIQ2_AUTO_ZOFFSET_ON_OFF` | Schaltet automatischen Z-Offset. |
|
||||
| `LEVIQ2_TEMP_OFFSET` | Temperaturausgleich (`expansion_factor` / `zoffset_base` in der Config). Fehlt im veröffentlichten Quelltext. |
|
||||
| `HOME_XY` | Nur X/Y homen (von LeviQ-Schritten genutzt). |
|
||||
|
||||
Netz: 5×5, X/Y 5–245 mm. Details: Wissen `Kobra S1.md`.
|
||||
|
||||
### Wipe (Pad hinten)
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `WIPE_ENTER` | Anfahrt Pad (Y 250 → X 81, Y 273). |
|
||||
| `WIPE_NOZZLE` | Wischbahn; wiederholt die Strecke X 96↔81. |
|
||||
| `WIPE_STOP` | Kurze Stopp-Bahnen, dann X 75. |
|
||||
| `WIPE_EXIT` | Weg vom Pad (X 83, Y 250). |
|
||||
| `TO_THROW_POSITION` | Position zum Abwerfen (~X 47, Y 276). |
|
||||
| `MOVE_TO_SWEEP_POSITION` | Wisch-/Kehrposition (gleiche Gegend). |
|
||||
| `MOVE_TO_IMPACT_POSITION` | Weg vom Pad nach vorn rechts (Y 25, X 261). |
|
||||
| `PRINT_LINE` | Purge-Linie bei Y 251, Z 0,28 bis X 125. |
|
||||
|
||||
---
|
||||
|
||||
## Kobra 3 — Anycubic-Makros
|
||||
|
||||
Befehle gelesen 11.10. auf `da26` (`92ee`/`6e41` gleiche `printer.generated.cfg`). Im veröffentlichten Quelltext heißen Teile noch `LEVIQ3_*` / `LEVIQ2_PROBE` — auf den drei Druckern gelten die Namen unten.
|
||||
|
||||
### LeviQ
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `LEVIQ` | Ganze Folge inkl. Z-Offset-Rechnung. **Nicht** aus Mainsail. `SYNC=enable` startet danach neu. |
|
||||
| `LEVIQ_PREHEATING` | Z-Basis 0, Bett 60 °C, Düse 170 °C, `HOME_XY`, auf Düse warten. `S` / `E` wie bei S1. |
|
||||
| `LEVIQ_WIPING` | Netz löschen, Düse 140 °C, `G9112`, `G28 Z`. |
|
||||
| `LEVIQ_PROBE` | `BED_MESH_CALIBRATE`, Lüfter/Bett aus, Z auf 30 mm, `HOME_XY`, Düse aus. |
|
||||
| `LEVIQ_SET_ZERO` | Z-Basis und Home auf 0. |
|
||||
| `LEVIQ_AUTO_ZOFFSET` | Löscht Koeffizient K (Hilfe). |
|
||||
| `LEVIQ_AUTO_ZOFFSET_ON_OFF` | Automatischen Z-Offset schalten (oft an). |
|
||||
| `LEVIQ_TEMP_OFFSET` | Temperaturausgleich (Hilfezeile „LEVIQ3 TEMP OFFSET“). Fehlt im Open-Source-Code. |
|
||||
| `HOME_XY` | Nur X/Y homen. |
|
||||
|
||||
Netz: 5×5, X 15–240, Y 15–235 mm. Details: Wissen `Kobra 3.md`.
|
||||
|
||||
### Wipe
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `WIPE_NOZZLE` | Dreimal `SINGLE_WIPE_NOZZLE` (Y 260/259, X 46–90, Z −0,8↔1, Lüfter an). |
|
||||
| `SINGLE_WIPE_NOZZLE` | Eine einzelne Wischbahn. |
|
||||
| `MOVE_HEAT_POS` | Z 15, dann X 278 (Heiz-/Parknahe Position). |
|
||||
| `UNDERLINE` | Purge-Linie Z 0,28 bis X 180, ~40 mm Extrusion. |
|
||||
| `MOVE_END_POS` | Ende/Park X 5, Y 242. |
|
||||
|
||||
### Wägezelle
|
||||
|
||||
| Befehl | Funktion |
|
||||
| --- | --- |
|
||||
| `CS1237_DUMP` | Debug-Ausgabe zum CS1237 (Z-Sensor / Kraft). Moonraker liefert keine laufende Gramm-Anzeige; `probe.last_z_result` fehlt. |
|
||||
|
||||
---
|
||||
|
||||
## Siehe auch
|
||||
|
||||
- [Anycubic-Stack](Anycubic-Stack.md) — MQTT-Start/Stop, 10101, kein Firmware-Restart
|
||||
- [Senden-Queue](Senden-Queue.md) — `.acm`, kein Community-ACE-Makro
|
||||
- [Abraeumen](Abraeumen.md) — K3 Farm-Scripts statt Druckermakro
|
||||
- [ACE-Live](ACE-Live.md) — Live-Mapping und Trailer
|
||||
@@ -12,7 +12,7 @@ Seite `/einstellungen`: Druckernamen/Host/Familie/gesperrt (PostgreSQL `printers
|
||||
|
||||
## Druckwarteschlange „wenn frei“
|
||||
|
||||
Dateien → „Wenn frei“ oder „Nächster freier“ → `when_free` in `POST /api/v1/senden`. Einträge in `print_queue`; Dispatcher startet, sobald der Host (oder ein freier Drucker) `standby`/`complete`/`cancelled` ist, Platte frei und nicht gesperrt. **Alle freien Drucker im selben Tick** (Upload/Start je Host im Worker parallel) — nicht einer alle ~8 s. Sidebar und Seite `/warteschlange`. Sofort-Senden bleibt über die Send-Queue (mehrere Worker). Hängender Fehler wird nur geräumt, wenn für den Host ein Auftrag wartet. Ablauf: Phase `starting` vor Upload; Timeout 10 min ohne `print_active`.
|
||||
Dateien → „Dieser Drucker“ (belegt) oder „Nächster passender“ → `when_free` in `POST /api/v1/senden`. Einträge in `print_queue`; Dispatcher startet, sobald der Host (oder ein freier Drucker) `standby`/`complete`/`cancelled` ist, Platte frei und nicht gesperrt. Material-Score: Katalog-Sorte aus `filament_settings_id` (streng), Farbe soft; bei ACE und leerer Map baut Grotti die Zuordnung aus Spulen. **Alle freien Drucker im selben Tick** (Upload/Start je Host im Worker parallel) — nicht einer alle ~8 s. Sidebar und Seite `/warteschlange`. Sofort-Senden bleibt über die Send-Queue (mehrere Worker). Hängender Fehler wird nur geräumt, wenn für den Host ein Auftrag wartet. Ablauf: Phase `starting` vor Upload; Timeout 10 min ohne `print_active`.
|
||||
|
||||
## Spulen
|
||||
|
||||
@@ -27,7 +27,7 @@ Jedes Ereignis landet in `events` und auf der Seite `/aktivitaet`. Telegram ist
|
||||
| `fertig` | Watcher, `printing`→`complete` | nein, Platte unter „Aufgaben“ | an |
|
||||
| `fehler` | Watcher, Zustand `error` | ja | an |
|
||||
| `abbruch` | Watcher, `printing`/`paused`→`cancelled`/`standby` | ja | wie `fehler` |
|
||||
| `offline` | Watcher, ≥2 Polls weg; auch „wieder erreichbar“ | ja | an |
|
||||
| `offline` | Watcher, ≥2 Polls weg; auch „wieder erreichbar“. Beendet den Lauf nicht und zieht nichts ab — der letzte Druckzustand bleibt gemerkt | ja | an |
|
||||
| `spule` | Watcher, Rest unter Job-Gewicht | ja | an |
|
||||
| `queue` | Dispatcher: Queue-Fehler, Ablauf gestoppt | ja | an |
|
||||
| `start` | Watcher: Druck startet, Pause, Fortsetzen | nein | aus |
|
||||
|
||||
@@ -3,3 +3,11 @@
|
||||
Diese Dateien sind für Entwicklung und Agenten — **nicht** unter `/doku` in der App.
|
||||
|
||||
Nutzer-Handbuch: `docs/Anleitung-*.md`.
|
||||
|
||||
| Datei | Inhalt |
|
||||
| --- | --- |
|
||||
| [API.md](API.md) | HTTP-API für App/Integrationen (Auth, confirm, SSE, Filter) |
|
||||
| [openapi.yaml](openapi.yaml) | OpenAPI-Skizze (Client-Generator) |
|
||||
| [MCP.md](MCP.md) | MCP-Server und Tool-Ablauf |
|
||||
| [Makros-Kobra.md](Makros-Kobra.md) | G-code/Makros Kobra S1 und 3: Nicht-tun, Vanilla-Alltag, ACE, LeviQ/Wipe |
|
||||
| [Anycubic-Stack.md](Anycubic-Stack.md) | GoKlipper, MQTT-Start/Stop, ACE-Kanäle |
|
||||
@@ -0,0 +1,180 @@
|
||||
openapi: 3.0.3
|
||||
info:
|
||||
title: Grotti API
|
||||
version: "1"
|
||||
description: |
|
||||
JSON unter /api/v1. Auth: Session-Cookie oder Bearer grt_….
|
||||
Mutierende Session-Calls brauchen Header X-CSRF-Token.
|
||||
Siehe docs/internal/API.md.
|
||||
servers:
|
||||
- url: /api/v1
|
||||
paths:
|
||||
/version:
|
||||
get:
|
||||
summary: Server-Info
|
||||
security: []
|
||||
responses:
|
||||
"200":
|
||||
description: name, version, api, features
|
||||
/auth/login:
|
||||
post:
|
||||
summary: Session-Login
|
||||
security: []
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required: [username, password]
|
||||
properties:
|
||||
username: { type: string }
|
||||
password: { type: string }
|
||||
responses:
|
||||
"200":
|
||||
description: user + csrf
|
||||
/auth/token:
|
||||
post:
|
||||
summary: Passwort → API-Token (App)
|
||||
security: []
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required: [username, password]
|
||||
properties:
|
||||
username: { type: string }
|
||||
password: { type: string }
|
||||
device_name: { type: string }
|
||||
role: { type: string, enum: [operator, admin] }
|
||||
responses:
|
||||
"201":
|
||||
description: token (einmalig) + user
|
||||
/drucker:
|
||||
get:
|
||||
summary: Druckerliste
|
||||
parameters:
|
||||
- name: live
|
||||
in: query
|
||||
schema: { type: integer, enum: [0, 1] }
|
||||
responses:
|
||||
"200":
|
||||
description: Array Drucker
|
||||
/drucker/{host}/{action}:
|
||||
post:
|
||||
summary: Pause / Fortsetzen / Abbrechen
|
||||
parameters:
|
||||
- name: host
|
||||
in: path
|
||||
required: true
|
||||
schema: { type: string }
|
||||
- name: action
|
||||
in: path
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
enum: [pause, fortsetzen, abbrechen, resume, cancel]
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
/dateien:
|
||||
get:
|
||||
summary: Bibliothek
|
||||
parameters:
|
||||
- { name: family, in: query, schema: { type: string } }
|
||||
- { name: material, in: query, schema: { type: string } }
|
||||
- { name: project_id, in: query, schema: { type: integer } }
|
||||
- { name: host, in: query, schema: { type: string } }
|
||||
- { name: q, in: query, schema: { type: string } }
|
||||
- { name: limit, in: query, schema: { type: integer } }
|
||||
- { name: offset, in: query, schema: { type: integer } }
|
||||
responses:
|
||||
"200":
|
||||
description: Array Dateien; Header X-Total-Count
|
||||
headers:
|
||||
X-Total-Count:
|
||||
schema: { type: integer }
|
||||
/senden:
|
||||
post:
|
||||
summary: Druck starten oder einreihen
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required: [file_id, confirm]
|
||||
properties:
|
||||
file_id: { type: integer }
|
||||
hosts: { type: array, items: { type: string } }
|
||||
confirm: { type: boolean }
|
||||
when_free: { type: boolean }
|
||||
ace_maps: { type: object }
|
||||
bed_leveling: { type: boolean }
|
||||
responses:
|
||||
"202":
|
||||
description: jobs
|
||||
/druck-queue:
|
||||
get:
|
||||
summary: Warteschlange
|
||||
parameters:
|
||||
- { name: host, in: query, schema: { type: string } }
|
||||
- { name: status, in: query, schema: { type: string } }
|
||||
- { name: limit, in: query, schema: { type: integer } }
|
||||
- { name: offset, in: query, schema: { type: integer } }
|
||||
responses:
|
||||
"200":
|
||||
description: Array; X-Total-Count
|
||||
post:
|
||||
summary: Einreihen
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required: [file_id, confirm]
|
||||
responses:
|
||||
"200":
|
||||
description: Queue-Eintrag
|
||||
/projekte/{id}/einreihen:
|
||||
post:
|
||||
summary: Projektdateien einreihen
|
||||
parameters:
|
||||
- name: id
|
||||
in: path
|
||||
required: true
|
||||
schema: { type: integer }
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required: [confirm]
|
||||
properties:
|
||||
confirm: { type: boolean }
|
||||
file_ids: { type: array, items: { type: integer } }
|
||||
menge: { type: integer }
|
||||
responses:
|
||||
"201":
|
||||
description: jobs
|
||||
/stream:
|
||||
get:
|
||||
summary: SSE Live-Events
|
||||
responses:
|
||||
"200":
|
||||
description: text/event-stream (drucker, queue, senden, ereignis, ping)
|
||||
components:
|
||||
securitySchemes:
|
||||
bearerAuth:
|
||||
type: http
|
||||
scheme: bearer
|
||||
bearerFormat: grt_
|
||||
cookieAuth:
|
||||
type: apiKey
|
||||
in: cookie
|
||||
name: session
|
||||
security:
|
||||
- bearerAuth: []
|
||||
- cookieAuth: []
|
||||
+171
-2
@@ -73,13 +73,182 @@ def normalize_mapping(raw):
|
||||
ams = int(item.get("ams_index"))
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
if paint < 0 or ams < 0 or ams > 7 or paint in seen:
|
||||
# paint_index = Slicer-T (oft 0–15 bei Bambu), ams_index = ACE-Platz 0–7
|
||||
if paint < 0 or paint > 63 or ams < 0 or ams > 7 or paint in seen:
|
||||
continue
|
||||
seen.add(paint)
|
||||
out.append({"paint_index": paint, "ams_index": ams})
|
||||
return out
|
||||
|
||||
|
||||
def filament_for_paint(filaments, paint):
|
||||
"""Filament-Eintrag zur Slicer-T-Nummer; Fallback Array-Index für Alt-Daten."""
|
||||
filaments = filaments or []
|
||||
try:
|
||||
paint = int(paint)
|
||||
except (TypeError, ValueError):
|
||||
return {}
|
||||
for index, row in enumerate(filaments):
|
||||
if not isinstance(row, dict):
|
||||
continue
|
||||
try:
|
||||
key = int(row.get("paint_index"))
|
||||
except (TypeError, ValueError):
|
||||
key = index
|
||||
if key == paint:
|
||||
return row
|
||||
if 0 <= paint < len(filaments) and isinstance(filaments[paint], dict):
|
||||
return filaments[paint]
|
||||
return {}
|
||||
|
||||
|
||||
def densify_mapping(mapping):
|
||||
"""Slicer-T mit Lücken (T1/T10) → dichte 0…n−1 für gklib/ACE.
|
||||
|
||||
gklib meldet bei zu hoher Filament-ID ``invalid filament id`` (10011700).
|
||||
Rückgabe: (remap alt→neu, dichte Map). Identity → ({}, unverändert).
|
||||
"""
|
||||
mapping = normalize_mapping(mapping)
|
||||
paints = sorted(item["paint_index"] for item in mapping)
|
||||
if not paints or paints == list(range(len(paints))):
|
||||
return {}, mapping
|
||||
remap = {old: new for new, old in enumerate(paints)}
|
||||
dense = [
|
||||
{"paint_index": remap[item["paint_index"]], "ams_index": item["ams_index"]}
|
||||
for item in mapping
|
||||
]
|
||||
return remap, dense
|
||||
|
||||
|
||||
def remap_filaments(filaments, remap):
|
||||
"""paint_index der Filament-Metadaten mit densify-Remap mitziehen."""
|
||||
if not remap:
|
||||
return list(filaments or [])
|
||||
out = []
|
||||
for row in filaments or []:
|
||||
if not isinstance(row, dict):
|
||||
continue
|
||||
copy = dict(row)
|
||||
try:
|
||||
old = int(row.get("paint_index"))
|
||||
except (TypeError, ValueError):
|
||||
out.append(copy)
|
||||
continue
|
||||
if old in remap:
|
||||
copy["paint_index"] = remap[old]
|
||||
out.append(copy)
|
||||
return out
|
||||
|
||||
|
||||
def align_tools_for_ace(content, mapping, filaments=None):
|
||||
"""G-code-T und ACE-Map auf dichte 0…n−1 bringen.
|
||||
|
||||
Maßgeblich sind die ``Tn`` im G-code. Die UI-Map darf echte Slicer-Indizes
|
||||
(T1/T10) oder fälschlich kompakte 0/1 haben — ACE-Plätze werden in
|
||||
Sortierreihenfolge der Map-Einträge den sortierten T-Nummern zugeordnet.
|
||||
Sonst: ACM 0/1 + G-code T10 → 10011700 invalid filament id.
|
||||
"""
|
||||
from grotti.parse import tools_used_in_gcode
|
||||
|
||||
mapping = normalize_mapping(mapping)
|
||||
used = sorted(tools_used_in_gcode(content))
|
||||
if not mapping:
|
||||
return content, mapping, list(filaments or []), {}
|
||||
if not used:
|
||||
remap, dense = densify_mapping(mapping)
|
||||
new_content = rewrite_gcode_tools(content, remap) if remap else content
|
||||
return new_content, dense, remap_filaments(filaments, remap), remap
|
||||
|
||||
if len(mapping) != len(used):
|
||||
from grotti.errors import GrottiError
|
||||
|
||||
raise GrottiError(
|
||||
"ACE-Zuordnung (%d Farben) passt nicht zum G-code (T%s). "
|
||||
"Datei neu lesen und Zuordnung erneut setzen."
|
||||
% (len(mapping), ", T".join(str(t) for t in used)),
|
||||
"ace",
|
||||
)
|
||||
|
||||
mapped_paints = {item["paint_index"] for item in mapping}
|
||||
paints_match_gcode = mapped_paints == set(used)
|
||||
if paints_match_gcode:
|
||||
ams_by_tool = {item["paint_index"]: item["ams_index"] for item in mapping}
|
||||
ams_order = [ams_by_tool[tool] for tool in used]
|
||||
else:
|
||||
# UI kompakt 0…n−1, G-code sparse — Reihenfolge der Map = Reihenfolge der Farben
|
||||
ordered = sorted(mapping, key=lambda item: item["paint_index"])
|
||||
ams_order = [item["ams_index"] for item in ordered]
|
||||
|
||||
remap = {old: new for new, old in enumerate(used)}
|
||||
dense = [
|
||||
{"paint_index": index, "ams_index": ams_order[index]}
|
||||
for index in range(len(used))
|
||||
]
|
||||
|
||||
source = list(filaments or [])
|
||||
if paints_match_gcode:
|
||||
new_fils = remap_filaments(source, remap)
|
||||
else:
|
||||
# Metadaten folgen der Map-Reihenfolge (0,1,…), nicht den G-code-T
|
||||
ordered_paints = sorted(item["paint_index"] for item in mapping)
|
||||
new_fils = []
|
||||
for index, tool in enumerate(used):
|
||||
row = filament_for_paint(source, ordered_paints[index]) or (
|
||||
source[index] if index < len(source) and isinstance(source[index], dict) else {}
|
||||
)
|
||||
if not row:
|
||||
row = filament_for_paint(source, tool) or {}
|
||||
copy = dict(row) if isinstance(row, dict) else {}
|
||||
copy["paint_index"] = index
|
||||
new_fils.append(copy)
|
||||
|
||||
# Identity-Remap weglassen (schon T0…n−1)
|
||||
if used == list(range(len(used))):
|
||||
return content, dense, new_fils, {}
|
||||
new_content = rewrite_gcode_tools(content, remap)
|
||||
return new_content, dense, new_fils, remap
|
||||
|
||||
|
||||
_TOOL_NUM_RE = re.compile(
|
||||
rb"^(?P<prefix>(?:MMU_CHANGE_TOOL(?:_STANDALONE)?[^\n]*?\bTOOL=)|T)(?P<num>\d{1,2})\b",
|
||||
re.I,
|
||||
)
|
||||
_REF_TOOLS_RE = re.compile(rb"^(;\s*referenced_tools\s*=\s*)(.+?)\s*$", re.I)
|
||||
|
||||
|
||||
def rewrite_gcode_tools(content, remap):
|
||||
"""Tn / TOOL=n / referenced_tools laut Remap umschreiben (T10 vor T1)."""
|
||||
if not content or not remap:
|
||||
return content
|
||||
text = content if isinstance(content, (bytes, bytearray)) else str(content).encode("utf-8", "replace")
|
||||
lines = text.splitlines(keepends=True)
|
||||
out = []
|
||||
for line in lines:
|
||||
stripped = line[:-2] if line.endswith(b"\r\n") else (line[:-1] if line.endswith(b"\n") else line)
|
||||
ending = line[len(stripped) :]
|
||||
ref = _REF_TOOLS_RE.match(stripped)
|
||||
if ref:
|
||||
parts = []
|
||||
for bit in ref.group(2).split(b","):
|
||||
raw = bit.strip()
|
||||
try:
|
||||
number = int(raw)
|
||||
except ValueError:
|
||||
parts.append(raw)
|
||||
continue
|
||||
parts.append(str(remap.get(number, number)).encode("ascii"))
|
||||
out.append(ref.group(1) + b",".join(parts) + ending)
|
||||
continue
|
||||
match = _TOOL_NUM_RE.match(stripped)
|
||||
if match:
|
||||
old = int(match.group("num"))
|
||||
if old in remap:
|
||||
new = str(remap[old]).encode("ascii")
|
||||
stripped = stripped[: match.start("num")] + new + stripped[match.end("num") :]
|
||||
out.append(stripped + ending)
|
||||
return b"".join(out)
|
||||
|
||||
|
||||
def build_acm(filaments, mapping, slots):
|
||||
filaments = filaments or []
|
||||
slots = slots or []
|
||||
@@ -88,7 +257,7 @@ def build_acm(filaments, mapping, slots):
|
||||
for item in normalize_mapping(mapping):
|
||||
paint = item["paint_index"]
|
||||
ams = item["ams_index"]
|
||||
filament = filaments[paint] if 0 <= paint < len(filaments) else {}
|
||||
filament = filament_for_paint(filaments, paint)
|
||||
slot = slot_by_index.get(ams) or {}
|
||||
paint_color = color_channels(filament.get("color")) or [0, 0, 0]
|
||||
ams_color = color_channels(slot.get("color")) or paint_color
|
||||
|
||||
+27
-2
@@ -2,6 +2,10 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
_HEX_COLOR_RE = re.compile(r"^#?[0-9a-f]{6}([0-9a-f]{2})?$", re.I)
|
||||
|
||||
|
||||
def _group_key(material_type, color):
|
||||
return (
|
||||
@@ -10,6 +14,27 @@ def _group_key(material_type, color):
|
||||
)
|
||||
|
||||
|
||||
def _is_slicer_hex(color):
|
||||
"""Orca/Anycubic speichert oft #26A69A — Lagerfarben heißen „Grau“/„Weiß“."""
|
||||
return bool(_HEX_COLOR_RE.match((color or "").strip()))
|
||||
|
||||
|
||||
def _stock_for_need(stock_map, mat, color):
|
||||
"""Exakte Farbe zuerst; bei Slice-Hex oder leerer Farbe: Summe gleicher Sorte."""
|
||||
key = _group_key(mat, color)
|
||||
exact = stock_map.get(key, 0.0)
|
||||
if exact > 0.5:
|
||||
return exact
|
||||
if not color or _is_slicer_hex(color):
|
||||
mat_key = (mat or "").strip().lower()
|
||||
return sum(
|
||||
grams
|
||||
for (m, _c), grams in stock_map.items()
|
||||
if m == mat_key and grams > 0
|
||||
)
|
||||
return exact
|
||||
|
||||
|
||||
def compute(conn):
|
||||
"""Wartende Jobs × Dateigewicht vs. Spulenrest, gruppiert nach Sorte/Farbe."""
|
||||
queue_rows = conn.execute(
|
||||
@@ -52,6 +77,7 @@ def compute(conn):
|
||||
"""
|
||||
SELECT material_type, color, COALESCE(SUM(remaining_g), 0) AS remaining_g
|
||||
FROM spools
|
||||
WHERE archived_at IS NULL
|
||||
GROUP BY material_type, color
|
||||
"""
|
||||
).fetchall()
|
||||
@@ -67,8 +93,7 @@ def compute(conn):
|
||||
)
|
||||
shortfall = []
|
||||
for item in needed:
|
||||
key = _group_key(item["material_type"], item["color"])
|
||||
have = stock_map.get(key, 0.0)
|
||||
have = _stock_for_need(stock_map, item["material_type"], item["color"])
|
||||
gap = item["weight_g"] - have
|
||||
if gap > 0.5:
|
||||
shortfall.append({
|
||||
|
||||
+33
-4
@@ -1,6 +1,7 @@
|
||||
"""Host, Port, Datenordner und Datenbank kommen aus config.json."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import secrets
|
||||
import threading
|
||||
from pathlib import Path
|
||||
@@ -9,11 +10,24 @@ from grotti.errors import GrottiError
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
LOOPBACK = {"127.0.0.1", "::1", "localhost"}
|
||||
CONFIG_PATH = ROOT / "config.json"
|
||||
DEFAULT_WATCH_REL = "slice"
|
||||
_SETTINGS_LOCK = threading.Lock()
|
||||
|
||||
|
||||
def config_path():
|
||||
"""GROTTI_CONFIG, sonst /etc/grotti/config.json (Paket), sonst Repo-config.json."""
|
||||
env = (os.environ.get("GROTTI_CONFIG") or "").strip()
|
||||
if env:
|
||||
return Path(env)
|
||||
etc = Path("/etc/grotti/config.json")
|
||||
if etc.is_file():
|
||||
return etc
|
||||
return ROOT / "config.json"
|
||||
|
||||
|
||||
CONFIG_PATH = config_path()
|
||||
|
||||
|
||||
def _tariff(raw):
|
||||
tariff = raw.get("tariff") if isinstance(raw, dict) else None
|
||||
if not isinstance(tariff, dict) or not tariff:
|
||||
@@ -110,6 +124,14 @@ def _oauth(raw):
|
||||
}
|
||||
|
||||
|
||||
def _http_threads(raw):
|
||||
try:
|
||||
count = int(raw.get("http_threads") or 16)
|
||||
except (TypeError, ValueError):
|
||||
count = 16
|
||||
return max(2, min(32, count))
|
||||
|
||||
|
||||
def _ensure_secret_key(path, raw):
|
||||
key = str(raw.get("secret_key") or "").strip()
|
||||
if key:
|
||||
@@ -121,9 +143,11 @@ def _ensure_secret_key(path, raw):
|
||||
|
||||
|
||||
def load():
|
||||
path = CONFIG_PATH
|
||||
path = config_path()
|
||||
if not path.exists():
|
||||
path.write_text((ROOT / "config.example.json").read_text(encoding="utf-8"), encoding="utf-8")
|
||||
example = ROOT / "config.example.json"
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
path.write_text(example.read_text(encoding="utf-8"), encoding="utf-8")
|
||||
raw = json.loads(path.read_text(encoding="utf-8"))
|
||||
host = (raw.get("host") or "127.0.0.1").strip()
|
||||
token = raw.get("token") or ""
|
||||
@@ -139,6 +163,9 @@ def load():
|
||||
if not data_dir.is_absolute():
|
||||
data_dir = ROOT / data_dir
|
||||
watch_dir, _stored = parse_watch_dir(raw.get("watch_dir") or "", create=False, missing_ok=True)
|
||||
printers_file = Path(raw.get("printers_file") or (ROOT / "drucker.json"))
|
||||
if not printers_file.is_absolute():
|
||||
printers_file = ROOT / printers_file
|
||||
return {
|
||||
"host": host,
|
||||
"port": int(raw.get("port") or 8770),
|
||||
@@ -149,13 +176,15 @@ def load():
|
||||
"secret_key": secret_key,
|
||||
"oauth": _oauth(raw),
|
||||
"fqdn": normalize_fqdn(raw.get("fqdn") or ""),
|
||||
"printers_file": ROOT / "drucker.json",
|
||||
"printers_file": printers_file,
|
||||
"log_level": str(raw.get("log_level") or "INFO").strip() or "INFO",
|
||||
"energy": _energy(raw),
|
||||
"telegram": _telegram(raw),
|
||||
"ntfy": _ntfy(raw),
|
||||
"alerts": _alerts(raw),
|
||||
"auto_queue": bool(raw.get("auto_queue", True)),
|
||||
"auto_retry": bool(raw.get("auto_retry", True)),
|
||||
"http_threads": _http_threads(raw),
|
||||
"_raw": raw,
|
||||
"_path": path,
|
||||
}
|
||||
|
||||
@@ -45,7 +45,10 @@ def _yesterday_stats(conn):
|
||||
|
||||
def build_text(conn, watcher_latest=None, printers=None):
|
||||
stats = _yesterday_stats(conn)
|
||||
waiting = len([j for j in store.list_print_queue(conn, limit=200) if j.get("status") == "waiting"])
|
||||
waiting = len([
|
||||
j for j in store.list_print_queue(conn, limit=200)["items"]
|
||||
if j.get("status") == "waiting"
|
||||
])
|
||||
eta = jetzt_mod.farm_eta([
|
||||
{"remain": (live or {}).get("remain") or 0}
|
||||
for live in (watcher_latest or [])
|
||||
|
||||
+5
-1
@@ -13,6 +13,10 @@ from psycopg import sql
|
||||
from psycopg.rows import dict_row
|
||||
from psycopg_pool import ConnectionPool
|
||||
|
||||
from grotti import logutil
|
||||
|
||||
log = logutil.get("grotti.db")
|
||||
|
||||
MIGRATIONS_DIR = Path(__file__).parent / "migrations"
|
||||
SCHEMA_LEGACY = Path(__file__).parent / "schema.sql"
|
||||
|
||||
@@ -123,7 +127,7 @@ def prepare(url):
|
||||
if not exists:
|
||||
conn.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(name)))
|
||||
except psycopg.Error as exc:
|
||||
print("Datenbank anlegen: %s" % exc, flush=True)
|
||||
log.warning("Datenbank anlegen: %s", exc)
|
||||
try:
|
||||
with psycopg.connect(url, row_factory=dict_row, connect_timeout=5) as conn:
|
||||
apply_migrations(conn)
|
||||
|
||||
+6
-2
@@ -111,7 +111,7 @@ def build(conn, watcher_latest, printers=None, send_jobs=None):
|
||||
"SELECT DISTINCT host FROM print_queue WHERE status = 'running'"
|
||||
).fetchall()
|
||||
}
|
||||
queue = store.list_print_queue(conn, limit=80)
|
||||
queue = store.list_print_queue(conn, limit=80)["items"]
|
||||
waiting = [j for j in queue if j.get("status") == "waiting"]
|
||||
errors = [j for j in queue if j.get("status") == "error"]
|
||||
running_q = [j for j in queue if j.get("status") == "running"]
|
||||
@@ -255,13 +255,17 @@ def build(conn, watcher_latest, printers=None, send_jobs=None):
|
||||
live_by_host[host]["display_step_index"] = job.get("display_step_index")
|
||||
live_by_host[host]["step_index"] = job.get("step_index")
|
||||
else:
|
||||
phase = (job.get("phase") or "").lower()
|
||||
starting = phase in ("starting", "await_print")
|
||||
running.append({
|
||||
"host": host,
|
||||
"name": job.get("printer_name") or host,
|
||||
"state": "running",
|
||||
"state": "starting" if starting else "running",
|
||||
"starting": starting,
|
||||
"progress": job.get("progress") or 0,
|
||||
"remain": job.get("remain") or 0,
|
||||
"filename": job.get("filename") or "",
|
||||
"message": job.get("message") or "",
|
||||
"queue_id": job.get("id"),
|
||||
"is_ablauf": bool(job.get("is_ablauf")),
|
||||
})
|
||||
|
||||
+603
-145
@@ -5,7 +5,7 @@ import urllib.error
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from grotti import acm, catalog, eject, library, moonraker, store, usage
|
||||
from grotti import acm, catalog, eject, library, logutil, moonraker, store, usage
|
||||
from grotti.cost import energy_cost
|
||||
from grotti.errors import GrottiError
|
||||
from grotti.parse import content_has_ace_trailer, prepare_rinkhals_gcode
|
||||
@@ -39,12 +39,12 @@ def _ace_map_of(sent):
|
||||
return []
|
||||
|
||||
|
||||
def _targets_from_ace(conn, host, ace):
|
||||
def _targets_from_ace(conn, host, ace, ended_at=None):
|
||||
targets = []
|
||||
for item in ace:
|
||||
slot = int(item["ams_index"]) + 1
|
||||
row = store.spool_at_slot(conn, host, slot)
|
||||
if row:
|
||||
if row and _spool_valid_for_end(row, ended_at):
|
||||
targets.append(row)
|
||||
return targets
|
||||
|
||||
@@ -55,27 +55,441 @@ def unix_to_dt(value):
|
||||
return datetime.fromtimestamp(float(value), timezone.utc)
|
||||
|
||||
|
||||
# Anycubic schließt bei Filament-Pause den History-Job (cancelled) und öffnet
|
||||
# beim Fortsetzen eine neue Job-ID. Zusammengelegt wird nur mit Beweis:
|
||||
# print_duration läuft weiter und die Lücke ist klein, oder der Watcher
|
||||
# hat paused→printing gesehen. Ein Neustart mit Dauer nahe 0 bleibt getrennt.
|
||||
RESUME_GAP_S = 5
|
||||
RESUME_DURATION_TOL_S = 30
|
||||
RESUME_FRESH_MAX_S = 60
|
||||
# Abwärtskompatibel für alte Aufrufe / Docs.
|
||||
RESUME_JOIN_S = RESUME_GAP_S
|
||||
LIVE_DEDUCT_FALLBACK_S = 600
|
||||
SYNC_LOCK_KEY = 748291053
|
||||
|
||||
|
||||
def _as_utc(value):
|
||||
if value is None:
|
||||
return None
|
||||
if getattr(value, "tzinfo", None) is None:
|
||||
return value.replace(tzinfo=timezone.utc)
|
||||
return value
|
||||
|
||||
|
||||
def history_shell_is_empty(run_or_job):
|
||||
"""History-Job ohne Ende und ohne Dauer. Nie als eigenen Lauf speichern."""
|
||||
if not run_or_job:
|
||||
return False
|
||||
duration = float(
|
||||
run_or_job.get("duration_s")
|
||||
or run_or_job.get("print_duration")
|
||||
or run_or_job.get("total_duration")
|
||||
or 0
|
||||
)
|
||||
ended = run_or_job.get("ended_at") or run_or_job.get("end_time")
|
||||
return duration <= 0 and not ended
|
||||
|
||||
|
||||
def is_filament_resume(
|
||||
prev_end,
|
||||
new_start,
|
||||
prev_duration_s=None,
|
||||
new_duration_s=None,
|
||||
watcher_resume=False,
|
||||
gap_s=RESUME_GAP_S,
|
||||
):
|
||||
"""True nur mit Beweis: Dauer fortgesetzt + kleine Lücke, oder Watcher-Signal.
|
||||
|
||||
Aufruf mit zwei Zeitpunkten (alt): nur Lücke — gilt nicht mehr als Resume.
|
||||
"""
|
||||
prev_end = _as_utc(prev_end)
|
||||
new_start = _as_utc(new_start)
|
||||
if prev_end is None or new_start is None:
|
||||
return False
|
||||
gap = (new_start - prev_end).total_seconds()
|
||||
if not (-30 <= gap <= max(float(gap_s), RESUME_GAP_S)):
|
||||
# Watcher-Signal: Lücke darf länger sein (Pause vor dem Resume-Ende).
|
||||
if not watcher_resume or gap > 24 * 3600 or gap < -30:
|
||||
return False
|
||||
return True
|
||||
if watcher_resume:
|
||||
return True
|
||||
# Zwei-Argument-Aufruf (Tests/alt): ohne Dauer kein Beweis → kein Resume.
|
||||
if prev_duration_s is None and new_duration_s is None:
|
||||
return False
|
||||
prev_d = float(prev_duration_s or 0)
|
||||
new_d = float(new_duration_s or 0)
|
||||
# Frischer Neustart: Dauer beginnt nahe 0 — nie zusammenlegen.
|
||||
if new_d <= RESUME_FRESH_MAX_S:
|
||||
return False
|
||||
if new_d < max(0.0, prev_d - RESUME_DURATION_TOL_S):
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def undo_deduction(conn, run):
|
||||
"""Spulenabzug eines Laufs zurücknehmen.
|
||||
|
||||
Letzten Abschnitt wieder öffnen — nach Filamentpause schließt ein
|
||||
vorzeitiger History-Abgleich den Abschnitt, bevor der Druck weiterläuft.
|
||||
"""
|
||||
if not run or not run.get("deducted"):
|
||||
return False
|
||||
rows = conn.execute(
|
||||
"SELECT spool_id, weight_g FROM run_spools WHERE run_id = %s",
|
||||
(run["id"],),
|
||||
).fetchall()
|
||||
for row in rows:
|
||||
grams = float(row["weight_g"] or 0)
|
||||
if grams and row["spool_id"]:
|
||||
conn.execute(
|
||||
"UPDATE spools SET remaining_g = remaining_g + %s WHERE id = %s",
|
||||
(grams, row["spool_id"]),
|
||||
)
|
||||
conn.execute("DELETE FROM run_spools WHERE run_id = %s", (run["id"],))
|
||||
conn.execute(
|
||||
"UPDATE runs SET deducted = false, filament_cost = 0 WHERE id = %s",
|
||||
(run["id"],),
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE run_segments
|
||||
SET mm_end = NULL, closed_at = NULL
|
||||
WHERE id = (
|
||||
SELECT id FROM run_segments
|
||||
WHERE run_id = %s
|
||||
ORDER BY id DESC
|
||||
LIMIT 1
|
||||
)
|
||||
AND mm_end IS NOT NULL
|
||||
""",
|
||||
(run["id"],),
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
def fold_filament_resume(
|
||||
conn,
|
||||
host,
|
||||
filename,
|
||||
job_id,
|
||||
start_dt,
|
||||
print_duration_s=0,
|
||||
watcher_resume=False,
|
||||
):
|
||||
"""Fortsetzung nach Filament-Pause auf den bestehenden Lauf legen.
|
||||
|
||||
Gibt die Lauf-ID zurück, deren moonraker_job_id jetzt job_id ist.
|
||||
Leere Hüllen (Dauer 0, kein Ende) werden vorher übersprungen — nicht hier.
|
||||
"""
|
||||
pred = store.find_resume_predecessor(
|
||||
conn, host, filename, job_id, start_dt, watcher_resume=watcher_resume
|
||||
)
|
||||
if not pred:
|
||||
return None
|
||||
if not is_filament_resume(
|
||||
pred.get("ended_at"),
|
||||
start_dt,
|
||||
prev_duration_s=pred.get("duration_s"),
|
||||
new_duration_s=print_duration_s,
|
||||
watcher_resume=watcher_resume,
|
||||
):
|
||||
return None
|
||||
other = conn.execute(
|
||||
"""
|
||||
SELECT * FROM runs
|
||||
WHERE printer_host = %s AND moonraker_job_id = %s AND id <> %s
|
||||
""",
|
||||
(host, str(job_id), pred["id"]),
|
||||
).fetchone()
|
||||
store.remember_run_job(conn, host, pred.get("moonraker_job_id"), pred["id"], replace=True)
|
||||
undo_deduction(conn, pred)
|
||||
kept = None
|
||||
if other:
|
||||
undo_deduction(conn, other)
|
||||
conn.execute(
|
||||
"UPDATE events SET run_id = %s WHERE run_id = %s",
|
||||
(pred["id"], other["id"]),
|
||||
)
|
||||
if not (pred.get("verdict") or "").strip() and (other.get("verdict") or "").strip():
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE runs
|
||||
SET verdict = %s, verdict_reason = %s, pieces_ok = %s, pieces_bad = %s
|
||||
WHERE id = %s
|
||||
""",
|
||||
(
|
||||
other.get("verdict") or "",
|
||||
other.get("verdict_reason") or "",
|
||||
other.get("pieces_ok") or 0,
|
||||
other.get("pieces_bad") or 0,
|
||||
pred["id"],
|
||||
),
|
||||
)
|
||||
kept = {
|
||||
"state": other.get("state") or "completed",
|
||||
"ended_at": other.get("ended_at"),
|
||||
"duration_s": float(other.get("duration_s") or 0),
|
||||
"weight_used_g": float(other.get("weight_used_g") or 0),
|
||||
"weight_source": other.get("weight_source") or "",
|
||||
"filament_used_mm": float(other.get("filament_used_mm") or 0),
|
||||
"filament_total_mm": float(other.get("filament_total_mm") or 0),
|
||||
"progress_last": float(other.get("progress_last") or 0),
|
||||
}
|
||||
for table in ("run_samples", "run_segments"):
|
||||
conn.execute(
|
||||
"UPDATE %s SET run_id = %%s WHERE run_id = %%s" % table,
|
||||
(pred["id"], other["id"]),
|
||||
)
|
||||
try:
|
||||
conn.execute(
|
||||
"""
|
||||
DELETE FROM run_labels AS src
|
||||
WHERE src.run_id = %s
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM run_labels AS dst
|
||||
WHERE dst.run_id = %s AND dst.object_name = src.object_name
|
||||
)
|
||||
""",
|
||||
(other["id"], pred["id"]),
|
||||
)
|
||||
conn.execute(
|
||||
"UPDATE run_labels SET run_id = %s WHERE run_id = %s",
|
||||
(pred["id"], other["id"]),
|
||||
)
|
||||
except Exception:
|
||||
logutil.get("grotti.jobs").warning(
|
||||
"Etiketten von Lauf %s nicht übernommen.", other["id"]
|
||||
)
|
||||
conn.execute("DELETE FROM run_spools WHERE run_id = %s", (other["id"],))
|
||||
store.move_run_jobs(conn, host, other["id"], pred["id"])
|
||||
# Job-ID freigeben, sonst Unique (printer_host, moonraker_job_id) beim Pred.
|
||||
conn.execute(
|
||||
"UPDATE runs SET moonraker_job_id = %s WHERE id = %s",
|
||||
("live:merged:%s" % other["id"], other["id"]),
|
||||
)
|
||||
conn.execute("DELETE FROM runs WHERE id = %s", (other["id"],))
|
||||
# Der Druck läuft weiter. Das Ende kommt vom Folgejob.
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE runs
|
||||
SET moonraker_job_id = %s,
|
||||
ended_at = NULL,
|
||||
state = CASE
|
||||
WHEN %s IN ('in_progress', 'printing', 'paused') THEN %s
|
||||
WHEN state IN ('cancelled', 'interrupted', 'error') THEN 'in_progress'
|
||||
ELSE state
|
||||
END
|
||||
WHERE id = %s
|
||||
""",
|
||||
(
|
||||
str(job_id),
|
||||
(kept or {}).get("state") or "in_progress",
|
||||
(kept or {}).get("state") or "in_progress",
|
||||
pred["id"],
|
||||
),
|
||||
)
|
||||
store.remember_run_job(conn, host, job_id, pred["id"], replace=True)
|
||||
store.set_printer_active_run(conn, host, pred["id"])
|
||||
if kept and kept.get("ended_at"):
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE runs SET
|
||||
state = %s,
|
||||
ended_at = COALESCE(%s, ended_at),
|
||||
duration_s = GREATEST(COALESCE(duration_s, 0), %s),
|
||||
weight_used_g = GREATEST(COALESCE(weight_used_g, 0), %s),
|
||||
weight_source = CASE WHEN %s <> '' THEN %s ELSE weight_source END,
|
||||
filament_used_mm = GREATEST(COALESCE(filament_used_mm, 0), %s),
|
||||
filament_total_mm = CASE WHEN %s > 0 THEN %s ELSE filament_total_mm END,
|
||||
progress_last = GREATEST(COALESCE(progress_last, 0), %s),
|
||||
deducted = false
|
||||
WHERE id = %s
|
||||
""",
|
||||
(
|
||||
kept["state"],
|
||||
kept["ended_at"],
|
||||
kept["duration_s"],
|
||||
kept["weight_used_g"],
|
||||
kept["weight_source"],
|
||||
kept["weight_source"],
|
||||
kept["filament_used_mm"],
|
||||
kept["filament_total_mm"],
|
||||
kept["filament_total_mm"],
|
||||
kept["progress_last"],
|
||||
pred["id"],
|
||||
),
|
||||
)
|
||||
elif print_duration_s:
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE runs
|
||||
SET duration_s = GREATEST(COALESCE(duration_s, 0), %s),
|
||||
deducted = false
|
||||
WHERE id = %s
|
||||
""",
|
||||
(float(print_duration_s), pred["id"]),
|
||||
)
|
||||
return pred["id"]
|
||||
|
||||
|
||||
def history_in_order(items):
|
||||
"""Älteste zuerst. Der abgebrochene Teil muss stehen, bevor die Fortsetzung kommt."""
|
||||
return sorted(
|
||||
items or [],
|
||||
key=lambda job: (float(job.get("start_time") or 0), str(job.get("job_id") or "")),
|
||||
)
|
||||
|
||||
|
||||
def manual_merge_runs(conn, keep_id, absorb_id, confirm=False):
|
||||
"""Zwei Läufe manuell verbinden. keep überlebt, absorb wird übernommen."""
|
||||
if not confirm:
|
||||
raise GrottiError("Verbinden braucht eine Bestätigung.", "bestaetigung")
|
||||
keep = store.get_run_row(conn, keep_id)
|
||||
absorb = store.get_run_row(conn, absorb_id)
|
||||
if not keep or not absorb:
|
||||
raise GrottiError("Der Lauf fehlt.", "lauf", 404)
|
||||
if keep["id"] == absorb["id"]:
|
||||
raise GrottiError("Gleicher Lauf.", "lauf")
|
||||
if (keep.get("printer_host") or "") != (absorb.get("printer_host") or ""):
|
||||
raise GrottiError("Nur Läufe desselben Druckers.", "drucker")
|
||||
if (keep.get("filename") or "") != (absorb.get("filename") or ""):
|
||||
raise GrottiError("Nur Läufe derselben Datei.", "datei")
|
||||
# Früherer Start bleibt der überlebende Lauf.
|
||||
if keep.get("started_at") and absorb.get("started_at") and absorb["started_at"] < keep["started_at"]:
|
||||
keep, absorb = absorb, keep
|
||||
host = keep["printer_host"]
|
||||
undo_deduction(conn, keep)
|
||||
undo_deduction(conn, absorb)
|
||||
snapshot = {
|
||||
"keep_id": keep["id"],
|
||||
"absorb_id": absorb["id"],
|
||||
"absorb_job_id": absorb.get("moonraker_job_id"),
|
||||
}
|
||||
for table in ("run_samples", "run_segments", "run_spools", "events"):
|
||||
conn.execute(
|
||||
"UPDATE %s SET run_id = %%s WHERE run_id = %%s" % table,
|
||||
(keep["id"], absorb["id"]),
|
||||
)
|
||||
try:
|
||||
conn.execute(
|
||||
"""
|
||||
DELETE FROM run_labels AS src
|
||||
WHERE src.run_id = %s
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM run_labels AS dst
|
||||
WHERE dst.run_id = %s AND dst.object_name = src.object_name
|
||||
)
|
||||
""",
|
||||
(absorb["id"], keep["id"]),
|
||||
)
|
||||
conn.execute(
|
||||
"UPDATE run_labels SET run_id = %s WHERE run_id = %s",
|
||||
(keep["id"], absorb["id"]),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
store.move_run_jobs(conn, host, absorb["id"], keep["id"])
|
||||
job_id = absorb.get("moonraker_job_id") or keep.get("moonraker_job_id")
|
||||
if job_id and not str(job_id).startswith("live:"):
|
||||
store.remember_run_job(conn, host, job_id, keep["id"], replace=True)
|
||||
# Job-ID am absorb freigeben, sonst Unique beim UPDATE auf keep.
|
||||
conn.execute(
|
||||
"UPDATE runs SET moonraker_job_id = %s WHERE id = %s",
|
||||
("live:merged:%s" % absorb["id"], absorb["id"]),
|
||||
)
|
||||
absorb_terminal = (absorb.get("state") or "") in TERMINAL
|
||||
keep_open = (keep.get("state") or "") in ("in_progress", "printing", "paused")
|
||||
new_state = absorb["state"] if absorb_terminal and not keep_open else (
|
||||
absorb["state"] if not keep_open else keep["state"]
|
||||
)
|
||||
if keep_open or (absorb.get("state") or "") in ("in_progress", "printing", "paused"):
|
||||
new_state = absorb["state"] if (absorb.get("state") or "") in ("in_progress", "printing", "paused") else "in_progress"
|
||||
ended = None
|
||||
else:
|
||||
ended = absorb.get("ended_at") or keep.get("ended_at")
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE runs SET
|
||||
moonraker_job_id = COALESCE(NULLIF(%s, ''), moonraker_job_id),
|
||||
state = %s,
|
||||
ended_at = %s,
|
||||
duration_s = GREATEST(COALESCE(duration_s, 0), COALESCE(%s, 0)),
|
||||
weight_used_g = GREATEST(COALESCE(weight_used_g, 0), COALESCE(%s, 0)),
|
||||
filament_used_mm = GREATEST(COALESCE(filament_used_mm, 0), COALESCE(%s, 0)),
|
||||
progress_last = GREATEST(COALESCE(progress_last, 0), COALESCE(%s, 0)),
|
||||
deducted = false
|
||||
WHERE id = %s
|
||||
""",
|
||||
(
|
||||
str(job_id or ""),
|
||||
new_state,
|
||||
ended,
|
||||
float(absorb.get("duration_s") or 0),
|
||||
float(absorb.get("weight_used_g") or 0),
|
||||
float(absorb.get("filament_used_mm") or 0),
|
||||
float(absorb.get("progress_last") or 0),
|
||||
keep["id"],
|
||||
),
|
||||
)
|
||||
try:
|
||||
conn.execute(
|
||||
"UPDATE print_queue SET run_id = %s WHERE run_id = %s",
|
||||
(keep["id"], absorb["id"]),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
conn.execute("DELETE FROM runs WHERE id = %s", (absorb["id"],))
|
||||
store.set_printer_active_run(
|
||||
conn, host, keep["id"] if new_state in ("in_progress", "printing", "paused") else None
|
||||
)
|
||||
fresh = store.get_run_row(conn, keep["id"])
|
||||
return {"run": store.run_out(fresh), "undo": snapshot}
|
||||
|
||||
|
||||
def choose_spool(conn, host, material, hinted_id, ended_at=None):
|
||||
"""Spule für History-Abzug. Ohne Hint nur Rollen, die vor Druckende existierten."""
|
||||
at_host = [
|
||||
row for row in store.spools_for_printer(conn, host)
|
||||
if _spool_valid_for_end(row, ended_at)
|
||||
]
|
||||
if hinted_id:
|
||||
row = store.get_spool_row(conn, hinted_id)
|
||||
if row and not _spool_valid_for_end(row, ended_at):
|
||||
return None
|
||||
# Hint nur nutzen, wenn die Rolle noch am Drucker liegt — sonst Rollenwechsel
|
||||
if row and (row.get("printer_host") or "") == (host or ""):
|
||||
return row
|
||||
if row and not at_host:
|
||||
# Rolle schon im Regal, kein Nachfolger am Host → Hint behalten (alte Jobs)
|
||||
return row
|
||||
if len(at_host) == 1:
|
||||
return at_host[0]
|
||||
if material:
|
||||
same = [row for row in at_host if (row["material_type"] or "").lower() == material.lower()]
|
||||
if len(same) == 1:
|
||||
return same[0]
|
||||
if hinted_id:
|
||||
row = store.get_spool_row(conn, hinted_id)
|
||||
if row and _spool_valid_for_end(row, ended_at):
|
||||
return row
|
||||
if row and not _spool_valid_for_end(row, ended_at):
|
||||
return None
|
||||
rows = [
|
||||
row for row in store.spools_for_printer(conn, host)
|
||||
if _spool_valid_for_end(row, ended_at)
|
||||
]
|
||||
if len(rows) == 1:
|
||||
return rows[0]
|
||||
if material:
|
||||
same = [row for row in rows if (row["material_type"] or "").lower() == material.lower()]
|
||||
if len(same) == 1:
|
||||
return same[0]
|
||||
return None
|
||||
|
||||
|
||||
def resolve_tracking_spool(conn, host, hinted_id, ace_map=None):
|
||||
"""Spule für Live-Tracking: am Host liegende Rolle schlägt veralteten Send-Hint."""
|
||||
current = resolve_spools_at_host(conn, host, ace_map=ace_map)
|
||||
if len(current) == 1:
|
||||
return current[0]["id"]
|
||||
if hinted_id:
|
||||
row = store.get_spool_row(conn, hinted_id)
|
||||
if row and (row.get("printer_host") or "") == (host or ""):
|
||||
return hinted_id
|
||||
if current:
|
||||
return current[0]["id"]
|
||||
return hinted_id
|
||||
|
||||
|
||||
def _spool_valid_for_end(spool, ended_at):
|
||||
"""Verhindert Abzug alter Moonraker-Jobs auf neu eingelegte Spulen."""
|
||||
if ended_at is None or not spool:
|
||||
@@ -174,23 +588,28 @@ def apply_deduction(conn, run, energy, metadata=None):
|
||||
|
||||
store.close_open_segments(conn, run["id"], None, run.get("filament_used_mm") or 0)
|
||||
segments = store.list_run_segments(conn, run["id"])
|
||||
ended = run.get("ended_at")
|
||||
|
||||
entries = []
|
||||
targets = _targets_from_ace(conn, run["printer_host"], ace) if ace else []
|
||||
targets = _targets_from_ace(conn, run["printer_host"], ace, ended_at=ended) if ace else []
|
||||
if not targets and run.get("spool_id"):
|
||||
spool = store.get_spool_row(conn, run["spool_id"])
|
||||
if spool:
|
||||
if spool and _spool_valid_for_end(spool, ended):
|
||||
targets = [spool]
|
||||
# Abschnitte ohne ACE-Map: externe Rollen nacheinander
|
||||
if segments and not ace:
|
||||
final_mm = float(run.get("filament_used_mm") or 0)
|
||||
total_mm = float(run.get("filament_total_mm") or 0)
|
||||
deltas = usage.segment_deltas(segments, final_mm)
|
||||
# Messwert (oder Soll) anteilig nach mm — nicht Soll gegen Soll-Gesamtlänge,
|
||||
# sonst fehlen Gramm, wenn ein Abschnitt zu früh geschlossen wurde.
|
||||
base_g = used if used > 0 else planned
|
||||
split_mm = sum(d for _, _, d in deltas) or final_mm or total_mm
|
||||
for spool_id, ace_slot, delta_mm in deltas:
|
||||
spool = store.get_spool_row(conn, spool_id)
|
||||
if not spool:
|
||||
continue
|
||||
grams = usage.grams_from_mm(delta_mm, total_mm, planned)
|
||||
grams = usage.grams_from_mm(delta_mm, split_mm, base_g)
|
||||
cost = (grams / 1000.0) * float(spool.get("price_per_kg") or 0)
|
||||
entries.append({
|
||||
"spool_id": spool_id,
|
||||
@@ -269,8 +688,10 @@ def apply_deduction(conn, run, energy, metadata=None):
|
||||
filament = sum(item["cost"] for item in entries)
|
||||
samples = store.list_run_samples(conn, run["id"])
|
||||
power = energy_cost(run["duration_s"], energy, samples)
|
||||
# run_spools vor deducted=true, sonst bleibt die Akte leer bei Abbruch dazwischen
|
||||
store.replace_run_spools(conn, run["id"], entries)
|
||||
weight_source = source or (
|
||||
"estimate" if any(e["is_estimate"] for e in entries) else "measured"
|
||||
)
|
||||
# Zuerst deducted=true — nur der Gewinner schreibt Akte und zieht ab.
|
||||
marked = store.mark_deducted(
|
||||
conn,
|
||||
run["id"],
|
||||
@@ -278,11 +699,11 @@ def apply_deduction(conn, run, energy, metadata=None):
|
||||
filament,
|
||||
power,
|
||||
weight_used_g=used_total,
|
||||
weight_source=source or ("estimate" if any(e["is_estimate"] for e in entries) else "measured"),
|
||||
weight_source=weight_source,
|
||||
)
|
||||
if not marked:
|
||||
store.replace_run_spools(conn, run["id"], [])
|
||||
return False
|
||||
store.replace_run_spools(conn, run["id"], entries)
|
||||
for item in entries:
|
||||
store.deduct_spool(conn, item["spool_id"], item["weight_g"])
|
||||
store.ensure_run_chargen(conn, run["id"], used_total)
|
||||
@@ -296,141 +717,160 @@ def apply_deduction(conn, run, energy, metadata=None):
|
||||
return True
|
||||
|
||||
|
||||
def sync_history(conn, cfg):
|
||||
def _sync_one_job(conn, cfg, printer, job, watcher_resume=False):
|
||||
"""Einen History-Job verarbeiten. Gibt 1 zurück wenn abgezogen wurde."""
|
||||
job_id = str(job.get("job_id") or "")
|
||||
if not job_id or str(job_id).startswith("live:"):
|
||||
return 0
|
||||
filename = job.get("filename") or ""
|
||||
start_dt = unix_to_dt(job.get("start_time"))
|
||||
end_dt = unix_to_dt(job.get("end_time"))
|
||||
duration_s = float(job.get("print_duration") or job.get("total_duration") or 0)
|
||||
state = job.get("status") or ""
|
||||
# Leere Hülle: nie speichern. Sobald Dauer da ist, gilt die Beweis-Regel.
|
||||
if history_shell_is_empty({
|
||||
"duration_s": duration_s,
|
||||
"ended_at": end_dt,
|
||||
"print_duration": duration_s,
|
||||
"end_time": end_dt,
|
||||
}) and state not in TERMINAL:
|
||||
return 0
|
||||
if store.history_job_already_folded(conn, printer["host"], filename, job_id, end_dt):
|
||||
return 0
|
||||
if store.history_job_retired(conn, printer["host"], job_id):
|
||||
return 0
|
||||
fold_filament_resume(
|
||||
conn,
|
||||
printer["host"],
|
||||
filename,
|
||||
job_id,
|
||||
start_dt,
|
||||
print_duration_s=duration_s,
|
||||
watcher_resume=watcher_resume,
|
||||
)
|
||||
metadata = job.get("metadata") or {}
|
||||
planned = weight_of(metadata)
|
||||
material = material_of(metadata)
|
||||
used_mm = usage.filament_used_mm(job)
|
||||
total_mm = usage.filament_total_mm(metadata, job)
|
||||
estimated = float(metadata.get("estimated_time") or 0)
|
||||
sent = store.latest_send(conn, printer["host"], filename)
|
||||
known = store.file_by_name(conn, filename)
|
||||
file_id = (sent or {}).get("file_id") or (known or {}).get("id")
|
||||
project_id = (sent or {}).get("project_id") or (known or {}).get("project_id")
|
||||
hinted = (sent or {}).get("spool_id") or (known or {}).get("spool_id")
|
||||
ended_at = end_dt
|
||||
if not sent and not hinted:
|
||||
spool = None
|
||||
else:
|
||||
spool = choose_spool(conn, printer["host"], material, hinted, ended_at=ended_at)
|
||||
terminal = state in TERMINAL
|
||||
live = store.find_live_run(conn, printer["host"], filename)
|
||||
progress = float((live or {}).get("progress_last") or 0)
|
||||
if used_mm <= 0 and live:
|
||||
used_mm = float(live.get("filament_used_mm") or 0)
|
||||
if total_mm <= 0 and live:
|
||||
total_mm = float(live.get("filament_total_mm") or 0)
|
||||
if planned <= 0 and live:
|
||||
planned = float(live.get("weight_planned_g") or 0)
|
||||
objects = (live or {}).get("objects") or []
|
||||
if isinstance(objects, str):
|
||||
try:
|
||||
objects = json.loads(objects)
|
||||
except json.JSONDecodeError:
|
||||
objects = []
|
||||
used_g, source = usage.resolve_used_grams(
|
||||
planned, used_mm, total_mm, progress, state, duration_s
|
||||
)
|
||||
row = store.upsert_run(conn, {
|
||||
"printer_host": printer["host"],
|
||||
"printer_name": printer["name"],
|
||||
"filename": filename,
|
||||
"file_id": file_id,
|
||||
"project_id": project_id,
|
||||
"spool_id": spool["id"] if spool else None,
|
||||
"state": state,
|
||||
"started_at": start_dt,
|
||||
"ended_at": ended_at,
|
||||
"duration_s": duration_s,
|
||||
"weight_g": planned,
|
||||
"weight_planned_g": planned,
|
||||
"weight_used_g": used_g,
|
||||
"weight_source": source,
|
||||
"filament_used_mm": used_mm,
|
||||
"filament_total_mm": total_mm,
|
||||
"progress_last": progress,
|
||||
"estimated_s": estimated,
|
||||
"energy_cost": energy_cost(duration_s, cfg["energy"]),
|
||||
"moonraker_job_id": job_id,
|
||||
"needs_spool": bool(terminal and used_g > 0 and not spool),
|
||||
"material_type": material,
|
||||
"message": (job.get("message") or "") if state == "error" else "",
|
||||
"objects": objects,
|
||||
})
|
||||
store.adopt_live_run(conn, printer["host"], filename, row["id"])
|
||||
row = store.get_run_row(conn, row["id"])
|
||||
if not terminal:
|
||||
store.set_printer_active_run(conn, printer["host"], row["id"])
|
||||
else:
|
||||
active = store.find_live_run(conn, printer["host"])
|
||||
if not active:
|
||||
ended = row.get("ended_at") or ended_at
|
||||
store.ensure_bed_after_print(
|
||||
conn, printer["host"], ended_at=ended, message=filename or state
|
||||
)
|
||||
store.set_printer_active_run(conn, printer["host"], None)
|
||||
# Resume nach Filamentpause: History kann den alten Teil schon als „fertig“
|
||||
# melden. Abzug und Segment-Schluss erst beim echten Druckende.
|
||||
if watcher_resume:
|
||||
return 0
|
||||
if apply_deduction(conn, row, cfg["energy"], metadata=metadata):
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
def deduct_stale_live_runs(conn, cfg, older_than_s=LIVE_DEDUCT_FALLBACK_S):
|
||||
"""Live-Läufe ohne History nach Frist abziehen (Fertig-Pfad ohne History)."""
|
||||
rows = store.list_stale_live_runs(conn, older_than_s=older_than_s)
|
||||
n = 0
|
||||
for row in rows:
|
||||
if apply_deduction(conn, row, cfg["energy"]):
|
||||
n += 1
|
||||
return n
|
||||
|
||||
|
||||
def sync_history(conn, cfg, host=None, watcher_resume=False):
|
||||
"""History abgleichen. Serialisiert über Session-Advisory-Lock."""
|
||||
printers = store.list_printers(conn)
|
||||
if host:
|
||||
printers = [p for p in printers if p.get("host") == host]
|
||||
|
||||
def fetch(printer):
|
||||
return printer, moonraker.history(printer["host"])
|
||||
|
||||
with ThreadPoolExecutor(max_workers=max(1, len(printers))) as pool:
|
||||
fetched = list(pool.map(fetch, printers))
|
||||
with ThreadPoolExecutor(max_workers=max(1, len(printers) or 1)) as pool:
|
||||
fetched = list(pool.map(fetch, printers)) if printers else []
|
||||
collected = []
|
||||
for printer, items in fetched:
|
||||
for job in items:
|
||||
for job in history_in_order(items):
|
||||
collected.append((printer, job))
|
||||
deducted = 0
|
||||
for printer, job in collected:
|
||||
job_id = str(job.get("job_id") or "")
|
||||
if not job_id or str(job_id).startswith("live:"):
|
||||
continue
|
||||
filename = job.get("filename") or ""
|
||||
metadata = job.get("metadata") or {}
|
||||
planned = weight_of(metadata)
|
||||
material = material_of(metadata)
|
||||
state = job.get("status") or ""
|
||||
used_mm = usage.filament_used_mm(job)
|
||||
total_mm = usage.filament_total_mm(metadata, job)
|
||||
estimated = float(metadata.get("estimated_time") or 0)
|
||||
sent = store.latest_send(conn, printer["host"], filename)
|
||||
known = store.file_by_name(conn, filename)
|
||||
file_id = (sent or {}).get("file_id") or (known or {}).get("id")
|
||||
project_id = (sent or {}).get("project_id") or (known or {}).get("project_id")
|
||||
hinted = (sent or {}).get("spool_id") or (known or {}).get("spool_id")
|
||||
ended_at = unix_to_dt(job.get("end_time"))
|
||||
# Ohne Send-Eintrag keine Rate — sonst zieht eine neue Spule alle alten Jobs ab.
|
||||
if not sent and not hinted:
|
||||
spool = None
|
||||
else:
|
||||
spool = choose_spool(conn, printer["host"], material, hinted, ended_at=ended_at)
|
||||
terminal = state in TERMINAL
|
||||
live = store.find_live_run(conn, printer["host"], filename)
|
||||
progress = float((live or {}).get("progress_last") or 0)
|
||||
if used_mm <= 0 and live:
|
||||
used_mm = float(live.get("filament_used_mm") or 0)
|
||||
if total_mm <= 0 and live:
|
||||
total_mm = float(live.get("filament_total_mm") or 0)
|
||||
if planned <= 0 and live:
|
||||
planned = float(live.get("weight_planned_g") or 0)
|
||||
objects = (live or {}).get("objects") or []
|
||||
if isinstance(objects, str):
|
||||
try:
|
||||
objects = json.loads(objects)
|
||||
except json.JSONDecodeError:
|
||||
objects = []
|
||||
used_g, source = usage.resolve_used_grams(
|
||||
planned, used_mm, total_mm, progress, state, job.get("print_duration") or 0
|
||||
)
|
||||
row = store.upsert_run(conn, {
|
||||
"printer_host": printer["host"],
|
||||
"printer_name": printer["name"],
|
||||
"filename": filename,
|
||||
"file_id": file_id,
|
||||
"project_id": project_id,
|
||||
"spool_id": spool["id"] if spool else None,
|
||||
"state": state,
|
||||
"started_at": unix_to_dt(job.get("start_time")),
|
||||
"ended_at": unix_to_dt(job.get("end_time")),
|
||||
"duration_s": float(job.get("print_duration") or job.get("total_duration") or 0),
|
||||
"weight_g": planned,
|
||||
"weight_planned_g": planned,
|
||||
"weight_used_g": used_g,
|
||||
"weight_source": source,
|
||||
"filament_used_mm": used_mm,
|
||||
"filament_total_mm": total_mm,
|
||||
"progress_last": progress,
|
||||
"estimated_s": estimated,
|
||||
"energy_cost": energy_cost(job.get("print_duration") or job.get("total_duration") or 0, cfg["energy"]),
|
||||
"moonraker_job_id": job_id,
|
||||
"needs_spool": bool(terminal and used_g > 0 and not spool),
|
||||
"material_type": material,
|
||||
"message": (job.get("message") or "") if state == "error" else "",
|
||||
"objects": objects,
|
||||
})
|
||||
# Live sofort auf History hängen — auch solange noch in_progress (eine Protokoll-Zeile)
|
||||
store.adopt_live_run(conn, printer["host"], filename, row["id"])
|
||||
row = store.get_run_row(conn, row["id"])
|
||||
if terminal:
|
||||
# Nachzug nicht während eines neuen Live-Drucks — sonst „Platte belegt“ zu Unrecht
|
||||
active = store.find_live_run(conn, printer["host"])
|
||||
if not active:
|
||||
ended = row.get("ended_at") or unix_to_dt(job.get("end_time"))
|
||||
store.ensure_bed_after_print(
|
||||
conn, printer["host"], ended_at=ended, message=filename or state
|
||||
)
|
||||
if apply_deduction(conn, row, cfg["energy"], metadata=metadata):
|
||||
deducted += 1
|
||||
conn.execute("SELECT pg_advisory_lock(%s)", (SYNC_LOCK_KEY,))
|
||||
try:
|
||||
for printer, job in collected:
|
||||
deducted += _sync_one_job(
|
||||
conn, cfg, printer, job, watcher_resume=watcher_resume
|
||||
)
|
||||
if not watcher_resume:
|
||||
deducted += deduct_stale_live_runs(conn, cfg)
|
||||
finally:
|
||||
conn.execute("SELECT pg_advisory_unlock(%s)", (SYNC_LOCK_KEY,))
|
||||
return {"gelesen": len(collected), "abgezogen": deducted}
|
||||
|
||||
|
||||
def assert_filament_enough(conn, file_row, spool_id=None, ace_map=None, host=""):
|
||||
"""Dateien-Gewicht gegen Spule oder ACE-Plätze prüfen."""
|
||||
need = float((file_row or {}).get("weight_g") or 0)
|
||||
if need <= 0:
|
||||
return
|
||||
mapping = acm.normalize_mapping(ace_map)
|
||||
if mapping and host:
|
||||
leftovers = []
|
||||
for item in mapping:
|
||||
slot = int(item["ams_index"]) + 1
|
||||
row = conn.execute(
|
||||
"""
|
||||
SELECT remaining_g, name FROM spools
|
||||
WHERE printer_host = %s AND ace_slot = %s
|
||||
ORDER BY id LIMIT 1
|
||||
""",
|
||||
(host, slot),
|
||||
).fetchone()
|
||||
if row:
|
||||
leftovers.append(float(row["remaining_g"] or 0))
|
||||
if leftovers and sum(leftovers) + 0.5 < need:
|
||||
raise GrottiError(
|
||||
"ACE-Plätze haben nur %.0f g, Datei braucht %.0f g."
|
||||
% (sum(leftovers), need),
|
||||
"spule",
|
||||
)
|
||||
return
|
||||
if not spool_id:
|
||||
return
|
||||
spool = store.get_spool_row(conn, spool_id)
|
||||
if not spool:
|
||||
return
|
||||
left = float(spool["remaining_g"] or 0)
|
||||
if left + 0.5 < need:
|
||||
raise GrottiError(
|
||||
"Spule „%s“ hat nur %.0f g, Datei braucht %.0f g."
|
||||
% (spool["name"], left, need),
|
||||
"spule",
|
||||
)
|
||||
"""Zu wenig Rest bricht den Start nicht ab. Die Oberfläche warnt vorher."""
|
||||
return
|
||||
|
||||
|
||||
def prepare_send(conn, file_id, host, confirm, override, spool_id, ace_map=None):
|
||||
@@ -544,12 +984,30 @@ def send_file(
|
||||
)
|
||||
# CJK/Unicode im Namen → Rinkhals 10115 not found (Upload ≠ Start-Name)
|
||||
filename = moonraker.safe_upload_name(filename)
|
||||
ace_tools = [item.get("paint_index") for item in mapping] if mapping else None
|
||||
if (row.get("kind") or "") == "gcode" and str(filename).endswith(".gcode"):
|
||||
if slots and mapping:
|
||||
# Immer an G-code-Tn ausrichten (auch wenn UI fälschlich 0/1 schickt)
|
||||
content, mapping, filaments, remap = acm.align_tools_for_ace(
|
||||
content, mapping, filaments
|
||||
)
|
||||
if remap:
|
||||
progress(
|
||||
"ace",
|
||||
32,
|
||||
"Slicer-T verdichtet (%s)…"
|
||||
% ", ".join("T%s→T%s" % pair for pair in sorted(remap.items())),
|
||||
)
|
||||
ace_tools = [item.get("paint_index") for item in mapping] if mapping else None
|
||||
content = prepare_rinkhals_gcode(content, tools=ace_tools)
|
||||
if keep_motors:
|
||||
# Slice-Ende `M84` → sofort unhomed; Abräumen braucht die Stepper.
|
||||
content = eject.strip_end_motor_disable(content)
|
||||
else:
|
||||
if slots and mapping:
|
||||
_, mapping, filaments, _ = acm.align_tools_for_ace(
|
||||
b"", mapping, filaments
|
||||
)
|
||||
ace_tools = [item.get("paint_index") for item in mapping] if mapping else None
|
||||
size_mb = len(content) / (1024 * 1024)
|
||||
|
||||
def upload_progress(sent, total):
|
||||
|
||||
+330
-27
@@ -46,7 +46,14 @@ def sync_watch(conn, cfg, force=False):
|
||||
now = time.monotonic()
|
||||
if not force and _LAST_WATCH_SYNC and now - _LAST_WATCH_SYNC < _WATCH_MIN_INTERVAL_S:
|
||||
return {"gelesen": 0, "hinweis": "", "skipped": True}
|
||||
known = {}
|
||||
if not force:
|
||||
for row in conn.execute(
|
||||
"SELECT stored_path, size_bytes, mtime FROM files WHERE source = 'watch'"
|
||||
).fetchall():
|
||||
known[row["stored_path"]] = (int(row["size_bytes"] or 0), float(row["mtime"] or 0))
|
||||
seen = []
|
||||
gelesen = 0
|
||||
for path in folder.rglob("*"):
|
||||
if not path.is_file() or skip_path(path, cfg["data_dir"]):
|
||||
continue
|
||||
@@ -54,13 +61,66 @@ def sync_watch(conn, cfg, force=False):
|
||||
if not (lower.endswith(".gcode") or lower.endswith(".3mf")):
|
||||
continue
|
||||
try:
|
||||
resolved = str(path.resolve())
|
||||
seen.append(resolved)
|
||||
if not force:
|
||||
st = path.stat()
|
||||
prev = known.get(resolved)
|
||||
if prev and prev[0] == st.st_size and prev[1] == float(st.st_mtime):
|
||||
continue
|
||||
store.upsert_scanned(conn, meta_for(path), force=force)
|
||||
seen.append(str(path.resolve()))
|
||||
gelesen += 1
|
||||
except (OSError, zipfile.BadZipFile):
|
||||
continue
|
||||
store.forget_missing_watch(conn, seen)
|
||||
link_watch_files_to_projects(conn, cfg)
|
||||
_LAST_WATCH_SYNC = now
|
||||
return {"gelesen": len(seen), "hinweis": ""}
|
||||
return {"gelesen": gelesen, "hinweis": ""}
|
||||
|
||||
|
||||
def _apply_meta(conn, file_id, row, meta):
|
||||
store.update_file(
|
||||
conn,
|
||||
file_id,
|
||||
{
|
||||
"printer_family": meta.get("printer_family") or row.get("printer_family"),
|
||||
"filaments": meta.get("filaments") or [],
|
||||
"weight_g": meta.get("weight_g") or 0,
|
||||
"estimated_s": meta.get("estimated_s") or 0,
|
||||
"thumb_entry": meta.get("thumb_entry") or "",
|
||||
"kind": meta.get("kind") or row.get("kind"),
|
||||
"plate": meta.get("plate") or "",
|
||||
"slice_meta": meta.get("slice_meta") or {},
|
||||
"ace_trailer": bool(meta.get("ace_trailer")),
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
def refresh_one_file(conn, file_id, watch_dir=None):
|
||||
"""Eine Datei neu parsen (paint_index / ACE). None wenn nicht gefunden."""
|
||||
row = store.get_file_row(conn, file_id)
|
||||
if not row:
|
||||
return None
|
||||
stored = row.get("stored_path") or ""
|
||||
path = Path(stored) if stored else None
|
||||
if path is not None and path.is_file():
|
||||
try:
|
||||
meta = meta_for(path)
|
||||
_apply_meta(conn, file_id, row, meta)
|
||||
row = store.get_file_row(conn, file_id) or row
|
||||
except (OSError, zipfile.BadZipFile):
|
||||
pass
|
||||
return store.file_out(row, watch_dir=watch_dir, conn=conn)
|
||||
|
||||
|
||||
def filaments_need_paint_index(filaments):
|
||||
rows = filaments if isinstance(filaments, list) else []
|
||||
if len(rows) < 2:
|
||||
return False
|
||||
for item in rows:
|
||||
if not isinstance(item, dict) or "paint_index" not in item:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def refresh_file_meta(conn, force=False):
|
||||
@@ -80,20 +140,7 @@ def refresh_file_meta(conn, force=False):
|
||||
meta = meta_for(path)
|
||||
except (OSError, zipfile.BadZipFile):
|
||||
continue
|
||||
store.update_file(
|
||||
conn,
|
||||
row["id"],
|
||||
{
|
||||
"printer_family": meta.get("printer_family") or row.get("printer_family"),
|
||||
"filaments": meta.get("filaments") or [],
|
||||
"weight_g": meta.get("weight_g") or 0,
|
||||
"estimated_s": meta.get("estimated_s") or 0,
|
||||
"thumb_entry": meta.get("thumb_entry") or "",
|
||||
"kind": meta.get("kind") or row.get("kind"),
|
||||
"plate": meta.get("plate") or "",
|
||||
"slice_meta": meta.get("slice_meta") or {},
|
||||
},
|
||||
)
|
||||
_apply_meta(conn, row["id"], row, meta)
|
||||
updated += 1
|
||||
return updated
|
||||
|
||||
@@ -213,33 +260,134 @@ def delete_folder(cfg, rel):
|
||||
return folder
|
||||
|
||||
|
||||
def _link_file_to_project_folder(conn, file_id, stored_path, watch_dir):
|
||||
"""Wenn Pfad unter einem Projekt-Ordner liegt → project_id setzen."""
|
||||
folder = store.file_folder(stored_path, "watch", watch_dir)
|
||||
if not folder:
|
||||
return
|
||||
for row in store.list_project_folders(conn):
|
||||
base = (row.get("folder") or "").strip().replace("\\", "/").strip("/")
|
||||
if not base:
|
||||
continue
|
||||
if folder == base or folder.startswith(base + "/"):
|
||||
store.set_file_project(conn, file_id, row["id"])
|
||||
return
|
||||
|
||||
|
||||
def move_file(conn, cfg, file_id, folder):
|
||||
"""Watch-Datei in Unterordner (oder Wurzel) verschieben; ID bleibt."""
|
||||
"""Watch- oder Upload-Datei in Slice-Unterordner (oder Wurzel); Upload wird Watch."""
|
||||
root = require_watch_dir(cfg)
|
||||
folder = normalize_folder(folder)
|
||||
row = store.get_file_row(conn, file_id)
|
||||
if not row:
|
||||
raise GrottiError("Die Datei fehlt.", "datei", 404)
|
||||
if row.get("source") != "watch":
|
||||
raise GrottiError(
|
||||
"Nur Dateien aus dem Slice-Ordner lassen sich verschieben.",
|
||||
"watch",
|
||||
)
|
||||
source = row.get("source") or ""
|
||||
if source not in ("watch", "upload"):
|
||||
raise GrottiError("Diese Datei lässt sich nicht verschieben.", "datei")
|
||||
src = Path(row.get("stored_path") or "")
|
||||
if not src.is_file():
|
||||
raise GrottiError("Die Datei liegt nicht mehr auf der Platte.", "datei", 404)
|
||||
dest_dir = path_under_watch(root, folder)
|
||||
dest_dir.mkdir(parents=True, exist_ok=True)
|
||||
dest = dest_dir / src.name
|
||||
if dest.resolve() == src.resolve():
|
||||
return store.file_out(row, watch_dir=root)
|
||||
if dest.exists():
|
||||
if dest.resolve() == src.resolve() and source == "watch":
|
||||
return store.file_out(row, watch_dir=root, conn=conn)
|
||||
if dest.exists() and dest.resolve() != src.resolve():
|
||||
dest = unique_path(dest_dir, src.name)
|
||||
try:
|
||||
shutil.move(str(src), str(dest))
|
||||
except OSError as exc:
|
||||
raise GrottiError("Verschieben fehlgeschlagen: %s" % exc, "ordner") from exc
|
||||
stat = dest.stat()
|
||||
store.update_file_location(
|
||||
conn,
|
||||
file_id,
|
||||
str(dest.resolve()),
|
||||
name=dest.name,
|
||||
size_bytes=stat.st_size,
|
||||
mtime=stat.st_mtime,
|
||||
source="watch",
|
||||
)
|
||||
_link_file_to_project_folder(conn, file_id, str(dest.resolve()), root)
|
||||
row = store.get_file_row(conn, file_id)
|
||||
return store.file_out(row, watch_dir=root, conn=conn)
|
||||
|
||||
|
||||
def path_allowed_for_delete(stored_path, cfg):
|
||||
"""Nur Dateien unter Slice-Ordner oder data/eingang."""
|
||||
try:
|
||||
resolved = Path(stored_path).resolve()
|
||||
except (OSError, ValueError):
|
||||
return False
|
||||
roots = []
|
||||
watch = cfg.get("watch_dir")
|
||||
if watch:
|
||||
roots.append(Path(watch).resolve())
|
||||
data_dir = cfg.get("data_dir")
|
||||
if data_dir:
|
||||
roots.append((Path(data_dir) / "eingang").resolve())
|
||||
for root in roots:
|
||||
try:
|
||||
if resolved == root or root in resolved.parents:
|
||||
return True
|
||||
except OSError:
|
||||
continue
|
||||
return False
|
||||
|
||||
|
||||
def delete_library_file(conn, cfg, file_id):
|
||||
"""Bibliotheksdatei löschen (Upload oder Watch) — DB + Datei auf der Platte."""
|
||||
row = store.get_file_row(conn, file_id)
|
||||
if not row:
|
||||
raise GrottiError("Die Datei fehlt.", "datei", 404)
|
||||
stored = row.get("stored_path") or ""
|
||||
if stored and not path_allowed_for_delete(stored, cfg):
|
||||
raise GrottiError("Löschen außerhalb von Slice-Ordner oder Eingang ist nicht erlaubt.", "datei")
|
||||
store.delete_file(conn, file_id)
|
||||
if stored:
|
||||
Path(stored).unlink(missing_ok=True)
|
||||
return row
|
||||
|
||||
|
||||
def _ensure_print_suffix(new_name, old_name):
|
||||
"""Endung .gcode / .3mf / .gcode.3mf behalten, wenn der Nutzer sie weglässt."""
|
||||
name = safe_filename(new_name)
|
||||
low = name.lower()
|
||||
old_low = (old_name or "").lower()
|
||||
if low.endswith(".gcode.3mf") or low.endswith(".3mf") or low.endswith(".gcode"):
|
||||
return name
|
||||
if old_low.endswith(".gcode.3mf"):
|
||||
return name + ".gcode.3mf"
|
||||
if old_low.endswith(".3mf"):
|
||||
return name + ".3mf"
|
||||
if old_low.endswith(".gcode"):
|
||||
return name + ".gcode"
|
||||
return name
|
||||
|
||||
|
||||
def rename_library_file(conn, cfg, file_id, new_name):
|
||||
"""Datei im selben Ordner umbenennen — Platte + DB."""
|
||||
row = store.get_file_row(conn, file_id)
|
||||
if not row:
|
||||
raise GrottiError("Die Datei fehlt.", "datei", 404)
|
||||
src = Path(row.get("stored_path") or "")
|
||||
if not src.is_file():
|
||||
raise GrottiError("Die Datei liegt nicht mehr auf der Platte.", "datei", 404)
|
||||
if not path_allowed_for_delete(str(src), cfg):
|
||||
raise GrottiError("Umbenennen außerhalb von Slice-Ordner oder Eingang ist nicht erlaubt.", "datei")
|
||||
final = _ensure_print_suffix(new_name, row.get("name") or src.name)
|
||||
if not final or final in (".", ".."):
|
||||
raise GrottiError("Ungültiger Dateiname.", "datei")
|
||||
dest = src.with_name(final)
|
||||
if dest.resolve() == src.resolve():
|
||||
return store.file_out(row, watch_dir=cfg.get("watch_dir"), conn=conn)
|
||||
if dest.exists():
|
||||
raise GrottiError("Unter diesem Namen liegt schon eine Datei.", "datei")
|
||||
try:
|
||||
src.rename(dest)
|
||||
except OSError as exc:
|
||||
raise GrottiError("Umbenennen fehlgeschlagen: %s" % exc, "datei") from exc
|
||||
stat = dest.stat()
|
||||
store.update_file_location(
|
||||
conn,
|
||||
file_id,
|
||||
@@ -249,7 +397,162 @@ def move_file(conn, cfg, file_id, folder):
|
||||
mtime=stat.st_mtime,
|
||||
)
|
||||
row = store.get_file_row(conn, file_id)
|
||||
return store.file_out(row, watch_dir=root)
|
||||
return store.file_out(row, watch_dir=cfg.get("watch_dir"), conn=conn)
|
||||
|
||||
|
||||
_PRINT_SUFFIXES = (".gcode", ".3mf", ".gcode.3mf")
|
||||
|
||||
|
||||
def is_print_filename(name):
|
||||
low = (name or "").lower()
|
||||
return any(low.endswith(suf) for suf in _PRINT_SUFFIXES)
|
||||
|
||||
|
||||
def project_slug(name):
|
||||
"""Ordner-sichere Kurzform aus Projektnamen."""
|
||||
text = re.sub(r"[^\w\- äöüÄÖÜß.]+", "-", (name or "").strip(), flags=re.UNICODE)
|
||||
text = re.sub(r"\s+", "-", text)
|
||||
text = re.sub(r"-{2,}", "-", text).strip("-.")
|
||||
text = text[:60] or "projekt"
|
||||
return normalize_folder(text)
|
||||
|
||||
|
||||
def ensure_project_folder(cfg, folder_rel):
|
||||
"""Projektordner unter watch_dir anlegen; gibt normalisierten Relativpfad zurück."""
|
||||
root = require_watch_dir(cfg)
|
||||
folder = normalize_folder(folder_rel)
|
||||
if not folder:
|
||||
raise GrottiError("Projektordner fehlt.", "ordner")
|
||||
path_under_watch(root, folder).mkdir(parents=True, exist_ok=True)
|
||||
return folder
|
||||
|
||||
|
||||
def default_project_folder(name):
|
||||
return "Projekte/" + project_slug(name)
|
||||
|
||||
|
||||
def link_watch_files_to_projects(conn, cfg):
|
||||
"""Watch-Dateien in Projektordnern dem passenden Projekt zuordnen."""
|
||||
watch = cfg.get("watch_dir")
|
||||
if not watch:
|
||||
return 0
|
||||
projects = store.list_project_folders(conn)
|
||||
if not projects:
|
||||
return 0
|
||||
linked = 0
|
||||
for row in store.list_file_rows(conn):
|
||||
if (row.get("source") or "") != "watch":
|
||||
continue
|
||||
folder = store.file_folder(row.get("stored_path"), "watch", watch)
|
||||
if not folder:
|
||||
continue
|
||||
for proj in projects:
|
||||
base = (proj.get("folder") or "").strip().replace("\\", "/").strip("/")
|
||||
if not base:
|
||||
continue
|
||||
if folder == base or folder.startswith(base + "/"):
|
||||
if row.get("project_id") != proj["id"]:
|
||||
store.set_file_project(conn, row["id"], proj["id"])
|
||||
linked += 1
|
||||
break
|
||||
return linked
|
||||
|
||||
|
||||
def list_project_assets(cfg, folder_rel):
|
||||
"""Nicht-Druckdateien im Projektordner (flach + Unterordner)."""
|
||||
root = require_watch_dir(cfg)
|
||||
folder = normalize_folder(folder_rel)
|
||||
if not folder:
|
||||
return []
|
||||
base = path_under_watch(root, folder)
|
||||
if not base.is_dir():
|
||||
return []
|
||||
items = []
|
||||
for path in sorted(base.rglob("*")):
|
||||
if not path.is_file() or skip_path(path, cfg["data_dir"]):
|
||||
continue
|
||||
if is_print_filename(path.name):
|
||||
continue
|
||||
try:
|
||||
rel = path.resolve().relative_to(base).as_posix()
|
||||
except ValueError:
|
||||
continue
|
||||
stat = path.stat()
|
||||
items.append({
|
||||
"name": path.name,
|
||||
"rel": rel,
|
||||
"size_bytes": stat.st_size,
|
||||
"mtime": stat.st_mtime,
|
||||
})
|
||||
return items
|
||||
|
||||
|
||||
def resolve_project_asset(cfg, folder_rel, rel_name):
|
||||
"""Sicheren Pfad zu einer Asset-Datei im Projektordner."""
|
||||
root = require_watch_dir(cfg)
|
||||
folder = normalize_folder(folder_rel)
|
||||
if not folder:
|
||||
raise GrottiError("Projektordner fehlt.", "ordner")
|
||||
base = path_under_watch(root, folder)
|
||||
rel = str(rel_name or "").replace("\\", "/").strip("/")
|
||||
if not rel or ".." in rel.split("/"):
|
||||
raise GrottiError("Ungültiger Dateiname.", "datei")
|
||||
target = (base / rel).resolve()
|
||||
if base not in target.parents and target != base:
|
||||
raise GrottiError("Pfad außerhalb des Projektordners.", "ordner")
|
||||
if not target.is_file():
|
||||
raise GrottiError("Die Datei fehlt.", "datei", 404)
|
||||
return target
|
||||
|
||||
|
||||
def save_project_asset(cfg, folder_rel, filename, content):
|
||||
root = require_watch_dir(cfg)
|
||||
folder = normalize_folder(folder_rel)
|
||||
if not folder:
|
||||
raise GrottiError("Projektordner fehlt.", "ordner")
|
||||
dest_dir = path_under_watch(root, folder)
|
||||
dest_dir.mkdir(parents=True, exist_ok=True)
|
||||
path = unique_path(dest_dir, filename)
|
||||
path.write_bytes(content)
|
||||
return {
|
||||
"name": path.name,
|
||||
"rel": path.name,
|
||||
"size_bytes": path.stat().st_size,
|
||||
"mtime": path.stat().st_mtime,
|
||||
}
|
||||
|
||||
|
||||
def delete_project_asset(cfg, folder_rel, rel_name):
|
||||
path = resolve_project_asset(cfg, folder_rel, rel_name)
|
||||
path.unlink(missing_ok=True)
|
||||
return True
|
||||
|
||||
|
||||
def delete_project_disk_folder(cfg, folder_rel, force=False):
|
||||
"""Projektordner auf der Platte entfernen (leer oder force inkl. Inhalt)."""
|
||||
if not folder_rel:
|
||||
return
|
||||
try:
|
||||
root = require_watch_dir(cfg)
|
||||
except GrottiError:
|
||||
return
|
||||
folder = normalize_folder(folder_rel)
|
||||
if not folder:
|
||||
return
|
||||
target = path_under_watch(root, folder)
|
||||
if not target.is_dir():
|
||||
return
|
||||
if force:
|
||||
shutil.rmtree(target, ignore_errors=True)
|
||||
return
|
||||
try:
|
||||
next(target.iterdir())
|
||||
raise GrottiError(
|
||||
"Projektordner ist nicht leer — mit Bestätigung inkl. Inhalt löschen.",
|
||||
"ordner",
|
||||
)
|
||||
except StopIteration:
|
||||
target.rmdir()
|
||||
|
||||
|
||||
def save_upload(conn, filename, content, cfg, project_id=None):
|
||||
@@ -271,7 +574,7 @@ def ensure_library_gcode(conn, cfg, host, filename):
|
||||
if known:
|
||||
path = Path(known.get("stored_path") or "")
|
||||
if path.is_file():
|
||||
return store.file_out(known)
|
||||
return store.file_out(known, conn=conn)
|
||||
from grotti import moonraker
|
||||
|
||||
pulled = moonraker.download_gcode(host, base)
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
"""Zentraler Logger für Dienst und journald (stdout)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import sys
|
||||
|
||||
_CONFIGURED = False
|
||||
|
||||
LEVELS = {
|
||||
"critical": logging.CRITICAL,
|
||||
"error": logging.ERROR,
|
||||
"warning": logging.WARNING,
|
||||
"warn": logging.WARNING,
|
||||
"info": logging.INFO,
|
||||
"debug": logging.DEBUG,
|
||||
}
|
||||
|
||||
|
||||
def parse_level(value, default=logging.INFO):
|
||||
if isinstance(value, int):
|
||||
return value
|
||||
text = str(value or "").strip().lower()
|
||||
return LEVELS.get(text, default)
|
||||
|
||||
|
||||
def setup(level="INFO"):
|
||||
"""Root-Logger einmalig auf stdout (systemd → journald)."""
|
||||
global _CONFIGURED
|
||||
resolved = parse_level(level)
|
||||
root = logging.getLogger()
|
||||
if _CONFIGURED:
|
||||
root.setLevel(resolved)
|
||||
return root
|
||||
root.handlers.clear()
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
handler.setFormatter(
|
||||
logging.Formatter(
|
||||
"%(asctime)s %(levelname)s [%(name)s] %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
)
|
||||
root.addHandler(handler)
|
||||
root.setLevel(resolved)
|
||||
logging.getLogger("waitress").setLevel(logging.WARNING)
|
||||
logging.getLogger("urllib3").setLevel(logging.WARNING)
|
||||
_CONFIGURED = True
|
||||
return root
|
||||
|
||||
|
||||
def get(name="grotti"):
|
||||
return logging.getLogger(name)
|
||||
+52
-13
@@ -57,6 +57,51 @@ def _write_guard():
|
||||
raise RuntimeError("MCP läuft im Read-only-Modus (GROTTI_MCP_READ_ONLY).")
|
||||
|
||||
|
||||
# Wird beim Connect an den Client gegeben (Claude, Cursor, …).
|
||||
INSTRUCTIONS = """\
|
||||
Grotti steuert eine 3D-Drucker-Farm (Anycubic Kobra, Klipper/Moonraker).
|
||||
Antworte dem Nutzer auf Deutsch. Handle nur über diese Tools.
|
||||
|
||||
Identität
|
||||
- Drucker über das Feld host (IP). Den Namen nur zur Anzeige nutzen. Hosts nie raten: erst list_printers oder get_printer.
|
||||
- Dateien über die numerische id aus list_files (Feld id), nicht über den Dateinamen allein.
|
||||
- Vor jedem Schreibzugriff den aktuellen Stand lesen.
|
||||
|
||||
Lesen
|
||||
- Farm: list_printers (live=true). Ein Drucker: get_printer(host).
|
||||
- Läuft: list_running. Warteschlange: list_queue. Ereignisse: list_events.
|
||||
- Bibliothek: list_files. Spulen: list_spools. Filament-Fehlmenge: bedarf_lesen.
|
||||
- Kundenaufträge: auftraege_lesen. Verschleißteile: wartung_lesen.
|
||||
|
||||
Zustand (Feld state)
|
||||
- printing: druckt. paused: Pause. standby: frei. complete: fertig, Platte oft noch belegt.
|
||||
- error: Fehler, nicht einfach neu starten. offline: nicht erreichbar.
|
||||
- progress ist 0…1. filament_empty oder pause_reason bei Pause heißt Filament leer.
|
||||
Dann dem Nutzer sagen, die neue Spule in Grotti dem Drucker zuzuweisen, und erst danach resume_printer.
|
||||
Eine Filament-Pause nicht blind fortsetzen.
|
||||
|
||||
Schreiben
|
||||
confirm=true nur setzen, wenn der Nutzer diese Aktion in diesem Zug klar will. Nicht vorauseilend bestätigen.
|
||||
- enqueue_when_free: Datei in die Warteschlange. host leer = Grotti wählt den nächsten Drucker mit passender Sorte. host gesetzt = dieser Drucker, sobald er frei ist und die Platte klar ist. Das ist der normale Weg.
|
||||
- enqueue_print: sofort senden und starten. Nur wenn der Nutzer einen Sofortstart auf einem genannten freien Drucker will (state standby, Platte frei). Große Dateien brauchen oft etwa eine Minute bis zum Start.
|
||||
- Den Material-Match macht Grotti (PLA Meta ist nicht Matte und nicht Silk). Eine falsche Maschine nicht erzwingen. Eine Ablehnung wörtlich weitergeben.
|
||||
- bed_leveling=true nur auf ausdrücklichen Wunsch (Bettnetz / Auto-Level).
|
||||
- pause_printer und resume_printer während des Drucks, ohne confirm.
|
||||
- cancel_printer bricht den Druck ab und braucht confirm=true. Bei Unklarheit erst nachfragen.
|
||||
- clear_bed ist nur die Quittung „Platte ist leer“ und schiebt nichts physisch. Erst aufrufen, wenn der Nutzer sagt, das Teil ist herunter. Ohne diese Quittung startet der nächste „wenn frei“-Job nicht.
|
||||
- steer_temp (Düse und Bett in °C), steer_speed (Prozent), steer_fan (0–100): nur diese Werte. Kein freier G-code.
|
||||
|
||||
Grenzen
|
||||
- Keine G-code-Konsole, kein Firmware-Restart, kein E-Stop, keine Benutzer- oder Token-Verwaltung. Diese Lücken nicht umgehen.
|
||||
- Im Read-only-Modus (GROTTI_MCP_READ_ONLY) schlagen Schreib-Tools fehl. Das sagen und nicht wiederholen.
|
||||
- Gesperrte Drucker und ausgeschaltete Automatik starten keine Warteschlangen-Jobs. Den Fehler nennen.
|
||||
|
||||
Antworten
|
||||
- Kurz und konkret: Druckername, host, Datei, Zustand, was du getan hast.
|
||||
- Den Fehlertext von Grotti zitieren. Keinen Workaround außerhalb der Tools erfinden.
|
||||
"""
|
||||
|
||||
|
||||
def main():
|
||||
try:
|
||||
from mcp.server.fastmcp import FastMCP
|
||||
@@ -67,23 +112,17 @@ def main():
|
||||
)
|
||||
sys.exit(1)
|
||||
|
||||
server = FastMCP(
|
||||
"grotti",
|
||||
instructions=(
|
||||
"Grotti steuert die 3D-Drucker-Farm. Destruktive Aktionen brauchen "
|
||||
"confirm=true. Kein freier G-code, kein Firmware-Restart."
|
||||
),
|
||||
)
|
||||
server = FastMCP("grotti", instructions=INSTRUCTIONS)
|
||||
|
||||
@server.tool()
|
||||
def list_printers(live: bool = True) -> str:
|
||||
"""Druckerliste mit optionalem Live-Zustand."""
|
||||
"""Alle Drucker. live=true liefert Zustand, Temps, Fortschritt, Dateiname. Host ist die IP."""
|
||||
q = "?live=1" if live else "?live=0"
|
||||
return json.dumps(_api("GET", "/drucker" + q), ensure_ascii=False, indent=2)
|
||||
|
||||
@server.tool()
|
||||
def get_printer(host: str) -> str:
|
||||
"""Einen Drucker anhand Host/IP aus der Live-Liste."""
|
||||
"""Einen Drucker anhand host (IP) aus der Live-Liste. Host vorher über list_printers holen."""
|
||||
rows = _api("GET", "/drucker?live=1") or []
|
||||
for row in rows:
|
||||
if row.get("host") == host:
|
||||
@@ -115,7 +154,7 @@ def main():
|
||||
|
||||
@server.tool()
|
||||
def list_files(limit: int = 50) -> str:
|
||||
"""Dateien in der Bibliothek."""
|
||||
"""Dateien in der Bibliothek. Die numerische id ist die file_id fürs Einreihen und Starten."""
|
||||
rows = _api("GET", "/dateien") or []
|
||||
return json.dumps(rows[: max(1, min(limit, 200))], ensure_ascii=False, indent=2)
|
||||
|
||||
@@ -181,7 +220,7 @@ def main():
|
||||
|
||||
@server.tool()
|
||||
def clear_bed(host: str, confirm: bool = False) -> str:
|
||||
"""Platte als geräumt quittieren (kein physisches Schieben)."""
|
||||
"""Quittung, dass der Nutzer die Platte geleert hat. Schiebt nichts. confirm muss true sein. Danach kann die Warteschlange den nächsten Job starten."""
|
||||
_write_guard()
|
||||
if not confirm:
|
||||
raise RuntimeError("Quittierung braucht confirm=true.")
|
||||
@@ -201,7 +240,7 @@ def main():
|
||||
confirm: bool = False,
|
||||
bed_leveling: bool = False,
|
||||
) -> str:
|
||||
"""Datei in die Warteschlange („wenn frei“). confirm muss true sein."""
|
||||
"""Datei in die Warteschlange. host leer: Grotti wählt den nächsten Drucker mit passender Sorte. host gesetzt: dieser Drucker, sobald frei und Platte klar. confirm muss true sein. Normaler Weg zum Drucken."""
|
||||
_write_guard()
|
||||
if not confirm:
|
||||
raise RuntimeError("Einreihen braucht confirm=true.")
|
||||
@@ -220,7 +259,7 @@ def main():
|
||||
confirm: bool = False,
|
||||
bed_leveling: bool = False,
|
||||
) -> str:
|
||||
"""Sofort senden und starten. confirm muss true sein."""
|
||||
"""Sofort an diesen host senden und starten. Nur bei freiem Drucker (standby, Platte frei) und klarem Sofortstart-Wunsch. confirm muss true sein."""
|
||||
_write_guard()
|
||||
if not confirm:
|
||||
raise RuntimeError("Start braucht confirm=true.")
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Leere/alte Spulen aus der Alltagsliste nehmen
|
||||
ALTER TABLE spools ADD COLUMN IF NOT EXISTS archived_at timestamptz;
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Projekt-Arbeitsmappe: Relativordner unter dem Slice-Pfad
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS folder text NOT NULL DEFAULT '';
|
||||
@@ -0,0 +1,16 @@
|
||||
-- Jede Moonraker-Job-ID bleibt einem Lauf zugeordnet, auch nach dem Zusammenlegen.
|
||||
CREATE TABLE IF NOT EXISTS run_jobs (
|
||||
printer_host text NOT NULL,
|
||||
job_id text NOT NULL,
|
||||
run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
|
||||
PRIMARY KEY (printer_host, job_id)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS run_jobs_run ON run_jobs (run_id);
|
||||
|
||||
INSERT INTO run_jobs (printer_host, job_id, run_id)
|
||||
SELECT printer_host, moonraker_job_id, id
|
||||
FROM runs
|
||||
WHERE moonraker_job_id <> ''
|
||||
AND moonraker_job_id NOT LIKE 'live:%'
|
||||
ON CONFLICT DO NOTHING;
|
||||
@@ -0,0 +1,6 @@
|
||||
-- Last active run per printer (survives Grotti restart during pause)
|
||||
ALTER TABLE printers
|
||||
ADD COLUMN IF NOT EXISTS active_run_id bigint REFERENCES runs (id) ON DELETE SET NULL;
|
||||
|
||||
CREATE INDEX IF NOT EXISTS printers_active_run ON printers (active_run_id)
|
||||
WHERE active_run_id IS NOT NULL;
|
||||
@@ -0,0 +1,10 @@
|
||||
-- Queue item points at the run it started. At most one running job per host.
|
||||
ALTER TABLE print_queue
|
||||
ADD COLUMN IF NOT EXISTS run_id bigint REFERENCES runs (id) ON DELETE SET NULL;
|
||||
|
||||
CREATE INDEX IF NOT EXISTS print_queue_run ON print_queue (run_id)
|
||||
WHERE run_id IS NOT NULL;
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS print_queue_one_running_per_host
|
||||
ON print_queue (host)
|
||||
WHERE status = 'running' AND host <> '';
|
||||
@@ -0,0 +1,3 @@
|
||||
-- ACE-Trailer-Flag einmalig speichern, damit die Dateiliste die Datei nicht erneut öffnet.
|
||||
ALTER TABLE files
|
||||
ADD COLUMN IF NOT EXISTS ace_trailer boolean;
|
||||
+47
-26
@@ -8,8 +8,11 @@ import urllib.parse
|
||||
import urllib.request
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
from grotti import logutil
|
||||
from grotti.parse import embedded_png
|
||||
|
||||
log = logutil.get("grotti.moonraker")
|
||||
|
||||
META_CACHE = {}
|
||||
CAMERA_CACHE = {}
|
||||
EMBEDDED = {}
|
||||
@@ -917,11 +920,27 @@ def last_filament_gcode_hint(host, limit=40):
|
||||
return ""
|
||||
|
||||
|
||||
def _mmu_tool_index(mmu):
|
||||
"""Aktives ACE/MMU-Tool, sonst None. −1 / fehlend = kein Tool (Anycubic-Normalfall)."""
|
||||
if not isinstance(mmu, dict):
|
||||
return None
|
||||
tool = mmu.get("tool")
|
||||
if not isinstance(tool, (int, float)) or isinstance(tool, bool):
|
||||
tool = mmu.get("gate")
|
||||
if not isinstance(tool, (int, float)) or isinstance(tool, bool):
|
||||
return None
|
||||
tool_i = int(tool)
|
||||
return tool_i if tool_i >= 0 else None
|
||||
|
||||
|
||||
def filament_out_hint(mmu, message="", host=None):
|
||||
"""Vermutetes Material-Ende bei Pause: (code, Text) oder (None, None).
|
||||
|
||||
Quellen: print_stats.message, ACE/mmu (active_filament.empty, gate_status),
|
||||
optional G-code-Store (nur wenn host gesetzt).
|
||||
Quellen: print_stats.message, mmu.reason_for_pause, gate_status bei aktivem Tool,
|
||||
active_filament.empty nur mit aktivem Tool, optional G-code-Store (host).
|
||||
|
||||
Nicht: active_filament.empty allein — Anycubic ACE meldet empty=true auch
|
||||
beim normalen Druck und bei manueller Pause (tool/gate = −1).
|
||||
"""
|
||||
text = (message or "").strip()
|
||||
if text and _FILAMENT_HINT_RE.search(text):
|
||||
@@ -930,33 +949,35 @@ def filament_out_hint(mmu, message="", host=None):
|
||||
return "message", text[:160]
|
||||
|
||||
if isinstance(mmu, dict) and mmu:
|
||||
rfp = (mmu.get("reason_for_pause") or "").strip()
|
||||
if rfp and _FILAMENT_HINT_RE.search(rfp):
|
||||
if "10107" in rfp.lower():
|
||||
return "reason", "Filament gerissen oder leer (10107)"
|
||||
return "reason", rfp[:160]
|
||||
|
||||
tool_i = _mmu_tool_index(mmu)
|
||||
states = mmu.get("gate_status")
|
||||
# gate_status==0 nur, wenn Status differenziert (nicht alle 0 = Anycubic-Unknown)
|
||||
if (
|
||||
tool_i is not None
|
||||
and isinstance(states, list)
|
||||
and tool_i < len(states)
|
||||
and int(states[tool_i] or 0) == 0
|
||||
and any(int(s or 0) != 0 for s in states)
|
||||
):
|
||||
return "gate_empty", "ACE-Platz %d leer" % (tool_i + 1)
|
||||
|
||||
active = mmu.get("active_filament")
|
||||
if isinstance(active, dict) and (
|
||||
active.get("empty") is True
|
||||
or str(active.get("empty") or "").lower() in ("1", "true")
|
||||
if (
|
||||
tool_i is not None
|
||||
and isinstance(active, dict)
|
||||
and (
|
||||
active.get("empty") is True
|
||||
or str(active.get("empty") or "").lower() in ("1", "true")
|
||||
)
|
||||
):
|
||||
return "active_empty", "Aktives Filament leer (ACE)"
|
||||
|
||||
tool = mmu.get("tool")
|
||||
if not isinstance(tool, (int, float)) or isinstance(tool, bool):
|
||||
tool = mmu.get("gate")
|
||||
if isinstance(tool, (int, float)) and not isinstance(tool, bool) and int(tool) >= 0:
|
||||
tool_i = int(tool)
|
||||
states = mmu.get("gate_status")
|
||||
if isinstance(states, list) and tool_i < len(states) and states[tool_i] == 0:
|
||||
return "gate_empty", "ACE-Platz %d leer" % (tool_i + 1)
|
||||
|
||||
# ACE pausiert und kein aktives Filament → oft Runout ohne leeren gate_status
|
||||
if mmu.get("is_paused") and isinstance(active, dict):
|
||||
kind = (
|
||||
active.get("filament_type")
|
||||
or active.get("type")
|
||||
or active.get("material")
|
||||
or ""
|
||||
)
|
||||
if not str(kind).strip():
|
||||
return "mmu_paused", "ACE pausiert — kein Filament aktiv"
|
||||
|
||||
if host:
|
||||
hint = last_filament_gcode_hint(host)
|
||||
if hint:
|
||||
@@ -1223,7 +1244,7 @@ def snapshot(printers):
|
||||
card.update(query(printer["host"]))
|
||||
except Exception as error:
|
||||
# Auch RemoteDisconnected / IncompleteRead / ValueError — sonst fällt der ganze Tick aus.
|
||||
print("snapshot %s: %s" % (printer.get("host"), error), flush=True)
|
||||
log.warning("snapshot %s: %s", printer.get("host"), error)
|
||||
card.update({
|
||||
"ok": False,
|
||||
"state": "offline",
|
||||
|
||||
+113
-9
@@ -17,6 +17,8 @@ TRAILER_RE = re.compile(rb";\s*referenced_tools\s*=", re.I)
|
||||
RINKHALS_FINGERPRINT = b"; processed by MmuAcePatcher"
|
||||
_SLICER_RE = re.compile(rb"^;.*generated by ([A-Za-z]*) .*$|^; (BambuStudio) .*$", re.I)
|
||||
_TOOL_RE = re.compile(rb"^(?:MMU_CHANGE_TOOL(?:_STANDALONE)? .*?TOOL=|T)(\d{1,2})", re.I)
|
||||
# Orca `; filament_colour_type` — gklib parsed wie `filament_colour` und panickt (10111).
|
||||
_COLOUR_TYPE_LINE_RE = re.compile(rb"(?m)^;\s*filament_colour_type\b[^\n]*\n?")
|
||||
_AUTHORIZED_SLICERS = {
|
||||
"prusaslicer",
|
||||
"superslicer",
|
||||
@@ -91,40 +93,111 @@ def color_hex(channels):
|
||||
return "#%02x%02x%02x" % tuple(rgb)
|
||||
|
||||
|
||||
def profile_name(raw):
|
||||
"""Orca-Profil → Katalogname: `Sunlu PLA Meta @Kobra 3` → `Sunlu PLA Meta`."""
|
||||
text = (raw or "").strip().strip('"').strip("'").strip()
|
||||
if " @" in text:
|
||||
text = text.rsplit(" @", 1)[0].strip()
|
||||
return text
|
||||
|
||||
|
||||
def filament_profiles(comments):
|
||||
"""Profilnamen aus `; filament_settings_id`, Index = Slicer-Slot / paint_index."""
|
||||
raw = (comments or {}).get("filament_settings_id") or ""
|
||||
if not raw.strip():
|
||||
fallback = profile_name((comments or {}).get("default_filament_profile") or "")
|
||||
return [fallback] if fallback else []
|
||||
return [profile_name(part) for part in raw.split(";") if profile_name(part)]
|
||||
|
||||
|
||||
def attach_profiles(filaments, comments):
|
||||
"""Hängt `profile` (Sorte) an Filament-Einträge anhand des paint_index."""
|
||||
profiles = filament_profiles(comments)
|
||||
if not filaments:
|
||||
return filaments
|
||||
if not profiles:
|
||||
return filaments
|
||||
for index, row in enumerate(filaments):
|
||||
if not isinstance(row, dict):
|
||||
continue
|
||||
try:
|
||||
paint = int(row.get("paint_index"))
|
||||
except (TypeError, ValueError):
|
||||
paint = index
|
||||
name = ""
|
||||
if 0 <= paint < len(profiles):
|
||||
name = profiles[paint]
|
||||
elif len(filaments) == 1 and len(profiles) == 1:
|
||||
name = profiles[0]
|
||||
if name:
|
||||
row["profile"] = name
|
||||
return filaments
|
||||
|
||||
|
||||
def filaments_from_paint_info(raw):
|
||||
"""Farben aus `; paint_info` — inkl. originalem `paint_index` (T-Nummer).
|
||||
|
||||
Bambu/Anycubic nutzen oft Lücken (T1 + T10 bei 16 Slots). Die Liste bleibt
|
||||
kompakt (nur belegte Farben), aber jeder Eintrag trägt den Slicer-Index,
|
||||
damit `.acm` und ACE-Map denselben Wert wie `Tn` im G-code schreiben.
|
||||
"""
|
||||
try:
|
||||
items = json.loads(raw or "")
|
||||
except (TypeError, json.JSONDecodeError):
|
||||
return []
|
||||
if not isinstance(items, list):
|
||||
return []
|
||||
found = []
|
||||
found = {}
|
||||
next_fallback = 0
|
||||
for item in items:
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
try:
|
||||
index = int(item.get("paint_index"))
|
||||
except (TypeError, ValueError):
|
||||
index = len(found)
|
||||
while len(found) <= index:
|
||||
found.append({"type": "", "color": ""})
|
||||
found[index] = {
|
||||
index = next_fallback
|
||||
if index < 0:
|
||||
continue
|
||||
next_fallback = max(next_fallback, index + 1)
|
||||
row = {
|
||||
"type": str(item.get("material_type") or "").strip(),
|
||||
"color": color_hex(item.get("paint_color")),
|
||||
"paint_index": index,
|
||||
}
|
||||
return [row for row in found if row["type"] or row["color"]]
|
||||
if row["type"] or row["color"]:
|
||||
found[index] = row
|
||||
return [found[key] for key in sorted(found)]
|
||||
|
||||
|
||||
def filaments_of(comments):
|
||||
painted = filaments_from_paint_info(comments.get("paint_info"))
|
||||
if painted:
|
||||
return painted
|
||||
return attach_profiles(painted, comments)
|
||||
types = [part.strip() for part in (comments.get("filament_type") or "").split(";") if part.strip()]
|
||||
colors = [part.strip() for part in (comments.get("filament_colour") or comments.get("filament_color") or "").split(";")]
|
||||
return [
|
||||
{"type": kind, "color": colors[index] if index < len(colors) else ""}
|
||||
rows = [
|
||||
{
|
||||
"type": kind,
|
||||
"color": colors[index] if index < len(colors) else "",
|
||||
"paint_index": index,
|
||||
}
|
||||
for index, kind in enumerate(types)
|
||||
]
|
||||
return attach_profiles(rows, comments)
|
||||
|
||||
|
||||
def tools_used_in_gcode(content):
|
||||
"""T-/MMU-Werkzeuge aus dem G-code (wie Rinkhals mmu_ace_metadata)."""
|
||||
if not content:
|
||||
return set()
|
||||
if isinstance(content, str):
|
||||
content = content.encode("utf-8", "replace")
|
||||
found = set()
|
||||
for line in _gcode_lines(content):
|
||||
match = _TOOL_RE.match(line)
|
||||
if match:
|
||||
found.add(int(match.group(1)))
|
||||
return found
|
||||
|
||||
|
||||
def _gcode_lines(content):
|
||||
@@ -173,6 +246,36 @@ def _paint_tool_indexes(content):
|
||||
return found
|
||||
|
||||
|
||||
def gcode_is_multicolor(content, tools=None):
|
||||
"""Mehr als ein Slicer-/ACE-Tool → Multicolor (Header nicht antasten)."""
|
||||
if not content or content[:2] == b"PK":
|
||||
return False
|
||||
indexes = set()
|
||||
for value in tools or []:
|
||||
try:
|
||||
indexes.add(int(value))
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
for line in _gcode_lines(content):
|
||||
match = _TOOL_RE.match(line)
|
||||
if match:
|
||||
indexes.add(int(match.group(1)))
|
||||
indexes |= _paint_tool_indexes(content)
|
||||
return len(indexes) > 1
|
||||
|
||||
|
||||
def strip_filament_colour_type(content, tools=None):
|
||||
"""`; filament_colour_type` nur bei Einfarbig entfernen (gklib 10111).
|
||||
|
||||
Multicolor unverändert — ACE/paint_index und `; filament_colour` bleiben.
|
||||
"""
|
||||
if not content or content[:2] == b"PK":
|
||||
return content
|
||||
if gcode_is_multicolor(content, tools=tools):
|
||||
return content
|
||||
return _COLOUR_TYPE_LINE_RE.sub(b"", content)
|
||||
|
||||
|
||||
def prepare_rinkhals_gcode(content, tools=None):
|
||||
"""Kopfzeile für Rinkhals plus `; referenced_tools`, wenn sie fehlt.
|
||||
|
||||
@@ -182,6 +285,7 @@ def prepare_rinkhals_gcode(content, tools=None):
|
||||
"""
|
||||
if not content or content[:2] == b"PK":
|
||||
return content
|
||||
content = strip_filament_colour_type(content, tools=tools)
|
||||
first_end = content.find(b"\n")
|
||||
first = content if first_end < 0 else content[:first_end]
|
||||
if first.endswith(b"\r"):
|
||||
|
||||
+305
-36
@@ -10,7 +10,7 @@ import threading
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from grotti import eject, jobs, moonraker, notify, store
|
||||
from grotti import acm, eject, jobs, logutil, moonraker, notify, store
|
||||
from grotti.db import connect
|
||||
from grotti.errors import GrottiError
|
||||
from grotti import time_window
|
||||
@@ -18,6 +18,8 @@ from grotti import time_window
|
||||
WINDOW_WAIT_MSG = "Wartet auf Zeitfenster…"
|
||||
from grotti.events_bus import publish as publish_live
|
||||
|
||||
log = logutil.get("grotti.queue")
|
||||
|
||||
|
||||
def _notify_queue():
|
||||
publish_live("queue", {})
|
||||
@@ -28,8 +30,13 @@ BUSY = {"printing", "paused", "heating", "error"}
|
||||
KEEPALIVE_S = 120
|
||||
# Nach Start ohne print_active: Upload/MQTT/LeviQ brauchen Zeit, aber nicht ewig
|
||||
PRINT_START_TIMEOUT_S = 600
|
||||
# Einfacher Queue-Start ohne Worker (typisch Grotti-Neustart)
|
||||
# Upload-Worker weg (typisch Grotti-Neustart mitten im Hochladen).
|
||||
# Nach erfolgreichem Senden ist die Phase await_print — dort gilt das nicht,
|
||||
# sonst wird ein noch anlaufender Druck als „Neustart“ neu eingereiht.
|
||||
SIMPLE_START_STUCK_S = 45
|
||||
# Anycubic meldet kurz cancelled/standby bei LeviQ und Filament-Resume.
|
||||
TERMINAL_CONFIRM_HITS = 3
|
||||
AWAIT_CANCEL_HITS = 3
|
||||
|
||||
|
||||
def _ablauf_needs_motors(item):
|
||||
@@ -111,7 +118,7 @@ class PrintQueueDispatcher:
|
||||
try:
|
||||
self.tick()
|
||||
except Exception as exc:
|
||||
print("Druck-Queue: %s" % exc, flush=True)
|
||||
log.warning("Druck-Queue: %s", exc)
|
||||
self._stop.wait(self.interval)
|
||||
|
||||
def _live_map(self, printers):
|
||||
@@ -147,10 +154,20 @@ class PrintQueueDispatcher:
|
||||
def _auto_retry_enabled(self):
|
||||
return bool((self.cfg or {}).get("auto_retry", True))
|
||||
|
||||
def _retryable_message(self, message):
|
||||
text = (message or "").lower()
|
||||
if "abgebrochen" in text:
|
||||
return False
|
||||
if "druck abgebrochen" in text:
|
||||
return False
|
||||
return True
|
||||
|
||||
def _try_auto_retry(self, conn, item, message):
|
||||
"""Ein automatischer Neuversuch; sonst False."""
|
||||
"""Ein automatischer Neuversuch; sonst False. Nicht nach Abbruch."""
|
||||
if not self._auto_retry_enabled():
|
||||
return False
|
||||
if not self._retryable_message(message):
|
||||
return False
|
||||
retries = int(item.get("retry_count") or 0)
|
||||
if retries >= 1:
|
||||
return False
|
||||
@@ -168,6 +185,23 @@ class PrintQueueDispatcher:
|
||||
)
|
||||
return True
|
||||
|
||||
def _terminal_hits(self, item_id, kind="end"):
|
||||
key = "%s:%s" % (item_id, kind)
|
||||
if not hasattr(self, "_term_hits"):
|
||||
self._term_hits = {}
|
||||
self._term_hits[key] = self._term_hits.get(key, 0) + 1
|
||||
return self._term_hits[key]
|
||||
|
||||
def _clear_terminal_hits(self, item_id, kind=None):
|
||||
if not hasattr(self, "_term_hits"):
|
||||
return
|
||||
if kind:
|
||||
self._term_hits.pop("%s:%s" % (item_id, kind), None)
|
||||
return
|
||||
for key in list(self._term_hits):
|
||||
if key.startswith("%s:" % item_id):
|
||||
self._term_hits.pop(key, None)
|
||||
|
||||
def _fail_stuck_simple_start(self, conn, item, printer):
|
||||
host = printer["host"]
|
||||
msg = "Start abgebrochen (Neustart)"
|
||||
@@ -207,7 +241,7 @@ class PrintQueueDispatcher:
|
||||
try:
|
||||
target(*args)
|
||||
except Exception as exc:
|
||||
print("Queue-Worker %s: %s" % (item_id, exc), flush=True)
|
||||
log.warning("Queue-Worker %s: %s", item_id, exc)
|
||||
finally:
|
||||
_notify_queue()
|
||||
with self._worker_lock:
|
||||
@@ -273,18 +307,27 @@ class PrintQueueDispatcher:
|
||||
lives[host] = live
|
||||
state = (live.get("state") or "").lower()
|
||||
if state in BUSY:
|
||||
# Laufenden Einfach-Druck mitziehen. Sonst bleibt await_print
|
||||
# stehen, bis der Drucker frei ist — und der Start gilt als Timeout,
|
||||
# obwohl er längst druckt.
|
||||
running = store.running_print_on_host(conn, host)
|
||||
if running and not _has_ablauf(running):
|
||||
self._advance_simple(conn, running, printer, live)
|
||||
conn.commit()
|
||||
continue
|
||||
if state not in FREE:
|
||||
continue
|
||||
running = store.running_print_on_host(conn, host)
|
||||
if running:
|
||||
if (
|
||||
not _has_ablauf(running)
|
||||
and (running.get("phase") or "").lower() == "starting"
|
||||
and not self._worker_busy(running["id"])
|
||||
and self._item_phase_age_s(running) > SIMPLE_START_STUCK_S
|
||||
):
|
||||
self._fail_stuck_simple_start(conn, running, printer)
|
||||
if not _has_ablauf(running):
|
||||
if (
|
||||
(running.get("phase") or "").lower() == "starting"
|
||||
and not self._worker_busy(running["id"])
|
||||
and self._item_phase_age_s(running) > SIMPLE_START_STUCK_S
|
||||
):
|
||||
self._fail_stuck_simple_start(conn, running, printer)
|
||||
else:
|
||||
self._advance_simple(conn, running, printer, live)
|
||||
conn.commit()
|
||||
continue
|
||||
if store.bed_needs_clear(conn, host):
|
||||
@@ -306,6 +349,11 @@ class PrintQueueDispatcher:
|
||||
if (waiting.get("message") or "") != WINDOW_WAIT_MSG:
|
||||
store.update_print_queue(conn, waiting["id"], {"message": WINDOW_WAIT_MSG})
|
||||
continue
|
||||
# Nächster passender / leere Map: ACE aus Spulen bauen oder warten
|
||||
if not _has_ablauf(waiting):
|
||||
waiting = self._ensure_ace_map(conn, waiting, host, live)
|
||||
if not waiting:
|
||||
continue
|
||||
claimed = store.claim_print_queue(conn, waiting["id"], host)
|
||||
if not claimed:
|
||||
continue
|
||||
@@ -317,6 +365,49 @@ class PrintQueueDispatcher:
|
||||
self._start_simple(conn, claimed, printer)
|
||||
conn.commit()
|
||||
|
||||
def _ensure_ace_map(self, conn, waiting, host, live):
|
||||
"""Bei ACE-Drucker und leerer Map: aus Spulen zuordnen oder Wartegrund setzen."""
|
||||
slots = (live or {}).get("slots") or []
|
||||
if not slots:
|
||||
return waiting
|
||||
ace = waiting.get("ace_map") or []
|
||||
if isinstance(ace, str):
|
||||
import json
|
||||
|
||||
try:
|
||||
ace = json.loads(ace)
|
||||
except json.JSONDecodeError:
|
||||
ace = []
|
||||
if acm.normalize_mapping(ace if isinstance(ace, list) else []):
|
||||
return waiting
|
||||
file_id = waiting.get("file_id")
|
||||
if not file_id:
|
||||
return waiting
|
||||
mapping, reason = store.auto_ace_map(conn, host, file_id)
|
||||
if reason:
|
||||
if (waiting.get("wait_reason") or "") != reason or (waiting.get("message") or "") != reason:
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
waiting["id"],
|
||||
{"wait_reason": reason, "message": reason},
|
||||
)
|
||||
return None
|
||||
if not mapping:
|
||||
# ACE am Drucker, aber keine ACE-Spulen in Grotti → nicht raten
|
||||
reason = "ACE-Zuordnung fehlt (keine passende Spule)"
|
||||
if (waiting.get("wait_reason") or "") != reason:
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
waiting["id"],
|
||||
{"wait_reason": reason, "message": reason},
|
||||
)
|
||||
return None
|
||||
store.update_print_queue(conn, waiting["id"], {"ace_map": mapping, "wait_reason": "", "message": ""})
|
||||
waiting = dict(waiting)
|
||||
waiting["ace_map"] = mapping
|
||||
waiting["wait_reason"] = ""
|
||||
return waiting
|
||||
|
||||
def _start_simple(self, conn, item, printer):
|
||||
"""Upload/Start im Worker — mehrere freie Drucker parallel."""
|
||||
host = printer["host"]
|
||||
@@ -364,22 +455,31 @@ class PrintQueueDispatcher:
|
||||
bed_leveling=bed_leveling,
|
||||
)
|
||||
name = (result or {}).get("filename") or ""
|
||||
# Abbruch während Upload: Status nicht überschreiben, Druck stoppen.
|
||||
current = store.get_print_queue_row(wconn, item_id)
|
||||
if current and (current.get("status") or "") in ("cancelled", "dismissed"):
|
||||
try:
|
||||
moonraker.command(host, "cancel")
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
oid = item.get("order_item_id")
|
||||
if oid:
|
||||
from grotti import orders
|
||||
|
||||
orders.attach_order_item_to_live_run(wconn, host, name, oid)
|
||||
store.update_print_queue(
|
||||
wconn,
|
||||
item_id,
|
||||
{
|
||||
"status": "done",
|
||||
"message": "Gestartet auf %s: %s" % (printer_copy["name"], name),
|
||||
"host": host,
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
live_run = store.find_active_run(wconn, host, name)
|
||||
fields = {
|
||||
"status": "running",
|
||||
"message": "Datei ist auf %s. Druckstart kann etwa eine Minute dauern."
|
||||
% printer_copy["name"],
|
||||
"host": host,
|
||||
"phase": "await_print",
|
||||
"phase_started_at": "now",
|
||||
}
|
||||
if live_run:
|
||||
fields["run_id"] = live_run["id"]
|
||||
store.update_print_queue(wconn, item_id, fields)
|
||||
self._event(
|
||||
wconn,
|
||||
host,
|
||||
@@ -429,6 +529,147 @@ class PrintQueueDispatcher:
|
||||
|
||||
self._spawn_worker(item_id, work)
|
||||
|
||||
def _advance_simple(self, conn, item, printer, live):
|
||||
"""Einfach-Druck: running bleiben bis Moonraker fertig/abgebrochen."""
|
||||
phase = (item.get("phase") or "").lower()
|
||||
state = (live.get("state") or "").lower()
|
||||
if phase in ("starting", "await_print"):
|
||||
if state in ("printing", "paused", "heating") or live.get("print_active"):
|
||||
self._clear_terminal_hits(item["id"])
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"phase": "print_active",
|
||||
"phase_started_at": "now",
|
||||
"message": "Druckt…",
|
||||
},
|
||||
)
|
||||
return
|
||||
if phase == "await_print" and state == "cancelled":
|
||||
hits = self._terminal_hits(item["id"], "await_cancel")
|
||||
if hits >= AWAIT_CANCEL_HITS:
|
||||
self._clear_terminal_hits(item["id"])
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "error",
|
||||
"message": "Druck abgebrochen.",
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
return
|
||||
if phase == "await_print" and self._print_start_timed_out(item):
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "error",
|
||||
"message": "Druckstart-Timeout: Drucker hat nach %d min nicht angefangen."
|
||||
% (PRINT_START_TIMEOUT_S // 60),
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
return
|
||||
# complete/standby vom vorherigen Auftrag: noch warten, nicht „Fertig.“
|
||||
return
|
||||
if phase != "print_active":
|
||||
return
|
||||
if state in ("printing", "paused", "heating"):
|
||||
self._clear_terminal_hits(item["id"])
|
||||
return
|
||||
if state == "error":
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "error",
|
||||
"message": (live.get("message") or "Druckerfehler").strip()[:200],
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
return
|
||||
# Nur complete = fertig. cancelled/standby erst nach Entprellen.
|
||||
if state == "complete":
|
||||
self._clear_terminal_hits(item["id"])
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "done",
|
||||
"message": "Fertig.",
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
self._event(
|
||||
conn,
|
||||
printer["host"],
|
||||
printer["name"],
|
||||
"fertig",
|
||||
"%s fertig: %s" % (printer["name"], item.get("filename") or "Druck"),
|
||||
item.get("filename") or "",
|
||||
)
|
||||
return
|
||||
if state in ("cancelled", "standby"):
|
||||
hits = self._terminal_hits(item["id"], "end")
|
||||
if hits < TERMINAL_CONFIRM_HITS:
|
||||
return
|
||||
live2 = live
|
||||
try:
|
||||
live2 = moonraker.query(printer["host"])
|
||||
except Exception:
|
||||
pass
|
||||
state2 = (live2.get("state") or "").lower()
|
||||
if state2 in ("printing", "paused", "heating") or live2.get("print_active"):
|
||||
self._clear_terminal_hits(item["id"])
|
||||
return
|
||||
self._clear_terminal_hits(item["id"])
|
||||
if state2 == "complete":
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "done",
|
||||
"message": "Fertig.",
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
self._event(
|
||||
conn,
|
||||
printer["host"],
|
||||
printer["name"],
|
||||
"fertig",
|
||||
"%s fertig: %s" % (printer["name"], item.get("filename") or "Druck"),
|
||||
item.get("filename") or "",
|
||||
)
|
||||
return
|
||||
# Echter Abbruch — nicht „Fertig.“ und kein Auto-Retry.
|
||||
store.update_print_queue(
|
||||
conn,
|
||||
item["id"],
|
||||
{
|
||||
"status": "cancelled",
|
||||
"message": "Druck abgebrochen.",
|
||||
"phase": "",
|
||||
"phase_started_at": None,
|
||||
},
|
||||
)
|
||||
self._event(
|
||||
conn,
|
||||
printer["host"],
|
||||
printer["name"],
|
||||
"abbruch",
|
||||
"%s: Druck abgebrochen (%s)"
|
||||
% (printer["name"], item.get("filename") or "ohne Datei"),
|
||||
item.get("filename") or "",
|
||||
)
|
||||
|
||||
def _begin_ablauf(self, conn, item, printer, live):
|
||||
try:
|
||||
eject.require_kobra_3(printer)
|
||||
@@ -665,9 +906,31 @@ class PrintQueueDispatcher:
|
||||
live.get("message") or "Druckerfehler während des Drucks.",
|
||||
)
|
||||
return
|
||||
# Erst weiter, wenn der Job wirklich gelaufen ist — sonst Race
|
||||
# (noch standby/complete vom vorherigen Auftrag).
|
||||
if phase == "print_active" and state in ("complete", "standby"):
|
||||
# Nur complete = Druckende. standby/cancelled entprellen (Filament-Resume).
|
||||
if phase == "print_active" and state == "complete":
|
||||
self._clear_terminal_hits(item["id"])
|
||||
self._next_step(conn, item, printer, live)
|
||||
return
|
||||
if phase == "print_active" and state in ("cancelled", "standby"):
|
||||
hits = self._terminal_hits(item["id"], "ablauf_end")
|
||||
if hits < TERMINAL_CONFIRM_HITS:
|
||||
return
|
||||
try:
|
||||
live = moonraker.query(printer["host"])
|
||||
state = (live.get("state") or "").lower()
|
||||
except Exception:
|
||||
pass
|
||||
if state in ("printing", "paused", "heating") or live.get("print_active"):
|
||||
self._clear_terminal_hits(item["id"])
|
||||
return
|
||||
self._clear_terminal_hits(item["id"])
|
||||
if state == "complete":
|
||||
self._next_step(conn, item, printer, live)
|
||||
return
|
||||
if state == "cancelled":
|
||||
self._fail_ablauf(conn, item, printer, "Druck abgebrochen.")
|
||||
return
|
||||
# standby nach Entprellen: Job wirklich zu Ende
|
||||
self._next_step(conn, item, printer, live)
|
||||
return
|
||||
# Idle schon während des Drucks verlängern — sonst greift M84/Default zu früh.
|
||||
@@ -787,16 +1050,22 @@ class PrintQueueDispatcher:
|
||||
)
|
||||
name = (result or {}).get("filename") or ""
|
||||
row = store.get_print_queue_row(wconn, item_id) or item
|
||||
store.update_print_queue(
|
||||
wconn,
|
||||
item_id,
|
||||
{
|
||||
"phase": "printing",
|
||||
"phase_started_at": "now",
|
||||
"file_id": step_copy["file_id"],
|
||||
"message": self._ablauf_message(row, "druckt %s" % name),
|
||||
},
|
||||
)
|
||||
if (row.get("status") or "") in ("cancelled", "dismissed"):
|
||||
try:
|
||||
moonraker.command(printer_copy["host"], "cancel")
|
||||
except Exception:
|
||||
pass
|
||||
return
|
||||
fields = {
|
||||
"phase": "printing",
|
||||
"phase_started_at": "now",
|
||||
"file_id": step_copy["file_id"],
|
||||
"message": self._ablauf_message(row, "druckt %s" % name),
|
||||
}
|
||||
live_run = store.find_active_run(wconn, printer_copy["host"], name)
|
||||
if live_run:
|
||||
fields["run_id"] = live_run["id"]
|
||||
store.update_print_queue(wconn, item_id, fields)
|
||||
self._step_event(wconn, row, printer_copy, "druckt %s" % name)
|
||||
wconn.commit()
|
||||
except GrottiError as exc:
|
||||
|
||||
@@ -7,9 +7,12 @@ CREATE TABLE IF NOT EXISTS projects (
|
||||
notes text NOT NULL DEFAULT '',
|
||||
status text NOT NULL DEFAULT 'idee',
|
||||
quote jsonb NOT NULL DEFAULT '{}'::jsonb,
|
||||
folder text NOT NULL DEFAULT '',
|
||||
created_at timestamptz NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS folder text NOT NULL DEFAULT '';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS spools (
|
||||
id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
|
||||
name text NOT NULL,
|
||||
@@ -123,6 +126,7 @@ ALTER TABLE spools ADD COLUMN IF NOT EXISTS material_id bigint REFERENCES materi
|
||||
ALTER TABLE spools ADD COLUMN IF NOT EXISTS chargen_nr text;
|
||||
ALTER TABLE spools ADD COLUMN IF NOT EXISTS hersteller_charge text NOT NULL DEFAULT '';
|
||||
ALTER TABLE spools ADD COLUMN IF NOT EXISTS code text;
|
||||
ALTER TABLE spools ADD COLUMN IF NOT EXISTS archived_at timestamptz;
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS spools_chargen_nr ON spools (chargen_nr) WHERE chargen_nr IS NOT NULL AND chargen_nr <> '';
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS spools_code ON spools (code) WHERE code IS NOT NULL AND code <> '';
|
||||
|
||||
+1256
-104
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,7 @@
|
||||
"""G-code zu einem dünnen 3D-Pfad für den Viewer."""
|
||||
|
||||
import re
|
||||
import threading
|
||||
import zipfile
|
||||
from pathlib import Path
|
||||
|
||||
@@ -10,6 +11,8 @@ AXIS = re.compile(r"([XYZE])\s*(-?\d*\.?\d+)", re.IGNORECASE)
|
||||
|
||||
# Cache-/Viewer-Version: ganze Z-Höhen dicht behalten (keine gesprenkelten Stichproben)
|
||||
TOOLPATH_VERSION = 8
|
||||
# Die volle Bahn liegt kurz im Speicher. Parallel auf einem Pi mit 2 GB füllt das den Swap.
|
||||
_build_lock = threading.Lock()
|
||||
|
||||
|
||||
def _gcode_text(path: Path) -> str:
|
||||
@@ -111,6 +114,11 @@ def _thin_points(points, layer_breaks, max_points):
|
||||
|
||||
|
||||
def build_toolpath(path: Path, max_points=220000):
|
||||
with _build_lock:
|
||||
return _build_toolpath(path, max_points)
|
||||
|
||||
|
||||
def _build_toolpath(path: Path, max_points=220000):
|
||||
text = _gcode_text(path)
|
||||
if not text:
|
||||
return {
|
||||
|
||||
+14
-6
@@ -53,15 +53,23 @@ def planned_shares(metadata, ace_map, target_count):
|
||||
weights = weight_list(metadata)
|
||||
mapping = ace_map if isinstance(ace_map, list) else []
|
||||
if weights and mapping and len(weights) >= len(mapping) and target_count == len(mapping):
|
||||
shares = []
|
||||
paints = []
|
||||
for item in mapping:
|
||||
paint = item.get("paint_index")
|
||||
try:
|
||||
index = int(paint)
|
||||
paints.append(int(item.get("paint_index")))
|
||||
except (TypeError, ValueError):
|
||||
index = len(shares)
|
||||
if 0 <= index < len(weights):
|
||||
shares.append(weights[index])
|
||||
paints.append(-1)
|
||||
# Nur bei dichter 0…n−1-Map paint_index = Gewichtsindex; sonst Map-Reihenfolge
|
||||
# (Bambu/Anycubic oft T1+T10 bei zwei kompakten Gewichten).
|
||||
dense = sorted(paints) == list(range(len(paints))) and all(
|
||||
0 <= paint < len(weights) for paint in paints
|
||||
)
|
||||
shares = []
|
||||
for order, paint in enumerate(paints):
|
||||
if dense:
|
||||
shares.append(weights[paint])
|
||||
elif order < len(weights):
|
||||
shares.append(weights[order])
|
||||
else:
|
||||
shares.append(0.0)
|
||||
if sum(shares) > 0:
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
"""Version von Grotti (SemVer). Bei jeder Änderung CHANGELOG.md mitführen."""
|
||||
|
||||
__version__ = "3.2.0"
|
||||
__version__ = "3.6.1"
|
||||
+202
-45
@@ -6,14 +6,31 @@ import threading
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from grotti import moonraker, notify, store, usage
|
||||
from grotti import jobs, logutil, moonraker, notify, store, usage
|
||||
from grotti.events_bus import publish as publish_live
|
||||
from grotti.db import connect
|
||||
|
||||
log = logutil.get("grotti.watcher")
|
||||
|
||||
SAMPLE_EVERY_S = 30
|
||||
SAMPLE_HEAT_S = 10
|
||||
|
||||
|
||||
def contact_gap_keeps_run(prev_filename, next_filename, next_state):
|
||||
"""Nach einem Kontaktverlust bleibt der Lauf, solange kein anderer Auftrag läuft.
|
||||
|
||||
Ein Timeout ist kein Druckende. Ohne Dateiname gibt es keinen Beweis
|
||||
für einen Wechsel, der offene Lauf bleibt.
|
||||
"""
|
||||
if next_state not in ("printing", "paused"):
|
||||
return False
|
||||
prev_filename = prev_filename or ""
|
||||
next_filename = next_filename or ""
|
||||
if not prev_filename or not next_filename:
|
||||
return True
|
||||
return prev_filename == next_filename
|
||||
|
||||
|
||||
class StateWatcher:
|
||||
def __init__(self, database_url, cfg, interval=10):
|
||||
self.database_url = database_url
|
||||
@@ -21,6 +38,7 @@ class StateWatcher:
|
||||
self.interval = max(5, int(interval))
|
||||
self._prev = {}
|
||||
self._offline_hits = {}
|
||||
self._cancel_hits = {}
|
||||
self.latest = []
|
||||
self._lock = threading.Lock()
|
||||
self._updated_at = 0.0
|
||||
@@ -59,7 +77,7 @@ class StateWatcher:
|
||||
try:
|
||||
self.tick()
|
||||
except Exception as exc:
|
||||
print("Watcher: %s" % exc, flush=True)
|
||||
log.warning("Watcher: %s", exc)
|
||||
self._stop.wait(self.interval)
|
||||
|
||||
def tick(self):
|
||||
@@ -93,16 +111,43 @@ class StateWatcher:
|
||||
if offline:
|
||||
hits = self._offline_hits.get(host, 0) + 1
|
||||
self._offline_hits[host] = hits
|
||||
if hits >= 2 and not prev_offline:
|
||||
# Ein Aussetzer ist noch kein Offline. Erst der zweite Poll.
|
||||
if hits < 2:
|
||||
return
|
||||
if not prev_offline:
|
||||
self._emit(conn, host, name, "offline", "%s ist offline." % name, filename)
|
||||
self._prev[host] = {"state": "offline", "offline": True, "filename": filename}
|
||||
# Kontakt weg ist kein Druckende. Der letzte echte Zustand bleibt
|
||||
# gemerkt, damit fertig/Abbruch/Fehler beim nächsten Poll greifen.
|
||||
remembered = prev_state if prev_state and prev_state != "offline" else ""
|
||||
self._prev[host] = {
|
||||
"state": remembered,
|
||||
"offline": True,
|
||||
"heating": bool(prev.get("heating")),
|
||||
"filename": prev.get("filename") or filename or "",
|
||||
"spool_warn": bool(prev.get("spool_warn")) if remembered == "printing" else False,
|
||||
"run_id": prev.get("run_id"),
|
||||
}
|
||||
return
|
||||
|
||||
self._offline_hits[host] = 0
|
||||
file_changed = False
|
||||
if prev_offline and state in ("printing", "paused"):
|
||||
file_changed = self._release_replaced_run(conn, host, name, filename)
|
||||
elif state == "printing" and filename and prev_state in (
|
||||
"printing", "paused", "cancelled", "standby",
|
||||
):
|
||||
# Abbruch verpasst oder sofort neu gestartet: alte Datei nicht umbenennen.
|
||||
existing = store.find_live_run(conn, host)
|
||||
old_name = (existing or {}).get("filename") or ""
|
||||
if old_name and old_name != filename:
|
||||
file_changed = self._release_replaced_run(conn, host, name, filename)
|
||||
starting = (
|
||||
bool(prev_state)
|
||||
and prev_state not in ("printing", "paused")
|
||||
and state == "printing"
|
||||
(
|
||||
bool(prev_state)
|
||||
and prev_state not in ("printing", "paused")
|
||||
and state == "printing"
|
||||
)
|
||||
or (file_changed and state == "printing")
|
||||
)
|
||||
if starting:
|
||||
# Aufheiz-Proben behalten: Live-Lauf gleicher Datei nicht verwerfen
|
||||
@@ -128,9 +173,21 @@ class StateWatcher:
|
||||
force = starting or (heating and not prev.get("heating"))
|
||||
run = self._track_print(conn, host, name, filename, live, state, force_sample=force)
|
||||
run_id = run["id"] if run else None
|
||||
if run_id:
|
||||
store.set_printer_active_run(conn, host, run_id)
|
||||
|
||||
if state not in ("cancelled", "standby"):
|
||||
self._cancel_hits[host] = 0
|
||||
|
||||
if prev_offline:
|
||||
self._emit(conn, host, name, "offline", "%s ist wieder erreichbar." % name, filename, run_id)
|
||||
if file_changed and state == "printing":
|
||||
self._emit(
|
||||
conn, host, name, "start",
|
||||
"%s druckt %s" % (name, filename or "einen Auftrag"),
|
||||
filename, run_id,
|
||||
)
|
||||
self._ensure_start_segment(conn, host, filename, live, run_id)
|
||||
elif starting:
|
||||
self._emit(
|
||||
conn, host, name, "start",
|
||||
@@ -151,9 +208,16 @@ class StateWatcher:
|
||||
self._emit(conn, host, name, "start", "%s pausiert." % name, filename, run_id)
|
||||
elif prev_state == "paused" and state == "printing":
|
||||
self._emit(conn, host, name, "start", "%s druckt weiter." % name, filename, run_id)
|
||||
try:
|
||||
jobs.sync_history(conn, self.cfg, host=host, watcher_resume=True)
|
||||
except Exception as exc:
|
||||
log.warning("Watcher Abgleich Resume %s: %s", host, exc)
|
||||
# Nach Fold: aktiven History-Lauf weiter tracken.
|
||||
open_run = store.find_active_run(conn, host, filename)
|
||||
if open_run:
|
||||
run_id = open_run["id"]
|
||||
store.set_printer_active_run(conn, host, run_id)
|
||||
elif prev_state == "printing" and state == "complete":
|
||||
# Live-Übergang: immer belegen (ensure_bed_after_print ohne Endzeit
|
||||
# würde nach Quittierung eines älteren Drucks stehen bleiben).
|
||||
store.set_bed_needs_clear(conn, host, True, filename or "fertig")
|
||||
self._emit(
|
||||
conn,
|
||||
@@ -165,42 +229,77 @@ class StateWatcher:
|
||||
run_id or (prev.get("run_id")),
|
||||
)
|
||||
try:
|
||||
from grotti import jobs
|
||||
|
||||
jobs.sync_history(conn, self.cfg)
|
||||
jobs.sync_history(conn, self.cfg, host=host)
|
||||
except Exception as exc:
|
||||
print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
|
||||
log.warning("Watcher Abgleich %s: %s", host, exc)
|
||||
# Live schließen ohne Abzug — History bucht; Fallback nach Frist.
|
||||
dangling = store.find_live_run(conn, host)
|
||||
if dangling:
|
||||
store.complete_open_run(conn, dangling["id"], state="completed")
|
||||
store.set_printer_active_run(conn, host, None)
|
||||
elif state in ("cancelled", "standby"):
|
||||
# Live-Lauf schließen: normaler Abbruch, oder nach Offline/Neustart
|
||||
# (prev wird „offline“, der Übergang paused→standby geht sonst verloren).
|
||||
dangling = store.find_live_run(conn, host)
|
||||
from_active = prev_state in ("printing", "paused")
|
||||
recover = bool(dangling) and (prev_offline or not prev_state)
|
||||
if from_active or recover:
|
||||
hits = self._cancel_hits.get(host, 0) + 1
|
||||
self._cancel_hits[host] = hits
|
||||
# Anycubic flackert kurz cancelled/standby während Pause/Resume —
|
||||
# erst nach 3 Polls aufgeben. Nach Offline-Lücke sofort.
|
||||
need_hits = 1 if recover else 3
|
||||
if (from_active or recover) and hits >= need_hits:
|
||||
file_label = filename or (dangling or {}).get("filename") or state
|
||||
store.set_bed_needs_clear(conn, host, True, file_label)
|
||||
store.abandon_live_runs(conn, host)
|
||||
self._emit(
|
||||
conn,
|
||||
host,
|
||||
name,
|
||||
"abbruch",
|
||||
"%s: Druck abgebrochen (%s)" % (
|
||||
name, file_label if file_label != state else "ohne Datei",
|
||||
),
|
||||
file_label if file_label != state else "",
|
||||
run_id or prev.get("run_id") or (dangling or {}).get("id"),
|
||||
)
|
||||
try:
|
||||
from grotti import jobs
|
||||
|
||||
jobs.sync_history(conn, self.cfg)
|
||||
jobs.sync_history(conn, self.cfg, host=host)
|
||||
except Exception as exc:
|
||||
print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
|
||||
log.warning("Watcher Abgleich %s: %s", host, exc)
|
||||
# Nach Sync evtl. schon Fortsetzung — dann nicht aufgeben.
|
||||
still = store.find_live_run(conn, host) or store.find_open_history_run(
|
||||
conn, host, filename or (dangling or {}).get("filename") or ""
|
||||
)
|
||||
if still and (still.get("state") or "") in ("in_progress", "printing", "paused"):
|
||||
self._cancel_hits[host] = 0
|
||||
run_id = still["id"]
|
||||
store.set_printer_active_run(conn, host, run_id)
|
||||
else:
|
||||
store.set_bed_needs_clear(conn, host, True, file_label)
|
||||
store.abandon_live_runs(conn, host)
|
||||
store.set_printer_active_run(conn, host, None)
|
||||
emit_id = run_id or prev.get("run_id") or (dangling or {}).get("id")
|
||||
label = file_label if file_label != state else ""
|
||||
if emit_id and not store.get_run_row(conn, emit_id):
|
||||
# History-Abgleich hat den Live-Lauf übernommen und gelöscht.
|
||||
emit_id = store.latest_run_id(conn, host, label)
|
||||
self._emit(
|
||||
conn,
|
||||
host,
|
||||
name,
|
||||
"abbruch",
|
||||
"%s: Druck abgebrochen (%s)" % (
|
||||
name, label or "ohne Datei",
|
||||
),
|
||||
label,
|
||||
emit_id,
|
||||
)
|
||||
# prev-Zustand behalten, bis die Hits reichen.
|
||||
if hits < 3 and from_active:
|
||||
self._prev[host] = {
|
||||
"state": prev_state,
|
||||
"offline": False,
|
||||
"heating": heating,
|
||||
"filename": prev.get("filename") or filename,
|
||||
"spool_warn": bool(prev.get("spool_warn")),
|
||||
"run_id": run_id or prev.get("run_id"),
|
||||
}
|
||||
return
|
||||
elif state == "error" and prev_state != "error":
|
||||
if prev_state == "printing" or prev_state == "paused":
|
||||
store.set_bed_needs_clear(conn, host, True, filename or "Fehler")
|
||||
try:
|
||||
jobs.sync_history(conn, self.cfg, host=host)
|
||||
except Exception as exc:
|
||||
log.warning("Watcher Abgleich %s: %s", host, exc)
|
||||
store.abandon_live_runs(conn, host)
|
||||
store.set_printer_active_run(conn, host, None)
|
||||
msg = (live.get("message") or "").strip()
|
||||
if not msg or msg.lower() in ("error", "fehler"):
|
||||
msg = "Ursache unbekannt — in Mainsail prüfen"
|
||||
@@ -214,18 +313,10 @@ class StateWatcher:
|
||||
filename,
|
||||
run_id or prev.get("run_id"),
|
||||
)
|
||||
try:
|
||||
from grotti import jobs
|
||||
|
||||
jobs.sync_history(conn, self.cfg)
|
||||
except Exception as exc:
|
||||
print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
|
||||
elif state == "error":
|
||||
if (live.get("nozzle_target") or 0) > 0 or (live.get("bed_target") or 0) > 0:
|
||||
self._cool_heaters(host)
|
||||
elif state == "complete" and (not prev_state or prev_offline):
|
||||
# Erster Blick nach Neustart: nur mit Endzeit des letzten Laufs,
|
||||
# sonst wird bereits Quittiertes wieder „Platte belegt“.
|
||||
ended = conn.execute(
|
||||
"""
|
||||
SELECT ended_at FROM runs
|
||||
@@ -243,6 +334,10 @@ class StateWatcher:
|
||||
ended_at=ended["ended_at"] if ended else None,
|
||||
message=filename or "fertig",
|
||||
)
|
||||
try:
|
||||
jobs.sync_history(conn, self.cfg, host=host)
|
||||
except Exception as exc:
|
||||
log.warning("Watcher Abgleich %s: %s", host, exc)
|
||||
|
||||
spool_warn = bool(prev.get("spool_warn"))
|
||||
if state == "printing" and not spool_warn:
|
||||
@@ -257,6 +352,49 @@ class StateWatcher:
|
||||
"run_id": run_id or (prev.get("run_id") if state in ("printing", "paused") or heating else None),
|
||||
}
|
||||
|
||||
def _release_replaced_run(self, conn, host, name, filename):
|
||||
"""Anderer Auftrag nach der Lücke: den offenen Lauf loslassen.
|
||||
|
||||
History zuerst, damit Proben am echten Job hängen. Bleibt der alte
|
||||
Live-Lauf, wird er beendet ohne Abzug — der History-Abgleich bucht
|
||||
das Filament, sobald der Job da ist.
|
||||
"""
|
||||
existing = store.find_live_run(conn, host)
|
||||
if not existing:
|
||||
return False
|
||||
if contact_gap_keeps_run(existing.get("filename") or "", filename, "printing"):
|
||||
return False
|
||||
label = existing.get("filename") or "ohne Datei"
|
||||
old_id = existing["id"]
|
||||
try:
|
||||
jobs.sync_history(conn, self.cfg, host=host)
|
||||
except Exception as exc:
|
||||
log.warning("Watcher Abgleich nach Offline %s: %s", host, exc)
|
||||
existing = store.find_live_run(conn, host)
|
||||
if not existing:
|
||||
# History hat den Live-Lauf übernommen. Ereignis an den überlebenden Lauf.
|
||||
emit_id = old_id if store.get_run_row(conn, old_id) else store.latest_run_id(conn, host, label)
|
||||
self._emit(
|
||||
conn, host, name, "abbruch",
|
||||
"%s: Druck unterbrochen (%s)" % (name, label),
|
||||
label, emit_id,
|
||||
)
|
||||
return True
|
||||
if contact_gap_keeps_run(existing.get("filename") or "", filename, "printing"):
|
||||
return False
|
||||
label = existing.get("filename") or "ohne Datei"
|
||||
store.abandon_live_runs(conn, host)
|
||||
self._emit(
|
||||
conn,
|
||||
host,
|
||||
name,
|
||||
"abbruch",
|
||||
"%s: Druck unterbrochen (%s)" % (name, label),
|
||||
label,
|
||||
existing["id"],
|
||||
)
|
||||
return True
|
||||
|
||||
def _should_sample(self, conn, host, live, state):
|
||||
"""Proben bei Druck/Pause und beim Aufheizen mit Bezug zu einem Auftrag."""
|
||||
if state in ("printing", "paused"):
|
||||
@@ -286,6 +424,8 @@ class StateWatcher:
|
||||
return None
|
||||
sent = store.latest_send(conn, host, filename) if filename else None
|
||||
spool_id = (sent or {}).get("spool_id")
|
||||
# Send kann nach Rollenwechsel veraltet sein — aktuelle Rolle am Host bevorzugt
|
||||
spool_id = jobs.resolve_tracking_spool(conn, host, spool_id, ace_map=(sent or {}).get("ace_map"))
|
||||
run = store.ensure_live_run(conn, host, name, filename, spool_id=spool_id)
|
||||
objects = self._merge_objects(run.get("objects"), live.get("exclude"))
|
||||
planned = usage.as_float(live.get("weight"))
|
||||
@@ -370,7 +510,11 @@ class StateWatcher:
|
||||
})
|
||||
|
||||
def _ensure_start_segment(self, conn, host, filename, live, run_id):
|
||||
"""Nur externe Einzelspule: ein Abschnitt. ACE-Farben ohne Wechsel → Anteil-Split."""
|
||||
"""Startabschnitte: externe Spule oder ACE-Plätze mit eingelegter Spule.
|
||||
|
||||
Ohne Rollenwechsel bleibt ACE-Abzug Anteil-Split (ein Segment je Platz).
|
||||
Mit Wechsel greift die mm-Aufteilung innerhalb der Farbe (0→jetzt).
|
||||
"""
|
||||
if not run_id:
|
||||
return
|
||||
existing = store.list_run_segments(conn, run_id)
|
||||
@@ -381,9 +525,18 @@ class StateWatcher:
|
||||
from grotti import acm
|
||||
|
||||
mapping = acm.normalize_mapping(ace) if ace else []
|
||||
if mapping:
|
||||
return
|
||||
used_mm = usage.as_float(live.get("filament_used"))
|
||||
if mapping:
|
||||
seen = set()
|
||||
for item in mapping:
|
||||
slot = int(item["ams_index"]) + 1
|
||||
if slot in seen:
|
||||
continue
|
||||
seen.add(slot)
|
||||
row = store.spool_at_slot(conn, host, slot)
|
||||
if row:
|
||||
store.open_segment(conn, run_id, row["id"], slot, used_mm)
|
||||
return
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT id FROM spools
|
||||
@@ -399,7 +552,7 @@ class StateWatcher:
|
||||
try:
|
||||
moonraker.heaters_off(host)
|
||||
except Exception as exc:
|
||||
print("Watcher Heizung aus %s: %s" % (host, exc), flush=True)
|
||||
log.warning("Watcher Heizung aus %s: %s", host, exc)
|
||||
|
||||
def _check_spool(self, conn, host, name, filename, live):
|
||||
need = float(live.get("weight") or 0)
|
||||
@@ -434,6 +587,10 @@ class StateWatcher:
|
||||
return True
|
||||
|
||||
def _emit(self, conn, host, printer, kind, message, filename, run_id=None):
|
||||
# Eine gelöschte Lauf-ID (Live wurde gerade übernommen) darf den Tick
|
||||
# nicht am Fremdschlüssel zurückrollen — sonst ist der Abbruch weg.
|
||||
if run_id is not None and not store.get_run_row(conn, run_id):
|
||||
run_id = None
|
||||
notify.record(
|
||||
conn, self.cfg, host, printer, kind, message, filename,
|
||||
dedupe_s=60, run_id=run_id,
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
#!/usr/bin/env bash
|
||||
# Baut grotti_<version>_<arch>.deb (auf dem Zielsystem oder arm64-Container).
|
||||
# Aufruf aus dem Repo-Root: bash packaging/build-deb.sh
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
if ! command -v dpkg-deb >/dev/null 2>&1; then
|
||||
echo "dpkg-deb fehlt — bitte auf Debian/Raspberry Pi OS bauen." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION="$(python3 -c "from grotti.version import __version__; print(__version__)")"
|
||||
ARCH="$(dpkg --print-architecture)"
|
||||
PKG="grotti_${VERSION}_${ARCH}"
|
||||
DIST="$ROOT/packaging/dist"
|
||||
STAGE="$DIST/$PKG"
|
||||
|
||||
rm -rf "$STAGE"
|
||||
mkdir -p "$STAGE/DEBIAN" \
|
||||
"$STAGE/usr/lib/grotti" \
|
||||
"$STAGE/usr/bin" \
|
||||
"$STAGE/etc/grotti" \
|
||||
"$STAGE/lib/systemd/system" \
|
||||
"$STAGE/usr/share/grotti" \
|
||||
"$STAGE/usr/share/doc/grotti" \
|
||||
"$STAGE/var/lib/grotti/data/eingang" \
|
||||
"$STAGE/var/lib/grotti/slice"
|
||||
|
||||
rsync -a --delete \
|
||||
--exclude '__pycache__' --exclude '*.pyc' --exclude '.pytest_cache' \
|
||||
"$ROOT/grotti/" "$STAGE/usr/lib/grotti/grotti/"
|
||||
rsync -a --delete \
|
||||
--exclude '__pycache__' --exclude '*.pyc' \
|
||||
"$ROOT/web/" "$STAGE/usr/lib/grotti/web/"
|
||||
cp "$ROOT/server.py" "$STAGE/usr/lib/grotti/server.py"
|
||||
cp "$ROOT/requirements.txt" "$STAGE/usr/lib/grotti/requirements.txt"
|
||||
cp "$ROOT/config.example.json" "$STAGE/usr/lib/grotti/config.example.json"
|
||||
mkdir -p "$STAGE/usr/lib/grotti/scripts"
|
||||
cp "$ROOT/scripts/pfade_umziehen.py" "$STAGE/usr/lib/grotti/scripts/pfade_umziehen.py"
|
||||
# Symlink-Pfad für die Anleitung
|
||||
mkdir -p "$STAGE/opt/grotti"
|
||||
ln -sfn /usr/lib/grotti/scripts "$STAGE/opt/grotti/scripts"
|
||||
ln -sfn /usr/lib/grotti/venv "$STAGE/opt/grotti/venv"
|
||||
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/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"
|
||||
|
||||
cat > "$STAGE/usr/bin/grotti" <<'EOF'
|
||||
#!/bin/sh
|
||||
export GROTTI_CONFIG="${GROTTI_CONFIG:-/etc/grotti/config.json}"
|
||||
exec /usr/lib/grotti/venv/bin/python /usr/lib/grotti/server.py "$@"
|
||||
EOF
|
||||
chmod 755 "$STAGE/usr/bin/grotti"
|
||||
|
||||
python3 -m venv "$STAGE/usr/lib/grotti/venv"
|
||||
"$STAGE/usr/lib/grotti/venv/bin/pip" install --upgrade pip wheel
|
||||
"$STAGE/usr/lib/grotti/venv/bin/pip" install -r "$ROOT/requirements.txt"
|
||||
|
||||
SIZE_KB="$(du -sk "$STAGE" | awk '{print $1}')"
|
||||
cat > "$STAGE/DEBIAN/control" <<EOF
|
||||
Package: grotti
|
||||
Version: ${VERSION}
|
||||
Section: web
|
||||
Priority: optional
|
||||
Architecture: ${ARCH}
|
||||
Maintainer: Dominic Gundel <[email protected]>
|
||||
Depends: python3 (>= 3.11), python3-venv, postgresql, adduser
|
||||
Installed-Size: ${SIZE_KB}
|
||||
Homepage: https://git.gundel.dev/dg/grotti
|
||||
Description: Farm-Manager für Moonraker-Drucker (Kobra 3 / S1)
|
||||
Grotti steuert eine 3D-Drucker-Farm über Moonraker: Wand, Warteschlange,
|
||||
Material, Abläufe und Protokoll. PostgreSQL wird lokal mit eingerichtet.
|
||||
EOF
|
||||
|
||||
cp "$ROOT/packaging/debian/conffiles" "$STAGE/DEBIAN/conffiles"
|
||||
for script in postinst prerm postrm; do
|
||||
cp "$ROOT/packaging/debian/$script" "$STAGE/DEBIAN/$script"
|
||||
chmod 755 "$STAGE/DEBIAN/$script"
|
||||
done
|
||||
|
||||
dpkg-deb --root-owner-group --build "$STAGE" "$DIST/${PKG}.deb"
|
||||
echo "Gebaut: $DIST/${PKG}.deb"
|
||||
echo "Install: sudo apt install ./packaging/dist/${PKG}.deb"
|
||||
echo "Logs: journalctl -u grotti -f"
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
"host": "0.0.0.0",
|
||||
"port": 8770,
|
||||
"data_dir": "/var/lib/grotti/data",
|
||||
"watch_dir": "/var/lib/grotti/slice",
|
||||
"database_url": "postgresql:///grotti?host=/var/run/postgresql",
|
||||
"token": "",
|
||||
"secret_key": "",
|
||||
"fqdn": "",
|
||||
"log_level": "INFO",
|
||||
"http_threads": 8,
|
||||
"auto_queue": true,
|
||||
"auto_retry": true,
|
||||
"oauth": {
|
||||
"enabled": false,
|
||||
"issuer": "",
|
||||
"client_id": "",
|
||||
"client_secret": "",
|
||||
"redirect_uri": ""
|
||||
},
|
||||
"energy": {
|
||||
"watts": 40,
|
||||
"nozzle_watts": 60,
|
||||
"bed_watts": 220,
|
||||
"euro_per_kwh": 0.35,
|
||||
"dryer_watts": 0,
|
||||
"dry_hours": 0,
|
||||
"waste_percent": 0,
|
||||
"utilization": 50,
|
||||
"tariff": {
|
||||
"ht_euro": 0.35,
|
||||
"nt_euro": 0.22,
|
||||
"nt_from": "22:00",
|
||||
"nt_to": "06:00"
|
||||
}
|
||||
},
|
||||
"telegram": {
|
||||
"enabled": false,
|
||||
"bot_token": "",
|
||||
"chat_id": ""
|
||||
},
|
||||
"ntfy": {
|
||||
"enabled": false,
|
||||
"server": "https://ntfy.sh",
|
||||
"topic": "",
|
||||
"token": ""
|
||||
},
|
||||
"alerts": {
|
||||
"fertig": true,
|
||||
"fehler": true,
|
||||
"offline": true,
|
||||
"queue": true,
|
||||
"spule": true,
|
||||
"ablauf": false,
|
||||
"start": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
/etc/grotti/config.json
|
||||
@@ -0,0 +1,45 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
_pg() {
|
||||
if command -v runuser >/dev/null 2>&1; then
|
||||
runuser -u postgres -- "$@"
|
||||
else
|
||||
su -s /bin/sh postgres -c "$*"
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
if ! getent passwd grotti >/dev/null; then
|
||||
adduser --system --group --home /var/lib/grotti --no-create-home \
|
||||
--gecos "Grotti farm manager" grotti
|
||||
fi
|
||||
|
||||
mkdir -p /var/lib/grotti/data/eingang /var/lib/grotti/slice /etc/grotti
|
||||
chown -R grotti:grotti /var/lib/grotti
|
||||
chmod 750 /var/lib/grotti
|
||||
|
||||
if [ ! -f /etc/grotti/config.json ]; then
|
||||
cp /usr/share/grotti/config.pi.json /etc/grotti/config.json
|
||||
fi
|
||||
chmod 640 /etc/grotti/config.json
|
||||
chown root:grotti /etc/grotti/config.json
|
||||
|
||||
if getent passwd postgres >/dev/null 2>&1; then
|
||||
_pg psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='grotti'" | grep -q 1 \
|
||||
|| _pg createuser -D -R -S grotti || true
|
||||
_pg psql -tAc "SELECT 1 FROM pg_database WHERE datname='grotti'" | grep -q 1 \
|
||||
|| _pg createdb -O grotti grotti || true
|
||||
_pg psql -c "GRANT ALL PRIVILEGES ON DATABASE grotti TO grotti;" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
if command -v systemctl >/dev/null 2>&1; then
|
||||
systemctl daemon-reload || true
|
||||
systemctl enable grotti.service || true
|
||||
systemctl restart grotti.service || true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,19 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
rm -f /etc/grotti/config.json
|
||||
rmdir /etc/grotti 2>/dev/null || true
|
||||
# Daten und DB bleiben absichtlich (Backup). Manuell:
|
||||
# sudo rm -rf /var/lib/grotti
|
||||
# sudo -u postgres dropdb grotti; sudo -u postgres dropuser grotti
|
||||
;;
|
||||
remove)
|
||||
if command -v systemctl >/dev/null 2>&1; then
|
||||
systemctl daemon-reload || true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,13 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
if command -v systemctl >/dev/null 2>&1; then
|
||||
systemctl stop grotti.service 2>/dev/null || true
|
||||
systemctl disable grotti.service 2>/dev/null || true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
Vendored
Whitespace-only changes.
@@ -0,0 +1,27 @@
|
||||
[Unit]
|
||||
Description=Grotti Farm-Manager
|
||||
Documentation=file:///usr/share/doc/grotti/Anleitung-Installation-Pi.md
|
||||
After=network-online.target postgresql.service
|
||||
Wants=network-online.target
|
||||
Requires=postgresql.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=grotti
|
||||
Group=grotti
|
||||
WorkingDirectory=/usr/lib/grotti
|
||||
Environment=GROTTI_CONFIG=/etc/grotti/config.json
|
||||
Environment=PYTHONUNBUFFERED=1
|
||||
ExecStart=/usr/lib/grotti/venv/bin/python /usr/lib/grotti/server.py
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
# Stopp nicht 90 s hängen: nach TimeoutStopSec folgt SIGKILL
|
||||
TimeoutStopSec=20
|
||||
KillMode=mixed
|
||||
# Logs → journald (journalctl -u grotti -f)
|
||||
StandardOutput=journal
|
||||
StandardError=journal
|
||||
SyslogIdentifier=grotti
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
+1
-1
@@ -4,5 +4,5 @@ psycopg-pool==3.3.3
|
||||
paho-mqtt==2.1.0
|
||||
cryptography==50.0.2
|
||||
markdown==3.11.1
|
||||
mcp>=1.2
|
||||
mcp==2.0.0
|
||||
waitress==3.0.2
|
||||
@@ -0,0 +1,136 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Alt-Paare und verwaiste Live-Läufe finden. Standard: Probelauf.
|
||||
|
||||
python scripts/laeufe_reparieren.py
|
||||
python scripts/laeufe_reparieren.py --apply
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT))
|
||||
|
||||
from grotti import jobs, store # noqa: E402
|
||||
from grotti.config import load # noqa: E402
|
||||
from grotti.db import connect, prepare # noqa: E402
|
||||
|
||||
|
||||
def find_pairs(conn):
|
||||
return conn.execute(
|
||||
"""
|
||||
SELECT a.id AS pred_id, b.id AS succ_id,
|
||||
a.printer_host, a.filename,
|
||||
a.state AS pred_state, b.state AS succ_state,
|
||||
a.duration_s AS pred_dur, b.duration_s AS succ_dur,
|
||||
a.ended_at, b.started_at,
|
||||
a.deducted AS pred_deducted, b.deducted AS succ_deducted,
|
||||
a.chargen_nr AS pred_chargen, b.chargen_nr AS succ_chargen
|
||||
FROM runs a
|
||||
JOIN runs b
|
||||
ON a.printer_host = b.printer_host
|
||||
AND a.filename = b.filename
|
||||
AND a.id <> b.id
|
||||
AND b.started_at BETWEEN a.ended_at - interval '30 seconds'
|
||||
AND a.ended_at + interval '5 seconds'
|
||||
WHERE a.state IN ('cancelled', 'interrupted', 'error')
|
||||
AND a.ended_at IS NOT NULL
|
||||
AND a.moonraker_job_id NOT LIKE 'live:%%'
|
||||
AND b.moonraker_job_id NOT LIKE 'live:%%'
|
||||
AND COALESCE(b.duration_s, 0) > 60
|
||||
AND COALESCE(b.duration_s, 0) >= COALESCE(a.duration_s, 0) - 30
|
||||
ORDER BY a.ended_at DESC
|
||||
"""
|
||||
).fetchall()
|
||||
|
||||
|
||||
def find_orphan_live(conn):
|
||||
return conn.execute(
|
||||
"""
|
||||
SELECT id, printer_host, filename, state, started_at, ended_at, duration_s, chargen_nr
|
||||
FROM runs
|
||||
WHERE moonraker_job_id LIKE 'live:%%'
|
||||
AND state IN ('interrupted', 'completed', 'cancelled')
|
||||
ORDER BY COALESCE(ended_at, started_at) DESC
|
||||
LIMIT 100
|
||||
"""
|
||||
).fetchall()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Läufe nach Filament-Resume reparieren")
|
||||
parser.add_argument("--apply", action="store_true", help="Wirklich zusammenlegen")
|
||||
args = parser.parse_args()
|
||||
cfg = load()
|
||||
prepare(cfg["database_url"])
|
||||
with connect(cfg["database_url"]) as conn:
|
||||
pairs = find_pairs(conn)
|
||||
orphans = find_orphan_live(conn)
|
||||
print("=== Verdachtspaare (Beweis: Dauer fortgesetzt, Lücke ≤ 5 s) ===")
|
||||
for row in pairs:
|
||||
print(json.dumps({k: str(v) for k, v in dict(row).items()}, ensure_ascii=False))
|
||||
print("%d Paare" % len(pairs))
|
||||
print("=== Verwaiste live:-Läufe ===")
|
||||
for row in orphans:
|
||||
print(json.dumps({k: str(v) for k, v in dict(row).items()}, ensure_ascii=False))
|
||||
print("%d orphan" % len(orphans))
|
||||
if not args.apply:
|
||||
print("Probelauf. Mit --apply werden Paare verbunden.")
|
||||
conn.rollback()
|
||||
return
|
||||
merged = 0
|
||||
for row in pairs:
|
||||
try:
|
||||
jobs.manual_merge_runs(
|
||||
conn, row["pred_id"], row["succ_id"], confirm=True
|
||||
)
|
||||
merged += 1
|
||||
print("verbunden", row["pred_id"], "+", row["succ_id"])
|
||||
except Exception as exc:
|
||||
print("Fehler", row["pred_id"], row["succ_id"], exc)
|
||||
conn.rollback()
|
||||
# Orphans nur an History derselben Datei hängen (kein Host-Fallback).
|
||||
# adopt_live_run nimmt geschlossene live: nur ≤ 2 h — ältere bleiben liegen.
|
||||
cleaned = 0
|
||||
skipped = 0
|
||||
for row in orphans:
|
||||
fname = (row.get("filename") or "").strip()
|
||||
if not fname:
|
||||
skipped += 1
|
||||
continue
|
||||
hist = conn.execute(
|
||||
"""
|
||||
SELECT * FROM runs
|
||||
WHERE printer_host = %s
|
||||
AND filename = %s
|
||||
AND moonraker_job_id NOT LIKE 'live:%%'
|
||||
AND state IN ('in_progress', 'printing', 'paused')
|
||||
ORDER BY id DESC
|
||||
LIMIT 1
|
||||
""",
|
||||
(row["printer_host"], fname),
|
||||
).fetchone()
|
||||
if not hist:
|
||||
skipped += 1
|
||||
continue
|
||||
store.adopt_live_run(conn, row["printer_host"], fname, hist["id"])
|
||||
still = conn.execute(
|
||||
"SELECT 1 FROM runs WHERE id = %s", (row["id"],)
|
||||
).fetchone()
|
||||
if still:
|
||||
skipped += 1
|
||||
else:
|
||||
cleaned += 1
|
||||
conn.commit()
|
||||
print(
|
||||
"verbunden=%d orphan_adopted=%d orphan_skipped=%d"
|
||||
% (merged, cleaned, skipped)
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+184
-4
@@ -13,8 +13,11 @@ from __future__ import annotations
|
||||
import json
|
||||
import mimetypes
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import uuid
|
||||
import webbrowser
|
||||
from pathlib import Path
|
||||
@@ -25,7 +28,19 @@ from urllib.request import Request, urlopen
|
||||
REPO_ROOT = Path(__file__).resolve().parent.parent
|
||||
CONFIG_PATH = REPO_ROOT / "data" / "orca-senden.json"
|
||||
DEBUG_LOG = REPO_ROOT / "data" / "orca-senden-last.log"
|
||||
BROWSER_LOCK = REPO_ROOT / "data" / "orca-senden-browser.lock"
|
||||
FOCUS_PATH = REPO_ROOT / "data" / "orca-senden-focus.json"
|
||||
APP_PROFILE = REPO_ROOT / "data" / "grotti-app-profile"
|
||||
ALLOWED_SUFFIXES = (".gcode", ".gcode.3mf", ".3mf", ".gcode.pp", ".pp")
|
||||
BROWSER_DEBOUNCE_S = 25.0
|
||||
# Anycubic: MMDD-HHMM-Name.gcode — Zeitstempel raus, sonst jedes Export ein neues Fenster
|
||||
_TIME_PREFIX_RE = re.compile(r"^\d{4}-\d{4}-")
|
||||
_CHROMIUM_CANDIDATES = (
|
||||
Path(r"C:\Program Files\Google\Chrome\Application\chrome.exe"),
|
||||
Path(r"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"),
|
||||
Path(os.path.expandvars(r"%LOCALAPPDATA%\Microsoft\Edge\Application\msedge.exe")),
|
||||
Path(os.path.expandvars(r"%LOCALAPPDATA%\Google\Chrome\Application\chrome.exe")),
|
||||
)
|
||||
|
||||
|
||||
def show_error(message: str) -> None:
|
||||
@@ -76,7 +91,10 @@ def load_config(path: Path = CONFIG_PATH) -> dict[str, str]:
|
||||
raise ValueError("Config: url fehlt (z. B. http://127.0.0.1:8770).")
|
||||
if not token:
|
||||
raise ValueError("Config: token fehlt (grt_… aus Einstellungen).")
|
||||
return {"url": url, "token": token}
|
||||
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}
|
||||
|
||||
|
||||
def is_gcode_path(path: Path) -> bool:
|
||||
@@ -140,6 +158,83 @@ def send_page_url(base_url: str, file_id: int) -> str:
|
||||
return "%s/dateien?file=%s" % (base_url.rstrip("/"), int(file_id))
|
||||
|
||||
|
||||
def app_page_url(base_url: str) -> str:
|
||||
"""Stabile App-URL — Datei kommt über orca-fokus, kein neues Fenster pro Slice."""
|
||||
return "%s/dateien?orca=1" % base_url.rstrip("/")
|
||||
|
||||
|
||||
def find_chromium() -> Path | None:
|
||||
for path in _CHROMIUM_CANDIDATES:
|
||||
try:
|
||||
if path.is_file():
|
||||
return path
|
||||
except OSError:
|
||||
continue
|
||||
return None
|
||||
|
||||
|
||||
def app_already_running() -> bool:
|
||||
"""True wenn Chrome/Edge schon mit grotti-app-profile läuft (Profil-Sperre)."""
|
||||
needle = "grotti-app-profile"
|
||||
if sys.platform == "win32":
|
||||
try:
|
||||
creationflags = getattr(subprocess, "CREATE_NO_WINDOW", 0)
|
||||
out = subprocess.check_output(
|
||||
[
|
||||
"powershell",
|
||||
"-NoProfile",
|
||||
"-Command",
|
||||
(
|
||||
"Get-CimInstance Win32_Process | "
|
||||
"Where-Object { "
|
||||
"($_.Name -match '^(chrome|msedge)\\.exe$') -and "
|
||||
"($_.CommandLine -like '*%s*') "
|
||||
"} | Select-Object -First 1 -ExpandProperty ProcessId"
|
||||
)
|
||||
% needle,
|
||||
],
|
||||
timeout=8,
|
||||
stderr=subprocess.DEVNULL,
|
||||
creationflags=creationflags,
|
||||
)
|
||||
return bool((out or b"").strip())
|
||||
except (OSError, subprocess.SubprocessError):
|
||||
pass
|
||||
for name in ("SingletonLock", "SingletonSocket", "lockfile"):
|
||||
path = APP_PROFILE / name
|
||||
try:
|
||||
if path.exists() or path.is_symlink():
|
||||
return True
|
||||
except OSError:
|
||||
continue
|
||||
return False
|
||||
|
||||
|
||||
def open_as_app(url: str) -> bool:
|
||||
"""Chrome/Edge --app=… → eigenes Fenster auf dem Desktop, kein Browser-Tab."""
|
||||
binary = find_chromium()
|
||||
if binary is None:
|
||||
return False
|
||||
try:
|
||||
APP_PROFILE.mkdir(parents=True, exist_ok=True)
|
||||
subprocess.Popen(
|
||||
[
|
||||
str(binary),
|
||||
"--app=%s" % url,
|
||||
"--user-data-dir=%s" % str(APP_PROFILE.resolve()),
|
||||
"--no-first-run",
|
||||
"--no-default-browser-check",
|
||||
],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
close_fds=True,
|
||||
)
|
||||
return True
|
||||
except OSError as exc:
|
||||
write_debug(sys.argv, "app_open_fail=%s" % exc)
|
||||
return False
|
||||
|
||||
|
||||
def _api_json(
|
||||
base_url: str,
|
||||
token: str,
|
||||
@@ -279,7 +374,79 @@ def upload_file(
|
||||
return payload
|
||||
|
||||
|
||||
def open_browser(url: str) -> None:
|
||||
def browser_key(name: str) -> str:
|
||||
"""Gleicher Slice trotz Zeitstempel / -2 / Leerzeichen → ein Browserfenster."""
|
||||
stem = Path(name or "").stem.lower()
|
||||
stem = _TIME_PREFIX_RE.sub("", stem)
|
||||
stem = re.sub(r"-\d+$", "", stem)
|
||||
return re.sub(r"[^a-z0-9]+", "", stem)
|
||||
|
||||
|
||||
def write_focus(file_id: int, url: str, key: str = "") -> None:
|
||||
"""Offene Dateien-Seite kann auf die neueste Orca-Datei umschalten."""
|
||||
try:
|
||||
FOCUS_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
FOCUS_PATH.write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"file_id": int(file_id),
|
||||
"url": url,
|
||||
"key": key,
|
||||
"ts": time.time(),
|
||||
},
|
||||
ensure_ascii=False,
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
except (OSError, TypeError, ValueError):
|
||||
pass
|
||||
|
||||
|
||||
def open_browser(
|
||||
url: str,
|
||||
key: str = "",
|
||||
file_id: int | None = None,
|
||||
mode: str = "app",
|
||||
) -> None:
|
||||
"""Anycubic/Orca starten das Skript oft 2× — nur ein Fenster pro Modell.
|
||||
|
||||
mode=app (Standard): Chrome/Edge als App-Fenster auf dem Desktop.
|
||||
mode=tab: klassischer Browser-Tab.
|
||||
"""
|
||||
token = (key or url).strip() or url
|
||||
now = time.time()
|
||||
if file_id is not None:
|
||||
write_focus(int(file_id), url, key=token)
|
||||
try:
|
||||
BROWSER_LOCK.parent.mkdir(parents=True, exist_ok=True)
|
||||
if BROWSER_LOCK.is_file():
|
||||
prev = json.loads(BROWSER_LOCK.read_text(encoding="utf-8"))
|
||||
if (
|
||||
isinstance(prev, dict)
|
||||
and prev.get("key") == token
|
||||
and now - float(prev.get("ts") or 0) < BROWSER_DEBOUNCE_S
|
||||
):
|
||||
write_debug(
|
||||
sys.argv,
|
||||
"browser_skip key=%s age=%.1fs focus=%s"
|
||||
% (token, now - float(prev.get("ts") or 0), file_id),
|
||||
)
|
||||
return
|
||||
BROWSER_LOCK.write_text(
|
||||
json.dumps({"key": token, "ts": now, "url": url, "mode": mode}, ensure_ascii=False),
|
||||
encoding="utf-8",
|
||||
)
|
||||
except (OSError, TypeError, ValueError, json.JSONDecodeError):
|
||||
pass
|
||||
if (mode or "app").strip().lower() != "tab":
|
||||
# Zweites Chrome mit gleichem Profil = leeres Profil / erneutes Login.
|
||||
# Offenes Fenster pollt orca-fokus und wechselt die Datei selbst.
|
||||
if app_already_running():
|
||||
write_debug(sys.argv, "browser_reuse focus=%s" % file_id)
|
||||
return
|
||||
if open_as_app(url):
|
||||
write_debug(sys.argv, "browser_app url=%s" % url)
|
||||
return
|
||||
webbrowser.open(url)
|
||||
|
||||
|
||||
@@ -319,8 +486,21 @@ def main(argv: list[str] | None = None) -> int:
|
||||
% (path, upload_name_for(path), output_target() or ""),
|
||||
)
|
||||
file_id = deliver(config["url"], config["token"], path)
|
||||
write_debug(argv, "file_id=%s" % file_id)
|
||||
open_browser(send_page_url(config["url"], file_id))
|
||||
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()
|
||||
# App: stabile URL; Tab: Deep-Link mit file=
|
||||
open_url = (
|
||||
send_page_url(config["url"], file_id)
|
||||
if mode == "tab"
|
||||
else app_page_url(config["url"])
|
||||
)
|
||||
open_browser(
|
||||
open_url,
|
||||
key=browser_key(name),
|
||||
file_id=file_id,
|
||||
mode=mode,
|
||||
)
|
||||
except Exception as exc:
|
||||
write_debug(argv, "error=%s" % exc)
|
||||
show_error(str(exc))
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Absolute Windows-Pfade in files.stored_path und projects.folder auf Linux umschreiben.
|
||||
|
||||
Beispiel (Dry-Run):
|
||||
python scripts/pfade_umziehen.py \\
|
||||
--database-url postgresql:///grotti?host=/var/run/postgresql \\
|
||||
--from "D:/Projekte/3DP/Slice" --to /var/lib/grotti/slice
|
||||
|
||||
Ohne --apply nur Anzeige. Mit --apply werden die Zeilen geschrieben.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
if str(ROOT) not in sys.path:
|
||||
sys.path.insert(0, str(ROOT))
|
||||
|
||||
|
||||
def normalize_slash(path: str) -> str:
|
||||
return (path or "").replace("\\", "/").rstrip("/")
|
||||
|
||||
|
||||
def rewrite(value: str, old: str, new: str) -> str | None:
|
||||
if not value:
|
||||
return None
|
||||
cur = value.replace("\\", "/")
|
||||
old_n = normalize_slash(old)
|
||||
new_n = normalize_slash(new)
|
||||
# case-insensitive für Windows-Laufwerke
|
||||
if cur.lower().startswith(old_n.lower()):
|
||||
rest = cur[len(old_n) :]
|
||||
if rest and not rest.startswith("/"):
|
||||
rest = "/" + rest
|
||||
return new_n + rest
|
||||
return None
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description="Slice-Pfade Windows → Linux umschreiben")
|
||||
parser.add_argument("--database-url", required=True)
|
||||
parser.add_argument("--from", dest="old", required=True, help="Alter Prefix (Windows)")
|
||||
parser.add_argument("--to", dest="new", required=True, help="Neuer Prefix (Linux)")
|
||||
parser.add_argument("--apply", action="store_true", help="Wirklich schreiben")
|
||||
args = parser.parse_args()
|
||||
|
||||
import psycopg
|
||||
from psycopg.rows import dict_row
|
||||
|
||||
old = args.old
|
||||
new = args.new
|
||||
changed_files = 0
|
||||
changed_projects = 0
|
||||
|
||||
with psycopg.connect(args.database_url, row_factory=dict_row) as conn:
|
||||
files = conn.execute("SELECT id, stored_path FROM files ORDER BY id").fetchall()
|
||||
for row in files:
|
||||
nxt = rewrite(row["stored_path"] or "", old, new)
|
||||
if nxt is None or nxt == row["stored_path"]:
|
||||
continue
|
||||
changed_files += 1
|
||||
print("file %s: %s → %s" % (row["id"], row["stored_path"], nxt))
|
||||
if args.apply:
|
||||
conn.execute("UPDATE files SET stored_path = %s WHERE id = %s", (nxt, row["id"]))
|
||||
|
||||
projects = conn.execute("SELECT id, folder FROM projects ORDER BY id").fetchall()
|
||||
for row in projects:
|
||||
folder = row["folder"] or ""
|
||||
# folder ist relativ — nur absolute Reste bereinigen
|
||||
nxt = rewrite(folder, old, new)
|
||||
if nxt is None:
|
||||
continue
|
||||
# relativ zum neuen Slice-Root speichern, falls möglich
|
||||
new_n = normalize_slash(new)
|
||||
if nxt.lower().startswith(new_n.lower()):
|
||||
rel = nxt[len(new_n) :].lstrip("/")
|
||||
nxt = rel
|
||||
changed_projects += 1
|
||||
print("project %s: %s → %s" % (row["id"], folder, nxt))
|
||||
if args.apply:
|
||||
conn.execute("UPDATE projects SET folder = %s WHERE id = %s", (nxt, row["id"]))
|
||||
|
||||
if args.apply:
|
||||
conn.commit()
|
||||
print("Geschrieben: %s Dateien, %s Projekte." % (changed_files, changed_projects))
|
||||
else:
|
||||
print(
|
||||
"Dry-Run: %s Dateien, %s Projekte würden sich ändern. Mit --apply ausführen."
|
||||
% (changed_files, changed_projects)
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -7,10 +7,12 @@ import time
|
||||
|
||||
from waitress import serve
|
||||
|
||||
from grotti import db, jobs, library, store
|
||||
from grotti import db, jobs, library, logutil, store
|
||||
from grotti.config import load
|
||||
from web.app import create_app
|
||||
|
||||
log = logutil.get("grotti.server")
|
||||
|
||||
|
||||
def background(cfg):
|
||||
def work():
|
||||
@@ -20,10 +22,10 @@ def background(cfg):
|
||||
jobs.sync_history(conn, cfg)
|
||||
deleted = db.prune_run_samples(conn, keep_days=90)
|
||||
if deleted:
|
||||
print("Proben gelöscht: %s" % deleted, flush=True)
|
||||
log.info("Proben gelöscht: %s", deleted)
|
||||
conn.commit()
|
||||
except Exception as exc:
|
||||
print("Abgleich: %s" % exc, flush=True)
|
||||
log.warning("Abgleich: %s", exc)
|
||||
|
||||
threading.Thread(target=work, name="grotti-abgleich", daemon=True).start()
|
||||
|
||||
@@ -39,14 +41,15 @@ def _retention_loop(cfg, stop_event):
|
||||
n = db.prune_run_samples(conn, keep_days=90)
|
||||
conn.commit()
|
||||
if n:
|
||||
print("Retention: %s Proben gelöscht." % n, flush=True)
|
||||
log.info("Retention: %s Proben gelöscht.", n)
|
||||
except Exception as exc:
|
||||
print("Retention: %s" % exc, flush=True)
|
||||
log.warning("Retention: %s", exc)
|
||||
stop_event.wait(3600)
|
||||
|
||||
|
||||
def main():
|
||||
cfg = load()
|
||||
logutil.setup(cfg.get("log_level") or "INFO")
|
||||
cfg["data_dir"].mkdir(parents=True, exist_ok=True)
|
||||
(cfg["data_dir"] / "eingang").mkdir(exist_ok=True)
|
||||
db.prepare(cfg["database_url"])
|
||||
@@ -107,8 +110,14 @@ def main():
|
||||
except (ValueError, OSError):
|
||||
pass
|
||||
|
||||
print("Grotti: http://%s:%s/" % (cfg["host"], cfg["port"]), flush=True)
|
||||
serve(app, host=cfg["host"], port=cfg["port"], threads=16, channel_timeout=120)
|
||||
log.info("Grotti: http://%s:%s/", cfg["host"], cfg["port"])
|
||||
serve(
|
||||
app,
|
||||
host=cfg["host"],
|
||||
port=cfg["port"],
|
||||
threads=int(cfg.get("http_threads") or 16),
|
||||
channel_timeout=120,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -63,6 +63,30 @@ class BedarfTests(unittest.TestCase):
|
||||
out = compute(conn)
|
||||
self.assertEqual(out["shortfall"], [])
|
||||
|
||||
def test_slicer_hex_matches_named_stock(self):
|
||||
"""Slice #26A69A vs. Spule „Grau“ — 1 kg reicht, kein Fehlalarm."""
|
||||
conn = MagicMock()
|
||||
conn.execute.side_effect = self._rows(
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"spool_id": None,
|
||||
"repeat_total": 1,
|
||||
"repeat_done": 0,
|
||||
"weight_g": 49.23,
|
||||
"filaments": [{"type": "PLA", "color": "#26A69A"}],
|
||||
"spool_material": None,
|
||||
"spool_color": None,
|
||||
},
|
||||
],
|
||||
[
|
||||
{"material_type": "PLA", "color": "Grau", "remaining_g": 1000.0},
|
||||
],
|
||||
)
|
||||
out = compute(conn)
|
||||
self.assertEqual(out["shortfall"], [])
|
||||
self.assertAlmostEqual(out["needed"][0]["weight_g"], 49.23)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,44 @@
|
||||
"""Einfarbig: filament_colour_type strippen; Multicolor unangetastet."""
|
||||
|
||||
import unittest
|
||||
|
||||
from grotti.parse import gcode_is_multicolor, prepare_rinkhals_gcode, strip_filament_colour_type
|
||||
|
||||
|
||||
class ColourTypeStripTest(unittest.TestCase):
|
||||
def test_strip_single_color(self):
|
||||
raw = (
|
||||
b"; generated by OrcaSlicer 2.3.0\n"
|
||||
b"; filament_colour = #26A69A\n"
|
||||
b"; filament_colour_type = 1\n"
|
||||
b"G28\n"
|
||||
b"T0\n"
|
||||
b"G1 X10\n"
|
||||
)
|
||||
out = strip_filament_colour_type(raw)
|
||||
self.assertNotIn(b"filament_colour_type", out)
|
||||
self.assertIn(b"filament_colour = #26A69A", out)
|
||||
self.assertFalse(gcode_is_multicolor(raw))
|
||||
|
||||
def test_keep_multicolor(self):
|
||||
raw = (
|
||||
b"; generated by OrcaSlicer 2.3.0\n"
|
||||
b"; filament_colour = #111111;#222222\n"
|
||||
b"; filament_colour_type = 0;1\n"
|
||||
b"T0\n"
|
||||
b"G1 X1\n"
|
||||
b"T1\n"
|
||||
b"G1 X2\n"
|
||||
)
|
||||
self.assertTrue(gcode_is_multicolor(raw))
|
||||
out = strip_filament_colour_type(raw)
|
||||
self.assertIn(b"filament_colour_type = 0;1", out)
|
||||
|
||||
def test_prepare_strips_single(self):
|
||||
raw = b"; filament_colour_type = 1\nG28\nT0\n"
|
||||
out = prepare_rinkhals_gcode(raw)
|
||||
self.assertNotIn(b"filament_colour_type", out)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -11,11 +11,43 @@ class FilamentOutHintTests(unittest.TestCase):
|
||||
self.assertEqual(code, "message")
|
||||
self.assertIn("10107", text)
|
||||
|
||||
def test_active_filament_empty(self):
|
||||
code, text = filament_out_hint({"active_filament": {"empty": True}})
|
||||
def test_reason_for_pause(self):
|
||||
code, text = filament_out_hint({"reason_for_pause": "Filament runout"}, "")
|
||||
self.assertEqual(code, "reason")
|
||||
self.assertIn("runout", text.lower())
|
||||
|
||||
def test_active_filament_empty_needs_active_tool(self):
|
||||
code, text = filament_out_hint({
|
||||
"tool": 1,
|
||||
"gate_status": [1, 1, 1, 1],
|
||||
"active_filament": {"empty": True},
|
||||
})
|
||||
self.assertEqual(code, "active_empty")
|
||||
self.assertIn("leer", text.lower())
|
||||
|
||||
def test_anycubic_empty_without_tool_is_not_runout(self):
|
||||
# Live A2/Kobra 3: empty=true, tool=-1, alle gate_status 0 — auch beim Druck
|
||||
code, text = filament_out_hint({
|
||||
"tool": -1,
|
||||
"gate": -1,
|
||||
"is_paused": False,
|
||||
"gate_status": [0, 0, 0, 0],
|
||||
"active_filament": {"empty": True, "material": ""},
|
||||
"reason_for_pause": "",
|
||||
})
|
||||
self.assertIsNone(code)
|
||||
self.assertIsNone(text)
|
||||
|
||||
def test_manual_pause_anycubic_not_material(self):
|
||||
code, text = filament_out_hint({
|
||||
"tool": -1,
|
||||
"is_paused": True,
|
||||
"gate_status": [0, 0, 0, 0],
|
||||
"active_filament": {"empty": True},
|
||||
}, "paused")
|
||||
self.assertIsNone(code)
|
||||
self.assertIsNone(text)
|
||||
|
||||
def test_gate_status_zero_for_tool(self):
|
||||
code, text = filament_out_hint({
|
||||
"tool": 2,
|
||||
@@ -25,13 +57,15 @@ class FilamentOutHintTests(unittest.TestCase):
|
||||
self.assertEqual(code, "gate_empty")
|
||||
self.assertIn("3", text)
|
||||
|
||||
def test_mmu_paused_without_active_type(self):
|
||||
def test_all_gates_zero_not_empty_signal(self):
|
||||
# Anycubic: gate_status oft durchgängig 0 — kein Runout-Beweis
|
||||
code, text = filament_out_hint({
|
||||
"is_paused": True,
|
||||
"active_filament": {},
|
||||
"tool": 0,
|
||||
"gate_status": [0, 0, 0, 0],
|
||||
"active_filament": {"type": "PLA", "empty": False},
|
||||
})
|
||||
self.assertEqual(code, "mmu_paused")
|
||||
self.assertTrue(text)
|
||||
self.assertIsNone(code)
|
||||
self.assertIsNone(text)
|
||||
|
||||
def test_no_hint_for_plain_pause(self):
|
||||
code, text = filament_out_hint({"tool": 0, "gate_status": [1, 1]}, "paused")
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
"""Leere History-Hülle, Resume-Beweis und Chargen-Tag."""
|
||||
|
||||
import unittest
|
||||
from datetime import date, datetime, timedelta, timezone
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
from grotti.jobs import (
|
||||
history_in_order,
|
||||
history_shell_is_empty,
|
||||
is_filament_resume,
|
||||
)
|
||||
from grotti.store import chargen_day, history_job_retired
|
||||
|
||||
|
||||
class HistoryShellTests(unittest.TestCase):
|
||||
def test_pause_shell_is_empty(self):
|
||||
self.assertTrue(history_shell_is_empty({"duration_s": 0, "ended_at": None}))
|
||||
|
||||
def test_recorded_cancel_is_not_a_shell(self):
|
||||
self.assertFalse(history_shell_is_empty({
|
||||
"duration_s": 653,
|
||||
"ended_at": datetime(2026, 10, 18, 13, 18, tzinfo=timezone.utc),
|
||||
}))
|
||||
|
||||
def test_missing_row_is_not_a_shell(self):
|
||||
self.assertFalse(history_shell_is_empty(None))
|
||||
|
||||
|
||||
class FilamentResumeProofTests(unittest.TestCase):
|
||||
def test_duration_continued_with_tiny_gap(self):
|
||||
# 2026-10-25 Kobra 3 A1: 000040 → 000041, 0,04 s Lücke, gleiche print_duration
|
||||
end = datetime(2026, 10, 25, 5, 48, 27, 569483, tzinfo=timezone.utc)
|
||||
start = end + timedelta(milliseconds=40)
|
||||
self.assertTrue(is_filament_resume(
|
||||
end, start, prev_duration_s=11711, new_duration_s=11711
|
||||
))
|
||||
|
||||
def test_fresh_restart_after_cancel_is_not_resume(self):
|
||||
# Lauf 27941: 8 s abgebrochen, 45 s später Neustart mit Dauer ~0
|
||||
end = datetime(2026, 10, 24, 11, 46, 8, tzinfo=timezone.utc)
|
||||
start = end + timedelta(seconds=45)
|
||||
self.assertFalse(is_filament_resume(
|
||||
end, start, prev_duration_s=8, new_duration_s=5
|
||||
))
|
||||
|
||||
def test_two_arg_call_without_proof_is_false(self):
|
||||
end = datetime(2026, 10, 21, 19, 32, 20, tzinfo=timezone.utc)
|
||||
start = end + timedelta(milliseconds=40)
|
||||
self.assertFalse(is_filament_resume(end, start))
|
||||
|
||||
def test_watcher_signal_allows_longer_gap(self):
|
||||
end = datetime(2026, 10, 25, 1, 0, 0, tzinfo=timezone.utc)
|
||||
start = end + timedelta(hours=4)
|
||||
self.assertTrue(is_filament_resume(
|
||||
end, start, prev_duration_s=1000, new_duration_s=1000, watcher_resume=True
|
||||
))
|
||||
|
||||
def test_duration_reset_is_not_resume(self):
|
||||
end = datetime(2026, 10, 25, 5, 48, 27, tzinfo=timezone.utc)
|
||||
start = end + timedelta(milliseconds=40)
|
||||
self.assertFalse(is_filament_resume(
|
||||
end, start, prev_duration_s=11711, new_duration_s=12
|
||||
))
|
||||
|
||||
|
||||
class HistoryOrderTests(unittest.TestCase):
|
||||
def test_cancelled_part_before_resume(self):
|
||||
items = [
|
||||
{"job_id": "000041", "start_time": 1792907307.607},
|
||||
{"job_id": "000040", "start_time": 1792879062.392},
|
||||
]
|
||||
self.assertEqual([j["job_id"] for j in history_in_order(items)], ["000040", "000041"])
|
||||
|
||||
def test_missing_start_first(self):
|
||||
items = [{"job_id": "b", "start_time": 5}, {"job_id": "a"}]
|
||||
self.assertEqual([j["job_id"] for j in history_in_order(items)], ["a", "b"])
|
||||
|
||||
|
||||
class HistoryJobRetiredTests(unittest.TestCase):
|
||||
def _conn(self, row):
|
||||
conn = MagicMock()
|
||||
conn.execute.return_value.fetchone.return_value = row
|
||||
return conn
|
||||
|
||||
def test_folded_predecessor_is_retired(self):
|
||||
conn = self._conn({"moonraker_job_id": "000041"})
|
||||
self.assertTrue(history_job_retired(conn, "h", "000040"))
|
||||
|
||||
def test_own_job_is_not_retired(self):
|
||||
conn = self._conn({"moonraker_job_id": "000041"})
|
||||
self.assertFalse(history_job_retired(conn, "h", "000041"))
|
||||
|
||||
def test_unknown_job_is_not_retired(self):
|
||||
self.assertFalse(history_job_retired(self._conn(None), "h", "000042"))
|
||||
|
||||
|
||||
class ChargenDayTests(unittest.TestCase):
|
||||
def test_old_print_keeps_its_day(self):
|
||||
started = datetime(2026, 10, 18, 13, 4, 16, tzinfo=timezone.utc)
|
||||
self.assertEqual(chargen_day(started, today=date(2026, 10, 24)), date(2026, 10, 18))
|
||||
|
||||
def test_without_start_uses_today(self):
|
||||
self.assertEqual(chargen_day(None, today=date(2026, 10, 24)), date(2026, 10, 24))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -28,13 +28,77 @@ class ChooseSpoolTests(unittest.TestCase):
|
||||
with patch("grotti.jobs.store.spools_for_printer", return_value=[old]):
|
||||
self.assertEqual(jobs.choose_spool(conn, "h", "PLA", None, ended_at=end)["id"], 1)
|
||||
|
||||
def test_prefers_host_spool_over_stale_hint(self):
|
||||
"""Rollenwechsel: Hint im Regal, neue Rolle am Drucker → Abzug auf die neue."""
|
||||
end = datetime(2026, 10, 18, 14, 58, tzinfo=timezone.utc)
|
||||
hinted = {
|
||||
"id": 4,
|
||||
"material_type": "PLA",
|
||||
"printer_host": "",
|
||||
"created_at": end - timedelta(days=5),
|
||||
}
|
||||
current = {
|
||||
"id": 14,
|
||||
"material_type": "PLA",
|
||||
"printer_host": "h",
|
||||
"created_at": end - timedelta(minutes=10),
|
||||
}
|
||||
conn = MagicMock()
|
||||
with patch("grotti.jobs.store.spools_for_printer", return_value=[current]):
|
||||
with patch("grotti.jobs.store.get_spool_row", return_value=hinted):
|
||||
self.assertEqual(jobs.choose_spool(conn, "h", "PLA", 4, ended_at=end)["id"], 14)
|
||||
|
||||
def test_keeps_hint_when_no_host_spool(self):
|
||||
end = datetime(2026, 10, 18, 14, 58, tzinfo=timezone.utc)
|
||||
hinted = {
|
||||
"id": 4,
|
||||
"material_type": "PLA",
|
||||
"printer_host": "",
|
||||
"created_at": end - timedelta(days=5),
|
||||
}
|
||||
conn = MagicMock()
|
||||
with patch("grotti.jobs.store.spools_for_printer", return_value=[]):
|
||||
with patch("grotti.jobs.store.get_spool_row", return_value=hinted):
|
||||
self.assertEqual(jobs.choose_spool(conn, "h", "PLA", 4, ended_at=end)["id"], 4)
|
||||
|
||||
def test_resolve_tracking_spool_prefers_host(self):
|
||||
conn = MagicMock()
|
||||
with patch(
|
||||
"grotti.jobs.resolve_spools_at_host",
|
||||
return_value=[{"id": 14, "printer_host": "h"}],
|
||||
):
|
||||
self.assertEqual(jobs.resolve_tracking_spool(conn, "h", 4), 14)
|
||||
|
||||
def test_ace_target_skips_spool_created_after_end(self):
|
||||
end = datetime(2026, 10, 15, 22, 0, tzinfo=timezone.utc)
|
||||
future = {"id": 18, "created_at": end + timedelta(days=6)}
|
||||
conn = MagicMock()
|
||||
with patch("grotti.jobs.store.spool_at_slot", return_value=future):
|
||||
self.assertEqual(
|
||||
jobs._targets_from_ace(conn, "h", [{"ams_index": 3}], ended_at=end),
|
||||
[],
|
||||
)
|
||||
|
||||
def test_spool_valid_for_end_naive(self):
|
||||
end = datetime(2026, 10, 1, 12, 0, tzinfo=timezone.utc)
|
||||
spool = {"created_at": datetime(2026, 9, 1, 12, 0)}
|
||||
self.assertTrue(jobs._spool_valid_for_end(spool, end))
|
||||
|
||||
|
||||
class UndoDeductionTests(unittest.TestCase):
|
||||
def test_reopens_last_segment(self):
|
||||
conn = MagicMock()
|
||||
conn.execute.return_value.fetchall.return_value = [
|
||||
{"spool_id": 7, "weight_g": 10},
|
||||
]
|
||||
run = {"id": 42, "deducted": True}
|
||||
self.assertTrue(jobs.undo_deduction(conn, run))
|
||||
sqls = [str(call.args[0]) for call in conn.execute.call_args_list]
|
||||
self.assertTrue(any("UPDATE run_segments" in sql and "mm_end = NULL" in sql for sql in sqls))
|
||||
|
||||
|
||||
class SteuernAliasTests(unittest.TestCase):
|
||||
|
||||
@patch("grotti.moonraker.gcode_script", return_value={"ok": True})
|
||||
def test_value_alias_for_temp(self, gcode):
|
||||
moonraker.steuern("10.0.0.1", "nozzle", {"value": 210})
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
"""Logging-Hilfen."""
|
||||
|
||||
import logging
|
||||
import unittest
|
||||
|
||||
from grotti import logutil
|
||||
|
||||
|
||||
class LogutilTests(unittest.TestCase):
|
||||
def test_parse_level(self):
|
||||
self.assertEqual(logutil.parse_level("DEBUG"), logging.DEBUG)
|
||||
self.assertEqual(logutil.parse_level("warn"), logging.WARNING)
|
||||
self.assertEqual(logutil.parse_level("nope"), logging.INFO)
|
||||
|
||||
def test_setup_idempotent(self):
|
||||
logutil.setup("INFO")
|
||||
logutil.setup("DEBUG")
|
||||
self.assertEqual(logging.getLogger().level, logging.DEBUG)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,145 @@
|
||||
"""Sorten-Routing: Profil (Meta/Matte) und Auto-ACE-Map."""
|
||||
|
||||
import unittest
|
||||
|
||||
from grotti import store
|
||||
|
||||
|
||||
class ProfileMatchTests(unittest.TestCase):
|
||||
def test_meta_not_matte(self):
|
||||
self.assertTrue(store._profile_matches("Sunlu PLA Meta", "Sunlu PLA Meta"))
|
||||
self.assertTrue(store._profile_matches("Sunlu PLA Meta", "Sunlu PLA Meta schwarz"))
|
||||
self.assertFalse(store._profile_matches("Sunlu PLA Meta", "Sunlu PLA Matte"))
|
||||
self.assertFalse(store._profile_matches("Sunlu PLA Matte", "Sunlu PLA"))
|
||||
self.assertFalse(store._profile_matches("Sunlu PLA", "Sunlu PLA Matte"))
|
||||
self.assertFalse(store._profile_matches("Sunlu PLA", "Sunlu PLA Meta"))
|
||||
|
||||
def test_empty_profile_always_ok(self):
|
||||
self.assertTrue(store._profile_matches("", "Sunlu PLA Meta"))
|
||||
|
||||
def test_base_profile_helpers(self):
|
||||
self.assertFalse(store._profile_has_variant("Sunlu PLA"))
|
||||
self.assertTrue(store._profile_has_variant("Sunlu PLA Meta"))
|
||||
self.assertEqual(store._profile_base_type("Sunlu PLA"), "pla")
|
||||
self.assertEqual(store._profile_base_type("Generic PETG"), "petg")
|
||||
|
||||
|
||||
class MatchSpoolsTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.have = [
|
||||
{
|
||||
"spool_id": 1,
|
||||
"material_type": "pla",
|
||||
"color": "#ff0000",
|
||||
"remaining_g": 800,
|
||||
"material_name": "sunlu pla meta",
|
||||
"ace_slot": 1,
|
||||
},
|
||||
{
|
||||
"spool_id": 2,
|
||||
"material_type": "pla",
|
||||
"color": "#000000",
|
||||
"remaining_g": 500,
|
||||
"material_name": "sunlu pla matte",
|
||||
"ace_slot": 2,
|
||||
},
|
||||
{
|
||||
"spool_id": 3,
|
||||
"material_type": "pla",
|
||||
"color": "",
|
||||
"remaining_g": 900,
|
||||
"material_name": "eryone pla",
|
||||
"ace_slot": None,
|
||||
},
|
||||
]
|
||||
|
||||
def test_base_sunlu_pla_matches_any_pla(self):
|
||||
need = {"profile": "Sunlu PLA", "material_type": "pla", "color": "", "paint_index": 0}
|
||||
matched = store._match_spools_for_need(need, self.have)
|
||||
ids = {m["spool_id"] for m in matched}
|
||||
self.assertEqual(ids, {1, 2, 3})
|
||||
|
||||
def test_base_pla_matches_matte_alone(self):
|
||||
need = {"profile": "Sunlu PLA", "material_type": "pla", "color": "#f2a900", "paint_index": 0}
|
||||
have = [self.have[1]]
|
||||
matched = store._match_spools_for_need(need, have)
|
||||
self.assertEqual([m["spool_id"] for m in matched], [2])
|
||||
|
||||
def test_meta_falls_back_to_any_pla(self):
|
||||
need = {"profile": "Sunlu PLA Meta", "material_type": "pla", "color": "", "paint_index": 0}
|
||||
have = [self.have[1]]
|
||||
matched = store._match_spools_for_need(need, have)
|
||||
self.assertEqual([m["spool_id"] for m in matched], [2])
|
||||
|
||||
def test_petg_does_not_match_pla(self):
|
||||
need = {"profile": "Sunlu PETG", "material_type": "petg", "color": "", "paint_index": 0}
|
||||
self.assertEqual(store._match_spools_for_need(need, self.have), [])
|
||||
|
||||
def test_pla_lite_hex_matches_any_pla(self):
|
||||
# Orca: Profil „Eryone PLA Lite“, Farbe #26A69A — Lager: Eryone/Sunlu PLA „Grau“
|
||||
need = {
|
||||
"profile": "Eryone PLA Lite",
|
||||
"material_type": "pla",
|
||||
"color": "#26A69A",
|
||||
"paint_index": 0,
|
||||
}
|
||||
have = [
|
||||
{
|
||||
"spool_id": 15,
|
||||
"material_type": "pla",
|
||||
"color": "grau",
|
||||
"remaining_g": 873,
|
||||
"material_name": "sunlu pla",
|
||||
"ace_slot": None,
|
||||
},
|
||||
{
|
||||
"spool_id": 1,
|
||||
"material_type": "pla",
|
||||
"color": "grau",
|
||||
"remaining_g": 800,
|
||||
"material_name": "sunlu pla meta",
|
||||
"ace_slot": 1,
|
||||
},
|
||||
]
|
||||
matched = store._match_spools_for_need(need, have)
|
||||
self.assertEqual({m["spool_id"] for m in matched}, {15, 1})
|
||||
|
||||
def test_picks_meta_not_matte(self):
|
||||
need = {"profile": "Sunlu PLA Meta", "material_type": "pla", "color": "", "paint_index": 0}
|
||||
matched = store._match_spools_for_need(need, self.have)
|
||||
self.assertEqual(len(matched), 1)
|
||||
self.assertEqual(matched[0]["spool_id"], 1)
|
||||
|
||||
def test_color_soft_among_profile(self):
|
||||
need = {
|
||||
"profile": "Sunlu PLA Meta",
|
||||
"material_type": "pla",
|
||||
"color": "#00ff00",
|
||||
"paint_index": 0,
|
||||
}
|
||||
# Nur Meta vorhanden, Farbe anders → trotzdem Meta (Farbe soft)
|
||||
matched = store._match_spools_for_need(need, self.have)
|
||||
self.assertEqual(matched[0]["spool_id"], 1)
|
||||
|
||||
def test_auto_ace_map_assigns_slots(self):
|
||||
# Ohne DB: Logik über _match + manuell wie auto_ace_map
|
||||
need = [
|
||||
{"profile": "Sunlu PLA Meta", "material_type": "pla", "color": "#ff0000", "paint_index": 1},
|
||||
{"profile": "Sunlu PLA Matte", "material_type": "pla", "color": "#000000", "paint_index": 10},
|
||||
]
|
||||
used = set()
|
||||
mapping = []
|
||||
for n in need:
|
||||
matched = store._match_spools_for_need(n, self.have, used)
|
||||
self.assertTrue(matched)
|
||||
chosen = matched[0]
|
||||
used.add(chosen["spool_id"])
|
||||
mapping.append({"paint_index": n["paint_index"], "ams_index": int(chosen["ace_slot"]) - 1})
|
||||
self.assertEqual(mapping, [
|
||||
{"paint_index": 1, "ams_index": 0},
|
||||
{"paint_index": 10, "ams_index": 1},
|
||||
])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -23,6 +23,90 @@ class OrcaSendenHelpersTest(unittest.TestCase):
|
||||
"http://127.0.0.1:8770/dateien?file=42",
|
||||
)
|
||||
|
||||
def test_app_page_url(self):
|
||||
self.assertEqual(
|
||||
orca.app_page_url("http://127.0.0.1:8770/"),
|
||||
"http://127.0.0.1:8770/dateien?orca=1",
|
||||
)
|
||||
|
||||
def test_browser_key_collapses_duplicates(self):
|
||||
self.assertEqual(
|
||||
orca.browser_key("1018-1648-Round Clip PLA + PETG(01)_PLA_0.2_30m34s.gcode"),
|
||||
orca.browser_key("1018-1648-Round_Clip_PLA_+_PETG(01)_PLA_0.2_30m34s-2.gcode"),
|
||||
)
|
||||
|
||||
def test_browser_key_strips_time_prefix(self):
|
||||
self.assertEqual(
|
||||
orca.browser_key("1018-1706-Round Clip PLA + PETG(01)_PLA_0.2_30m34s.gcode"),
|
||||
orca.browser_key("1018-1709-Round_Clip_PLA_+_PETG(01)_PLA_0.2_30m34s.gcode"),
|
||||
)
|
||||
self.assertEqual(
|
||||
orca.browser_key("1018-1709-Round Clip PLA + PETG(01)_PLA_0.2_30m34s.gcode"),
|
||||
"roundclipplapetg01pla0230m34s",
|
||||
)
|
||||
|
||||
def test_open_browser_debounces(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
lock = Path(tmp) / "browser.lock"
|
||||
focus = Path(tmp) / "focus.json"
|
||||
with patch.object(orca, "BROWSER_LOCK", lock):
|
||||
with patch.object(orca, "FOCUS_PATH", focus):
|
||||
with patch.object(orca, "open_as_app", return_value=False):
|
||||
with patch.object(orca, "webbrowser") as browser:
|
||||
orca.open_browser(
|
||||
"http://127.0.0.1:8770/dateien?file=1",
|
||||
key="roundclip",
|
||||
file_id=1,
|
||||
mode="tab",
|
||||
)
|
||||
orca.open_browser(
|
||||
"http://127.0.0.1:8770/dateien?file=2",
|
||||
key="roundclip",
|
||||
file_id=2,
|
||||
mode="tab",
|
||||
)
|
||||
self.assertEqual(browser.open.call_count, 1)
|
||||
data = json.loads(focus.read_text(encoding="utf-8"))
|
||||
self.assertEqual(data["file_id"], 2)
|
||||
|
||||
def test_open_browser_app_mode(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
lock = Path(tmp) / "browser.lock"
|
||||
focus = Path(tmp) / "focus.json"
|
||||
with patch.object(orca, "BROWSER_LOCK", lock):
|
||||
with patch.object(orca, "FOCUS_PATH", focus):
|
||||
with patch.object(orca, "app_already_running", return_value=False):
|
||||
with patch.object(orca, "open_as_app", return_value=True) as app:
|
||||
with patch.object(orca, "webbrowser") as browser:
|
||||
orca.open_browser(
|
||||
"http://127.0.0.1:8770/dateien?orca=1",
|
||||
key="roundclip",
|
||||
file_id=9,
|
||||
mode="app",
|
||||
)
|
||||
app.assert_called_once()
|
||||
browser.open.assert_not_called()
|
||||
|
||||
def test_open_browser_reuses_running_app(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
lock = Path(tmp) / "browser.lock"
|
||||
focus = Path(tmp) / "focus.json"
|
||||
with patch.object(orca, "BROWSER_LOCK", lock):
|
||||
with patch.object(orca, "FOCUS_PATH", focus):
|
||||
with patch.object(orca, "app_already_running", return_value=True):
|
||||
with patch.object(orca, "open_as_app", return_value=True) as app:
|
||||
with patch.object(orca, "webbrowser") as browser:
|
||||
orca.open_browser(
|
||||
"http://127.0.0.1:8770/dateien?orca=1",
|
||||
key="andere-datei",
|
||||
file_id=11,
|
||||
mode="app",
|
||||
)
|
||||
app.assert_not_called()
|
||||
browser.open.assert_not_called()
|
||||
data = json.loads(focus.read_text(encoding="utf-8"))
|
||||
self.assertEqual(data["file_id"], 11)
|
||||
|
||||
def test_find_gcode_arg_last_matching(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
folder = Path(tmp)
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
"""Sparse paint_index / Bambu-T-Nummern für ACE-Map."""
|
||||
|
||||
import json
|
||||
import unittest
|
||||
|
||||
from grotti import acm, parse, usage
|
||||
|
||||
|
||||
PAINT_SPARSE = json.dumps(
|
||||
[
|
||||
{"material_type": "PLA", "paint_color": [255, 128, 0], "paint_index": 1},
|
||||
{"material_type": "PLA", "paint_color": [0, 0, 0], "paint_index": 10},
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
class PaintIndexTests(unittest.TestCase):
|
||||
def test_filaments_keep_slicer_paint_index(self):
|
||||
rows = parse.filaments_from_paint_info(PAINT_SPARSE)
|
||||
self.assertEqual(len(rows), 2)
|
||||
self.assertEqual(rows[0]["paint_index"], 1)
|
||||
self.assertEqual(rows[0]["type"], "PLA")
|
||||
self.assertEqual(rows[0]["color"], "#ff8000")
|
||||
self.assertEqual(rows[1]["paint_index"], 10)
|
||||
self.assertEqual(rows[1]["color"], "#000000")
|
||||
|
||||
def test_build_acm_uses_paint_index_not_array_slot(self):
|
||||
filaments = parse.filaments_from_paint_info(PAINT_SPARSE)
|
||||
mapping = [
|
||||
{"paint_index": 1, "ams_index": 3},
|
||||
{"paint_index": 10, "ams_index": 2},
|
||||
]
|
||||
slots = [
|
||||
{"index": 2, "type": "PLA", "color": "#f4f4f4"},
|
||||
{"index": 3, "type": "PLA", "color": "#c23b3b"},
|
||||
]
|
||||
payload = acm.build_acm(filaments, mapping, slots)
|
||||
paints = [item["paint_index"] for item in payload["ams_box_mapping"]]
|
||||
self.assertEqual(paints, [1, 10])
|
||||
by_paint = {item["paint_index"]: item for item in payload["ams_box_mapping"]}
|
||||
self.assertEqual(by_paint[1]["ams_index"], 3)
|
||||
self.assertEqual(by_paint[10]["ams_index"], 2)
|
||||
self.assertEqual(by_paint[1]["paint_color"], [255, 128, 0])
|
||||
self.assertEqual(by_paint[10]["paint_color"], [0, 0, 0])
|
||||
|
||||
def test_densify_mapping_and_rewrite_avoids_invalid_filament_id(self):
|
||||
mapping = [
|
||||
{"paint_index": 1, "ams_index": 3},
|
||||
{"paint_index": 10, "ams_index": 2},
|
||||
]
|
||||
remap, dense = acm.densify_mapping(mapping)
|
||||
self.assertEqual(remap, {1: 0, 10: 1})
|
||||
self.assertEqual(
|
||||
dense,
|
||||
[
|
||||
{"paint_index": 0, "ams_index": 3},
|
||||
{"paint_index": 1, "ams_index": 2},
|
||||
],
|
||||
)
|
||||
gcode = b"; hdr\nT10\nG1 X0\nT1 ; change\n; referenced_tools = 1,10\n"
|
||||
out = acm.rewrite_gcode_tools(gcode, remap)
|
||||
self.assertIn(b"T1\n", out)
|
||||
self.assertIn(b"T0 ; change", out)
|
||||
self.assertNotIn(b"T10", out)
|
||||
self.assertIn(b"; referenced_tools = 0,1", out)
|
||||
filaments = acm.remap_filaments(
|
||||
parse.filaments_from_paint_info(PAINT_SPARSE), remap
|
||||
)
|
||||
slots = [
|
||||
{"index": 2, "type": "PLA", "color": "#f4f4f4"},
|
||||
{"index": 3, "type": "PLA", "color": "#c23b3b"},
|
||||
]
|
||||
payload = acm.build_acm(filaments, dense, slots)
|
||||
paints = [item["paint_index"] for item in payload["ams_box_mapping"]]
|
||||
self.assertEqual(paints, [0, 1])
|
||||
self.assertEqual(payload["ams_box_mapping"][0]["paint_color"], [255, 128, 0])
|
||||
|
||||
def test_densify_identity_when_already_dense(self):
|
||||
mapping = [{"paint_index": 0, "ams_index": 1}, {"paint_index": 1, "ams_index": 2}]
|
||||
remap, dense = acm.densify_mapping(mapping)
|
||||
self.assertEqual(remap, {})
|
||||
self.assertEqual(dense, mapping)
|
||||
|
||||
def test_align_rewrites_when_ui_map_is_already_dense(self):
|
||||
"""Regression 10011700: UI schickt 0/1, G-code hat noch T1/T10."""
|
||||
gcode = b"; hdr\nT10\nG1 X0\nT1 ; change\n; referenced_tools = 1,10\n"
|
||||
mapping = [
|
||||
{"paint_index": 0, "ams_index": 3},
|
||||
{"paint_index": 1, "ams_index": 2},
|
||||
]
|
||||
filaments = [
|
||||
{"type": "PLA", "color": "#ff8000", "paint_index": 0},
|
||||
{"type": "PLA", "color": "#000000", "paint_index": 1},
|
||||
]
|
||||
out, dense, fils, remap = acm.align_tools_for_ace(gcode, mapping, filaments)
|
||||
self.assertEqual(remap, {1: 0, 10: 1})
|
||||
self.assertEqual(
|
||||
dense,
|
||||
[
|
||||
{"paint_index": 0, "ams_index": 3},
|
||||
{"paint_index": 1, "ams_index": 2},
|
||||
],
|
||||
)
|
||||
self.assertIn(b"T1\n", out)
|
||||
self.assertIn(b"T0 ; change", out)
|
||||
self.assertNotIn(b"T10", out)
|
||||
self.assertIn(b"; referenced_tools = 0,1", out)
|
||||
self.assertEqual([row["paint_index"] for row in fils], [0, 1])
|
||||
self.assertEqual(fils[0]["color"], "#ff8000")
|
||||
self.assertEqual(fils[1]["color"], "#000000")
|
||||
|
||||
def test_align_with_sparse_ui_map(self):
|
||||
gcode = b"T10\nT1\n"
|
||||
mapping = [
|
||||
{"paint_index": 1, "ams_index": 3},
|
||||
{"paint_index": 10, "ams_index": 2},
|
||||
]
|
||||
out, dense, fils, remap = acm.align_tools_for_ace(
|
||||
gcode, mapping, parse.filaments_from_paint_info(PAINT_SPARSE)
|
||||
)
|
||||
self.assertEqual(remap, {1: 0, 10: 1})
|
||||
self.assertEqual(dense[0]["ams_index"], 3)
|
||||
self.assertEqual(dense[1]["ams_index"], 2)
|
||||
self.assertNotIn(b"T10", out)
|
||||
self.assertEqual([row["paint_index"] for row in fils], [0, 1])
|
||||
|
||||
def test_tools_used_finds_t10(self):
|
||||
gcode = b"; header\nT10\nG1 X0\nT1 ; change\n"
|
||||
self.assertEqual(parse.tools_used_in_gcode(gcode), {1, 10})
|
||||
|
||||
def test_planned_shares_sparse_paint_falls_back_to_order(self):
|
||||
meta = {"filament_weight_total": [12.0, 8.0]}
|
||||
mapping = [
|
||||
{"paint_index": 1, "ams_index": 0},
|
||||
{"paint_index": 10, "ams_index": 1},
|
||||
]
|
||||
self.assertEqual(usage.planned_shares(meta, mapping, 2), [12.0, 8.0])
|
||||
|
||||
def test_profile_name_strips_machine(self):
|
||||
self.assertEqual(parse.profile_name('Sunlu PLA Meta @Kobra 3'), "Sunlu PLA Meta")
|
||||
self.assertEqual(parse.profile_name('"Sunlu PLA Matte @Kobra S1"'), "Sunlu PLA Matte")
|
||||
|
||||
def test_filaments_of_attaches_settings_id_profiles(self):
|
||||
# Slot 1 = PLA, Slot 10 = Matte — wie sparse paint_info
|
||||
profiles = ";".join(
|
||||
['"Sunlu PLA @Kobra 3"' if i not in (1, 10) else (
|
||||
'"Sunlu PLA @Kobra 3"' if i == 1 else '"Sunlu PLA Matte @Kobra 3"'
|
||||
) for i in range(15)]
|
||||
)
|
||||
comments = {
|
||||
"paint_info": PAINT_SPARSE,
|
||||
"filament_settings_id": profiles,
|
||||
}
|
||||
rows = parse.filaments_of(comments)
|
||||
self.assertEqual(rows[0]["profile"], "Sunlu PLA")
|
||||
self.assertEqual(rows[1]["profile"], "Sunlu PLA Matte")
|
||||
|
||||
def test_filaments_of_single_without_paint(self):
|
||||
comments = {
|
||||
"filament_type": "PLA",
|
||||
"filament_colour": "#00FF00",
|
||||
"filament_settings_id": '"Sunlu PLA Meta @Kobra 3"',
|
||||
}
|
||||
rows = parse.filaments_of(comments)
|
||||
self.assertEqual(len(rows), 1)
|
||||
self.assertEqual(rows[0]["profile"], "Sunlu PLA Meta")
|
||||
self.assertEqual(rows[0]["type"], "PLA")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -8,7 +8,15 @@ from unittest import mock
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT))
|
||||
|
||||
from grotti.print_queue import PRINT_START_TIMEOUT_S, PrintQueueDispatcher, _cool_wait_text
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from grotti.jobs import is_filament_resume
|
||||
from grotti.print_queue import (
|
||||
PRINT_START_TIMEOUT_S,
|
||||
TERMINAL_CONFIRM_HITS,
|
||||
PrintQueueDispatcher,
|
||||
_cool_wait_text,
|
||||
)
|
||||
|
||||
|
||||
class CoolTextTests(unittest.TestCase):
|
||||
@@ -20,9 +28,26 @@ class CoolTextTests(unittest.TestCase):
|
||||
self.assertNotIn(" · ", text)
|
||||
|
||||
|
||||
class FilamentResumeTests(unittest.TestCase):
|
||||
def test_same_moment_with_duration_is_resume(self):
|
||||
end = datetime(2026, 10, 21, 19, 32, 20, tzinfo=timezone.utc)
|
||||
start = end + timedelta(milliseconds=40)
|
||||
self.assertTrue(is_filament_resume(
|
||||
end, start, prev_duration_s=500, new_duration_s=520
|
||||
))
|
||||
|
||||
def test_later_reprint_is_not_resume(self):
|
||||
end = datetime(2026, 10, 21, 19, 32, 20, tzinfo=timezone.utc)
|
||||
start = end + timedelta(minutes=10)
|
||||
self.assertFalse(is_filament_resume(
|
||||
end, start, prev_duration_s=500, new_duration_s=10
|
||||
))
|
||||
|
||||
|
||||
class DispatcherHelpers(unittest.TestCase):
|
||||
def test_timeout_constant(self):
|
||||
self.assertGreaterEqual(PRINT_START_TIMEOUT_S, 300)
|
||||
self.assertGreaterEqual(TERMINAL_CONFIRM_HITS, 2)
|
||||
|
||||
def test_worker_busy_empty(self):
|
||||
d = PrintQueueDispatcher("postgresql://x", {}, watcher=None)
|
||||
@@ -34,6 +59,21 @@ class DispatcherHelpers(unittest.TestCase):
|
||||
d.cfg = {"auto_queue": False}
|
||||
self.assertFalse(d._auto_enabled())
|
||||
|
||||
def test_no_retry_after_abort(self):
|
||||
d = PrintQueueDispatcher("postgresql://x", {}, watcher=None)
|
||||
self.assertFalse(d._retryable_message("Druck abgebrochen."))
|
||||
self.assertTrue(d._retryable_message("Start-Timeout"))
|
||||
|
||||
def test_advance_simple_ignores_single_cancelled(self):
|
||||
d = PrintQueueDispatcher("postgresql://x", {}, watcher=None)
|
||||
item = {"id": 1, "phase": "print_active", "filename": "a.gcode"}
|
||||
printer = {"host": "h", "name": "P"}
|
||||
live = {"state": "cancelled", "print_active": False}
|
||||
with mock.patch("grotti.print_queue.store.update_print_queue") as upd:
|
||||
d._advance_simple(mock.Mock(), item, printer, live)
|
||||
upd.assert_not_called()
|
||||
self.assertEqual(d._term_hits.get("1:end"), 1)
|
||||
|
||||
|
||||
class ResolveSpoolTests(unittest.TestCase):
|
||||
def test_material_match(self):
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
"""Szenarien für einen physischen Druck = ein Lauf (ohne DB, mit Mocks)."""
|
||||
|
||||
import os
|
||||
import unittest
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from grotti import jobs
|
||||
|
||||
|
||||
class SyncOneJobShellTests(unittest.TestCase):
|
||||
def test_empty_shell_skipped(self):
|
||||
conn = MagicMock()
|
||||
printer = {"host": "h", "name": "P"}
|
||||
job = {
|
||||
"job_id": "000041",
|
||||
"filename": "a.gcode",
|
||||
"status": "in_progress",
|
||||
"start_time": 1000,
|
||||
"end_time": None,
|
||||
"print_duration": 0,
|
||||
"total_duration": 0,
|
||||
"metadata": {},
|
||||
}
|
||||
self.assertEqual(jobs._sync_one_job(conn, {"energy": {}}, printer, job), 0)
|
||||
conn.execute.assert_not_called()
|
||||
|
||||
|
||||
class FoldProofIntegrationLike(unittest.TestCase):
|
||||
def test_fold_requires_duration_proof(self):
|
||||
end = datetime(2026, 10, 25, 5, 48, 27, tzinfo=timezone.utc)
|
||||
start = end + timedelta(milliseconds=40)
|
||||
pred = {
|
||||
"id": 1,
|
||||
"ended_at": end,
|
||||
"duration_s": 11711,
|
||||
"moonraker_job_id": "000040",
|
||||
"verdict": "",
|
||||
}
|
||||
conn = MagicMock()
|
||||
conn.execute.return_value.fetchone.return_value = None
|
||||
with patch("grotti.jobs.store.find_resume_predecessor", return_value=pred), \
|
||||
patch("grotti.jobs.store.remember_run_job"), \
|
||||
patch("grotti.jobs.store.move_run_jobs"), \
|
||||
patch("grotti.jobs.store.set_printer_active_run"), \
|
||||
patch("grotti.jobs.undo_deduction"):
|
||||
# Frischer Neustart (Dauer 12) — kein Fold
|
||||
self.assertIsNone(jobs.fold_filament_resume(
|
||||
conn, "h", "a.gcode", "000041", start, print_duration_s=12
|
||||
))
|
||||
# Fortgesetzte Dauer — Fold
|
||||
self.assertEqual(
|
||||
jobs.fold_filament_resume(
|
||||
conn, "h", "a.gcode", "000041", start, print_duration_s=11711
|
||||
),
|
||||
1,
|
||||
)
|
||||
|
||||
|
||||
@unittest.skipUnless(os.environ.get("GROTTI_TEST_DB"), "GROTTI_TEST_DB nicht gesetzt")
|
||||
class LiveDbScenarios(unittest.TestCase):
|
||||
"""Gegen echte Test-DB: GROTTI_TEST_DB=postgresql://…"""
|
||||
|
||||
def setUp(self):
|
||||
import psycopg
|
||||
from psycopg.rows import dict_row
|
||||
|
||||
self.conn = psycopg.connect(os.environ["GROTTI_TEST_DB"], row_factory=dict_row)
|
||||
|
||||
def tearDown(self):
|
||||
self.conn.rollback()
|
||||
self.conn.close()
|
||||
|
||||
def test_connection(self):
|
||||
self.assertTrue(self.conn.execute("SELECT 1").fetchone())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,127 @@
|
||||
"""ACE-Startabschnitte und Spulenwechsel 0→jetzt."""
|
||||
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
from grotti import store
|
||||
from grotti.watcher import StateWatcher
|
||||
|
||||
|
||||
class PrevSpoolForSlotTests(unittest.TestCase):
|
||||
def test_prefers_old_at_slot(self):
|
||||
conn = mock.Mock()
|
||||
live = {"id": 1, "filename": "a.gcode", "spool_id": 99}
|
||||
got = store.prev_spool_id_for_slot(
|
||||
conn, "h", 4, live, 21, old_rows=[{"id": 18}],
|
||||
)
|
||||
self.assertEqual(got, 18)
|
||||
|
||||
def test_ace_map_send_when_old_empty(self):
|
||||
conn = mock.Mock()
|
||||
live = {"id": 33805, "filename": "x.gcode", "spool_id": None}
|
||||
with mock.patch(
|
||||
"grotti.store.latest_send",
|
||||
return_value={
|
||||
"ace_map": [{"paint_index": 0, "ams_index": 3}],
|
||||
"spool_id": 18,
|
||||
},
|
||||
):
|
||||
got = store.prev_spool_id_for_slot(conn, "h", 4, live, 21, old_rows=[])
|
||||
self.assertEqual(got, 18)
|
||||
|
||||
def test_last_segment_on_slot(self):
|
||||
conn = mock.Mock()
|
||||
live = {"id": 7, "filename": "x.gcode", "spool_id": None}
|
||||
with mock.patch("grotti.store.latest_send", return_value={"ace_map": [], "spool_id": None}), \
|
||||
mock.patch(
|
||||
"grotti.store.list_run_segments",
|
||||
return_value=[
|
||||
{"spool_id": 10, "ace_slot": 2, "mm_start": 0, "mm_end": 100},
|
||||
{"spool_id": 18, "ace_slot": 4, "mm_start": 0, "mm_end": 500},
|
||||
],
|
||||
):
|
||||
got = store.prev_spool_id_for_slot(conn, "h", 4, live, 21, old_rows=[])
|
||||
self.assertEqual(got, 18)
|
||||
|
||||
|
||||
class EnsureStartSegmentAceTests(unittest.TestCase):
|
||||
def test_opens_mapped_slots_with_spool(self):
|
||||
watcher = StateWatcher("postgresql://x", {})
|
||||
conn = mock.Mock()
|
||||
live = {"filament_used": 0}
|
||||
with mock.patch("grotti.watcher.store.list_run_segments", return_value=[]), \
|
||||
mock.patch(
|
||||
"grotti.watcher.store.latest_send",
|
||||
return_value={"ace_map": [{"paint_index": 0, "ams_index": 3}]},
|
||||
), \
|
||||
mock.patch(
|
||||
"grotti.watcher.store.spool_at_slot",
|
||||
return_value={"id": 18},
|
||||
) as at_slot, \
|
||||
mock.patch("grotti.watcher.store.open_segment") as open_seg:
|
||||
watcher._ensure_start_segment(conn, "h", "a.gcode", live, 33805)
|
||||
at_slot.assert_called_once_with(conn, "h", 4)
|
||||
open_seg.assert_called_once_with(conn, 33805, 18, 4, 0.0)
|
||||
|
||||
def test_ace_without_spool_opens_nothing(self):
|
||||
watcher = StateWatcher("postgresql://x", {})
|
||||
conn = mock.Mock()
|
||||
with mock.patch("grotti.watcher.store.list_run_segments", return_value=[]), \
|
||||
mock.patch(
|
||||
"grotti.watcher.store.latest_send",
|
||||
return_value={"ace_map": [{"paint_index": 0, "ams_index": 3}]},
|
||||
), \
|
||||
mock.patch("grotti.watcher.store.spool_at_slot", return_value=None), \
|
||||
mock.patch("grotti.watcher.store.open_segment") as open_seg:
|
||||
watcher._ensure_start_segment(conn, "h", "a.gcode", {"filament_used": 0}, 1)
|
||||
open_seg.assert_not_called()
|
||||
|
||||
|
||||
class SpoolLoadFallbackSegmentsTests(unittest.TestCase):
|
||||
"""ACE ohne Segment + Einlegen ohne old → 0→jetzt + neuer offener Abschnitt."""
|
||||
|
||||
def test_creates_closed_and_open_segment(self):
|
||||
conn = mock.Mock()
|
||||
live = {"id": 33805, "filename": "x.gcode", "spool_id": None, "state": "in_progress"}
|
||||
opened = []
|
||||
closed = []
|
||||
|
||||
def open_segment(_c, run_id, spool_id, ace_slot, mm_start):
|
||||
opened.append((run_id, spool_id, ace_slot, mm_start))
|
||||
return True
|
||||
|
||||
def close_open_segments(_c, run_id, ace_slot, mm_end):
|
||||
closed.append((run_id, ace_slot, mm_end))
|
||||
# Erster Aufruf: nichts offen; zweiter: nach open_segment
|
||||
return 1 if opened else 0
|
||||
|
||||
with mock.patch("grotti.store.close_open_segments", side_effect=close_open_segments), \
|
||||
mock.patch("grotti.store.open_segment", side_effect=open_segment), \
|
||||
mock.patch(
|
||||
"grotti.store.prev_spool_id_for_slot",
|
||||
return_value=18,
|
||||
):
|
||||
# Logik wie in spool_load (Auszug)
|
||||
slot = 4
|
||||
spool_id = 21
|
||||
mm_now = 5291.0
|
||||
old = []
|
||||
closed_n = store.close_open_segments(conn, live["id"], slot, mm_now)
|
||||
if not closed_n and old:
|
||||
pass
|
||||
elif not closed_n and mm_now > 0:
|
||||
prev_id = store.prev_spool_id_for_slot(
|
||||
conn, "h", slot, live, spool_id, old_rows=old,
|
||||
)
|
||||
if prev_id:
|
||||
store.open_segment(conn, live["id"], prev_id, slot, 0)
|
||||
store.close_open_segments(conn, live["id"], slot, mm_now)
|
||||
store.open_segment(conn, live["id"], spool_id, slot, mm_now)
|
||||
|
||||
self.assertEqual(opened[0], (33805, 18, 4, 0))
|
||||
self.assertEqual(closed[-1], (33805, 4, 5291.0))
|
||||
self.assertEqual(opened[-1], (33805, 21, 4, 5291.0))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,205 @@
|
||||
"""Kontaktverlust beendet einen Druck nicht."""
|
||||
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
from grotti.watcher import StateWatcher, contact_gap_keeps_run
|
||||
|
||||
HOST = "10.10.1.88"
|
||||
FILE = "boden_PETG_0.2_2h15m.gcode"
|
||||
|
||||
|
||||
class ContactGapTests(unittest.TestCase):
|
||||
def test_same_file_stays(self):
|
||||
self.assertTrue(contact_gap_keeps_run(FILE, FILE, "printing"))
|
||||
self.assertTrue(contact_gap_keeps_run(FILE, FILE, "paused"))
|
||||
|
||||
def test_other_file_does_not_stay(self):
|
||||
self.assertFalse(contact_gap_keeps_run(FILE, "andere.gcode", "printing"))
|
||||
|
||||
def test_terminal_state_does_not_stay(self):
|
||||
self.assertFalse(contact_gap_keeps_run(FILE, FILE, "standby"))
|
||||
self.assertFalse(contact_gap_keeps_run(FILE, FILE, "complete"))
|
||||
self.assertFalse(contact_gap_keeps_run(FILE, FILE, "error"))
|
||||
|
||||
def test_missing_name_is_not_a_change(self):
|
||||
self.assertTrue(contact_gap_keeps_run("", FILE, "printing"))
|
||||
self.assertTrue(contact_gap_keeps_run(FILE, "", "paused"))
|
||||
|
||||
|
||||
class WatcherOfflineTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.watcher = StateWatcher("postgresql://x", {})
|
||||
self.watcher._prev[HOST] = {
|
||||
"state": "printing",
|
||||
"offline": False,
|
||||
"filename": FILE,
|
||||
"run_id": 42,
|
||||
}
|
||||
|
||||
def test_two_misses_keep_the_run(self):
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "offline",
|
||||
"ok": False,
|
||||
"filename": "",
|
||||
}
|
||||
with mock.patch.object(self.watcher, "_emit") as emit, \
|
||||
mock.patch("grotti.watcher.store.complete_open_run") as close, \
|
||||
mock.patch("grotti.watcher.jobs.apply_deduction") as deduct:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
close.assert_not_called()
|
||||
deduct.assert_not_called()
|
||||
remembered = self.watcher._prev[HOST]
|
||||
self.assertEqual(remembered["state"], "printing")
|
||||
self.assertTrue(remembered["offline"])
|
||||
self.assertEqual(remembered["run_id"], 42)
|
||||
self.assertEqual(remembered["filename"], FILE)
|
||||
self.assertEqual([call.args[3] for call in emit.call_args_list], ["offline"])
|
||||
|
||||
def test_same_print_after_gap_is_the_same_run(self):
|
||||
self.watcher._prev[HOST]["offline"] = True
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "printing",
|
||||
"ok": True,
|
||||
"filename": FILE,
|
||||
"weight": 0,
|
||||
}
|
||||
run = {"id": 42, "filename": FILE}
|
||||
with mock.patch.object(self.watcher, "_emit") as emit, \
|
||||
mock.patch.object(self.watcher, "_track_print", return_value=run) as track, \
|
||||
mock.patch.object(self.watcher, "_check_spool", return_value=False), \
|
||||
mock.patch("grotti.watcher.store.find_live_run", return_value=run), \
|
||||
mock.patch("grotti.watcher.store.abandon_live_runs") as abandon, \
|
||||
mock.patch("grotti.watcher.store.complete_open_run") as close, \
|
||||
mock.patch("grotti.watcher.jobs.sync_history") as sync, \
|
||||
mock.patch("grotti.watcher.jobs.apply_deduction") as deduct:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
close.assert_not_called()
|
||||
deduct.assert_not_called()
|
||||
abandon.assert_not_called()
|
||||
sync.assert_not_called()
|
||||
track.assert_called_once()
|
||||
self.assertEqual([call.args[3] for call in emit.call_args_list], ["offline"])
|
||||
self.assertIn("wieder erreichbar", emit.call_args_list[0].args[4])
|
||||
self.assertEqual(self.watcher._prev[HOST]["state"], "printing")
|
||||
self.assertFalse(self.watcher._prev[HOST]["offline"])
|
||||
|
||||
def test_standby_after_gap_closes(self):
|
||||
self.watcher._prev[HOST]["offline"] = True
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "standby",
|
||||
"ok": True,
|
||||
"filename": "",
|
||||
}
|
||||
run = {"id": 42, "filename": FILE}
|
||||
with mock.patch.object(self.watcher, "_emit") as emit, \
|
||||
mock.patch.object(self.watcher, "_track_print", return_value=None), \
|
||||
mock.patch.object(self.watcher, "_check_spool", return_value=False), \
|
||||
mock.patch("grotti.watcher.store.find_live_run", return_value=run), \
|
||||
mock.patch("grotti.watcher.store.running_print_on_host", return_value=None), \
|
||||
mock.patch("grotti.watcher.store.abandon_live_runs") as abandon, \
|
||||
mock.patch("grotti.watcher.store.set_bed_needs_clear"), \
|
||||
mock.patch("grotti.watcher.jobs.sync_history") as sync:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
abandon.assert_called_once()
|
||||
sync.assert_called_once()
|
||||
self.assertIn("abbruch", [call.args[3] for call in emit.call_args_list])
|
||||
|
||||
def test_other_file_after_gap_releases_the_old_run(self):
|
||||
self.watcher._prev[HOST]["offline"] = True
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "printing",
|
||||
"ok": True,
|
||||
"filename": "andere.gcode",
|
||||
"weight": 0,
|
||||
}
|
||||
old = {"id": 42, "filename": FILE}
|
||||
new = {"id": 99, "filename": "andere.gcode"}
|
||||
with mock.patch.object(self.watcher, "_emit") as emit, \
|
||||
mock.patch.object(self.watcher, "_track_print", return_value=new), \
|
||||
mock.patch.object(self.watcher, "_ensure_start_segment"), \
|
||||
mock.patch.object(self.watcher, "_check_spool", return_value=False), \
|
||||
mock.patch("grotti.watcher.store.find_live_run", side_effect=[old, old, None]), \
|
||||
mock.patch("grotti.watcher.store.abandon_live_runs") as abandon, \
|
||||
mock.patch("grotti.watcher.jobs.sync_history") as sync:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
sync.assert_called_once()
|
||||
self.assertGreaterEqual(abandon.call_count, 1)
|
||||
kinds = [call.args[3] for call in emit.call_args_list]
|
||||
self.assertEqual(kinds, ["abbruch", "offline", "start"])
|
||||
|
||||
def test_other_file_without_offline_releases_the_old_run(self):
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "printing",
|
||||
"ok": True,
|
||||
"filename": "andere.gcode",
|
||||
"weight": 0,
|
||||
}
|
||||
old = {"id": 42, "filename": FILE}
|
||||
new = {"id": 99, "filename": "andere.gcode"}
|
||||
seen = {"n": 0}
|
||||
|
||||
def live_run(_conn, _host, filename=""):
|
||||
seen["n"] += 1
|
||||
if seen["n"] <= 3:
|
||||
return old
|
||||
return None
|
||||
|
||||
with mock.patch.object(self.watcher, "_emit") as emit, \
|
||||
mock.patch.object(self.watcher, "_track_print", return_value=new), \
|
||||
mock.patch.object(self.watcher, "_ensure_start_segment"), \
|
||||
mock.patch.object(self.watcher, "_check_spool", return_value=False), \
|
||||
mock.patch("grotti.watcher.store.find_live_run", side_effect=live_run), \
|
||||
mock.patch("grotti.watcher.store.abandon_live_runs") as abandon, \
|
||||
mock.patch("grotti.watcher.jobs.sync_history") as sync:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
sync.assert_called_once()
|
||||
abandon.assert_called()
|
||||
self.assertIn("abbruch", [call.args[3] for call in emit.call_args_list])
|
||||
self.assertIn("start", [call.args[3] for call in emit.call_args_list])
|
||||
|
||||
def test_cancel_event_survives_deleted_live_run(self):
|
||||
self.watcher._cancel_hits[HOST] = 2
|
||||
live = {
|
||||
"host": HOST,
|
||||
"name": "Kobra S1",
|
||||
"state": "cancelled",
|
||||
"ok": True,
|
||||
"filename": FILE,
|
||||
}
|
||||
dangling = {"id": 42, "filename": FILE, "state": "in_progress"}
|
||||
|
||||
def row(_conn, run_id):
|
||||
if run_id == 77:
|
||||
return {"id": 77, "filename": FILE}
|
||||
return None
|
||||
|
||||
with mock.patch("grotti.watcher.store.find_live_run", side_effect=[dangling, None]), \
|
||||
mock.patch("grotti.watcher.store.find_open_history_run", return_value=None), \
|
||||
mock.patch("grotti.watcher.store.get_run_row", side_effect=row), \
|
||||
mock.patch("grotti.watcher.store.latest_run_id", return_value=77), \
|
||||
mock.patch("grotti.watcher.store.abandon_live_runs"), \
|
||||
mock.patch("grotti.watcher.store.set_bed_needs_clear"), \
|
||||
mock.patch("grotti.watcher.store.set_printer_active_run"), \
|
||||
mock.patch("grotti.watcher.jobs.sync_history") as sync, \
|
||||
mock.patch("grotti.watcher.notify.record") as record:
|
||||
self.watcher._one(mock.Mock(), live)
|
||||
sync.assert_called_once()
|
||||
record.assert_called()
|
||||
self.assertEqual(record.call_args.kwargs["run_id"], 77)
|
||||
self.assertEqual(record.call_args.args[4], "abbruch")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
+412
-31
@@ -5,7 +5,7 @@ import re
|
||||
import secrets
|
||||
import time
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timedelta
|
||||
from pathlib import Path
|
||||
from urllib.parse import quote
|
||||
|
||||
@@ -19,7 +19,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
|
||||
from grotti import auth as grotti_auth
|
||||
from grotti import config as grotti_config
|
||||
from grotti import db as grotti_db
|
||||
from grotti import eject, jobs, library, moonraker, notify, store
|
||||
from grotti import eject, jobs, library, logutil, moonraker, notify, store
|
||||
from grotti.catalog import color_catalog
|
||||
from grotti.cost import calculate, offer_from_file, order_actuals
|
||||
from grotti import orders as grotti_orders
|
||||
@@ -32,6 +32,8 @@ from grotti.version import __version__
|
||||
from grotti import verdict as grotti_verdict
|
||||
from grotti.watcher import StateWatcher
|
||||
|
||||
log = logutil.get("grotti.web")
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
TOOL_ROOT = ROOT.parent
|
||||
DOCS_DIR = TOOL_ROOT / "docs"
|
||||
@@ -46,6 +48,8 @@ TOKEN_QUERY_PATHS = (
|
||||
"/api/v1/kamera",
|
||||
"/api/v1/kamera/stream",
|
||||
"/api/v1/vorschau",
|
||||
"/api/v1/dateien/",
|
||||
"/api/v1/projekte/",
|
||||
)
|
||||
STEER_ACTIONS = {
|
||||
"nozzle", "bed", "speed", "flow", "fan", "emergency_stop", "clear_error",
|
||||
@@ -77,6 +81,9 @@ def create_app(cfg):
|
||||
app.config["MAX_CONTENT_LENGTH"] = 256 * 1024 * 1024
|
||||
app.config["SESSION_COOKIE_HTTPONLY"] = True
|
||||
app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
|
||||
# Orca-App-Fenster schließt oft — Session-Cookie muss überleben (30 Tage, gleitend).
|
||||
app.config["PERMANENT_SESSION_LIFETIME"] = timedelta(days=30)
|
||||
app.config["SESSION_REFRESH_EACH_REQUEST"] = True
|
||||
if cfg.get("fqdn", "").startswith("https://"):
|
||||
app.config["SESSION_COOKIE_SECURE"] = True
|
||||
app.json.ensure_ascii = False
|
||||
@@ -94,6 +101,7 @@ def create_app(cfg):
|
||||
"/setup",
|
||||
"/api/v1/auth/status",
|
||||
"/api/v1/auth/login",
|
||||
"/api/v1/auth/token",
|
||||
"/api/v1/auth/setup",
|
||||
"/api/v1/version",
|
||||
}
|
||||
@@ -313,7 +321,7 @@ def create_app(cfg):
|
||||
message = "Diesen Eintrag gibt es schon."
|
||||
elif isinstance(err, psycopg.errors.InvalidTextRepresentation):
|
||||
message = "Ungültiger Wert in der Anfrage."
|
||||
print("DB: %s" % err, flush=True)
|
||||
log.warning("DB: %s", err)
|
||||
return jsonify({"error": message, "code": "db"}), 500
|
||||
|
||||
def body():
|
||||
@@ -421,6 +429,7 @@ def create_app(cfg):
|
||||
grotti_db.invalidate_user_count()
|
||||
store.touch_user_login(conn(), row["id"])
|
||||
session.clear()
|
||||
session.permanent = True
|
||||
session["user_id"] = row["id"]
|
||||
session["csrf"] = grotti_auth.new_csrf()
|
||||
store.add_event(conn(), "", "", "auth", "Admin %s angelegt" % username)
|
||||
@@ -442,11 +451,45 @@ def create_app(cfg):
|
||||
raise GrottiError("Benutzer oder Passwort falsch.", "auth", 401)
|
||||
store.touch_user_login(conn(), row["id"])
|
||||
session.clear()
|
||||
session.permanent = True
|
||||
session["user_id"] = row["id"]
|
||||
session["csrf"] = grotti_auth.new_csrf()
|
||||
store.add_event(conn(), "", "", "auth", "Login %s" % row["username"])
|
||||
return jsonify({"user": grotti_auth.public_user(row), "csrf": session["csrf"]})
|
||||
|
||||
@app.post("/api/v1/auth/token")
|
||||
def auth_token():
|
||||
"""Passwort → API-Token (für Android/App). Keine Session, Rate-Limit wie Login."""
|
||||
if store.user_count(conn()) == 0:
|
||||
raise GrottiError("Zuerst Admin anlegen.", "setup", 503)
|
||||
key = request.remote_addr or "unknown"
|
||||
if not grotti_auth.login_rate_ok(key):
|
||||
raise GrottiError("Zu viele Versuche. Bitte warten.", "rate", 429)
|
||||
data = body()
|
||||
username = (data.get("username") or "").strip()
|
||||
password = data.get("password") or ""
|
||||
device = (data.get("device_name") or data.get("name") or "App").strip()[:80] or "App"
|
||||
row = store.get_user_by_name(conn(), username)
|
||||
if not row or not row.get("active") or not grotti_auth.verify_password(row["password_hash"], password):
|
||||
grotti_auth.login_rate_hit(key)
|
||||
raise GrottiError("Benutzer oder Passwort falsch.", "auth", 401)
|
||||
store.touch_user_login(conn(), row["id"])
|
||||
raw = grotti_auth.new_api_token()
|
||||
role = grotti_auth.clamp_token_role(row["role"], data.get("role"))
|
||||
token_row = store.create_api_token(
|
||||
conn(),
|
||||
row["id"],
|
||||
device,
|
||||
grotti_auth.hash_token(raw),
|
||||
grotti_auth.token_prefix(raw),
|
||||
role,
|
||||
)
|
||||
store.add_event(conn(), "", "", "auth", "Token „%s“ für %s" % (device, row["username"]))
|
||||
item = grotti_auth.public_token(token_row)
|
||||
item["token"] = raw
|
||||
item["user"] = grotti_auth.public_user(row)
|
||||
return jsonify(item), 201
|
||||
|
||||
@app.post("/api/v1/auth/logout")
|
||||
def auth_logout():
|
||||
session.clear()
|
||||
@@ -577,6 +620,7 @@ def create_app(cfg):
|
||||
|
||||
ANLEITUNG_ORDER = (
|
||||
"Anleitung-Einrichtung",
|
||||
"Anleitung-Installation-Pi",
|
||||
"Anleitung-Oberflaeche",
|
||||
"Anleitung-Wand",
|
||||
"Anleitung-Dateien",
|
||||
@@ -600,6 +644,7 @@ def create_app(cfg):
|
||||
def anleitung_title(name):
|
||||
labels = {
|
||||
"Anleitung-Einrichtung": "Einrichtung",
|
||||
"Anleitung-Installation-Pi": "Raspberry Pi (.deb)",
|
||||
"Anleitung-Oberflaeche": "Oberfläche",
|
||||
"Anleitung-Wand": "Druckerwand",
|
||||
"Anleitung-Dateien": "Dateien senden",
|
||||
@@ -633,7 +678,8 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/kameras")
|
||||
def kameras():
|
||||
return page("kameras.html", "Kameras")
|
||||
"""Alte Links → Wand (Kameras sitzen als Snapshot-Thumbs auf den Karten)."""
|
||||
return redirect("/", code=301)
|
||||
|
||||
@app.get("/dateien")
|
||||
def dateien():
|
||||
@@ -641,7 +687,7 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/projekte")
|
||||
def projekte():
|
||||
return redirect("/auftraege", code=301)
|
||||
return page("projekte.html", "Projekte")
|
||||
|
||||
@app.get("/auftraege")
|
||||
def auftraege_page():
|
||||
@@ -801,7 +847,22 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/api/v1/version")
|
||||
def version_info():
|
||||
return jsonify({"version": __version__})
|
||||
return jsonify({
|
||||
"name": "Grotti",
|
||||
"version": __version__,
|
||||
"api": 1,
|
||||
"features": [
|
||||
"auth_token",
|
||||
"sse",
|
||||
"queue",
|
||||
"projects",
|
||||
"orders",
|
||||
"spools",
|
||||
"camera",
|
||||
"confirm",
|
||||
"ntfy",
|
||||
],
|
||||
})
|
||||
|
||||
@app.get("/api/v1/einstellungen")
|
||||
def settings():
|
||||
@@ -959,6 +1020,8 @@ def create_app(cfg):
|
||||
@app.post("/api/v1/drucker/<host>/<action>")
|
||||
def printer_action(host, action):
|
||||
require_host(host)
|
||||
aliases = {"resume": "fortsetzen", "cancel": "abbrechen"}
|
||||
action = aliases.get(action, action)
|
||||
if action not in ("pause", "fortsetzen", "abbrechen"):
|
||||
raise GrottiError("Unbekannter Befehl.", "befehl")
|
||||
return jsonify(jobs.control(conn(), host, action))
|
||||
@@ -979,7 +1042,7 @@ def create_app(cfg):
|
||||
host = require_host(request.args.get("host", ""))
|
||||
image = moonraker.camera_image(host)
|
||||
if not image:
|
||||
abort(404)
|
||||
raise GrottiError("Kein Kamerabild.", "kamera", 404)
|
||||
return image[1], 200, {"Content-Type": image[0], "Cache-Control": "no-store"}
|
||||
|
||||
@app.get("/api/v1/kamera/stream")
|
||||
@@ -1038,7 +1101,8 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/api/v1/projekte")
|
||||
def project_list():
|
||||
return jsonify(store.list_projects(conn()))
|
||||
status = (request.args.get("status") or "").strip() or None
|
||||
return jsonify(store.list_projects(conn(), status=status))
|
||||
|
||||
@app.post("/api/v1/projekte")
|
||||
def project_create():
|
||||
@@ -1049,15 +1113,107 @@ def create_app(cfg):
|
||||
status = data.get("status") or "idee"
|
||||
if status not in PROJECT_STATUS:
|
||||
raise GrottiError("Unbekannter Status.", "status")
|
||||
return jsonify(store.create_project(conn(), name, (data.get("notes") or "").strip(), status)), 201
|
||||
folder = (data.get("folder") or "").strip()
|
||||
if not folder:
|
||||
folder = library.default_project_folder(name)
|
||||
try:
|
||||
if cfg.get("watch_dir"):
|
||||
folder = library.ensure_project_folder(cfg, folder)
|
||||
else:
|
||||
folder = library.normalize_folder(folder)
|
||||
except GrottiError as exc:
|
||||
if exc.code in ("ordner", "watch"):
|
||||
raise GrottiError(
|
||||
"%s — Ordner relativ unter dem Slice-Pfad, z. B. Projekte/%s (kein D:\\…)."
|
||||
% (exc.message.rstrip("."), library.project_slug(name)),
|
||||
exc.code,
|
||||
getattr(exc, "status", 400) or 400,
|
||||
) from exc
|
||||
raise
|
||||
row = store.create_project(
|
||||
conn(), name, (data.get("notes") or "").strip(), status, folder=folder
|
||||
)
|
||||
return jsonify(row), 201
|
||||
|
||||
@app.get("/api/v1/projekte/<int:project_id>")
|
||||
def project_get(project_id):
|
||||
row = store.get_project(conn(), project_id)
|
||||
row = store.get_project(conn(), project_id, watch_dir=cfg.get("watch_dir"))
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
# Status „druckt“, wenn ein Lauf aktiv ist (nur Anzeige — kein Auto-Write ohne Wunsch)
|
||||
return jsonify(row)
|
||||
|
||||
@app.get("/api/v1/projekte/<int:project_id>/laeufe")
|
||||
def project_runs(project_id):
|
||||
if not store.get_project(conn(), project_id):
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
try:
|
||||
limit = max(1, min(200, int(request.args.get("limit") or 40)))
|
||||
except (TypeError, ValueError):
|
||||
limit = 40
|
||||
try:
|
||||
offset = max(0, int(request.args.get("offset") or 0))
|
||||
except (TypeError, ValueError):
|
||||
offset = 0
|
||||
data = store.list_project_runs(conn(), project_id, limit=limit, offset=offset)
|
||||
resp = jsonify(data["items"])
|
||||
resp.headers["X-Total-Count"] = str(data["total"])
|
||||
return resp
|
||||
|
||||
@app.post("/api/v1/projekte/<int:project_id>/einreihen")
|
||||
def project_einreihen(project_id):
|
||||
data = body()
|
||||
if not bool(data.get("confirm")):
|
||||
raise GrottiError("Bestätigung fehlt.", "bestaetigung")
|
||||
project = store.get_project(conn(), project_id, watch_dir=cfg.get("watch_dir"))
|
||||
if not project:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
wanted = data.get("file_ids")
|
||||
if isinstance(wanted, list) and wanted:
|
||||
try:
|
||||
wanted_ids = {int(x) for x in wanted}
|
||||
except (TypeError, ValueError) as exc:
|
||||
raise GrottiError("Ungültige Datei-IDs.", "datei") from exc
|
||||
files = [f for f in (project.get("files") or []) if f["id"] in wanted_ids]
|
||||
else:
|
||||
files = list(project.get("files") or [])
|
||||
if not files:
|
||||
raise GrottiError("Keine Druckdateien zum Einreihen.", "datei")
|
||||
try:
|
||||
menge = max(1, min(50, int(data.get("menge") or 1)))
|
||||
except (TypeError, ValueError):
|
||||
menge = 1
|
||||
try:
|
||||
priority = int(data.get("priority", 100))
|
||||
except (TypeError, ValueError):
|
||||
priority = 100
|
||||
host = optional_host(data.get("host") or "")
|
||||
if host:
|
||||
require_host(host)
|
||||
bed = bool(data.get("bed_leveling"))
|
||||
override = bool(data.get("override_machine"))
|
||||
created = []
|
||||
for file_row in files:
|
||||
family = (data.get("family") or file_row.get("printer_family") or "").strip()
|
||||
for _ in range(menge):
|
||||
created.append(
|
||||
store.enqueue_print(
|
||||
conn(),
|
||||
file_row["id"],
|
||||
host,
|
||||
family if not host else "",
|
||||
priority,
|
||||
optional_id(data.get("spool_id")),
|
||||
data.get("ace_map") if isinstance(data.get("ace_map"), list) else [],
|
||||
bed,
|
||||
override,
|
||||
)
|
||||
)
|
||||
# Status auf „druckt“ heben, wenn noch Idee/bereit
|
||||
if project.get("status") in ("idee", "bereit"):
|
||||
store.update_project(conn(), project_id, {"status": "druckt"})
|
||||
return jsonify({"jobs": created, "count": len(created)}), 201
|
||||
|
||||
@app.patch("/api/v1/projekte/<int:project_id>")
|
||||
def project_patch(project_id):
|
||||
data = body()
|
||||
@@ -1073,6 +1229,13 @@ def create_app(cfg):
|
||||
if data["status"] not in PROJECT_STATUS:
|
||||
raise GrottiError("Unbekannter Status.", "status")
|
||||
fields["status"] = data["status"]
|
||||
if "folder" in data:
|
||||
folder = (data.get("folder") or "").strip()
|
||||
if folder and cfg.get("watch_dir"):
|
||||
folder = library.ensure_project_folder(cfg, folder)
|
||||
elif folder:
|
||||
folder = library.normalize_folder(folder)
|
||||
fields["folder"] = folder
|
||||
row = store.update_project(conn(), project_id, fields)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
@@ -1080,14 +1243,126 @@ def create_app(cfg):
|
||||
|
||||
@app.delete("/api/v1/projekte/<int:project_id>")
|
||||
def project_delete(project_id):
|
||||
row = store.get_project(conn(), project_id)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
# ?force=1 löscht den Projektordner inkl. Inhalt
|
||||
force = (request.args.get("force") or "").strip() in ("1", "true", "yes")
|
||||
folder = (row.get("folder") or "").strip()
|
||||
if folder and cfg.get("watch_dir"):
|
||||
library.delete_project_disk_folder(cfg, folder, force=force)
|
||||
if not store.delete_project(conn(), project_id):
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
return "", 204
|
||||
|
||||
@app.get("/api/v1/projekte/<int:project_id>/assets")
|
||||
def project_assets_list(project_id):
|
||||
row = store.get_project(conn(), project_id)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
folder = (row.get("folder") or "").strip()
|
||||
if not folder:
|
||||
return jsonify([])
|
||||
if not cfg.get("watch_dir"):
|
||||
return jsonify([])
|
||||
return jsonify(library.list_project_assets(cfg, folder))
|
||||
|
||||
@app.post("/api/v1/projekte/<int:project_id>/assets")
|
||||
def project_assets_upload(project_id):
|
||||
row = store.get_project(conn(), project_id)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
folder = (row.get("folder") or "").strip()
|
||||
if not folder:
|
||||
raise GrottiError("Das Projekt hat keinen Ordner.", "ordner")
|
||||
if not cfg.get("watch_dir"):
|
||||
raise GrottiError("Kein Slice-Ordner gesetzt — unter Einstellungen festlegen.", "watch")
|
||||
upload = request.files.get("file")
|
||||
if not upload or not upload.filename:
|
||||
raise GrottiError("Keine Datei angehängt.", "datei")
|
||||
saved = library.save_project_asset(cfg, folder, upload.filename, upload.read())
|
||||
return jsonify(saved), 201
|
||||
|
||||
@app.get("/api/v1/projekte/<int:project_id>/assets/<path:rel>")
|
||||
def project_assets_download(project_id, rel):
|
||||
row = store.get_project(conn(), project_id)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
folder = (row.get("folder") or "").strip()
|
||||
if not folder:
|
||||
raise GrottiError("Das Projekt hat keinen Ordner.", "ordner")
|
||||
path = library.resolve_project_asset(cfg, folder, rel)
|
||||
return send_file(path, as_attachment=True, download_name=path.name)
|
||||
|
||||
@app.delete("/api/v1/projekte/<int:project_id>/assets/<path:rel>")
|
||||
def project_assets_delete(project_id, rel):
|
||||
row = store.get_project(conn(), project_id)
|
||||
if not row:
|
||||
raise GrottiError("Das Projekt fehlt.", "projekt", 404)
|
||||
folder = (row.get("folder") or "").strip()
|
||||
if not folder:
|
||||
raise GrottiError("Das Projekt hat keinen Ordner.", "ordner")
|
||||
library.delete_project_asset(cfg, folder, rel)
|
||||
return "", 204
|
||||
|
||||
@app.get("/api/v1/dateien")
|
||||
def file_list():
|
||||
library.sync_watch(conn(), cfg, force=False)
|
||||
return jsonify(store.list_files(conn(), watch_dir=cfg.get("watch_dir")))
|
||||
family = (request.args.get("family") or "").strip()
|
||||
material = (request.args.get("material") or "").strip()
|
||||
q = (request.args.get("q") or "").strip()
|
||||
host = optional_host(request.args.get("host") or "")
|
||||
project_id = optional_id(request.args.get("project_id") or request.args.get("project"))
|
||||
limit_raw = request.args.get("limit")
|
||||
offset_raw = request.args.get("offset")
|
||||
limit = None
|
||||
offset = 0
|
||||
if limit_raw is not None and str(limit_raw).strip() != "":
|
||||
try:
|
||||
limit = max(1, min(500, int(limit_raw)))
|
||||
except (TypeError, ValueError):
|
||||
limit = 40
|
||||
if offset_raw is not None:
|
||||
try:
|
||||
offset = max(0, int(offset_raw))
|
||||
except (TypeError, ValueError):
|
||||
offset = 0
|
||||
data = store.list_files(
|
||||
conn(),
|
||||
watch_dir=cfg.get("watch_dir"),
|
||||
family=family,
|
||||
material=material,
|
||||
project_id=project_id,
|
||||
q=q,
|
||||
host=host,
|
||||
limit=limit,
|
||||
offset=offset,
|
||||
)
|
||||
resp = jsonify(data["items"])
|
||||
resp.headers["X-Total-Count"] = str(data["total"])
|
||||
return resp
|
||||
|
||||
@app.post("/api/v1/dateien/<int:file_id>/meta")
|
||||
def file_meta_refresh(file_id):
|
||||
"""Eine Datei neu parsen — z. B. paint_index für ACE nach Orca-Deep-Link."""
|
||||
out = library.refresh_one_file(conn(), file_id, watch_dir=cfg.get("watch_dir"))
|
||||
if not out:
|
||||
raise GrottiError("Datei nicht gefunden.", "datei", 404)
|
||||
return jsonify(out)
|
||||
|
||||
@app.get("/api/v1/orca-fokus")
|
||||
def orca_focus():
|
||||
"""Zuletzt von orca_senden gesetzte Datei — offene Tabs schalten um statt neu zu öffnen."""
|
||||
path = Path(cfg["data_dir"]) / "orca-senden-focus.json"
|
||||
if not path.is_file():
|
||||
return jsonify({})
|
||||
try:
|
||||
data = json.loads(path.read_text(encoding="utf-8"))
|
||||
except (OSError, json.JSONDecodeError):
|
||||
return jsonify({})
|
||||
if not isinstance(data, dict) or data.get("file_id") is None:
|
||||
return jsonify({})
|
||||
return jsonify(data)
|
||||
|
||||
@app.post("/api/v1/dateien/neu-lesen")
|
||||
def file_rescan():
|
||||
@@ -1120,6 +1395,14 @@ def create_app(cfg):
|
||||
moved = library.move_file(conn(), cfg, file_id, folder)
|
||||
return jsonify(moved)
|
||||
|
||||
@app.post("/api/v1/dateien/<int:file_id>/umbenennen")
|
||||
def file_rename(file_id):
|
||||
data = body()
|
||||
name = (data.get("name") or "").strip()
|
||||
if not name:
|
||||
raise GrottiError("Neuer Dateiname fehlt.", "datei")
|
||||
return jsonify(library.rename_library_file(conn(), cfg, file_id, name))
|
||||
|
||||
@app.post("/api/v1/dateien")
|
||||
def file_upload():
|
||||
upload = request.files.get("file")
|
||||
@@ -1142,10 +1425,10 @@ def create_app(cfg):
|
||||
def file_preview(file_id):
|
||||
row = store.get_file_row(conn(), file_id)
|
||||
if not row:
|
||||
abort(404)
|
||||
raise GrottiError("Vorschau fehlt.", "vorschau", 404)
|
||||
png = library.preview_png(row, conn=conn(), data_dir=cfg["data_dir"])
|
||||
if not png:
|
||||
abort(404)
|
||||
raise GrottiError("Vorschau fehlt.", "vorschau", 404)
|
||||
return png, 200, {"Content-Type": "image/png", "Cache-Control": "private, max-age=300"}
|
||||
|
||||
@app.get("/api/v1/dateien/<int:file_id>/pfad")
|
||||
@@ -1203,13 +1486,7 @@ def create_app(cfg):
|
||||
|
||||
@app.delete("/api/v1/dateien/<int:file_id>")
|
||||
def file_delete(file_id):
|
||||
row = store.get_file_row(conn(), file_id)
|
||||
if not row:
|
||||
raise GrottiError("Die Datei fehlt.", "datei", 404)
|
||||
if row["source"] != "upload":
|
||||
raise GrottiError("Die Datei kommt aus dem Watch-Ordner und bleibt, solange sie dort liegt.", "watch")
|
||||
store.delete_file(conn(), file_id)
|
||||
Path(row["stored_path"]).unlink(missing_ok=True)
|
||||
library.delete_library_file(conn(), cfg, file_id)
|
||||
return "", 204
|
||||
|
||||
@app.post("/api/v1/senden")
|
||||
@@ -1292,9 +1569,12 @@ def create_app(cfg):
|
||||
file_id = int(request.args.get("file_id") or 0)
|
||||
except (TypeError, ValueError):
|
||||
file_id = 0
|
||||
if not host or not file_id:
|
||||
raise GrottiError("Host und Datei nötig.", "senden")
|
||||
row = store.latest_send_for_file(conn(), host, file_id)
|
||||
if not host:
|
||||
raise GrottiError("Host nötig.", "senden")
|
||||
if file_id:
|
||||
row = store.latest_send_for_file(conn(), host, file_id)
|
||||
else:
|
||||
row = store.latest_send_for_host(conn(), host)
|
||||
if not row:
|
||||
return jsonify(None)
|
||||
return jsonify(row)
|
||||
@@ -1389,7 +1669,18 @@ def create_app(cfg):
|
||||
limit = max(1, min(200, int(request.args.get("limit") or 40)))
|
||||
except (TypeError, ValueError):
|
||||
limit = 40
|
||||
return jsonify(store.list_print_queue(conn(), limit=limit))
|
||||
try:
|
||||
offset = max(0, int(request.args.get("offset") or 0))
|
||||
except (TypeError, ValueError):
|
||||
offset = 0
|
||||
host = optional_host(request.args.get("host") or "")
|
||||
status = (request.args.get("status") or "").strip()
|
||||
data = store.list_print_queue(
|
||||
conn(), limit=limit, offset=offset, host=host, status=status
|
||||
)
|
||||
resp = jsonify(data["items"])
|
||||
resp.headers["X-Total-Count"] = str(data["total"])
|
||||
return resp
|
||||
|
||||
@app.get("/api/v1/laeuft")
|
||||
def running_now():
|
||||
@@ -1471,7 +1762,10 @@ def create_app(cfg):
|
||||
for item in running:
|
||||
rem = float(item.get("remain") or 0)
|
||||
item["free_at"] = jetzt_mod._iso_remain(rem) if rem > 0 else None
|
||||
waiting = [j for j in store.list_print_queue(conn(), limit=80) if j.get("status") == "waiting"]
|
||||
waiting = [
|
||||
j for j in store.list_print_queue(conn(), limit=80)["items"]
|
||||
if j.get("status") == "waiting"
|
||||
]
|
||||
return jsonify({
|
||||
"running": running,
|
||||
"waiting_count": len(waiting),
|
||||
@@ -1575,6 +1869,16 @@ def create_app(cfg):
|
||||
except ValueError as exc:
|
||||
raise GrottiError(str(exc), "urteil") from exc
|
||||
run_json = store.set_verdict(c, run_row["id"], verdict, reason, ok_n, bad_n)
|
||||
# Live-Lauf schließen ohne Abzug — History bucht; Fallback nach Frist.
|
||||
if run_row and (run_row.get("state") or "") in ("in_progress", "printing", "paused"):
|
||||
closed = store.complete_open_run(c, run_row["id"], state="completed")
|
||||
if closed:
|
||||
try:
|
||||
jobs.sync_history(c, cfg, host=host)
|
||||
except Exception as exc:
|
||||
log.warning("Abräumen Abgleich %s: %s", host, exc)
|
||||
row = store.get_run_row(c, closed["id"]) or closed
|
||||
run_json = store.run_out(row)
|
||||
reprint = None
|
||||
if bool(data.get("reprint")) and run_row and run_row.get("file_id"):
|
||||
reprint = store.enqueue_print(
|
||||
@@ -2066,7 +2370,28 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/api/v1/spulen")
|
||||
def spool_list():
|
||||
return jsonify(store.list_spools(conn()))
|
||||
aktiv_raw = (request.args.get("aktiv") or "").strip().lower()
|
||||
aktiv = None
|
||||
if aktiv_raw in ("1", "true", "yes"):
|
||||
aktiv = True
|
||||
elif aktiv_raw in ("0", "false", "no"):
|
||||
aktiv = False
|
||||
limit_raw = request.args.get("limit")
|
||||
limit = None
|
||||
offset = 0
|
||||
if limit_raw is not None and str(limit_raw).strip() != "":
|
||||
try:
|
||||
limit = max(1, min(500, int(limit_raw)))
|
||||
except (TypeError, ValueError):
|
||||
limit = 100
|
||||
try:
|
||||
offset = max(0, int(request.args.get("offset") or 0))
|
||||
except (TypeError, ValueError):
|
||||
offset = 0
|
||||
data = store.list_spools(conn(), aktiv=aktiv, limit=limit, offset=offset)
|
||||
resp = jsonify(data["items"])
|
||||
resp.headers["X-Total-Count"] = str(data["total"])
|
||||
return resp
|
||||
|
||||
@app.get("/api/v1/spulen/by-code/<path:code>")
|
||||
def spool_by_code(code):
|
||||
@@ -2098,11 +2423,27 @@ def create_app(cfg):
|
||||
|
||||
@app.patch("/api/v1/spulen/<int:spool_id>")
|
||||
def spool_patch(spool_id):
|
||||
row = store.update_spool(conn(), spool_id, spool_fields(body(), partial=True, spool_id=spool_id))
|
||||
data = body()
|
||||
fields = spool_fields(data, partial=True, spool_id=spool_id)
|
||||
if "archived" in data or "archived_at" in data:
|
||||
if data.get("archived") is False or data.get("archived_at") is None:
|
||||
fields["archived_at"] = None
|
||||
elif data.get("archived") is True or data.get("archived_at") in (True, "now"):
|
||||
fields["archived_at"] = "now"
|
||||
row = store.update_spool(conn(), spool_id, fields)
|
||||
if not row:
|
||||
raise GrottiError("Die Spule fehlt.", "spule", 404)
|
||||
return jsonify(row)
|
||||
|
||||
@app.post("/api/v1/spulen/<int:spool_id>/leer")
|
||||
def spool_empty(spool_id):
|
||||
"""Rest 0, Regal, archivieren — wenn der Rest falsch geschätzt war."""
|
||||
row = store.mark_spool_empty(conn(), spool_id)
|
||||
if not row:
|
||||
raise GrottiError("Die Spule fehlt.", "spule", 404)
|
||||
store.add_event(conn(), "", "", "spule", "Spule „%s“ als leer markiert" % row["name"])
|
||||
return jsonify(row)
|
||||
|
||||
@app.post("/api/v1/spulen/<int:spool_id>/einlegen")
|
||||
def spool_load(spool_id):
|
||||
"""Spule an Drucker/Platz legen; vorherige Rolle dort geht ins Regal."""
|
||||
@@ -2112,7 +2453,8 @@ def create_app(cfg):
|
||||
spool = store.get_spool_row(conn(), spool_id)
|
||||
if not spool:
|
||||
raise GrottiError("Die Spule fehlt.", "spule", 404)
|
||||
live_run = store.find_live_run(conn(), host)
|
||||
# Auch offene History-Jobs (Pause/Resume nach Moonraker-Split), nicht nur live:
|
||||
live_run = store.find_active_run(conn(), host)
|
||||
mm_now = float((live_run or {}).get("filament_used_mm") or 0)
|
||||
printing = bool(
|
||||
live_run and (live_run.get("state") or "") in ("in_progress", "printing", "paused")
|
||||
@@ -2143,6 +2485,15 @@ def create_app(cfg):
|
||||
for row in old:
|
||||
store.open_segment(conn(), live_run["id"], row["id"], slot, 0)
|
||||
store.close_open_segments(conn(), live_run["id"], slot, mm_now)
|
||||
elif not closed and mm_now > 0:
|
||||
# ACE ohne Startabschnitt oder alte Rolle schon im Regal —
|
||||
# slot-genau: Platz / ACE-Map / letzter Abschnitt / Lauf-Hinweis.
|
||||
prev_id = store.prev_spool_id_for_slot(
|
||||
conn(), host, slot, live_run, spool_id, old_rows=old,
|
||||
)
|
||||
if prev_id:
|
||||
store.open_segment(conn(), live_run["id"], prev_id, slot, 0)
|
||||
store.close_open_segments(conn(), live_run["id"], slot, mm_now)
|
||||
for row in old:
|
||||
store.update_spool(conn(), row["id"], {"printer_host": "", "ace_slot": None})
|
||||
store.add_event(
|
||||
@@ -2161,6 +2512,8 @@ def create_app(cfg):
|
||||
updated = store.update_spool(conn(), spool_id, {"printer_host": host, "ace_slot": slot})
|
||||
if printing:
|
||||
store.open_segment(conn(), live_run["id"], spool_id, slot, mm_now)
|
||||
store.assign_run_spool(conn(), live_run["id"], spool_id)
|
||||
store.update_send_spool(conn(), host, live_run.get("filename") or "", spool_id)
|
||||
store.add_event(
|
||||
conn(),
|
||||
host,
|
||||
@@ -2306,7 +2659,11 @@ def create_app(cfg):
|
||||
|
||||
@app.get("/api/v1/laeufe")
|
||||
def run_list():
|
||||
return jsonify(store.list_runs(conn()))
|
||||
try:
|
||||
limit = min(1000, max(1, int(request.args.get("limit") or 500)))
|
||||
except (TypeError, ValueError):
|
||||
limit = 500
|
||||
return jsonify(store.list_runs(conn(), limit=limit))
|
||||
|
||||
@app.get("/api/v1/laeufe/aktuell")
|
||||
def run_aktuell():
|
||||
@@ -2342,8 +2699,18 @@ def create_app(cfg):
|
||||
run = store.run_out(row)
|
||||
if run.get("chargen_nr") and run.get("objects"):
|
||||
store.ensure_run_labels(conn(), run_id, run.get("objects") or [], qty=1)
|
||||
if run.get("order_item_id") and not run.get("order_id"):
|
||||
oi = conn().execute(
|
||||
"SELECT order_id FROM order_items WHERE id = %s",
|
||||
(run["order_item_id"],),
|
||||
).fetchone()
|
||||
if oi:
|
||||
run["order_id"] = oi["order_id"]
|
||||
file_row = store.get_file_row(conn(), run["file_id"]) if run.get("file_id") else None
|
||||
project = store.get_project(conn(), run["project_id"]) if run.get("project_id") else None
|
||||
project = (
|
||||
store.get_project(conn(), run["project_id"], watch_dir=cfg.get("watch_dir"))
|
||||
if run.get("project_id") else None
|
||||
)
|
||||
samples = store.list_run_samples(conn(), run_id)
|
||||
from grotti.cost import energy_estimate
|
||||
|
||||
@@ -2359,7 +2726,7 @@ def create_app(cfg):
|
||||
"samples": samples,
|
||||
"labels": store.list_run_labels(conn(), run_id),
|
||||
"events": store.list_run_events(conn(), run_id),
|
||||
"file": store.file_out(file_row) if file_row else None,
|
||||
"file": store.file_out(file_row, watch_dir=cfg.get("watch_dir"), conn=conn()) if file_row else None,
|
||||
"project": project,
|
||||
"energy": energy,
|
||||
})
|
||||
@@ -2369,6 +2736,18 @@ def create_app(cfg):
|
||||
library.sync_watch(conn(), cfg, force=False)
|
||||
return jsonify(jobs.sync_history(conn(), cfg))
|
||||
|
||||
@app.post("/api/v1/laeufe/<int:run_id>/verbinden")
|
||||
def run_merge(run_id):
|
||||
"""Zwei Protokoll-Zeilen desselben physischen Drucks verbinden (admin)."""
|
||||
require_role("admin")
|
||||
data = body()
|
||||
other = int(data.get("other_id") or data.get("mit") or 0)
|
||||
if not other:
|
||||
raise GrottiError("other_id fehlt.", "lauf")
|
||||
return jsonify(jobs.manual_merge_runs(
|
||||
conn(), run_id, other, confirm=bool(data.get("confirm"))
|
||||
))
|
||||
|
||||
@app.patch("/api/v1/laeufe/<int:run_id>")
|
||||
def run_patch(run_id):
|
||||
data = body()
|
||||
@@ -2462,6 +2841,7 @@ def create_app(cfg):
|
||||
host = (request.args.get("host") or "").strip()
|
||||
material = (request.args.get("material") or "").strip()
|
||||
brand = (request.args.get("brand") or "").strip()
|
||||
color = (request.args.get("color") or "").strip()
|
||||
project_id = optional_id(request.args.get("project_id"))
|
||||
return jsonify(store.statistics(
|
||||
conn(),
|
||||
@@ -2470,6 +2850,7 @@ def create_app(cfg):
|
||||
host=host,
|
||||
material=material or "",
|
||||
brand=brand or "",
|
||||
color=color or "",
|
||||
project_id=project_id,
|
||||
))
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ const CSRF = document.querySelector('meta[name="csrf"]')?.content || "";
|
||||
const STATE_LABELS = {
|
||||
printing: "druckt", paused: "pausiert", complete: "fertig", standby: "bereit",
|
||||
heating: "heizt", error: "Fehler", cancelled: "abgebrochen", offline: "offline",
|
||||
waiting: "wartet", running: "läuft",
|
||||
waiting: "wartet", running: "läuft", starting: "startet",
|
||||
};
|
||||
|
||||
function escapeHtml(value) {
|
||||
|
||||
+449
-35
@@ -64,8 +64,8 @@
|
||||
--st-error-soft: rgba(248, 113, 113, 0.14);
|
||||
--st-offline: #71717a;
|
||||
--st-offline-soft: rgba(255, 255, 255, 0.04);
|
||||
--st-waiting: #f97316;
|
||||
--st-waiting-soft: rgba(249, 115, 22, 0.14);
|
||||
--st-waiting: #f59e0b;
|
||||
--st-waiting-soft: rgba(245, 158, 11, 0.16);
|
||||
--st-idle: #a1a1aa;
|
||||
--st-idle-soft: rgba(255, 255, 255, 0.05);
|
||||
--ease: cubic-bezier(0.2, 0.7, 0.2, 1);
|
||||
@@ -105,8 +105,8 @@ html[data-theme="light"] {
|
||||
--st-error-soft: rgba(220, 38, 38, 0.1);
|
||||
--st-offline: #73737c;
|
||||
--st-offline-soft: rgba(0, 0, 0, 0.04);
|
||||
--st-waiting: #ea580c;
|
||||
--st-waiting-soft: rgba(234, 88, 12, 0.1);
|
||||
--st-waiting: #b45309;
|
||||
--st-waiting-soft: rgba(180, 83, 9, 0.12);
|
||||
--st-idle: #5c5c66;
|
||||
--st-idle-soft: rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
@@ -124,14 +124,14 @@ body {
|
||||
font: 14.5px/1.45 var(--font);
|
||||
color: var(--ink);
|
||||
background:
|
||||
radial-gradient(900px 420px at 0% 0%, rgba(249, 115, 22, 0.07), transparent 55%),
|
||||
radial-gradient(1100px 520px at 0% 0%, rgba(249, 115, 22, 0.14), transparent 58%),
|
||||
var(--bg);
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font-feature-settings: "cv11", "ss01";
|
||||
}
|
||||
html[data-theme="light"] body {
|
||||
background:
|
||||
radial-gradient(900px 420px at 0% 0%, rgba(234, 88, 12, 0.06), transparent 55%),
|
||||
radial-gradient(1100px 520px at 0% 0%, rgba(234, 88, 12, 0.11), transparent 58%),
|
||||
var(--bg);
|
||||
}
|
||||
.tabular, .num, .hero-main, .hero-side, .stat b, .chip, .count, .run-line-text, time {
|
||||
@@ -298,6 +298,8 @@ html.shelf .hero-main,
|
||||
html.shelf [data-role="hero"],
|
||||
body.shelf .hero-main,
|
||||
body.shelf [data-role="hero"] { font-size: 1.35rem; }
|
||||
html.shelf article.machine.printing .hero-main,
|
||||
body.shelf article.machine.printing .hero-main { font-size: 2.4rem; }
|
||||
.mobile-nav .nav-shelf { display: none; }
|
||||
|
||||
@media (max-height: 900px) {
|
||||
@@ -396,6 +398,9 @@ body.shelf [data-role="hero"] { font-size: 1.35rem; }
|
||||
min-width: 0;
|
||||
}
|
||||
.live-page {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
|
||||
max-width: 36rem;
|
||||
}
|
||||
.jetzt-eta {
|
||||
@@ -548,7 +553,16 @@ button.warn:hover { background: var(--st-error-soft); filter: none; }
|
||||
background: rgba(255, 255, 255, 0.025);
|
||||
overflow: hidden;
|
||||
}
|
||||
.queue-box.is-empty { display: none; }
|
||||
.live-pop .queue-box.is-empty { display: none; }
|
||||
.live-page .queue-box.is-empty { display: block; }
|
||||
.queue-empty {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0.85rem 0.7rem 1rem;
|
||||
color: var(--muted);
|
||||
font-size: var(--t-sm);
|
||||
text-align: center;
|
||||
}
|
||||
.queue-box[open] { border-color: var(--line); }
|
||||
.run-stack {
|
||||
flex: none;
|
||||
@@ -613,6 +627,8 @@ h2.queue-title { font-size: var(--t-xs); }
|
||||
}
|
||||
.icon-btn:hover { color: var(--ink); background: rgba(255, 255, 255, 0.06); filter: none; }
|
||||
.icon-btn.danger:hover { color: var(--st-error); background: var(--st-error-soft); }
|
||||
.ghost.tiny-btn.danger { color: var(--st-error); }
|
||||
.ghost.tiny-btn.danger:hover { background: var(--st-error-soft); }
|
||||
.queue-list { list-style: none; margin: 0; padding: 0 0.4rem 0.45rem; display: grid; grid-template-columns: minmax(0, 1fr); gap: 0.35rem; }
|
||||
.queue-list > li { min-width: 0; }
|
||||
.queue-empty {
|
||||
@@ -693,6 +709,14 @@ h2.queue-title { font-size: var(--t-xs); }
|
||||
display: grid;
|
||||
gap: 0.45rem;
|
||||
}
|
||||
.steer-group { display: grid; gap: 0.35rem; }
|
||||
.steer-group-label {
|
||||
font-size: 0.68rem;
|
||||
font-weight: 650;
|
||||
letter-spacing: 0.05em;
|
||||
text-transform: uppercase;
|
||||
color: var(--faint);
|
||||
}
|
||||
.steer-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -714,7 +738,8 @@ h2.queue-title { font-size: var(--t-xs); }
|
||||
.steer-ace-slots {
|
||||
display: grid;
|
||||
gap: 0.35rem;
|
||||
padding-top: 0.35rem;
|
||||
padding-top: 0.45rem;
|
||||
margin-top: 0.15rem;
|
||||
border-top: 1px solid var(--line);
|
||||
}
|
||||
.steer-ace-head {
|
||||
@@ -726,9 +751,9 @@ h2.queue-title { font-size: var(--t-xs); }
|
||||
}
|
||||
.steer-ace-head b { font-weight: 650; }
|
||||
.steer-slot-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.35rem 0.55rem;
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr auto;
|
||||
gap: 0.45rem 0.55rem;
|
||||
align-items: center;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
@@ -739,7 +764,13 @@ h2.queue-title { font-size: var(--t-xs); }
|
||||
flex: none;
|
||||
border: 1px solid rgba(255, 255, 255, 0.15);
|
||||
}
|
||||
.steer-slot-row .grow { min-width: 0; overflow-wrap: anywhere; }
|
||||
.steer-slot-row .grow {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.steer-slot-row button { flex: none; white-space: nowrap; }
|
||||
.queue-name { color: var(--ink); font-size: var(--t-sm); font-weight: 650; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; }
|
||||
.queue-msg { color: var(--muted); font-size: var(--t-xs); line-height: 1.3; overflow-wrap: anywhere; }
|
||||
.queue-sub { color: var(--faint); font-size: 0.66rem; font-variant-numeric: tabular-nums; flex: none; }
|
||||
@@ -871,6 +902,79 @@ h2 { font-size: 0.95rem; margin: 0 0 0.65rem; letter-spacing: -0.02em; font-weig
|
||||
padding: 0.4rem 0.55rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.stat-tools {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 0.55rem;
|
||||
}
|
||||
.stat-tools .period-presets {
|
||||
flex: 0 1 auto;
|
||||
width: auto;
|
||||
}
|
||||
.stat-more {
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 10px;
|
||||
padding: 0.35rem 0.65rem 0.55rem;
|
||||
background: rgba(255, 255, 255, 0.02);
|
||||
}
|
||||
.stat-more > summary {
|
||||
list-style: none;
|
||||
cursor: pointer;
|
||||
color: var(--muted);
|
||||
font-size: var(--t-sm);
|
||||
font-weight: 650;
|
||||
padding: 0.25rem 0;
|
||||
}
|
||||
.stat-more > summary::-webkit-details-marker { display: none; }
|
||||
.stat-more[open] > summary { margin-bottom: 0.45rem; }
|
||||
.stat-filters {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.45rem 0.55rem;
|
||||
align-items: center;
|
||||
}
|
||||
.stat-filters input[type="text"],
|
||||
.stat-filters select {
|
||||
width: auto;
|
||||
min-width: 7rem;
|
||||
max-width: 11rem;
|
||||
flex: 0 1 auto;
|
||||
}
|
||||
.mat-extra-filters {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.4rem;
|
||||
align-items: center;
|
||||
}
|
||||
.mat-extra-filters select {
|
||||
width: auto;
|
||||
min-width: 7.5rem;
|
||||
max-width: 11rem;
|
||||
padding: 0.35rem 0.55rem;
|
||||
min-height: var(--control-h);
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
.mat-group td {
|
||||
padding-top: 0.75rem !important;
|
||||
font-size: 0.72rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.04em;
|
||||
text-transform: uppercase;
|
||||
color: var(--ink);
|
||||
border-bottom: 1px solid var(--line);
|
||||
background: rgba(255, 255, 255, 0.02);
|
||||
}
|
||||
tr.is-archived { opacity: 0.65; }
|
||||
.kpi-row.kpi-primary {
|
||||
grid-template-columns: repeat(auto-fill, minmax(10.5rem, 1fr));
|
||||
}
|
||||
.kpi-row.kpi-secondary {
|
||||
grid-template-columns: repeat(auto-fill, minmax(8.5rem, 1fr));
|
||||
margin-top: -0.35rem;
|
||||
opacity: 0.95;
|
||||
}
|
||||
.kpi.kpi-sm .kpi-value { font-size: 1.05rem; }
|
||||
.kpi.kpi-empty { opacity: 0.55; }
|
||||
.lead, .tiny, .summary { color: var(--muted); }
|
||||
.summary { margin: 0.3rem 0 0; }
|
||||
.tiny { font-size: 0.8rem; margin: 0.2rem 0 0; line-height: 1.4; max-width: 52ch; }
|
||||
@@ -913,7 +1017,7 @@ article.machine {
|
||||
background: linear-gradient(180deg, rgba(255, 255, 255, 0.03), transparent 40%), var(--card);
|
||||
border: 1px solid var(--line);
|
||||
border-radius: var(--radius);
|
||||
box-shadow: var(--shadow);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06), var(--shadow);
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -921,6 +1025,9 @@ article.machine {
|
||||
cursor: pointer;
|
||||
transition: border-color 0.3s var(--ease), box-shadow 0.3s var(--ease), transform 0.2s var(--ease);
|
||||
}
|
||||
html[data-theme="light"] article.machine {
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.9), var(--shadow);
|
||||
}
|
||||
article.machine::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
@@ -930,12 +1037,31 @@ article.machine::before {
|
||||
}
|
||||
article.machine:hover {
|
||||
border-color: var(--line-strong);
|
||||
box-shadow: var(--shadow), 0 0 0 1px rgba(255, 255, 255, 0.04);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08), var(--shadow), 0 0 0 1px rgba(255, 255, 255, 0.04);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
article.machine.printing { border-color: rgba(61, 206, 124, 0.35); box-shadow: var(--shadow), 0 0 0 1px rgba(61, 206, 124, 0.06), 0 18px 40px -24px rgba(61, 206, 124, 0.45); }
|
||||
article.machine.printing::before { background: linear-gradient(90deg, transparent, var(--st-printing), transparent); opacity: 0.7; }
|
||||
article.machine.printing:hover { border-color: rgba(61, 206, 124, 0.55); box-shadow: var(--shadow), 0 0 0 1px rgba(61, 206, 124, 0.12), 0 18px 40px -20px rgba(61, 206, 124, 0.55); }
|
||||
html[data-theme="light"] article.machine:hover {
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.95), var(--shadow), 0 0 0 1px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
article.machine.printing {
|
||||
border-color: rgba(61, 206, 124, 0.35);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06), var(--shadow), 0 0 0 1px rgba(61, 206, 124, 0.06), 0 18px 40px -24px rgba(61, 206, 124, 0.45);
|
||||
}
|
||||
article.machine.printing::before {
|
||||
background: linear-gradient(90deg, transparent, var(--st-printing), transparent);
|
||||
opacity: 0.7;
|
||||
animation: print-strip-breathe 2.8s var(--ease) infinite;
|
||||
}
|
||||
article.machine.printing:hover {
|
||||
border-color: rgba(61, 206, 124, 0.55);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08), var(--shadow), 0 0 0 1px rgba(61, 206, 124, 0.12), 0 18px 40px -20px rgba(61, 206, 124, 0.55);
|
||||
}
|
||||
article.machine.printing .hero-main {
|
||||
font-size: 2.4rem;
|
||||
letter-spacing: -0.05em;
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.05;
|
||||
}
|
||||
article.machine.paused { border-color: rgba(251, 191, 36, 0.35); }
|
||||
article.machine.paused:hover { border-color: rgba(251, 191, 36, 0.55); }
|
||||
article.machine.heating { border-color: rgba(251, 191, 36, 0.28); }
|
||||
@@ -945,8 +1071,33 @@ article.machine.error::before { background: var(--st-error); opacity: 0.7; }
|
||||
article.machine.error:hover { border-color: rgba(248, 113, 113, 0.6); }
|
||||
article.machine.offline { opacity: 0.62; }
|
||||
article.machine.offline:hover { opacity: 1; }
|
||||
@keyframes print-strip-breathe {
|
||||
0%, 100% { opacity: 0.45; }
|
||||
50% { opacity: 0.9; }
|
||||
}
|
||||
|
||||
.machine-head { padding: 0.85rem 0.95rem 0.3rem; }
|
||||
.machine-head {
|
||||
padding: 0.85rem 0.95rem 0.3rem;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr;
|
||||
gap: 0.55rem;
|
||||
align-items: start;
|
||||
}
|
||||
.machine-head.has-cam {
|
||||
grid-template-columns: 1fr auto;
|
||||
}
|
||||
.machine-head-main { min-width: 0; }
|
||||
.wall-cam-thumb {
|
||||
width: 4.75rem;
|
||||
height: 3.35rem;
|
||||
object-fit: cover;
|
||||
border-radius: 9px;
|
||||
border: 1px solid var(--line);
|
||||
background: var(--card-2);
|
||||
flex: none;
|
||||
pointer-events: none;
|
||||
}
|
||||
.wall-cam-thumb[hidden] { display: none; }
|
||||
.machine-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1235,6 +1386,15 @@ article.printer {
|
||||
}
|
||||
main > .card { margin-bottom: 0.85rem; }
|
||||
.split { display: grid; grid-template-columns: minmax(0, 0.9fr) minmax(0, 1.1fr); gap: 1rem; align-items: start; }
|
||||
.edit-split { grid-template-columns: minmax(0, 1.15fr) minmax(18rem, 0.95fr); }
|
||||
.edit-split.is-idle { grid-template-columns: 1fr; }
|
||||
.edit-panel { position: sticky; top: calc(var(--topbar-h) + 0.75rem); }
|
||||
.cell-path {
|
||||
max-width: 14rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.grid-2 { display: grid; grid-template-columns: 1fr 1fr; gap: 0.55rem 0.75rem; }
|
||||
.field { display: grid; gap: 0.28rem; min-width: 0; }
|
||||
.field > label, .field-label {
|
||||
@@ -1348,7 +1508,7 @@ td select { width: auto; min-width: 8.5rem; padding: 0.3rem 0.45rem; min-height:
|
||||
place-items: center;
|
||||
padding: 1.5rem;
|
||||
background:
|
||||
radial-gradient(ellipse at 20% 0%, rgba(61, 206, 124, 0.12), transparent 45%),
|
||||
radial-gradient(ellipse at 20% 0%, rgba(249, 115, 22, 0.16), transparent 50%),
|
||||
var(--bg);
|
||||
}
|
||||
.auth-card {
|
||||
@@ -1357,6 +1517,10 @@ td select { width: auto; min-width: 8.5rem; padding: 0.3rem 0.45rem; min-height:
|
||||
border: 1px solid var(--line);
|
||||
border-radius: var(--radius);
|
||||
padding: 1.4rem 1.35rem 1.5rem;
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06), var(--shadow);
|
||||
}
|
||||
html[data-theme="light"] .auth-card {
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.9), var(--shadow);
|
||||
}
|
||||
.auth-card h1 { margin: 0 0 0.35rem; font-size: 1.45rem; }
|
||||
.auth-brand {
|
||||
@@ -1899,6 +2063,31 @@ body.desk-on main {
|
||||
font-size: var(--t-sm);
|
||||
}
|
||||
.desk-facts b { color: var(--ink); font-weight: 650; }
|
||||
.desk-tech-facts {
|
||||
gap: 0.35rem;
|
||||
}
|
||||
.fact-chip {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.3rem;
|
||||
padding: 0.2rem 0.5rem;
|
||||
border-radius: 99px;
|
||||
border: 1px solid var(--line);
|
||||
background: rgba(255, 255, 255, 0.03);
|
||||
font-size: 0.72rem;
|
||||
color: var(--muted);
|
||||
max-width: 100%;
|
||||
}
|
||||
.fact-chip .ico { width: 0.85em; height: 0.85em; opacity: 0.75; flex: none; }
|
||||
.fact-chip-label { color: var(--faint); }
|
||||
.fact-chip b {
|
||||
color: var(--ink);
|
||||
font-weight: 650;
|
||||
font-variant-numeric: tabular-nums;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.desk-foot {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -2032,7 +2221,7 @@ body.desk-on main {
|
||||
.chip.complete { --c: var(--st-done); --cs: var(--st-done-soft); }
|
||||
.chip.error { --c: var(--st-error); --cs: var(--st-error-soft); }
|
||||
.chip.offline { --c: var(--st-offline); --cs: var(--st-offline-soft); }
|
||||
.chip.waiting { --c: var(--st-waiting); --cs: transparent; box-shadow: inset 0 0 0 1px rgba(249, 115, 22, 0.45); }
|
||||
.chip.waiting { --c: var(--st-waiting); --cs: transparent; box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--st-waiting) 45%, transparent); }
|
||||
.chip.cancelled { --c: var(--muted); --cs: var(--st-idle-soft); }
|
||||
.chip.sm { font-size: 0.6rem; padding: 0.12rem 0.45rem 0.12rem 0.38rem; gap: 0.3rem; }
|
||||
.chip.sm::before { width: 0.36rem; height: 0.36rem; }
|
||||
@@ -2172,7 +2361,46 @@ body.desk-on main {
|
||||
.strip.stopped .strip-actions button:not(.ghost) { background: var(--accent); color: var(--accent-ink); }
|
||||
.strip.stopped .strip-actions button.ghost { color: #fecaca; border-color: rgba(248, 113, 113, 0.4); }
|
||||
.waiting-note { font-size: var(--t-xs); color: var(--muted); display: flex; align-items: center; gap: 0.35rem; }
|
||||
.waiting-note b { color: var(--accent); }
|
||||
.waiting-note b { color: var(--st-waiting); }
|
||||
.desk-next {
|
||||
margin-top: 0.65rem;
|
||||
padding: 0.55rem 0.6rem;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: var(--radius-sm);
|
||||
background: rgba(255, 255, 255, 0.02);
|
||||
display: grid;
|
||||
gap: 0.45rem;
|
||||
}
|
||||
.desk-next-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
font-weight: 650;
|
||||
font-size: var(--t-sm);
|
||||
}
|
||||
.desk-next-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
.desk-next-row .grow {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.05rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.desk-next-row .grow span,
|
||||
.desk-next-row .grow b {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.desk-next-files {
|
||||
display: grid;
|
||||
gap: 0.3rem;
|
||||
padding-top: 0.25rem;
|
||||
border-top: 1px solid var(--line);
|
||||
}
|
||||
|
||||
.segmented {
|
||||
display: inline-grid;
|
||||
@@ -2320,16 +2548,33 @@ article.machine.flash { animation: flash 2s var(--ease); }
|
||||
.lib-tools {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.45rem;
|
||||
margin-bottom: 0.65rem;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
margin-bottom: 0.55rem;
|
||||
position: sticky;
|
||||
top: var(--topbar-h);
|
||||
z-index: 5;
|
||||
background: linear-gradient(180deg, var(--card) 72%, transparent);
|
||||
padding-bottom: 0.35rem;
|
||||
padding-bottom: 0.3rem;
|
||||
}
|
||||
.lib-tools .search-wrap {
|
||||
flex: 1 1 8rem;
|
||||
min-width: 7rem;
|
||||
max-width: 16rem;
|
||||
}
|
||||
.lib-tools input[type="search"] { flex: 1 1 auto; width: 100%; margin: 0; min-width: 0; }
|
||||
.lib-tools select {
|
||||
flex: 0 1 auto;
|
||||
width: auto;
|
||||
min-width: 6.5rem;
|
||||
max-width: 9.5rem;
|
||||
margin: 0;
|
||||
padding: 0.35rem 0.5rem;
|
||||
}
|
||||
@media (min-width: 1280px) {
|
||||
.lib-tools { flex-wrap: nowrap; }
|
||||
.lib-tools .search-wrap { max-width: 12rem; }
|
||||
}
|
||||
.lib-tools input[type="search"] { flex: 1 1 12rem; margin: 0; }
|
||||
.lib-tools select { flex: 0 1 11rem; width: auto; margin: 0; }
|
||||
.lib-group {
|
||||
font-size: var(--t-xs);
|
||||
font-weight: 650;
|
||||
@@ -2375,21 +2620,22 @@ article.machine.flash { animation: flash 2s var(--ease); }
|
||||
.lib-info > summary { list-style: none; }
|
||||
.lib-info > summary::-webkit-details-marker { display: none; }
|
||||
.lib-info-pop {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: calc(100% + 0.25rem);
|
||||
z-index: 20;
|
||||
position: fixed;
|
||||
z-index: 80;
|
||||
min-width: 11rem;
|
||||
max-width: min(18rem, calc(100vw - 1rem));
|
||||
padding: 0.55rem 0.7rem;
|
||||
border-radius: 10px;
|
||||
border: 1px solid var(--line-strong);
|
||||
background: #121217;
|
||||
background: var(--card-2);
|
||||
box-shadow: var(--shadow);
|
||||
font-size: var(--t-xs);
|
||||
color: var(--muted);
|
||||
display: grid;
|
||||
color: var(--ink);
|
||||
display: none;
|
||||
gap: 0.2rem;
|
||||
line-height: 1.35;
|
||||
}
|
||||
.lib-info[open] > .lib-info-pop { display: grid; }
|
||||
.picked-details { opacity: 0.9; }
|
||||
|
||||
.flow-step { padding: 0.9rem 0 0.95rem; border-top: 1px solid var(--line); }
|
||||
@@ -2486,6 +2732,65 @@ label.button {
|
||||
}
|
||||
label.button:hover { background: rgba(255, 255, 255, 0.04); }
|
||||
.page-head-side button { display: inline-flex; align-items: center; gap: 0.4rem; }
|
||||
.proj-file-list {
|
||||
display: grid;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
.proj-file, .proj-asset {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.55rem;
|
||||
padding: 0.45rem 0.55rem;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: var(--radius-sm);
|
||||
background: rgba(255, 255, 255, 0.02);
|
||||
min-width: 0;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
.proj-file { flex-direction: column; align-items: flex-start; gap: 0.15rem; flex: 1 1 auto; min-width: 0; }
|
||||
.proj-file:hover, .proj-asset:hover { border-color: var(--line-strong); }
|
||||
.proj-asset a { flex: 1 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--ink); }
|
||||
.proj-asset .tiny { flex: none; color: var(--muted); }
|
||||
.proj-stats {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(5.5rem, 1fr));
|
||||
gap: 0.45rem;
|
||||
margin: 0.75rem 0 0.35rem;
|
||||
}
|
||||
.proj-stat {
|
||||
padding: 0.45rem 0.55rem;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: var(--radius-sm);
|
||||
background: rgba(255, 255, 255, 0.02);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.1rem;
|
||||
}
|
||||
.proj-stat strong { font-size: var(--t-sm); }
|
||||
.proj-file-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
}
|
||||
.proj-file-row .ghost { flex: none; }
|
||||
.focus-flash {
|
||||
outline: 2px solid var(--accent);
|
||||
outline-offset: 2px;
|
||||
border-radius: var(--radius-sm);
|
||||
animation: focus-flash-fade 2.4s var(--ease) forwards;
|
||||
}
|
||||
@keyframes focus-flash-fade {
|
||||
0% { outline-color: var(--accent); }
|
||||
70% { outline-color: var(--accent); }
|
||||
100% { outline-color: transparent; }
|
||||
}
|
||||
|
||||
a.lib-proj {
|
||||
color: var(--accent);
|
||||
text-decoration: none;
|
||||
}
|
||||
a.lib-proj:hover { text-decoration: underline; }
|
||||
.lib-card { position: relative; transition: box-shadow 0.2s var(--ease); }
|
||||
.lib-card.drop { box-shadow: 0 0 0 2px var(--accent), var(--shadow); }
|
||||
.drop-hint { margin: 0.6rem 0 0; font-size: var(--t-xs); color: var(--faint); text-align: center; }
|
||||
@@ -2633,11 +2938,17 @@ label.button:hover { background: rgba(255, 255, 255, 0.04); }
|
||||
@media (max-width: 1080px) {
|
||||
.send-layout { grid-template-columns: 1fr; }
|
||||
.send-panel { position: static; }
|
||||
.split, .edit-split, .mat-split { grid-template-columns: 1fr; }
|
||||
.edit-panel, .mat-form { position: static; }
|
||||
.doc-layout { grid-template-columns: 1fr; }
|
||||
.doc-toc { position: static; display: flex; flex-wrap: wrap; gap: 0.3rem; padding-bottom: 0.9rem; border-bottom: 1px solid var(--line); }
|
||||
.doc-toc p { display: none; }
|
||||
.doc-toc a { border: 1px solid var(--line-strong); border-radius: 99px; padding: 0.22rem 0.65rem; font-size: var(--t-xs); }
|
||||
.doc-toc a.on { border-radius: 99px; border-color: rgba(249, 115, 22, 0.55); }
|
||||
.proto-table th:nth-child(4),
|
||||
.proto-table th:nth-child(5),
|
||||
.proto-table td:nth-child(4),
|
||||
.proto-table td:nth-child(5) { display: none; }
|
||||
}
|
||||
|
||||
@media (max-width: 960px) {
|
||||
@@ -2675,7 +2986,11 @@ label.button:hover { background: rgba(255, 255, 255, 0.04); }
|
||||
.send-panel, .doc-toc { top: 1rem; }
|
||||
.sidebar { border-right: 0; border-bottom: 1px solid var(--line); }
|
||||
.live-bar { display: none; }
|
||||
.split, .grid-2 { grid-template-columns: 1fr; }
|
||||
.grid-2 { grid-template-columns: 1fr; }
|
||||
.proto-table th:nth-child(6),
|
||||
.proto-table th:nth-child(8),
|
||||
.proto-table td:nth-child(6),
|
||||
.proto-table td.proto-spool { display: none; }
|
||||
.fleet { grid-template-columns: 1fr; }
|
||||
main { padding: 1rem 0.85rem 2rem; }
|
||||
.hero-main { font-size: 1.4rem; }
|
||||
@@ -2892,6 +3207,16 @@ ul.plain li:last-child { border-bottom: 0; }
|
||||
gap: 0.35rem;
|
||||
margin-bottom: 0.75rem;
|
||||
}
|
||||
.mobile-more-sheet .nav-label {
|
||||
margin: 0.45rem 0 0.1rem;
|
||||
padding: 0 0.25rem;
|
||||
font-size: var(--t-xs);
|
||||
color: var(--faint);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
font-weight: 700;
|
||||
}
|
||||
.mobile-more-sheet .nav-label:first-child { margin-top: 0; }
|
||||
.mobile-more-sheet a {
|
||||
display: block;
|
||||
padding: 0.65rem 0.75rem;
|
||||
@@ -3300,11 +3625,79 @@ td .cell-file {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.proto-table {
|
||||
table-layout: fixed;
|
||||
width: 100%;
|
||||
}
|
||||
.proto-table th:nth-child(1),
|
||||
.proto-table td.proto-printer { width: 7.5rem; }
|
||||
.proto-table th:nth-child(2),
|
||||
.proto-table td.proto-file { width: auto; }
|
||||
.proto-table th:nth-child(3) { width: 6.5rem; }
|
||||
.proto-table th:nth-child(4),
|
||||
.proto-table th:nth-child(5),
|
||||
.proto-table th:nth-child(6) { width: 4.5rem; }
|
||||
.proto-table th:nth-child(7) { width: 6.5rem; }
|
||||
.proto-table th:nth-child(8),
|
||||
.proto-table td.proto-spool { width: 10rem; }
|
||||
.proto-table th:nth-child(9) { width: 5.5rem; }
|
||||
.proto-table td.proto-file .cell-file {
|
||||
max-width: 100%;
|
||||
}
|
||||
.proto-table td.proto-file .mono-badge {
|
||||
margin-top: 0.15rem;
|
||||
opacity: 0.85;
|
||||
}
|
||||
.proto-table td.proto-file .warn-text {
|
||||
color: var(--warn, #b45309);
|
||||
margin-top: 0.2rem;
|
||||
}
|
||||
.proto-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.25rem;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.proto-help {
|
||||
margin: 0.35rem 0 0;
|
||||
max-width: 36rem;
|
||||
}
|
||||
.proto-help summary {
|
||||
cursor: pointer;
|
||||
color: var(--muted);
|
||||
}
|
||||
.proto-help p { margin: 0.35rem 0 0; color: var(--muted); }
|
||||
.sr-only {
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
padding: 0;
|
||||
margin: -1px;
|
||||
overflow: hidden;
|
||||
clip: rect(0, 0, 0, 0);
|
||||
white-space: nowrap;
|
||||
border: 0;
|
||||
}
|
||||
.proto-table td.proto-spool {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.proto-table td.proto-spool select {
|
||||
max-width: 100%;
|
||||
}
|
||||
td.actions-cell {
|
||||
white-space: nowrap;
|
||||
text-align: right;
|
||||
}
|
||||
td.actions-cell .icon-btn { vertical-align: middle; }
|
||||
td.actions-cell .act-label { margin-left: 0.15rem; font-size: var(--t-xs); }
|
||||
td.actions-cell .ghost.tiny-btn.with-label {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.2rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
button.is-busy { position: relative; color: transparent !important; pointer-events: none; }
|
||||
button.is-busy::after {
|
||||
@@ -3457,8 +3850,29 @@ dialog::backdrop { background: rgba(0, 0, 0, 0.55); backdrop-filter: blur(4px);
|
||||
margin-right: 0.35rem;
|
||||
}
|
||||
|
||||
.pager {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.75rem;
|
||||
margin: 0.75rem 0 0;
|
||||
padding: 0.35rem 0;
|
||||
}
|
||||
.pager[hidden] { display: none !important; }
|
||||
.pager-info {
|
||||
font-size: 0.85rem;
|
||||
color: var(--muted);
|
||||
min-width: 7rem;
|
||||
text-align: center;
|
||||
}
|
||||
.pager button:disabled {
|
||||
opacity: 0.4;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
@media print {
|
||||
.sidebar, .mobile-nav, .conn-banner, .toast-host, .nav-toggle { display: none !important; }
|
||||
.sidebar, .mobile-nav, .conn-banner, .toast-host, .nav-toggle, .pager { display: none !important; }
|
||||
.app-shell { display: block; }
|
||||
.app-main { margin: 0; }
|
||||
body { background: #fff; color: #111; }
|
||||
|
||||
@@ -333,3 +333,97 @@ window.setConnectionBanner = setConnectionBanner;
|
||||
window.createPoller = createPoller;
|
||||
window.promptAbraeumen = promptAbraeumen;
|
||||
window.VERDICT_REASON_LABELS = VERDICT_REASON_LABELS;
|
||||
|
||||
/** Listen-Pagination (clientseitig auf gefiltertem Array). */
|
||||
const DEFAULT_PAGE_SIZE = 40;
|
||||
|
||||
function pageSlice(items, page, pageSize) {
|
||||
const list = Array.isArray(items) ? items : [];
|
||||
const size = Math.max(1, Number(pageSize) || DEFAULT_PAGE_SIZE);
|
||||
const total = list.length;
|
||||
const pages = Math.max(1, Math.ceil(total / size) || 1);
|
||||
let p = Math.max(1, parseInt(page, 10) || 1);
|
||||
if (p > pages) p = pages;
|
||||
const start = (p - 1) * size;
|
||||
return {
|
||||
items: list.slice(start, start + size),
|
||||
page: p,
|
||||
pages,
|
||||
total,
|
||||
pageSize: size,
|
||||
from: total ? start + 1 : 0,
|
||||
to: Math.min(start + size, total),
|
||||
};
|
||||
}
|
||||
|
||||
function renderPager(el, state, onPage) {
|
||||
if (!el) return;
|
||||
const s = state || pageSlice([], 1);
|
||||
if (s.total <= s.pageSize) {
|
||||
el.hidden = true;
|
||||
el.innerHTML = "";
|
||||
return;
|
||||
}
|
||||
el.hidden = false;
|
||||
el.className = "pager";
|
||||
el.innerHTML =
|
||||
'<button type="button" class="ghost pager-prev" ' + (s.page <= 1 ? "disabled" : "") + ">Zurück</button>" +
|
||||
'<span class="pager-info">' + s.from + "–" + s.to + " von " + s.total + "</span>" +
|
||||
'<button type="button" class="ghost pager-next" ' + (s.page >= s.pages ? "disabled" : "") + ">Weiter</button>";
|
||||
el.querySelector(".pager-prev").onclick = () => onPage(s.page - 1);
|
||||
el.querySelector(".pager-next").onclick = () => onPage(s.page + 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Einheitliche Querverlinkung zwischen Seiten.
|
||||
* @param {"datei"|"projekt"|"spule"|"auftrag"|"lauf"|"drucker"} kind
|
||||
* @param {string|number} id
|
||||
* @param {string} [label]
|
||||
* @returns {string} HTML-Anker oder escaped Text
|
||||
*/
|
||||
function linkTo(kind, id, label) {
|
||||
const text = escapeHtml(label == null || label === "" ? String(id ?? "") : String(label));
|
||||
if (id == null || id === "") return text;
|
||||
const enc = encodeURIComponent(String(id));
|
||||
let href = "";
|
||||
switch (kind) {
|
||||
case "datei":
|
||||
href = "/dateien?file=" + enc;
|
||||
break;
|
||||
case "projekt":
|
||||
href = "/projekte#" + enc;
|
||||
break;
|
||||
case "spule":
|
||||
href = "/material?spule=" + enc;
|
||||
break;
|
||||
case "auftrag":
|
||||
href = "/auftraege#" + enc;
|
||||
break;
|
||||
case "lauf":
|
||||
href = "/protokoll/" + enc;
|
||||
break;
|
||||
case "drucker":
|
||||
href = "/#" + enc;
|
||||
break;
|
||||
default:
|
||||
return text;
|
||||
}
|
||||
return '<a href="' + href + '">' + text + "</a>";
|
||||
}
|
||||
|
||||
/** Hash/Query-Fokus: Element hervorheben und scrollen. */
|
||||
function focusById(id, opts) {
|
||||
if (!id) return null;
|
||||
const el = document.getElementById(id) || document.querySelector('[data-id="' + CSS.escape(String(id)) + '"]');
|
||||
if (!el) return null;
|
||||
el.classList.add("focus-flash");
|
||||
el.scrollIntoView({ behavior: (opts && opts.behavior) || "smooth", block: "center" });
|
||||
setTimeout(() => el.classList.remove("focus-flash"), 2400);
|
||||
return el;
|
||||
}
|
||||
|
||||
window.DEFAULT_PAGE_SIZE = DEFAULT_PAGE_SIZE;
|
||||
window.pageSlice = pageSlice;
|
||||
window.renderPager = renderPager;
|
||||
window.linkTo = linkTo;
|
||||
window.focusById = focusById;
|
||||
@@ -14,5 +14,5 @@
|
||||
<section class="queue-box" data-box="alerts" id="alert-box" hidden>
|
||||
<h2 class="queue-title"><svg class="ico title-ico"><use href="#i-bell"/></svg><span class="grow">Meldungen</span><span class="count bad" id="alert-count">0</span></h2>
|
||||
<ul class="queue-list" id="alert-list"></ul>
|
||||
<div class="queue-foot"><button type="button" class="ghost tiny-btn" id="events-clear">gelesen</button> <a href="/aktivitaet">alle →</a></div>
|
||||
<div class="queue-foot"><button type="button" class="ghost tiny-btn" id="events-clear">Meldungen gelesen</button> <a href="/aktivitaet">alle →</a></div>
|
||||
</section>
|
||||
@@ -19,16 +19,26 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbar" id="f-kind" role="group" aria-label="Art"></div>
|
||||
<div class="toolbar" id="f-host" role="group" aria-label="Drucker"></div>
|
||||
<div class="toolbar" aria-label="Drucker">
|
||||
<label class="field inline" for="f-host">
|
||||
<span class="sr-only">Drucker</span>
|
||||
<select id="f-host" title="Drucker">
|
||||
<option value="">Alle Drucker</option>
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p id="tl-note" class="tiny"></p>
|
||||
<div class="timeline" id="timeline">
|
||||
<div class="skeleton" style="height:4rem"></div>
|
||||
<div class="skeleton" style="height:4rem"></div>
|
||||
</div>
|
||||
<div class="pager" id="tl-pager" hidden></div>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
<script>
|
||||
let tlPage = 1;
|
||||
let tlItems = [];
|
||||
const KINDS = [
|
||||
["queue", "Warteschlange"],
|
||||
["ablauf", "Ablauf"],
|
||||
@@ -64,11 +74,13 @@ function renderFilters() {
|
||||
KINDS.map(([k, label]) =>
|
||||
`<button type="button" class="fchip ${filter.kinds.has(k) ? "on" : ""}" data-kind="${k}"><span class="tl-dot ${k}"></span>${label}</button>`
|
||||
).join("");
|
||||
document.getElementById("f-host").innerHTML =
|
||||
`<button type="button" class="fchip ${filter.host ? "" : "on"}" data-host="">Alle Drucker</button>` +
|
||||
const hostSel = document.getElementById("f-host");
|
||||
const cur = filter.host;
|
||||
hostSel.innerHTML = '<option value="">Alle Drucker</option>' +
|
||||
printers.map((p) =>
|
||||
`<button type="button" class="fchip ${filter.host === p.host ? "on" : ""}" data-host="${escapeHtml(p.host)}">${escapeHtml(p.name)}</button>`
|
||||
`<option value="${escapeHtml(p.host)}">${escapeHtml(p.name)}</option>`
|
||||
).join("");
|
||||
if ([...hostSel.options].some((o) => o.value === cur)) hostSel.value = cur;
|
||||
}
|
||||
|
||||
function sinceIso() {
|
||||
@@ -111,14 +123,19 @@ function itemHtml(ev) {
|
||||
function render(items) {
|
||||
const box = document.getElementById("timeline");
|
||||
const note = document.getElementById("tl-note");
|
||||
if (!items.length) {
|
||||
const pager = document.getElementById("tl-pager");
|
||||
tlItems = items || [];
|
||||
if (!tlItems.length) {
|
||||
box.innerHTML = `<div class="card empty-state">${icon("activity")}<p>Keine Einträge${filter.range === "day" ? " heute" : ""}.</p>${
|
||||
filter.range !== "all" ? `<button type="button" class="ghost" data-range-jump="all">Alle anzeigen</button>` : ""}</div>`;
|
||||
note.textContent = "";
|
||||
renderPager(pager, null, () => {});
|
||||
return;
|
||||
}
|
||||
const paged = pageSlice(tlItems, tlPage, DEFAULT_PAGE_SIZE);
|
||||
tlPage = paged.page;
|
||||
const groups = [];
|
||||
for (const ev of items) {
|
||||
for (const ev of paged.items) {
|
||||
const label = dayLabel(ev.created_at);
|
||||
if (!groups.length || groups[groups.length - 1].label !== label) groups.push({ label, items: [] });
|
||||
groups[groups.length - 1].items.push(ev);
|
||||
@@ -126,7 +143,11 @@ function render(items) {
|
||||
box.innerHTML = groups.map((g) =>
|
||||
`<section class="tl-day"><h3>${escapeHtml(g.label)} · ${g.items.length}</h3><ol class="tl-list">${g.items.map(itemHtml).join("")}</ol></section>`
|
||||
).join("");
|
||||
note.textContent = items.length >= 300 ? "Die letzten 300 Einträge. Zeitraum oder Filter enger stellen für ältere." : "";
|
||||
note.textContent = tlItems.length >= 300 ? "Die letzten 300 Einträge. Zeitraum oder Filter enger stellen für ältere." : "";
|
||||
renderPager(pager, paged, (p) => {
|
||||
tlPage = p;
|
||||
render(tlItems);
|
||||
});
|
||||
}
|
||||
|
||||
async function load() {
|
||||
@@ -137,6 +158,7 @@ async function load() {
|
||||
if (filter.host) q.set("host", filter.host);
|
||||
try {
|
||||
const data = await api("/ereignisse?" + q.toString());
|
||||
tlPage = 1;
|
||||
render(data.items || []);
|
||||
} catch (err) {
|
||||
document.getElementById("timeline").innerHTML = `<div class="strip bad">${icon("alert")}<span>${escapeHtml(err.message)}</span></div>`;
|
||||
@@ -152,8 +174,6 @@ document.addEventListener("click", (e) => {
|
||||
if (!k) filter.kinds.clear();
|
||||
else if (filter.kinds.has(k)) filter.kinds.delete(k);
|
||||
else filter.kinds.add(k);
|
||||
} else if (e.target.closest("#f-host [data-host]")) {
|
||||
filter.host = e.target.closest("[data-host]").dataset.host;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@@ -162,6 +182,13 @@ document.addEventListener("click", (e) => {
|
||||
load();
|
||||
});
|
||||
|
||||
document.getElementById("f-host").addEventListener("change", () => {
|
||||
filter.host = document.getElementById("f-host").value || "";
|
||||
syncUrl();
|
||||
renderFilters();
|
||||
load();
|
||||
});
|
||||
|
||||
document.getElementById("tl-refresh").addEventListener("click", load);
|
||||
document.getElementById("tl-read").addEventListener("click", async () => {
|
||||
await api("/ereignisse/gelesen", { method: "POST", json: {} });
|
||||
|
||||
+237
-84
@@ -7,9 +7,10 @@
|
||||
</div>
|
||||
<div class="actions">
|
||||
<a class="ghost" id="lieferschein-link" href="#" hidden target="_blank" rel="noopener">Lieferschein</a>
|
||||
<button type="button" class="btn-primary" id="order-new-head"><svg class="ico"><use href="#i-plus"/></svg>Neuer Auftrag</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="split">
|
||||
<div class="split edit-split is-idle" id="order-layout">
|
||||
<section class="card">
|
||||
<div class="field inline">
|
||||
<label for="filter-status">Status</label>
|
||||
@@ -29,11 +30,17 @@
|
||||
<thead><tr><th>Titel</th><th>Status</th><th>Fortschritt</th></tr></thead>
|
||||
<tbody id="order-rows"></tbody>
|
||||
</table>
|
||||
<div class="pager" id="order-pager" hidden></div>
|
||||
</div>
|
||||
</section>
|
||||
<section class="card">
|
||||
<h2 id="order-title">Neuer Auftrag</h2>
|
||||
<form id="order-form">
|
||||
<section class="card edit-panel" id="order-panel" hidden>
|
||||
<div class="mat-form-head">
|
||||
<h2 id="order-title">Neuer Auftrag</h2>
|
||||
<button type="button" class="ghost tiny-btn" id="order-edit-btn" hidden>Bearbeiten</button>
|
||||
<button type="button" class="icon-btn" id="order-close" title="Schließen" aria-label="Schließen"></button>
|
||||
</div>
|
||||
|
||||
<form id="order-form" hidden>
|
||||
<input id="order-id" type="hidden">
|
||||
<div class="field"><label for="order-title-in">Titel</label><input id="order-title-in" required></div>
|
||||
<div class="grid-2">
|
||||
@@ -56,43 +63,61 @@
|
||||
<div class="field"><label for="order-notes">Notiz</label><textarea id="order-notes"></textarea></div>
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn-primary">Speichern</button>
|
||||
<button type="button" class="ghost" id="order-new">Neu</button>
|
||||
<button type="button" class="ghost" id="order-cancel-edit" hidden>Abbrechen</button>
|
||||
<button type="button" class="btn-danger" id="order-delete" hidden>Löschen</button>
|
||||
</div>
|
||||
</form>
|
||||
<p id="order-note" class="tiny"></p>
|
||||
<p class="tiny" id="order-progress"></p>
|
||||
<p class="tiny" id="order-actuals"></p>
|
||||
|
||||
<h2 class="section-gap">Positionen</h2>
|
||||
<div class="table-wrap">
|
||||
<table>
|
||||
<thead><tr><th>Datei</th><th class="num">Stk</th><th class="num">fertig</th><th></th></tr></thead>
|
||||
<tbody id="item-rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<form id="item-form" class="section-gap">
|
||||
<div class="grid-2">
|
||||
<div class="field"><label for="item-file">Datei</label><select id="item-file"><option value="">—</option></select></div>
|
||||
<div class="field"><label for="item-qty">Stück</label><input id="item-qty" type="number" min="1" step="1" value="1"></div>
|
||||
<div class="field"><label for="item-price">Preis/Stk €</label><input id="item-price" type="number" min="0" step="0.01" value="0"></div>
|
||||
<div class="field"><label for="item-material">Material</label><input id="item-material"></div>
|
||||
<div id="order-detail" hidden>
|
||||
<p class="tiny" id="order-progress"></p>
|
||||
<p class="tiny" id="order-actuals"></p>
|
||||
<p class="tiny" id="order-notes-view"></p>
|
||||
|
||||
<h2 class="section-gap">Positionen</h2>
|
||||
<div class="table-wrap">
|
||||
<table>
|
||||
<thead><tr><th>Datei</th><th class="num">Stk</th><th class="num">fertig</th><th></th></tr></thead>
|
||||
<tbody id="item-rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="actions"><button type="submit">Position hinzufügen</button></div>
|
||||
</form>
|
||||
<details class="section-gap">
|
||||
<summary>Kunde anlegen / bearbeiten</summary>
|
||||
<form id="customer-form">
|
||||
<input type="hidden" id="cust-id">
|
||||
<div class="field"><label for="cust-name">Name</label><input id="cust-name" required></div>
|
||||
<div class="field"><label for="cust-email">E-Mail</label><input id="cust-email" type="email"></div>
|
||||
|
||||
<form id="item-edit-form" class="section-gap card" hidden style="padding:0.75rem;margin-top:0.75rem">
|
||||
<input type="hidden" id="item-edit-id">
|
||||
<h3 style="margin:0 0 0.5rem;font-size:0.95rem">Position ändern</h3>
|
||||
<div class="grid-2">
|
||||
<div class="field"><label for="item-edit-qty">Stück</label><input id="item-edit-qty" type="number" min="1" step="1" value="1"></div>
|
||||
<div class="field"><label for="item-edit-price">Preis/Stk €</label><input id="item-edit-price" type="number" min="0" step="0.01" value="0"></div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn-primary">Kunde speichern</button>
|
||||
<button type="button" class="ghost" id="cust-edit-current">Aktuellen laden</button>
|
||||
<button type="button" class="btn-danger" id="cust-delete" hidden>Kunde löschen</button>
|
||||
<button type="submit" class="btn-primary">Speichern</button>
|
||||
<button type="button" class="ghost" id="item-edit-cancel">Abbrechen</button>
|
||||
</div>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<form id="item-form" class="section-gap">
|
||||
<div class="grid-2">
|
||||
<div class="field"><label for="item-file">Datei</label><select id="item-file"><option value="">—</option></select></div>
|
||||
<div class="field"><label for="item-qty">Stück</label><input id="item-qty" type="number" min="1" step="1" value="1"></div>
|
||||
<div class="field"><label for="item-price">Preis/Stk €</label><input id="item-price" type="number" min="0" step="0.01" value="0"></div>
|
||||
<div class="field"><label for="item-material">Material</label><input id="item-material"></div>
|
||||
</div>
|
||||
<div class="actions"><button type="submit">Position hinzufügen</button></div>
|
||||
</form>
|
||||
<details class="section-gap">
|
||||
<summary>Kunde anlegen / bearbeiten</summary>
|
||||
<form id="customer-form">
|
||||
<input type="hidden" id="cust-id">
|
||||
<div class="field"><label for="cust-name">Name</label><input id="cust-name" required></div>
|
||||
<div class="field"><label for="cust-email">E-Mail</label><input id="cust-email" type="email"></div>
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn-primary">Kunde speichern</button>
|
||||
<button type="button" class="ghost" id="cust-edit-current">Aktuellen laden</button>
|
||||
<button type="button" class="btn-danger" id="cust-delete" hidden>Kunde löschen</button>
|
||||
</div>
|
||||
</form>
|
||||
</details>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -106,6 +131,43 @@ let orders = [];
|
||||
let customers = [];
|
||||
let files = [];
|
||||
let current = null;
|
||||
/** idle | create | view | edit */
|
||||
let panelMode = "idle";
|
||||
let orderPage = 1;
|
||||
|
||||
document.getElementById("order-close").innerHTML = icon("x");
|
||||
|
||||
function openPanel() {
|
||||
document.getElementById("order-panel").hidden = false;
|
||||
document.getElementById("order-layout").classList.remove("is-idle");
|
||||
document.getElementById("order-panel").scrollIntoView({ block: "nearest", behavior: "smooth" });
|
||||
}
|
||||
|
||||
function closePanel() {
|
||||
panelMode = "idle";
|
||||
current = null;
|
||||
document.getElementById("order-panel").hidden = true;
|
||||
document.getElementById("order-layout").classList.add("is-idle");
|
||||
document.getElementById("order-form").hidden = true;
|
||||
document.getElementById("order-detail").hidden = true;
|
||||
document.getElementById("order-edit-btn").hidden = true;
|
||||
document.getElementById("order-cancel-edit").hidden = true;
|
||||
document.getElementById("order-delete").hidden = true;
|
||||
document.getElementById("lieferschein-link").hidden = true;
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
document.getElementById("order-note").textContent = "";
|
||||
history.replaceState(null, "", location.pathname);
|
||||
renderList();
|
||||
}
|
||||
|
||||
function setFormValues(order) {
|
||||
document.getElementById("order-id").value = order ? order.id : "";
|
||||
document.getElementById("order-title-in").value = order ? order.title : "";
|
||||
document.getElementById("order-status").value = order ? order.status : "idee";
|
||||
document.getElementById("order-due").value = order && order.due_at ? order.due_at.slice(0, 10) : "";
|
||||
document.getElementById("order-customer").value = order && order.customer_id ? order.customer_id : "";
|
||||
document.getElementById("order-notes").value = order ? (order.notes || "") : "";
|
||||
}
|
||||
|
||||
function fillCustomers() {
|
||||
const sel = document.getElementById("order-customer");
|
||||
@@ -145,27 +207,64 @@ function paintActuals(order) {
|
||||
el.textContent = bits.join(" · ");
|
||||
}
|
||||
|
||||
function fillOrder(order) {
|
||||
function showCreate() {
|
||||
panelMode = "create";
|
||||
current = null;
|
||||
setFormValues(null);
|
||||
document.getElementById("order-title").textContent = "Neuer Auftrag";
|
||||
document.getElementById("order-form").hidden = false;
|
||||
document.getElementById("order-detail").hidden = true;
|
||||
document.getElementById("order-edit-btn").hidden = true;
|
||||
document.getElementById("order-cancel-edit").hidden = true;
|
||||
document.getElementById("order-delete").hidden = true;
|
||||
document.getElementById("lieferschein-link").hidden = true;
|
||||
document.getElementById("order-note").textContent = "";
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
history.replaceState(null, "", location.pathname);
|
||||
openPanel();
|
||||
renderList();
|
||||
document.getElementById("order-title-in").focus();
|
||||
}
|
||||
|
||||
function showView(order) {
|
||||
panelMode = "view";
|
||||
current = order;
|
||||
document.getElementById("order-id").value = order ? order.id : "";
|
||||
document.getElementById("order-title-in").value = order ? order.title : "";
|
||||
document.getElementById("order-status").value = order ? order.status : "idee";
|
||||
document.getElementById("order-due").value = order && order.due_at ? order.due_at.slice(0, 10) : "";
|
||||
document.getElementById("order-customer").value = order && order.customer_id ? order.customer_id : "";
|
||||
document.getElementById("order-notes").value = order ? order.notes : "";
|
||||
document.getElementById("order-title").textContent = order ? order.title : "Neuer Auftrag";
|
||||
document.getElementById("order-delete").hidden = !order;
|
||||
setFormValues(order);
|
||||
document.getElementById("order-title").textContent = order.title || "Auftrag";
|
||||
document.getElementById("order-form").hidden = true;
|
||||
document.getElementById("order-detail").hidden = false;
|
||||
document.getElementById("order-edit-btn").hidden = false;
|
||||
document.getElementById("order-cancel-edit").hidden = true;
|
||||
document.getElementById("order-delete").hidden = true;
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
const link = document.getElementById("lieferschein-link");
|
||||
if (order) {
|
||||
link.href = "/auftraege/" + order.id + "/lieferschein";
|
||||
link.hidden = false;
|
||||
} else {
|
||||
link.hidden = true;
|
||||
}
|
||||
const prog = order && order.progress;
|
||||
link.href = "/auftraege/" + order.id + "/lieferschein";
|
||||
link.hidden = false;
|
||||
history.replaceState(null, "", "#" + order.id);
|
||||
const prog = order.progress;
|
||||
document.getElementById("order-progress").textContent = prog ? "Fortschritt: " + prog.label : "";
|
||||
paintActuals(order || {});
|
||||
renderItems(order && order.items ? order.items : []);
|
||||
paintActuals(order);
|
||||
const notes = (order.notes || "").trim();
|
||||
document.getElementById("order-notes-view").textContent = notes ? "Notiz: " + notes : "";
|
||||
renderItems(order.items || []);
|
||||
openPanel();
|
||||
renderList();
|
||||
}
|
||||
|
||||
function showEdit(order) {
|
||||
panelMode = "edit";
|
||||
current = order;
|
||||
setFormValues(order);
|
||||
document.getElementById("order-title").textContent = "Bearbeiten";
|
||||
document.getElementById("order-form").hidden = false;
|
||||
document.getElementById("order-detail").hidden = true;
|
||||
document.getElementById("order-edit-btn").hidden = true;
|
||||
document.getElementById("order-cancel-edit").hidden = false;
|
||||
document.getElementById("order-delete").hidden = false;
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
openPanel();
|
||||
renderList();
|
||||
document.getElementById("order-title-in").focus();
|
||||
}
|
||||
|
||||
function renderItems(items) {
|
||||
@@ -178,7 +277,11 @@ function renderItems(items) {
|
||||
items.forEach((item) => {
|
||||
const tr = document.createElement("tr");
|
||||
tr.innerHTML = "<td></td><td class=\"num\"></td><td class=\"num\"></td><td class=\"actions\"></td>";
|
||||
tr.children[0].textContent = item.file_name || ("#" + (item.file_id || "—"));
|
||||
if (item.file_id) {
|
||||
tr.children[0].innerHTML = linkTo("datei", item.file_id, item.file_name || ("#" + item.file_id));
|
||||
} else {
|
||||
tr.children[0].textContent = item.file_name || "—";
|
||||
}
|
||||
tr.children[1].textContent = item.qty;
|
||||
tr.children[2].textContent = item.done_ok + (item.done_bad ? " (−" + item.done_bad + ")" : "");
|
||||
const tools = document.createElement("div");
|
||||
@@ -193,7 +296,7 @@ function renderItems(items) {
|
||||
edit.type = "button";
|
||||
edit.className = "ghost tiny-btn";
|
||||
edit.textContent = "Ändern";
|
||||
edit.addEventListener("click", () => editItem(item));
|
||||
edit.addEventListener("click", () => beginEditItem(item));
|
||||
const del = document.createElement("button");
|
||||
del.type = "button";
|
||||
del.className = "btn-danger tiny-btn";
|
||||
@@ -203,7 +306,7 @@ function renderItems(items) {
|
||||
await api("/auftraege/positionen/" + item.id, { method: "DELETE" });
|
||||
toast("Position gelöscht.");
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
fillOrder(full);
|
||||
showView(full);
|
||||
});
|
||||
});
|
||||
tools.append(btn, edit, del);
|
||||
@@ -212,22 +315,12 @@ function renderItems(items) {
|
||||
});
|
||||
}
|
||||
|
||||
async function editItem(item) {
|
||||
const qty = prompt("Stückzahl", String(item.qty || 1));
|
||||
if (qty == null) return;
|
||||
const price = prompt("Preis/Stk €", String(item.unit_price || 0));
|
||||
if (price == null) return;
|
||||
try {
|
||||
await api("/auftraege/positionen/" + item.id, {
|
||||
method: "PATCH",
|
||||
json: { qty: Number(qty) || 1, unit_price: Number(price) || 0 },
|
||||
});
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
fillOrder(full);
|
||||
toast("Position gespeichert.");
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
function beginEditItem(item) {
|
||||
document.getElementById("item-edit-id").value = item.id;
|
||||
document.getElementById("item-edit-qty").value = item.qty || 1;
|
||||
document.getElementById("item-edit-price").value = item.unit_price || 0;
|
||||
document.getElementById("item-edit-form").hidden = false;
|
||||
document.getElementById("item-edit-qty").focus();
|
||||
}
|
||||
|
||||
async function einreihen(itemId) {
|
||||
@@ -239,7 +332,7 @@ async function einreihen(itemId) {
|
||||
});
|
||||
toast("In Warteschlange.");
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
fillOrder(full);
|
||||
showView(full);
|
||||
await loadList();
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
@@ -249,38 +342,47 @@ async function einreihen(itemId) {
|
||||
function renderList() {
|
||||
const body = document.getElementById("order-rows");
|
||||
body.innerHTML = "";
|
||||
const pager = document.getElementById("order-pager");
|
||||
if (!orders.length) {
|
||||
body.innerHTML = '<tr><td colspan="3" class="empty"><div class="empty-state"><p>Noch kein Auftrag.</p><p><button type="button" class="ghost" id="order-empty-new">Ersten Auftrag anlegen →</button></p></div></td></tr>';
|
||||
document.getElementById("order-empty-new")?.addEventListener("click", () => fillOrder(null));
|
||||
body.innerHTML = '<tr><td colspan="3" class="empty"><div class="empty-state"><p>Noch kein Auftrag.</p><p><button type="button" class="btn-primary" id="order-empty-new">Ersten Auftrag anlegen</button></p></div></td></tr>';
|
||||
document.getElementById("order-empty-new")?.addEventListener("click", showCreate);
|
||||
renderPager(pager, null, () => {});
|
||||
return;
|
||||
}
|
||||
const selected = document.getElementById("order-id").value;
|
||||
orders.forEach((order) => {
|
||||
const selected = current ? String(current.id) : "";
|
||||
const paged = pageSlice(orders, orderPage, DEFAULT_PAGE_SIZE);
|
||||
orderPage = paged.page;
|
||||
paged.items.forEach((order) => {
|
||||
const tr = document.createElement("tr");
|
||||
tr.className = "pick" + (selected && String(order.id) === selected ? " on" : "");
|
||||
tr.innerHTML = "<td></td><td></td><td></td>";
|
||||
tr.innerHTML = "<td></td><td></td><td class=\"cell-path\"></td>";
|
||||
tr.children[0].textContent = order.title;
|
||||
const st = order.status || "";
|
||||
const chipState = st === "druckt" ? "printing" : (st === "fertig" || st === "geliefert" || st === "bezahlt") ? "done" : st === "bestaetigt" ? "waiting" : "idle";
|
||||
tr.children[1].innerHTML = chipHtml(chipState, STATUS_LABEL[st] || st);
|
||||
tr.children[2].textContent = (order.progress && order.progress.label) || "";
|
||||
tr.children[2].title = (order.progress && order.progress.label) || "";
|
||||
tr.addEventListener("click", async () => {
|
||||
try {
|
||||
const full = await api("/auftraege/" + order.id);
|
||||
fillOrder(full);
|
||||
renderList();
|
||||
showView(full);
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
});
|
||||
body.appendChild(tr);
|
||||
});
|
||||
renderPager(pager, paged, (p) => {
|
||||
orderPage = p;
|
||||
renderList();
|
||||
});
|
||||
}
|
||||
|
||||
async function loadList() {
|
||||
const st = document.getElementById("filter-status").value;
|
||||
const q = st ? "?status=" + encodeURIComponent(st) : "";
|
||||
orders = await api("/auftraege" + q);
|
||||
orderPage = 1;
|
||||
renderList();
|
||||
}
|
||||
|
||||
@@ -292,11 +394,28 @@ async function loadBase() {
|
||||
fillCustomers();
|
||||
fillFiles();
|
||||
await loadList();
|
||||
fillOrder(null);
|
||||
}
|
||||
|
||||
document.getElementById("filter-status").addEventListener("change", () => loadList().catch((e) => showNote("order-note", e)));
|
||||
|
||||
document.getElementById("order-new-head").addEventListener("click", showCreate);
|
||||
document.getElementById("order-close").addEventListener("click", closePanel);
|
||||
document.getElementById("order-edit-btn").addEventListener("click", () => {
|
||||
if (current) showEdit(current);
|
||||
});
|
||||
document.getElementById("order-cancel-edit").addEventListener("click", async () => {
|
||||
if (!current) {
|
||||
closePanel();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
showView(full);
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById("order-form").addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
const id = document.getElementById("order-id").value;
|
||||
@@ -312,22 +431,22 @@ document.getElementById("order-form").addEventListener("submit", async (event) =
|
||||
? await api("/auftraege/" + id, { method: "PATCH", json: payload })
|
||||
: await api("/auftraege", { method: "POST", json: payload });
|
||||
showNote("order-note", null);
|
||||
document.getElementById("order-note").textContent = "Gespeichert.";
|
||||
toast("Gespeichert.", "good");
|
||||
await loadList();
|
||||
fillOrder(saved);
|
||||
const full = await api("/auftraege/" + saved.id);
|
||||
showView(full);
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById("order-new").addEventListener("click", () => fillOrder(null));
|
||||
document.getElementById("order-delete").addEventListener("click", (event) => {
|
||||
const id = document.getElementById("order-id").value;
|
||||
if (!id) return;
|
||||
armButton(event.currentTarget, "Auftrag wirklich löschen?", async () => {
|
||||
await api("/auftraege/" + id, { method: "DELETE" });
|
||||
toast("Gelöscht.");
|
||||
fillOrder(null);
|
||||
closePanel();
|
||||
loadList();
|
||||
});
|
||||
});
|
||||
@@ -347,12 +466,36 @@ document.getElementById("item-form").addEventListener("submit", async (event) =>
|
||||
try {
|
||||
await api("/auftraege/" + current.id + "/positionen", { method: "POST", json: payload });
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
fillOrder(full);
|
||||
showView(full);
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById("item-edit-form").addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
if (!current) return;
|
||||
const itemId = document.getElementById("item-edit-id").value;
|
||||
try {
|
||||
await api("/auftraege/positionen/" + itemId, {
|
||||
method: "PATCH",
|
||||
json: {
|
||||
qty: Number(document.getElementById("item-edit-qty").value) || 1,
|
||||
unit_price: Number(document.getElementById("item-edit-price").value) || 0,
|
||||
},
|
||||
});
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
const full = await api("/auftraege/" + current.id);
|
||||
showView(full);
|
||||
toast("Position gespeichert.");
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
});
|
||||
document.getElementById("item-edit-cancel").addEventListener("click", () => {
|
||||
document.getElementById("item-edit-form").hidden = true;
|
||||
});
|
||||
|
||||
document.getElementById("customer-form").addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
const id = document.getElementById("cust-id").value;
|
||||
@@ -409,6 +552,16 @@ document.getElementById("cust-delete").addEventListener("click", (event) => {
|
||||
});
|
||||
});
|
||||
|
||||
loadBase().catch((error) => showNote("order-note", error));
|
||||
loadBase().then(async () => {
|
||||
const hash = (location.hash || "").replace(/^#/, "");
|
||||
if (hash && /^\d+$/.test(hash)) {
|
||||
try {
|
||||
const full = await api("/auftraege/" + hash);
|
||||
showView(full);
|
||||
} catch (error) {
|
||||
showNote("order-note", error);
|
||||
}
|
||||
}
|
||||
}).catch((error) => showNote("order-note", error));
|
||||
</script>
|
||||
{% endblock %}
|
||||
+39
-21
@@ -29,7 +29,8 @@ function sourceLabel(source, estimate) {
|
||||
return source || "";
|
||||
}
|
||||
|
||||
const ENERGY_PART_COLORS = {
|
||||
const COST_PART_COLORS = {
|
||||
filament: "#0d9488",
|
||||
base: "#94a3b8",
|
||||
nozzle: "#ea580c",
|
||||
bed: "#2563eb",
|
||||
@@ -37,19 +38,20 @@ const ENERGY_PART_COLORS = {
|
||||
};
|
||||
|
||||
function kwhLabel(value) {
|
||||
if (value == null || value === "") return "—";
|
||||
return (Number(value) || 0).toLocaleString("de-DE", { maximumFractionDigits: 3 }) + " kWh";
|
||||
}
|
||||
|
||||
function energyPieSvg(parts) {
|
||||
const items = (parts || []).filter((p) => Number(p.kwh) > 0);
|
||||
const total = items.reduce((sum, p) => sum + Number(p.kwh || 0), 0);
|
||||
function costPieSvg(parts) {
|
||||
const items = (parts || []).filter((p) => Number(p.cost) > 0);
|
||||
const total = items.reduce((sum, p) => sum + Number(p.cost || 0), 0);
|
||||
if (!items.length || total <= 0) return "";
|
||||
const cx = 42;
|
||||
const cy = 42;
|
||||
const r = 36;
|
||||
let angle = -Math.PI / 2;
|
||||
const slices = items.map((p) => {
|
||||
const share = Number(p.kwh) / total;
|
||||
const share = Number(p.cost) / total;
|
||||
const sweep = share * Math.PI * 2;
|
||||
const x1 = cx + r * Math.cos(angle);
|
||||
const y1 = cy + r * Math.sin(angle);
|
||||
@@ -57,38 +59,48 @@ function energyPieSvg(parts) {
|
||||
const x2 = cx + r * Math.cos(angle);
|
||||
const y2 = cy + r * Math.sin(angle);
|
||||
const large = sweep > Math.PI ? 1 : 0;
|
||||
const color = ENERGY_PART_COLORS[p.key] || "#64748b";
|
||||
const color = COST_PART_COLORS[p.key] || "#64748b";
|
||||
if (share >= 0.999) {
|
||||
return `<circle cx="${cx}" cy="${cy}" r="${r}" fill="${color}"/>`;
|
||||
}
|
||||
return `<path d="M ${cx} ${cy} L ${x1.toFixed(2)} ${y1.toFixed(2)} A ${r} ${r} 0 ${large} 1 ${x2.toFixed(2)} ${y2.toFixed(2)} Z" fill="${color}"/>`;
|
||||
}).join("");
|
||||
return `<svg class="energy-pie" viewBox="0 0 84 84" role="img" aria-label="Stromanteile">${slices}</svg>`;
|
||||
return `<svg class="energy-pie" viewBox="0 0 84 84" role="img" aria-label="Kostenanteile">${slices}</svg>`;
|
||||
}
|
||||
|
||||
function energyBreakdownHtml(energy) {
|
||||
const parts = energy.parts || [];
|
||||
function costBreakdownHtml(energy, filamentCost) {
|
||||
const fil = Number(filamentCost) || 0;
|
||||
const energyParts = (energy && energy.parts) || [];
|
||||
const parts = [];
|
||||
if (fil > 1e-6) {
|
||||
parts.push({ key: "filament", label: "Filament", kwh: null, cost: fil });
|
||||
}
|
||||
energyParts.forEach((p) => parts.push(p));
|
||||
if (!parts.length) return "";
|
||||
const src = energy.source === "ed" ? "aus ED" : "pauschal";
|
||||
const rate = energy.euro_per_kwh != null
|
||||
const energyEuro = Number((energy && energy.cost) || 0);
|
||||
const totalEuro = fil + energyEuro;
|
||||
const src = energy && energy.source === "ed" ? "Strom aus ED" : (energyParts.length ? "Strom pauschal" : "");
|
||||
const rate = energy && energy.euro_per_kwh != null
|
||||
? Number(energy.euro_per_kwh).toLocaleString("de-DE", { style: "currency", currency: "EUR", maximumFractionDigits: 3 }) + "/kWh"
|
||||
: "";
|
||||
const rows = parts.map((p) => {
|
||||
const color = ENERGY_PART_COLORS[p.key] || "#64748b";
|
||||
const color = COST_PART_COLORS[p.key] || "#64748b";
|
||||
return `<tr>
|
||||
<td><span class="energy-swatch" style="background:${color}"></span>${escapeHtml(p.label)}</td>
|
||||
<td class="num">${kwhLabel(p.kwh)}</td>
|
||||
<td class="num">${euro(p.cost)}</td>
|
||||
</tr>`;
|
||||
}).join("");
|
||||
const sumKwh = energy && energy.kwh != null ? kwhLabel(energy.kwh) : "—";
|
||||
const hint = [src, rate].filter(Boolean).join(" · ");
|
||||
return `<div class="energy-break">
|
||||
<div class="energy-break-chart">${energyPieSvg(parts)}</div>
|
||||
<div class="energy-break-chart">${costPieSvg(parts)}</div>
|
||||
<div class="energy-break-table">
|
||||
<div class="lib-head"><h3>Strom</h3><span class="tiny">${escapeHtml(src)}${rate ? " · " + rate : ""}</span></div>
|
||||
<div class="lib-head"><h3>Kosten</h3><span class="tiny">${escapeHtml(hint)}</span></div>
|
||||
<div class="table-wrap"><table>
|
||||
<thead><tr><th>Anteil</th><th class="num">kWh</th><th class="num">€</th></tr></thead>
|
||||
<tbody>${rows}
|
||||
<tr class="energy-total"><td>Summe</td><td class="num">${kwhLabel(energy.kwh)}</td><td class="num">${euro(energy.cost)}</td></tr>
|
||||
<tr class="energy-total"><td>Summe</td><td class="num">${sumKwh}</td><td class="num">${euro(totalEuro)}</td></tr>
|
||||
</tbody>
|
||||
</table></div>
|
||||
</div>
|
||||
@@ -98,9 +110,14 @@ function energyBreakdownHtml(energy) {
|
||||
function render(data) {
|
||||
const run = data.run;
|
||||
const name = (run.filename || "").split("/").pop() || "ohne Datei";
|
||||
document.getElementById("bericht-sub").textContent =
|
||||
(run.printer_name || run.printer_host) + " · " + name
|
||||
+ (run.chargen_nr ? " · " + run.chargen_nr : "");
|
||||
const subBits = [
|
||||
run.printer_host
|
||||
? linkTo("drucker", run.printer_host, run.printer_name || run.printer_host)
|
||||
: escapeHtml(run.printer_name || ""),
|
||||
run.file_id ? linkTo("datei", run.file_id, name) : escapeHtml(name),
|
||||
run.chargen_nr ? escapeHtml(run.chargen_nr) : "",
|
||||
].filter(Boolean);
|
||||
document.getElementById("bericht-sub").innerHTML = subBits.join(" · ");
|
||||
|
||||
const planned = Number(run.weight_planned_g) || 0;
|
||||
const used = Number(run.weight_used_g) || 0;
|
||||
@@ -116,7 +133,7 @@ function render(data) {
|
||||
|
||||
const spoolRows = (data.spools || []).map((s) => `
|
||||
<tr>
|
||||
<td>${escapeHtml(s.name)}${s.ace_slot ? " · ACE " + s.ace_slot : ""}</td>
|
||||
<td>${s.spool_id ? linkTo("spule", s.spool_id, s.name) : escapeHtml(s.name)}${s.ace_slot ? " · ACE " + s.ace_slot : ""}</td>
|
||||
<td>${escapeHtml(s.material_type || "")}</td>
|
||||
<td class="num">${grams(s.weight_planned_g)}</td>
|
||||
<td class="num">${grams(s.weight_g)}${s.is_estimate ? ' <span class="tag">Schätzwert</span>' : ""}</td>
|
||||
@@ -149,9 +166,10 @@ function render(data) {
|
||||
<p>Kosten <b>${euro(cost)}</b> (Filament ${euro(run.filament_cost)} · Strom ${euro(energyEuro)}${energyHint ? " · " + energyHint : ""})${run.cost_per_part != null ? " · <b>" + euro(run.cost_per_part) + "</b>/Teil" : ""}</p>
|
||||
${run.pieces_ok || run.pieces_bad ? `<p>Stück <b>${run.pieces_ok || 0}</b> gut${run.pieces_bad ? " · " + run.pieces_bad + " schlecht" : ""}</p>` : ""}
|
||||
${run.message ? "<p class=\"msg\">" + escapeHtml(run.message) + "</p>" : ""}
|
||||
${data.project ? "<p class=\"tiny\">Projekt: " + escapeHtml(data.project.name) + "</p>" : ""}
|
||||
${data.project ? "<p class=\"tiny\">Projekt: " + linkTo("projekt", data.project.id, data.project.name) + "</p>" : ""}
|
||||
${run.order_id ? "<p class=\"tiny\">Auftrag: " + linkTo("auftrag", run.order_id, "#" + run.order_id) + "</p>" : ""}
|
||||
</div>
|
||||
${energyBreakdownHtml(energy)}
|
||||
${costBreakdownHtml(energy, run.filament_cost)}
|
||||
</div>
|
||||
<div class="card">
|
||||
<h2>Spulen</h2>
|
||||
|
||||
+351
-74
@@ -57,6 +57,7 @@
|
||||
<div class="skeleton" style="height:4rem"></div>
|
||||
<div class="skeleton" style="height:4rem"></div>
|
||||
</div>
|
||||
<div class="pager" id="lib-pager" hidden></div>
|
||||
<p class="drop-hint">Dateien hierher ziehen zum Hochladen.</p>
|
||||
</section>
|
||||
|
||||
@@ -78,11 +79,10 @@
|
||||
</div>
|
||||
|
||||
<div class="flow-step ok" data-pane="send" id="step-mode">
|
||||
<h3><span class="step-num">3</span>Wann</h3>
|
||||
<h3><span class="step-num">3</span>Start</h3>
|
||||
<div class="segmented" id="mode" role="radiogroup">
|
||||
<button type="button" data-mode="now" class="on">Jetzt<small>sofort starten</small></button>
|
||||
<button type="button" data-mode="free">Wenn frei<small>auf diesem Drucker</small></button>
|
||||
<button type="button" data-mode="next">Nächster freier<small>Grotti wählt</small></button>
|
||||
<button type="button" data-mode="this" class="on">Dieser Drucker<small>frei → start, sonst Warteschlange</small></button>
|
||||
<button type="button" data-mode="next">Nächster passender<small>Grotti wählt nach Sorte</small></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -189,7 +189,7 @@ let ablaufDefaults = {
|
||||
check: { max_delta_mm: 3.0, timeout_min: 2, x: 125, y: 125, ref_x: 25, ref_y: 125, z_clear: 20 },
|
||||
};
|
||||
let ablaufSteps = [];
|
||||
const sel = { fileId: null, hosts: new Set(), mode: "now", tab: "send" };
|
||||
const sel = { fileId: null, hosts: new Set(), mode: "this", tab: "send" };
|
||||
let aceHostsKey = "";
|
||||
|
||||
/* ---------- 3D-Pfad ---------- */
|
||||
@@ -202,6 +202,25 @@ function ensureViewer() {
|
||||
return pathViewer;
|
||||
}
|
||||
|
||||
let toolpathGen = 0;
|
||||
|
||||
function scheduleToolpath(file, progress, deferMs) {
|
||||
const gen = ++toolpathGen;
|
||||
const run = () => {
|
||||
if (gen !== toolpathGen) return;
|
||||
showToolpath(file, progress);
|
||||
};
|
||||
if (deferMs > 0) {
|
||||
if (window.requestIdleCallback) {
|
||||
requestIdleCallback(run, { timeout: Math.max(800, deferMs) });
|
||||
} else {
|
||||
setTimeout(run, deferMs);
|
||||
}
|
||||
return;
|
||||
}
|
||||
run();
|
||||
}
|
||||
|
||||
async function showToolpath(file, progress) {
|
||||
const card = document.getElementById("viewer-card");
|
||||
const caption = document.getElementById("viewer-caption");
|
||||
@@ -221,6 +240,7 @@ async function showToolpath(file, progress) {
|
||||
meta.textContent = "Pfad wird gelesen …";
|
||||
try {
|
||||
const data = await api("/dateien/" + file.id + "/pfad?tp=8");
|
||||
if (String(sel.fileId) !== String(file.id)) return;
|
||||
viewer.setPath(data);
|
||||
viewerFileId = file.id;
|
||||
meta.textContent = (data.count || 0).toLocaleString("de-DE") + " Punkte";
|
||||
@@ -262,7 +282,9 @@ function saveSendMemory() {
|
||||
function loadSendMemory() {
|
||||
try {
|
||||
const data = JSON.parse(localStorage.getItem(SEND_KEY) || "{}");
|
||||
if (["now", "free", "next"].includes(data.mode)) sel.mode = data.mode;
|
||||
let mode = data.mode;
|
||||
if (mode === "now" || mode === "free") mode = "this";
|
||||
if (["this", "next"].includes(mode)) sel.mode = mode;
|
||||
if (["send", "ablauf"].includes(data.tab)) sel.tab = data.tab;
|
||||
if (Array.isArray(data.hosts)) sel.hosts = new Set(data.hosts);
|
||||
} catch (error) { /* ignore */ }
|
||||
@@ -309,10 +331,22 @@ function slotTitle(host, slot) {
|
||||
return bits.join(" · ");
|
||||
}
|
||||
|
||||
function paintIndexOf(filament, fallback) {
|
||||
const raw = filament && filament.paint_index;
|
||||
if (raw === 0 || raw === "0") return 0;
|
||||
const n = Number(raw);
|
||||
return Number.isFinite(n) && n >= 0 ? n : fallback;
|
||||
}
|
||||
|
||||
function filamentLabel(filament, index) {
|
||||
const kind = filament.type || "Filament";
|
||||
const paint = paintIndexOf(filament, index);
|
||||
const kind = filament.profile || filament.type || "Filament";
|
||||
const color = filament.color ? " · " + filament.color : "";
|
||||
return "Farbe " + (index + 1) + " · " + kind + color;
|
||||
return "T" + paint + " · " + kind + color;
|
||||
}
|
||||
|
||||
function canStartNow(p) {
|
||||
return isFree(p) && !p.needs_clear;
|
||||
}
|
||||
|
||||
function spoolsOnHost(host) {
|
||||
@@ -326,6 +360,39 @@ function spoolWarnText() {
|
||||
const maps = collectAceMaps();
|
||||
const hosts = selectedHosts();
|
||||
const fileTypes = ((file.filaments || []).map((f) => (f.type || "").toLowerCase()).filter(Boolean));
|
||||
const fileProfiles = ((file.filaments || []).map((f) => (f.profile || "").toLowerCase()).filter(Boolean));
|
||||
const PROFILE_VARIANTS = ["meta", "matte", "matt", "silk", "plus", "hf", "cf"];
|
||||
function profileHasVariant(want) {
|
||||
return PROFILE_VARIANTS.some((v) => new RegExp("\\b" + v + "\\b", "i").test(want || ""));
|
||||
}
|
||||
function profileBaseType(want) {
|
||||
const m = String(want || "").toLowerCase().match(/\b(pla|petg|abs|asa|tpu|pa|pc|hips|pva)\b/);
|
||||
return m ? m[1] : "";
|
||||
}
|
||||
function profileOk(spoolRows) {
|
||||
if (!fileProfiles.length) return true;
|
||||
const names = spoolRows.map((s) => (s.name || "").toLowerCase()).filter(Boolean);
|
||||
const types = spoolRows.map((s) => (s.material_type || "").toLowerCase()).filter(Boolean);
|
||||
if (!names.length && !types.length) return true;
|
||||
return fileProfiles.every((want) => {
|
||||
if (names.some((n) => {
|
||||
if (n === want) return true;
|
||||
if (!n.startsWith(want) || /[a-z0-9]/i.test(n.charAt(want.length) || "")) return false;
|
||||
const rest = n.slice(want.length).replace(/^[\s·\-_|/]+/, "");
|
||||
const first = (rest.split(/\s+/)[0] || "").toLowerCase();
|
||||
return !PROFILE_VARIANTS.includes(first);
|
||||
})) return true;
|
||||
// Basis-Profil (nur „… PLA“): Typ reicht, Marke egal — keine Meta/Matte-Spule
|
||||
if (profileHasVariant(want)) return false;
|
||||
const kind = profileBaseType(want);
|
||||
if (!kind) return true;
|
||||
return spoolRows.some((s) => {
|
||||
const t = (s.material_type || "").toLowerCase();
|
||||
const n = (s.name || "").toLowerCase();
|
||||
return t === kind && !profileHasVariant(n);
|
||||
});
|
||||
});
|
||||
}
|
||||
for (const host of hosts) {
|
||||
const name = (printers.find((p) => p.host === host) || {}).name || host;
|
||||
const mapping = maps[host] || [];
|
||||
@@ -334,18 +401,23 @@ function spoolWarnText() {
|
||||
let left = 0;
|
||||
let any = false;
|
||||
const types = [];
|
||||
const mappedSpools = [];
|
||||
mapping.forEach((item) => {
|
||||
const slot = Number(item.ams_index) + 1;
|
||||
const spool = onHost.find((s) => Number(s.ace_slot) === slot);
|
||||
if (spool) {
|
||||
any = true;
|
||||
left += Number(spool.remaining_g) || 0;
|
||||
mappedSpools.push(spool);
|
||||
if (spool.material_type) types.push(spool.material_type.toLowerCase());
|
||||
}
|
||||
});
|
||||
if (!any) return name + ": keine Grotti-Spule auf den gewählten ACE-Plätzen — Abzug entfällt.";
|
||||
if (left + 0.5 < need) return "ACE auf " + name + ": nur " + grams(left) + ", Datei braucht " + grams(need) + ".";
|
||||
if (fileTypes.length && types.length && !fileTypes.some((t) => types.includes(t))) {
|
||||
if (!profileOk(mappedSpools)) {
|
||||
return name + ": Sorte passt nicht (Datei " + fileProfiles.join("/") + ").";
|
||||
}
|
||||
if (!fileProfiles.length && fileTypes.length && types.length && !fileTypes.some((t) => types.includes(t))) {
|
||||
return name + ": Material passt nicht (Datei " + fileTypes.join("/") + ", ACE " + types.join("/") + ").";
|
||||
}
|
||||
continue;
|
||||
@@ -359,8 +431,11 @@ function spoolWarnText() {
|
||||
if (left + 0.5 < need) {
|
||||
return name + ": nur " + grams(left) + ", Datei braucht " + grams(need) + ".";
|
||||
}
|
||||
if (!profileOk(external)) {
|
||||
return name + ": Sorte passt nicht (Datei " + fileProfiles.join("/") + ").";
|
||||
}
|
||||
const types = external.map((s) => (s.material_type || "").toLowerCase()).filter(Boolean);
|
||||
if (fileTypes.length && types.length && !fileTypes.some((t) => types.includes(t))) {
|
||||
if (!fileProfiles.length && fileTypes.length && types.length && !fileTypes.some((t) => types.includes(t))) {
|
||||
return name + ": Material passt nicht (Datei " + fileTypes.join("/") + ", Drucker " + types.join("/") + ").";
|
||||
}
|
||||
}
|
||||
@@ -432,16 +507,17 @@ function renderAceMaps(force) {
|
||||
title.className = "ace-printer-name";
|
||||
title.textContent = printer.name;
|
||||
block.appendChild(title);
|
||||
paints.forEach((filament, paintIndex) => {
|
||||
paints.forEach((filament, uiIndex) => {
|
||||
const paint = paintIndexOf(filament, uiIndex);
|
||||
const row = document.createElement("label");
|
||||
row.className = "ace-row";
|
||||
const swatch = document.createElement("span");
|
||||
swatch.className = "ace-swatch";
|
||||
if (filament.color) swatch.style.background = filament.color;
|
||||
const text = document.createElement("span");
|
||||
text.textContent = filamentLabel(filament, paintIndex);
|
||||
text.textContent = filamentLabel(filament, uiIndex);
|
||||
const select = document.createElement("select");
|
||||
select.dataset.paint = String(paintIndex);
|
||||
select.dataset.paint = String(paint);
|
||||
select.innerHTML = '<option value="">Platz wählen</option>';
|
||||
printer.slots.forEach((slot) => {
|
||||
const option = document.createElement("option");
|
||||
@@ -452,16 +528,30 @@ function renderAceMaps(force) {
|
||||
const hex = (spool && spool.colors && spool.colors[0] && spool.colors[0].hex) || slot.color || "";
|
||||
if (hex) option.style.borderLeft = "4px solid " + hex;
|
||||
const spoolType = (spool && spool.material_type) || slot.type || "";
|
||||
// Vorauswahl: gleiche Sorte (Grotti-Spule bevorzugt), sonst Platz in Reihenfolge
|
||||
if (!select.dataset.picked && filament.type && spoolType
|
||||
const spoolName = ((spool && spool.name) || "").toLowerCase();
|
||||
const wantProfile = (filament.profile || "").toLowerCase();
|
||||
// Vorauswahl: Katalog-Sorte exakt (Meta ≠ Matte), sonst grober Typ
|
||||
let profileHit = false;
|
||||
if (wantProfile && spoolName) {
|
||||
if (spoolName === wantProfile) profileHit = true;
|
||||
else if (spoolName.startsWith(wantProfile) && !/[a-z0-9]/i.test(spoolName.charAt(wantProfile.length) || "")) {
|
||||
const rest = spoolName.slice(wantProfile.length).replace(/^[\s·\-_|/]+/, "");
|
||||
const first = (rest.split(/\s+/)[0] || "").toLowerCase();
|
||||
if (!["meta", "matte", "matt", "silk", "plus", "hf", "cf"].includes(first)) profileHit = true;
|
||||
}
|
||||
}
|
||||
if (!select.dataset.picked && profileHit) {
|
||||
option.selected = true;
|
||||
select.dataset.picked = "1";
|
||||
} else if (!select.dataset.picked && !wantProfile && filament.type && spoolType
|
||||
&& filament.type.toLowerCase() === String(spoolType).toLowerCase()) {
|
||||
option.selected = true;
|
||||
select.dataset.picked = "1";
|
||||
}
|
||||
select.appendChild(option);
|
||||
});
|
||||
if (!select.dataset.picked && printer.slots[paintIndex]) {
|
||||
select.value = String(printer.slots[paintIndex].index);
|
||||
if (!select.dataset.picked && printer.slots[uiIndex]) {
|
||||
select.value = String(printer.slots[uiIndex].index);
|
||||
}
|
||||
select.addEventListener("change", updateSpoolWarn);
|
||||
row.appendChild(swatch);
|
||||
@@ -514,6 +604,20 @@ function folderLabel(folder) {
|
||||
return "Wurzel";
|
||||
}
|
||||
|
||||
function folderMatches(fileFolder, selected) {
|
||||
if (!selected) return true;
|
||||
if (selected === "root") return !fileFolder;
|
||||
if (!fileFolder) return false;
|
||||
return fileFolder === selected || fileFolder.startsWith(selected + "/");
|
||||
}
|
||||
|
||||
function releaseRootForProject() {
|
||||
const project = document.getElementById("file-filter-project").value;
|
||||
const folder = document.getElementById("file-filter-folder");
|
||||
if (!folder || !project || project === "none" || folder.value !== "root") return;
|
||||
folder.value = "";
|
||||
}
|
||||
|
||||
function saveLibMemory() {
|
||||
try {
|
||||
localStorage.setItem(LIB_KEY, JSON.stringify({
|
||||
@@ -560,8 +664,7 @@ function filteredFiles() {
|
||||
const types = ((file.filaments) || []).map((f) => f.type).filter(Boolean);
|
||||
if (!types.includes(material)) return false;
|
||||
}
|
||||
if (folder === "root" && folderKey(file)) return false;
|
||||
if (folder && folder !== "root" && folderKey(file) !== folder) return false;
|
||||
if (!folderMatches(folderKey(file), folder)) return false;
|
||||
if (!q) return true;
|
||||
const hay = [
|
||||
file.name || "",
|
||||
@@ -638,8 +741,9 @@ function fillFolderFilter() {
|
||||
}
|
||||
|
||||
function moveSelectHtml(file) {
|
||||
if (!hasWatchDir || file.source !== "watch") return "";
|
||||
const current = folderKey(file);
|
||||
if (!hasWatchDir) return "";
|
||||
if (file.source !== "watch" && file.source !== "upload") return "";
|
||||
const current = file.source === "upload" ? "" : folderKey(file);
|
||||
const opts = [
|
||||
`<option value="" selected disabled>Verschieben…</option>`,
|
||||
`<option value="__root__">Wurzel</option>`,
|
||||
@@ -701,8 +805,8 @@ function sliceOf(file) {
|
||||
}
|
||||
|
||||
function materialText(file) {
|
||||
const types = [...new Set(((file && file.filaments) || []).map((f) => f.type).filter(Boolean))];
|
||||
return types.join("+");
|
||||
const labels = [...new Set(((file && file.filaments) || []).map((f) => f.profile || f.type).filter(Boolean))];
|
||||
return labels.join("+");
|
||||
}
|
||||
|
||||
function layerHeightText(file) {
|
||||
@@ -718,10 +822,13 @@ function alwaysMeta(file, project) {
|
||||
file.weight_g ? grams(file.weight_g) : "",
|
||||
layerHeightText(file),
|
||||
families[file.printer_family] || "",
|
||||
project ? project.name : "",
|
||||
];
|
||||
if (!file.weight_g && !file.estimated_s) bits.push(sizeText(file.size_bytes));
|
||||
return bits.filter(Boolean).map((t) => `<span>${escapeHtml(t)}</span>`).join("") + swatchesHtml(file);
|
||||
const spans = bits.filter(Boolean).map((t) => `<span>${escapeHtml(t)}</span>`);
|
||||
if (project) {
|
||||
spans.push(`<a class="lib-proj" href="/projekte#${encodeURIComponent(project.id)}" onclick="event.stopPropagation()">${escapeHtml(project.name)}</a>`);
|
||||
}
|
||||
return spans.join("") + swatchesHtml(file);
|
||||
}
|
||||
|
||||
function detailMeta(file) {
|
||||
@@ -749,6 +856,39 @@ function infoPopupHtml(file) {
|
||||
</details>`;
|
||||
}
|
||||
|
||||
function placeLibInfoPop(details) {
|
||||
const pop = details.querySelector(".lib-info-pop");
|
||||
const anchor = details.querySelector("summary");
|
||||
if (!pop || !anchor) return;
|
||||
const margin = 6;
|
||||
const r = anchor.getBoundingClientRect();
|
||||
pop.style.left = "0px";
|
||||
pop.style.top = "0px";
|
||||
const pw = pop.offsetWidth;
|
||||
const ph = pop.offsetHeight;
|
||||
let left = r.right - pw;
|
||||
left = Math.max(margin, Math.min(left, window.innerWidth - pw - margin));
|
||||
let top = r.bottom + margin;
|
||||
if (top + ph > window.innerHeight - margin && r.top - margin - ph >= margin) {
|
||||
top = r.top - margin - ph;
|
||||
} else {
|
||||
top = Math.min(top, Math.max(margin, window.innerHeight - ph - margin));
|
||||
}
|
||||
pop.style.left = left + "px";
|
||||
pop.style.top = top + "px";
|
||||
}
|
||||
|
||||
function closeOpenLibInfo(except) {
|
||||
document.querySelectorAll("details.lib-info[open]").forEach((node) => {
|
||||
if (node !== except) node.removeAttribute("open");
|
||||
});
|
||||
}
|
||||
|
||||
function repositionOpenLibInfo() {
|
||||
const open = document.querySelector("details.lib-info[open]");
|
||||
if (open) placeLibInfoPop(open);
|
||||
}
|
||||
|
||||
function thumbHtml(file) {
|
||||
return file.preview
|
||||
? `<img alt="" loading="lazy" src="${escapeHtml(withToken(file.preview))}" onerror="this.style.visibility='hidden'">`
|
||||
@@ -757,15 +897,17 @@ function thumbHtml(file) {
|
||||
|
||||
function libItemHtml(file) {
|
||||
const project = projects.find((p) => String(p.id) === String(file.project_id));
|
||||
const del = file.source === "upload"
|
||||
? `<button type="button" class="icon-btn" data-delete="${file.id}" title="Hochgeladene Datei löschen">${icon("x")}</button>` : "";
|
||||
const rename = `<button type="button" class="icon-btn" data-rename="${file.id}" title="Umbenennen">${icon("edit")}</button>`;
|
||||
const del = `<button type="button" class="icon-btn" data-delete="${file.id}" title="Datei löschen">${icon("trash")}</button>`;
|
||||
return `<div class="lib-item ${String(file.id) === String(sel.fileId) ? "on" : ""}" role="button" tabindex="0" data-file="${file.id}">
|
||||
${thumbHtml(file)}
|
||||
<span style="min-width:0"><span class="t" title="${escapeHtml(file.name)}">${escapeHtml(file.name)}</span><span class="m">${alwaysMeta(file, project)}</span></span>
|
||||
<span class="side">${moveSelectHtml(file)}${infoPopupHtml(file)}${del}</span>
|
||||
<span class="side">${moveSelectHtml(file)}${infoPopupHtml(file)}${rename}${del}</span>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
let libPage = 1;
|
||||
|
||||
function renderLibrary() {
|
||||
const list = document.getElementById("lib-list");
|
||||
const shown = filteredFiles();
|
||||
@@ -773,15 +915,19 @@ function renderLibrary() {
|
||||
document.getElementById("lib-count").textContent = shown.length === files.length ? String(files.length) : shown.length + "/" + files.length;
|
||||
if (!files.length) {
|
||||
list.innerHTML = '<div class="picked-empty">' + icon("file") + '<span>Noch keine Datei.</span><span class="tiny">Hochladen oder Slice-Ordner in den Einstellungen setzen.</span></div>';
|
||||
renderPager(document.getElementById("lib-pager"), null, () => {});
|
||||
return;
|
||||
}
|
||||
if (!shown.length) {
|
||||
list.innerHTML = '<div class="picked-empty">' + icon("search") + '<span>Keine Datei passt.</span></div>';
|
||||
renderPager(document.getElementById("lib-pager"), null, () => {});
|
||||
return;
|
||||
}
|
||||
const paged = pageSlice(shown, libPage, DEFAULT_PAGE_SIZE);
|
||||
libPage = paged.page;
|
||||
const parts = [];
|
||||
let lastGroup = null;
|
||||
shown.forEach((file) => {
|
||||
paged.items.forEach((file) => {
|
||||
let group = null;
|
||||
if (sort === "material") group = materialKey(file) || "Ohne Material";
|
||||
else if (sort === "folder") group = folderLabel(folderKey(file));
|
||||
@@ -792,6 +938,10 @@ function renderLibrary() {
|
||||
parts.push(libItemHtml(file));
|
||||
});
|
||||
list.innerHTML = parts.join("");
|
||||
renderPager(document.getElementById("lib-pager"), paged, (p) => {
|
||||
libPage = p;
|
||||
renderLibrary();
|
||||
});
|
||||
}
|
||||
|
||||
/* ---------- Flow rechts ---------- */
|
||||
@@ -882,17 +1032,25 @@ function updateSendButton() {
|
||||
let note = "";
|
||||
if (!file) problem = "Erst eine Datei wählen.";
|
||||
else if (file.kind === "3mf") problem = "Die 3MF hat keinen G-code. Mit G-code slicen.";
|
||||
if (sel.mode === "now") {
|
||||
if (sel.mode === "this") {
|
||||
if (!problem && !chosen.length) problem = "Einen oder mehrere Drucker wählen.";
|
||||
const busy = chosen.filter((p) => !isFree(p));
|
||||
if (!problem && busy.length) note = namesText(busy) + " " + (busy.length === 1 ? "ist" : "sind") + " nicht frei. „Wenn frei“ reiht stattdessen ein.";
|
||||
text = chosen.length ? "Jetzt starten auf " + namesText(chosen) : "Jetzt starten";
|
||||
} else if (sel.mode === "free") {
|
||||
text = chosen.length ? "Einreihen für " + namesText(chosen) : "Einreihen: nächster freier " + familyOfSelection();
|
||||
note = chosen.length ? "Startet von selbst, sobald der Drucker bereit und die Platte frei ist." : "Ohne Drucker: der nächste freie passende übernimmt.";
|
||||
const ready = chosen.filter(canStartNow);
|
||||
const later = chosen.filter((p) => !canStartNow(p));
|
||||
if (ready.length && !later.length) {
|
||||
text = "Jetzt starten auf " + namesText(ready);
|
||||
note = "";
|
||||
} else if (!ready.length && later.length) {
|
||||
text = "Einreihen für " + namesText(later);
|
||||
note = "Startet, sobald der Drucker bereit und die Platte frei ist.";
|
||||
} else if (ready.length && later.length) {
|
||||
text = "Starten / einreihen auf " + namesText(chosen);
|
||||
note = namesText(ready) + " sofort, " + namesText(later) + " in die Warteschlange.";
|
||||
} else {
|
||||
text = "Starten";
|
||||
}
|
||||
} else {
|
||||
text = "Einreihen: nächster freier " + familyOfSelection();
|
||||
note = "Grotti nimmt den ersten freien Drucker mit passender Maschine.";
|
||||
text = "Einreihen: nächster passender " + familyOfSelection();
|
||||
note = "Grotti wählt den nächsten freien Drucker mit passender Sorte (z. B. PLA Meta ≠ Matte).";
|
||||
}
|
||||
const mismatch = chosen.filter((p) => familyMismatch(p, file));
|
||||
if (!problem && mismatch.length && !document.getElementById("send-override").checked) {
|
||||
@@ -902,7 +1060,7 @@ function updateSendButton() {
|
||||
button.disabled = !!problem || !!sendPoll;
|
||||
hint.textContent = problem || note;
|
||||
hint.classList.toggle("bad", !!problem);
|
||||
targetHint.textContent = sel.mode === "next" && sel.tab === "send" ? "Ziel wählt Grotti." : chosen.length > 1 ? "Je Drucker ein eigener Auftrag." : "";
|
||||
targetHint.textContent = sel.mode === "next" && sel.tab === "send" ? "Ziel wählt Grotti nach Sorte." : chosen.length > 1 ? "Je Drucker ein eigener Auftrag." : "";
|
||||
}
|
||||
|
||||
function updateAblaufButton() {
|
||||
@@ -971,7 +1129,7 @@ function selectFile(id) {
|
||||
}
|
||||
document.querySelectorAll("#lib-list .lib-item").forEach((n) => n.classList.toggle("on", n.dataset.file === String(id)));
|
||||
refreshFlow();
|
||||
showToolpath(file, 0);
|
||||
scheduleToolpath(file, 0, 0);
|
||||
if (window.matchMedia("(max-width: 1080px)").matches) {
|
||||
document.querySelector(".send-panel").scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
}
|
||||
@@ -1012,22 +1170,81 @@ async function load() {
|
||||
fillProjectFilter();
|
||||
fillMaterialFilter();
|
||||
fillFolderFilter();
|
||||
const deepProject = new URLSearchParams(location.search).get("project");
|
||||
if (deepProject) {
|
||||
const pf = document.getElementById("file-filter-project");
|
||||
if (pf && [...pf.options].some((o) => o.value === deepProject)) pf.value = deepProject;
|
||||
}
|
||||
releaseRootForProject();
|
||||
renderLibrary();
|
||||
renderTabs();
|
||||
refreshFlow();
|
||||
const file = selectedFile();
|
||||
if (file) showToolpath(file, 0);
|
||||
// Deep-Link von Orca /orca_senden: Senden in den Blick, Optionen offen für ACE
|
||||
if (new URLSearchParams(location.search).get("file") && file) {
|
||||
let file = selectedFile();
|
||||
// Orca/Anycubic: Metadaten oft ohne paint_index → ACE zeigt T0/T1 statt T1/T10
|
||||
if (file && file.id && filamentsNeedPaintIndex(file.filaments)) {
|
||||
try {
|
||||
const fresh = await api("/dateien/" + file.id + "/meta", { method: "POST" });
|
||||
if (fresh && fresh.id) {
|
||||
const idx = files.findIndex((row) => String(row.id) === String(fresh.id));
|
||||
if (idx >= 0) files[idx] = fresh;
|
||||
else files.unshift(fresh);
|
||||
file = selectedFile();
|
||||
renderLibrary();
|
||||
refreshFlow();
|
||||
}
|
||||
} catch (error) { /* manuell: Ordner neu lesen */ }
|
||||
}
|
||||
const q = new URLSearchParams(location.search);
|
||||
const deepLink = !!(q.get("file") || q.get("orca"));
|
||||
// Deep-Link / Orca-App: ACE/Senden zuerst — 3D-Pfad friert sonst den Tab ein
|
||||
if (file) scheduleToolpath(file, 0, deepLink ? 900 : 0);
|
||||
if (deepLink) {
|
||||
sel.tab = "send";
|
||||
renderTabs();
|
||||
const opts = document.getElementById("options");
|
||||
if (opts) opts.open = true;
|
||||
const panel = document.querySelector(".send-panel");
|
||||
if (panel) panel.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
if (file) lastOrcaFocusId = String(file.id);
|
||||
if (q.get("orca")) pullOrcaFocus();
|
||||
}
|
||||
}
|
||||
|
||||
let lastOrcaFocusId = null;
|
||||
|
||||
async function pullOrcaFocus() {
|
||||
try {
|
||||
const data = await api("/orca-fokus");
|
||||
if (!data || data.file_id == null) return;
|
||||
const id = String(data.file_id);
|
||||
const age = Date.now() / 1000 - Number(data.ts || 0);
|
||||
if (age > 180) return;
|
||||
const already = id === String(sel.fileId) && selectedFile();
|
||||
if (id === lastOrcaFocusId && already) return;
|
||||
const switched = lastOrcaFocusId != null && id !== lastOrcaFocusId;
|
||||
lastOrcaFocusId = id;
|
||||
if (already) return;
|
||||
let file = files.find((row) => String(row.id) === id);
|
||||
if (!file) {
|
||||
files = await api("/dateien");
|
||||
renderLibrary();
|
||||
file = files.find((row) => String(row.id) === id);
|
||||
}
|
||||
if (file) {
|
||||
selectFile(file.id);
|
||||
sel.tab = "send";
|
||||
renderTabs();
|
||||
if (switched) toast("Neue Slice-Datei ausgewählt.", "good");
|
||||
}
|
||||
} catch (error) { /* nächster Tick */ }
|
||||
}
|
||||
|
||||
function filamentsNeedPaintIndex(filaments) {
|
||||
const rows = filaments || [];
|
||||
if (rows.length < 2) return false;
|
||||
return rows.some((item) => !item || item.paint_index == null);
|
||||
}
|
||||
|
||||
async function refreshPrinters() {
|
||||
if (document.hidden) return;
|
||||
try {
|
||||
@@ -1105,32 +1322,36 @@ async function watchJobs(ids) {
|
||||
await tick();
|
||||
}
|
||||
|
||||
async function postSenden(hosts, whenFree) {
|
||||
return api("/senden", {
|
||||
method: "POST",
|
||||
json: {
|
||||
file_id: Number(sel.fileId),
|
||||
hosts,
|
||||
confirm: true,
|
||||
override_machine: document.getElementById("send-override").checked,
|
||||
bed_leveling: document.getElementById("send-bed-level").checked,
|
||||
ace_maps: collectAceMaps(),
|
||||
when_free: whenFree,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async function doSend() {
|
||||
const button = document.getElementById("send-go");
|
||||
const whenFree = sel.mode !== "now";
|
||||
button.disabled = true;
|
||||
document.getElementById("send-note").textContent = "";
|
||||
try {
|
||||
const payload = await api("/senden", {
|
||||
method: "POST",
|
||||
json: {
|
||||
file_id: Number(sel.fileId),
|
||||
hosts: selectedHosts(),
|
||||
confirm: true,
|
||||
override_machine: document.getElementById("send-override").checked,
|
||||
bed_leveling: document.getElementById("send-bed-level").checked,
|
||||
ace_maps: collectAceMaps(),
|
||||
when_free: whenFree,
|
||||
},
|
||||
});
|
||||
const projectId = document.getElementById("send-project")?.value;
|
||||
if (projectId && sel.fileId) {
|
||||
try {
|
||||
await api("/dateien/" + sel.fileId, { method: "PATCH", json: { project_id: Number(projectId) } });
|
||||
} catch (error) { /* Projektbindung optional */ }
|
||||
}
|
||||
const jobs = payload.jobs || [];
|
||||
if (whenFree || payload.mode === "when_free") {
|
||||
|
||||
if (sel.mode === "next") {
|
||||
const payload = await postSenden([], true);
|
||||
const jobs = payload.jobs || [];
|
||||
document.getElementById("send-progress").hidden = true;
|
||||
toast((jobs.length > 1 ? jobs.length + " Aufträge" : "Auftrag") + " eingereiht. Steht unter „Wartet“.", "good");
|
||||
updateSendButton();
|
||||
@@ -1138,9 +1359,35 @@ async function doSend() {
|
||||
refreshPrinters();
|
||||
return;
|
||||
}
|
||||
showJobsProgress(jobs);
|
||||
|
||||
const chosen = selectedPrinters();
|
||||
const ready = chosen.filter(canStartNow).map((p) => p.host);
|
||||
const later = chosen.filter((p) => !canStartNow(p)).map((p) => p.host);
|
||||
let queued = 0;
|
||||
let nowJobs = [];
|
||||
if (later.length) {
|
||||
const payload = await postSenden(later, true);
|
||||
queued += (payload.jobs || []).length;
|
||||
}
|
||||
if (ready.length) {
|
||||
const payload = await postSenden(ready, false);
|
||||
nowJobs = payload.jobs || [];
|
||||
}
|
||||
if (queued && !nowJobs.length) {
|
||||
document.getElementById("send-progress").hidden = true;
|
||||
toast((queued > 1 ? queued + " Aufträge" : "Auftrag") + " eingereiht. Steht unter „Wartet“.", "good");
|
||||
updateSendButton();
|
||||
if (typeof refreshPrintQueue === "function") refreshPrintQueue();
|
||||
refreshPrinters();
|
||||
return;
|
||||
}
|
||||
if (queued && nowJobs.length) {
|
||||
toast(queued + " eingereiht, " + nowJobs.length + " startet jetzt.", "good");
|
||||
if (typeof refreshPrintQueue === "function") refreshPrintQueue();
|
||||
}
|
||||
showJobsProgress(nowJobs);
|
||||
if (typeof refreshSendQueue === "function") refreshSendQueue();
|
||||
await watchJobs(jobs.map((job) => job.id));
|
||||
await watchJobs(nowJobs.map((job) => job.id));
|
||||
} catch (error) {
|
||||
updateSendButton();
|
||||
toast(error.message || String(error), "bad");
|
||||
@@ -1365,11 +1612,46 @@ async function doAblauf() {
|
||||
|
||||
/* ---------- Ereignisse ---------- */
|
||||
|
||||
document.getElementById("lib-list").addEventListener("toggle", (event) => {
|
||||
const details = event.target;
|
||||
if (!(details instanceof HTMLDetailsElement) || !details.classList.contains("lib-info")) return;
|
||||
if (details.open) {
|
||||
closeOpenLibInfo(details);
|
||||
placeLibInfoPop(details);
|
||||
}
|
||||
}, true);
|
||||
|
||||
document.getElementById("lib-list").addEventListener("scroll", repositionOpenLibInfo, { passive: true });
|
||||
window.addEventListener("resize", repositionOpenLibInfo);
|
||||
|
||||
document.addEventListener("pointerdown", (event) => {
|
||||
if (event.target.closest("details.lib-info")) return;
|
||||
closeOpenLibInfo();
|
||||
});
|
||||
|
||||
document.getElementById("lib-list").addEventListener("click", (event) => {
|
||||
if (event.target.closest(".lib-move")) {
|
||||
event.stopPropagation();
|
||||
return;
|
||||
}
|
||||
const ren = event.target.closest("[data-rename]");
|
||||
if (ren) {
|
||||
event.stopPropagation();
|
||||
const file = files.find((f) => String(f.id) === String(ren.dataset.rename));
|
||||
if (!file) return;
|
||||
const next = window.prompt("Neuer Dateiname:", file.name);
|
||||
if (next == null) return;
|
||||
const trimmed = String(next).trim();
|
||||
if (!trimmed || trimmed === file.name) return;
|
||||
api("/dateien/" + file.id + "/umbenennen", { method: "POST", json: { name: trimmed } })
|
||||
.then(async (saved) => {
|
||||
toast("Umbenannt in „" + (saved.name || trimmed) + "“.", "good");
|
||||
await load();
|
||||
if (saved && saved.id) selectFile(saved.id);
|
||||
})
|
||||
.catch((error) => toast(error.message || String(error), "bad"));
|
||||
return;
|
||||
}
|
||||
const del = event.target.closest("[data-delete]");
|
||||
if (del) {
|
||||
event.stopPropagation();
|
||||
@@ -1429,6 +1711,8 @@ document.getElementById("lib-list").addEventListener("keydown", (event) => {
|
||||
const node = document.getElementById(id);
|
||||
if (!node) return;
|
||||
const onChange = () => {
|
||||
if (id === "file-filter-project") releaseRootForProject();
|
||||
libPage = 1;
|
||||
saveLibMemory();
|
||||
renderLibrary();
|
||||
};
|
||||
@@ -1445,7 +1729,7 @@ document.getElementById("targets").addEventListener("click", (event) => {
|
||||
toast("Abläufe gehen nur auf Kobra 3.", "bad");
|
||||
return;
|
||||
}
|
||||
if (sel.tab === "send" && sel.mode === "next") sel.mode = "free";
|
||||
if (sel.tab === "send" && sel.mode === "next") sel.mode = "this";
|
||||
if (sel.hosts.has(host)) sel.hosts.delete(host);
|
||||
else sel.hosts.add(host);
|
||||
saveSendMemory();
|
||||
@@ -1479,19 +1763,11 @@ document.getElementById("send-bed-level").addEventListener("change", updateOptio
|
||||
document.getElementById("send-override").addEventListener("change", () => { refreshFlow(); });
|
||||
document.getElementById("send-project")?.addEventListener("change", updateOptionsSummary);
|
||||
|
||||
document.getElementById("send-go").addEventListener("click", (event) => {
|
||||
const button = event.currentTarget;
|
||||
const warn = spoolWarnText();
|
||||
if (sel.mode === "now") {
|
||||
armButton(button, warn ? "Warnung — trotzdem starten?" : "Wirklich starten? Nochmal klicken", doSend);
|
||||
} else if (warn) {
|
||||
armButton(button, "Warnung — trotzdem einreihen?", doSend);
|
||||
} else {
|
||||
doSend();
|
||||
}
|
||||
document.getElementById("send-go").addEventListener("click", () => {
|
||||
doSend();
|
||||
});
|
||||
document.getElementById("ablauf-go").addEventListener("click", (event) => {
|
||||
armButton(event.currentTarget, "Ablauf wirklich einreihen? Nochmal klicken", doAblauf);
|
||||
document.getElementById("ablauf-go").addEventListener("click", () => {
|
||||
doAblauf();
|
||||
});
|
||||
|
||||
document.getElementById("ablauf-add-print").addEventListener("click", () => addStep(defaultPrintStep()));
|
||||
@@ -1591,5 +1867,6 @@ loadSendMemory();
|
||||
loadAblaufMemory();
|
||||
load().catch((error) => toast(error.message || String(error), "bad"));
|
||||
setInterval(refreshPrinters, 5000);
|
||||
setInterval(pullOrcaFocus, 2000);
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -13,15 +13,14 @@
|
||||
<div class="flow-diagram">
|
||||
<span class="step done">Datei</span><span class="step-sep"></span>
|
||||
<span class="step done">Drucker</span><span class="step-sep"></span>
|
||||
<span class="step now">Jetzt · Wenn frei · Nächster freier</span><span class="step-sep"></span>
|
||||
<span class="step now">Dieser Drucker · Nächster passender</span><span class="step-sep"></span>
|
||||
<span class="step">Druck</span><span class="step-sep"></span>
|
||||
<span class="step">Platte räumen</span>
|
||||
</div>
|
||||
<ol>
|
||||
<li><strong>Datei wählen.</strong> Unter <a href="/dateien">Dateien</a> links in der Bibliothek. Der Slice-Ordner wird beobachtet, Hochladen geht per Knopf oder Ziehen.</li>
|
||||
<li><strong>Drucker wählen.</strong> Die Kacheln zeigen live, was jeder Drucker gerade tut. Passt die Maschine nicht zur Datei, ist die Kachel blass.</li>
|
||||
<li><strong>Wann.</strong> <em>Jetzt</em> startet sofort. <em>Wenn frei</em> reiht für diesen Drucker ein. <em>Nächster freier</em> lässt Grotti den ersten freien passenden Drucker nehmen.</li>
|
||||
<li><strong>Starten.</strong> „Jetzt“ will zwei Klicks. Der zweite ist die Bestätigung.</li>
|
||||
<li><strong>Start.</strong> <em>Dieser Drucker</em>: frei → sofort, sonst Warteschlange. <em>Nächster passender</em>: Grotti wählt nach Maschine und Sorte (PLA Meta ≠ Matte).</li>
|
||||
<li><strong>Während des Drucks</strong> zeigt die <a href="/">Wand</a> Fortschritt, Fertig-Uhrzeit und Temperaturen. Ein Klick auf die Karte öffnet das Cockpit mit Kamera (falls vorhanden), Steuerung, Bettnetz und 3D-Pfad. Die Seitenleiste zeigt immer, was läuft und was wartet.</li>
|
||||
<li><strong>Danach</strong> ist die Platte belegt. Ein wartender Auftrag startet erst, wenn auf der Karte <em>Platte geräumt</em> gedrückt wurde, oder ein Ablauf sie selbst freischiebt.</li>
|
||||
</ol>
|
||||
@@ -49,7 +48,8 @@
|
||||
<dl class="terms">
|
||||
<dt>Auftrag</dt><dd>Ein Eintrag in der Warteschlange: eine Datei für einen Drucker oder für den nächsten freien.</dd>
|
||||
<dt>Ablauf</dt><dd>Auftrag mit mehreren Schritten und Wiederholungen. Nur Kobra 3.</dd>
|
||||
<dt>Wenn frei</dt><dd>Startet, sobald der Drucker bereit und die Platte geräumt ist.</dd>
|
||||
<dt>Dieser Drucker</dt><dd>Frei und Platte klar → sofort; sonst Warteschlange für genau diesen Drucker.</dd>
|
||||
<dt>Nächster passender</dt><dd>Grotti claimt den nächsten freien Drucker mit passender Katalog-Sorte. Zu wenig Rest warnt nur und hält den Start nicht auf.</dd>
|
||||
<dt>Platte belegt</dt><dd>Nach jedem Druck gesetzt. Blockiert den nächsten Auftrag auf diesem Drucker.</dd>
|
||||
<dt>Alert</dt><dd>Wichtiges Ereignis (Fertig, Fehler, Abbruch, offline). Steht in der Seitenleiste und geht auf Wunsch an Telegram.</dd>
|
||||
<dt>Ereignis</dt><dd>Jeder Eintrag unter Aktivität. Ablauf-Schritte und Starts sind Ereignisse, aber keine Alerts.</dd>
|
||||
|
||||
@@ -257,6 +257,10 @@
|
||||
</form>
|
||||
<p id="token-note"></p>
|
||||
<p class="ok" id="token-once" hidden></p>
|
||||
<div id="token-qr-wrap" hidden style="margin-top:0.75rem">
|
||||
<p class="tiny">App-Kopplung — QR mit Server-URL und Token (nur jetzt):</p>
|
||||
<canvas id="token-qr" width="180" height="180" aria-label="QR-Code"></canvas>
|
||||
</div>
|
||||
<p class="hint" id="legacy-token-hint" hidden>In der Config steht noch ein Shared-<code>token</code> — der wird seit 3.1 nicht mehr akzeptiert. Bitte leeren und API-Tokens (<code>grt_…</code>) nutzen.</p>
|
||||
</section>
|
||||
|
||||
@@ -293,6 +297,7 @@
|
||||
</dialog>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
<script src="{{ url_for('static', filename='qrcode.min.js') }}?v=1"></script>
|
||||
<script>
|
||||
const families = { kobra_3: "Kobra 3", kobra_s1: "Kobra S1", "": "—" };
|
||||
const isAdmin = document.querySelector('meta[name="user-role"]')?.content === "admin";
|
||||
@@ -543,7 +548,9 @@ document.getElementById("user-add")?.addEventListener("submit", async (event) =>
|
||||
document.getElementById("token-add").addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
const once = document.getElementById("token-once");
|
||||
const qrWrap = document.getElementById("token-qr-wrap");
|
||||
once.hidden = true;
|
||||
if (qrWrap) qrWrap.hidden = true;
|
||||
try {
|
||||
const out = await api("/tokens", {
|
||||
method: "POST",
|
||||
@@ -555,8 +562,20 @@ document.getElementById("token-add").addEventListener("submit", async (event) =>
|
||||
document.getElementById("token-add").reset();
|
||||
once.hidden = false;
|
||||
once.textContent = "Token (nur jetzt sichtbar): " + out.token;
|
||||
showNote("token-note", null, "Token erzeugt — jetzt kopieren.");
|
||||
showNote("token-note", null, "Token erzeugt — jetzt kopieren oder QR scannen.");
|
||||
loadTokens();
|
||||
if (out.token && window.QRCode && qrWrap) {
|
||||
const canvas = document.getElementById("token-qr");
|
||||
const payload = JSON.stringify({
|
||||
url: location.origin,
|
||||
token: out.token,
|
||||
name: "Grotti",
|
||||
});
|
||||
try {
|
||||
QRCode.toCanvas(canvas, payload, { width: 180, margin: 1, errorCorrectionLevel: "M" });
|
||||
qrWrap.hidden = false;
|
||||
} catch (error) { /* QR optional */ }
|
||||
}
|
||||
} catch (error) {
|
||||
showNote("token-note", error);
|
||||
}
|
||||
|
||||
@@ -1,136 +0,0 @@
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
<div class="page-head">
|
||||
<div>
|
||||
<h1>Kameras</h1>
|
||||
<p class="tiny">Livebilder aller Drucker.</p>
|
||||
</div>
|
||||
<div class="page-head-side">
|
||||
<label class="field cam-mode-field">
|
||||
<span class="tiny">Bild</span>
|
||||
<select id="cam-mode" title="Kamera-Modus">
|
||||
<option value="snapshot">Snapshot</option>
|
||||
<option value="stream">Stream</option>
|
||||
</select>
|
||||
</label>
|
||||
<span id="when"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="camera-grid" id="grid"></div>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
<script>
|
||||
const tiles = new Map();
|
||||
|
||||
(function initCamMode() {
|
||||
const sel = document.getElementById("cam-mode");
|
||||
if (!sel || typeof cameraMode !== "function") return;
|
||||
sel.value = cameraMode();
|
||||
sel.addEventListener("change", () => {
|
||||
setCameraMode(sel.value);
|
||||
for (const tile of tiles.values()) {
|
||||
const img = tile.querySelector('[data-role="cam"]');
|
||||
if (img) img.dataset.srcKey = "";
|
||||
}
|
||||
refresh().catch(() => {});
|
||||
});
|
||||
window.addEventListener("grotti-camera-mode", () => {
|
||||
sel.value = cameraMode();
|
||||
});
|
||||
})();
|
||||
|
||||
function metaLine(printer) {
|
||||
const state = shownState(printer);
|
||||
const busy = state === "printing" || state === "paused";
|
||||
const bits = [chipHtml(state, STATE_LABELS[state] || state)];
|
||||
if (busy) {
|
||||
const pct = Math.round((printer.progress || 0) * 100);
|
||||
bits.push(pct + " %");
|
||||
const eta = finishClock(printer.remain);
|
||||
if (eta) bits.push("fertig " + eta);
|
||||
else if (hours(printer.remain)) bits.push("Rest " + hours(printer.remain));
|
||||
}
|
||||
const job = (printer.filename || "").replace(/\.gcode$/i, "").replace(/^(\d+-)+/, "");
|
||||
if (busy && job) bits.push(escapeHtml(job));
|
||||
return bits.join(" · ");
|
||||
}
|
||||
|
||||
function ensureTile(printer) {
|
||||
let tile = tiles.get(printer.host);
|
||||
if (tile) return tile;
|
||||
tile = document.createElement("figure");
|
||||
tile.className = "camera-tile";
|
||||
tile.dataset.host = printer.host;
|
||||
tile.innerHTML = `
|
||||
<figcaption>
|
||||
<span class="cam-name"></span>
|
||||
<span class="host"></span>
|
||||
</figcaption>
|
||||
<p class="cam-meta tiny"></p>
|
||||
<div class="cam-stage">
|
||||
<img alt="" data-role="cam" hidden>
|
||||
<p class="cam-empty" data-role="cam-empty">${icon("camera")}<span>Keine Kamera</span></p>
|
||||
</div>
|
||||
<a class="ghost cam-open" href="/#${encodeURIComponent(printer.host)}">Cockpit</a>`;
|
||||
tiles.set(printer.host, tile);
|
||||
document.getElementById("grid").appendChild(tile);
|
||||
return tile;
|
||||
}
|
||||
|
||||
async function refresh() {
|
||||
const printers = await api("/drucker?live=1");
|
||||
document.getElementById("when").textContent = new Date().toLocaleTimeString("de-DE", { hour: "2-digit", minute: "2-digit" });
|
||||
const grid = document.getElementById("grid");
|
||||
if (!printers.length) {
|
||||
tiles.clear();
|
||||
grid.innerHTML = `<div class="empty-state">${icon("camera", "lg")}<p>Noch keine Drucker.</p><a href="/einstellungen">Zu den Einstellungen</a></div>`;
|
||||
return;
|
||||
}
|
||||
if (grid.querySelector(".empty-state")) grid.innerHTML = "";
|
||||
const streaming = cameraMode() === "stream";
|
||||
const seen = new Set();
|
||||
for (const printer of printers) {
|
||||
seen.add(printer.host);
|
||||
const tile = ensureTile(printer);
|
||||
const state = shownState(printer);
|
||||
tile.className = "camera-tile " + state + (streaming ? " stream" : "");
|
||||
tile.querySelector(".cam-name").textContent = printer.name;
|
||||
tile.querySelector(".host").textContent = printer.host;
|
||||
tile.querySelector(".cam-meta").innerHTML = metaLine(printer);
|
||||
tile.querySelector(".cam-open").href = "/#" + encodeURIComponent(printer.host);
|
||||
const img = tile.querySelector('[data-role="cam"]');
|
||||
const empty = tile.querySelector('[data-role="cam-empty"]');
|
||||
if (!printer.camera || printer.has_camera === false) {
|
||||
img.removeAttribute("src");
|
||||
img.hidden = true;
|
||||
empty.hidden = false;
|
||||
empty.innerHTML = icon("camera") + "<span>Keine Kamera</span>";
|
||||
img.dataset.srcKey = "";
|
||||
continue;
|
||||
}
|
||||
img.alt = "Kamera " + printer.name;
|
||||
const next = cameraUrl(printer, streaming ? 0 : 2000);
|
||||
if (img.dataset.srcKey === next) continue;
|
||||
img.dataset.srcKey = next;
|
||||
img.onerror = () => {
|
||||
img.hidden = true;
|
||||
empty.hidden = false;
|
||||
empty.innerHTML = icon("camera") + "<span>Keine Kamera</span>";
|
||||
};
|
||||
img.onload = () => {
|
||||
img.hidden = false;
|
||||
empty.hidden = true;
|
||||
};
|
||||
img.src = next;
|
||||
}
|
||||
for (const [host, tile] of [...tiles.entries()]) {
|
||||
if (!seen.has(host)) {
|
||||
tile.remove();
|
||||
tiles.delete(host);
|
||||
}
|
||||
}
|
||||
}
|
||||
refresh().catch((error) => console.error(error));
|
||||
setInterval(() => refresh().catch(() => {}), 5000);
|
||||
</script>
|
||||
{% endblock %}
|
||||
+25
-11
@@ -9,7 +9,7 @@
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='brand/favicon-32.png') }}">
|
||||
<link rel="icon" type="image/png" sizes="512x512" href="{{ url_for('static', filename='brand/favicon.png') }}">
|
||||
<link rel="apple-touch-icon" href="{{ url_for('static', filename='brand/apple-touch-icon.png') }}">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=66">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=75">
|
||||
<link rel="manifest" href="{{ url_for('static', filename='manifest.webmanifest') }}">
|
||||
<meta name="theme-color" content="#0a0a0c" id="theme-color-meta">
|
||||
<script>
|
||||
@@ -81,14 +81,14 @@
|
||||
<span class="nav-label">Live</span>
|
||||
<a href="/" class="{{ 'on' if page == 'wand' else '' }}" title="Drucker"><svg class="ico"><use href="#i-printer"/></svg><span>Drucker</span></a>
|
||||
<a href="/dateien" class="{{ 'on' if page == 'dateien' else '' }} nav-desk" title="Dateien"><svg class="ico"><use href="#i-file"/></svg><span>Dateien</span></a>
|
||||
<a href="/kameras" class="{{ 'on' if page == 'kameras' else '' }}" title="Kameras"><svg class="ico"><use href="#i-camera"/></svg><span>Kameras</span></a>
|
||||
<a href="/warteschlange" class="{{ 'on' if page == 'warteschlange' else '' }}" title="Warteschlange"><svg class="ico"><use href="#i-queue"/></svg><span>Warteschlange</span></a>
|
||||
<a href="/auftraege" class="{{ 'on' if page == 'auftraege' else '' }} nav-desk" title="Aufträge"><svg class="ico"><use href="#i-folder"/></svg><span>Aufträge</span></a>
|
||||
<a href="/auftraege" class="{{ 'on' if page == 'auftraege' else '' }} nav-desk" title="Aufträge"><svg class="ico"><use href="#i-clipboard"/></svg><span>Aufträge</span></a>
|
||||
<span class="nav-label nav-desk">Rückschau</span>
|
||||
<a href="/protokoll" class="{{ 'on' if page == 'protokoll' or page == 'bericht' else '' }} nav-desk" title="Protokoll"><svg class="ico"><use href="#i-list"/></svg><span>Protokoll</span></a>
|
||||
<a href="/statistik" class="{{ 'on' if page == 'statistik' else '' }} nav-desk" title="Statistik"><svg class="ico"><use href="#i-chart"/></svg><span>Statistik</span></a>
|
||||
<a href="/aktivitaet" class="{{ 'on' if page == 'aktivitaet' else '' }} nav-desk" title="Aktivität"><svg class="ico"><use href="#i-activity"/></svg><span>Aktivität</span></a>
|
||||
<span class="nav-label nav-desk">Verwalten</span>
|
||||
<a href="/projekte" class="{{ 'on' if page == 'projekte' else '' }} nav-desk" title="Projekte"><svg class="ico"><use href="#i-folder"/></svg><span>Projekte</span></a>
|
||||
<a href="/material" class="{{ 'on' if page == 'material' else '' }} nav-desk" title="Material"><svg class="ico"><use href="#i-spool"/></svg><span>Material</span></a>
|
||||
<a href="/wartung" class="{{ 'on' if page == 'wartung' else '' }} nav-desk" title="Wartung"><svg class="ico"><use href="#i-wrench"/></svg><span>Wartung</span></a>
|
||||
</nav>
|
||||
@@ -138,11 +138,14 @@
|
||||
</nav>
|
||||
<dialog id="mobile-more-sheet" class="mobile-more-sheet">
|
||||
<nav aria-label="Weitere Seiten">
|
||||
<a href="/kameras">Kameras</a>
|
||||
<p class="nav-label">Live</p>
|
||||
<a href="/auftraege">Aufträge</a>
|
||||
<p class="nav-label">Rückschau</p>
|
||||
<a href="/protokoll">Protokoll</a>
|
||||
<a href="/statistik">Statistik</a>
|
||||
<a href="/aktivitaet">Aktivität</a>
|
||||
<p class="nav-label">Verwalten</p>
|
||||
<a href="/projekte">Projekte</a>
|
||||
<a href="/material">Material</a>
|
||||
<a href="/wartung">Wartung</a>
|
||||
<a href="/einstellungen">Einstellungen</a>
|
||||
@@ -160,8 +163,8 @@
|
||||
{% endif %}
|
||||
<form method="dialog"><button class="ghost" value="cancel">Schließen</button></form>
|
||||
</dialog>
|
||||
<script src="{{ url_for('static', filename='api.js') }}?v=32"></script>
|
||||
<script src="{{ url_for('static', filename='ui.js') }}?v=5"></script>
|
||||
<script src="{{ url_for('static', filename='api.js') }}?v=33"></script>
|
||||
<script src="{{ url_for('static', filename='ui.js') }}?v=6"></script>
|
||||
<script>
|
||||
async function doLogout() {
|
||||
try { await api("/auth/logout", { method: "POST", json: {} }); } catch (e) {}
|
||||
@@ -315,9 +318,9 @@ function runLineHtml({ name, progress, remain, filename, tipExtra, cancelId, hos
|
||||
const pct = Math.max(0, Math.min(100, Math.round((Number(progress) || 0) * 100)));
|
||||
const finish = remain > 0 ? finishClock(remain) : "";
|
||||
const bits = [name];
|
||||
if (pct > 0 || remain > 0) bits.push(pct + " %");
|
||||
if (finish) bits.push(finish);
|
||||
if (tipExtra) bits.push(tipExtra);
|
||||
else if (pct > 0 || remain > 0) bits.push(pct + " %");
|
||||
if (finish) bits.push(finish);
|
||||
const tip = [
|
||||
filename ? jobLabel(filename) : "",
|
||||
remain > 0 ? "noch " + hours(remain) : "",
|
||||
@@ -375,9 +378,10 @@ function renderLiveChips({ actionItems, running, activeSends, alertCount, etaTex
|
||||
const pct = Math.max(0, Math.min(100, Math.round((Number(p.progress) || 0) * 100)));
|
||||
const finish = p.remain > 0 ? finishClock(p.remain) : "";
|
||||
const pausedFil = p.state === "paused" && (p.filament_empty || p.pause_reason);
|
||||
const starting = p.starting || p.state === "starting";
|
||||
const label = [
|
||||
shortPrinter(p.name || p.host),
|
||||
pausedFil ? "Material!" : (pct ? pct + "%" : ""),
|
||||
pausedFil ? "Material!" : (starting ? "startet" : (pct ? pct + "%" : "")),
|
||||
finish,
|
||||
].filter(Boolean).join(" · ");
|
||||
const tip = [p.name || "", p.pause_reason || ""].filter(Boolean).join(" — ");
|
||||
@@ -465,7 +469,12 @@ async function refreshJetzt() {
|
||||
}
|
||||
if (jetztBox) {
|
||||
jetztBox.classList.toggle("is-empty", !actionItems.length);
|
||||
setListHtml(document.getElementById("jetzt-list"), actionItems.map(actionItemHtml).join(""));
|
||||
const jetztList = document.getElementById("jetzt-list");
|
||||
if (!actionItems.length) {
|
||||
setListHtml(jetztList, '<li class="queue-empty">Alles erledigt — nichts zu tun.</li>');
|
||||
} else {
|
||||
setListHtml(jetztList, actionItems.map(actionItemHtml).join(""));
|
||||
}
|
||||
}
|
||||
|
||||
const runBox = document.getElementById("run-box");
|
||||
@@ -479,6 +488,7 @@ async function refreshJetzt() {
|
||||
progress: p.progress,
|
||||
remain: p.remain,
|
||||
filename: p.filename,
|
||||
tipExtra: (p.starting || p.state === "starting") ? "wird gestartet" : "",
|
||||
cancelId: p.queue_id,
|
||||
})).join(""),
|
||||
);
|
||||
@@ -605,13 +615,17 @@ refreshJetzt();
|
||||
(function liveUpdates() {
|
||||
let streamLive = false;
|
||||
const sseKinds = {
|
||||
queue: () => refreshJetzt(),
|
||||
queue: () => {
|
||||
refreshJetzt();
|
||||
if (typeof window.onQueueChanged === "function") window.onQueueChanged();
|
||||
},
|
||||
senden: () => refreshJetzt(),
|
||||
ereignis: () => refreshJetzt(),
|
||||
aufgaben: () => refreshJetzt(),
|
||||
drucker: () => {
|
||||
refreshJetzt();
|
||||
if (typeof window.onDruckerLive === "function") window.onDruckerLive();
|
||||
if (typeof window.onQueueChanged === "function") window.onQueueChanged();
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<meta name="csrf" content="{{ csrf }}">
|
||||
<title>Anmelden · Grotti</title>
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='brand/favicon-32.png') }}">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=62">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=75">
|
||||
</head>
|
||||
<body class="auth-body">
|
||||
<main class="auth-card">
|
||||
|
||||
+158
-11
@@ -40,6 +40,11 @@
|
||||
<button type="button" class="fchip" data-filter="loaded">Am Drucker</button>
|
||||
<button type="button" class="fchip" data-filter="shelf">Regal</button>
|
||||
<button type="button" class="fchip" data-filter="low">Wenig Rest</button>
|
||||
<button type="button" class="fchip" data-filter="archive">Archiv</button>
|
||||
</div>
|
||||
<div class="mat-extra-filters">
|
||||
<select id="spool-filter-type" title="Sorte"><option value="">Alle Sorten</option></select>
|
||||
<select id="spool-filter-color" title="Farbe"><option value="">Alle Farben</option></select>
|
||||
</div>
|
||||
<div class="search-wrap">
|
||||
<svg class="ico"><use href="#i-search"/></svg>
|
||||
@@ -60,6 +65,7 @@
|
||||
<thead><tr><th>Spule</th><th>Charge</th><th>Sorte</th><th>Farbe</th><th>Ort</th><th class="num">Rest</th></tr></thead>
|
||||
<tbody id="spool-rows"></tbody>
|
||||
</table>
|
||||
<div class="pager" id="spool-pager" hidden></div>
|
||||
</section>
|
||||
|
||||
<section class="card mat-form" id="spool-panel" hidden>
|
||||
@@ -141,6 +147,9 @@
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn-primary">Speichern</button>
|
||||
<button type="button" class="ghost" id="spool-shelf" hidden>Ins Regal</button>
|
||||
<button type="button" class="ghost" id="spool-empty" hidden title="Rest auf 0, Regal, archivieren">Leer</button>
|
||||
<button type="button" class="ghost" id="spool-archive" hidden>Archivieren</button>
|
||||
<button type="button" class="ghost" id="spool-restore" hidden>Wiederherstellen</button>
|
||||
<button type="button" class="ghost" id="spool-label" hidden>Etikett</button>
|
||||
<button type="button" class="warn" id="spool-delete" hidden><svg class="ico"><use href="#i-trash"/></svg>Löschen</button>
|
||||
</div>
|
||||
@@ -237,6 +246,8 @@ let picked = [];
|
||||
let colorLabel = "";
|
||||
let autoName = "";
|
||||
let spoolFilter = "all";
|
||||
let spoolTypeFilter = "";
|
||||
let spoolColorFilter = "";
|
||||
let spoolSearch = "";
|
||||
let sortenSearch = "";
|
||||
let view = "spools";
|
||||
@@ -513,8 +524,13 @@ async function loadAkte(spoolId) {
|
||||
const charge = run.chargen_nr
|
||||
? '<a class="tag akte-charge" href="' + href + '">' + escapeHtml(run.chargen_nr) + "</a>"
|
||||
: '<span class="akte-charge tiny">—</span>';
|
||||
const file = '<a class="akte-file" href="' + href + '" title="' + escapeHtml((run.filename || "").split("/").pop() || "") + '">'
|
||||
+ escapeHtml(akteFile(run.filename)) + "</a>";
|
||||
const fileName = akteFile(run.filename);
|
||||
const file = run.file_id
|
||||
? '<a class="akte-file" href="/dateien?file=' + encodeURIComponent(run.file_id) + '" title="' + escapeHtml((run.filename || "").split("/").pop() || "") + '">'
|
||||
+ escapeHtml(fileName) + "</a>"
|
||||
+ ' <a class="tiny" href="' + href + '">Lauf</a>'
|
||||
: '<a class="akte-file" href="' + href + '" title="' + escapeHtml((run.filename || "").split("/").pop() || "") + '">'
|
||||
+ escapeHtml(fileName) + "</a>";
|
||||
const gramsTxt = grams(run.spool_weight_g) + (run.spool_is_estimate ? " ≈" : "");
|
||||
return '<div class="akte-run">'
|
||||
+ '<span class="akte-when tiny">' + escapeHtml(akteWhen(run.started_at)) + "</span>"
|
||||
@@ -556,6 +572,9 @@ function fill(spool) {
|
||||
document.getElementById("spool-delete").hidden = !spool;
|
||||
document.getElementById("spool-label").hidden = !spool;
|
||||
document.getElementById("spool-shelf").hidden = !spool || !(spool.printer_host);
|
||||
document.getElementById("spool-empty").hidden = !spool || spool.archived;
|
||||
document.getElementById("spool-archive").hidden = !spool || spool.archived;
|
||||
document.getElementById("spool-restore").hidden = !spool || !spool.archived;
|
||||
document.getElementById("color-box").open = !spool || !picked.length;
|
||||
showHint();
|
||||
renderPalette();
|
||||
@@ -583,12 +602,30 @@ function fillSorten(material) {
|
||||
renderSorten();
|
||||
}
|
||||
|
||||
function isSpoolArchived(spool) {
|
||||
return !!(spool && (spool.archived || spool.archived_at));
|
||||
}
|
||||
|
||||
function isSpoolEmpty(spool) {
|
||||
return (Number(spool.remaining_g) || 0) <= 0.5;
|
||||
}
|
||||
|
||||
function shownSpools() {
|
||||
const q = spoolSearch.trim().toLowerCase();
|
||||
const type = spoolTypeFilter.trim().toLowerCase();
|
||||
const color = spoolColorFilter.trim().toLowerCase();
|
||||
return spools.filter((spool) => {
|
||||
const archived = isSpoolArchived(spool) || isSpoolEmpty(spool);
|
||||
if (spoolFilter === "archive") {
|
||||
if (!archived) return false;
|
||||
} else if (archived) {
|
||||
return false;
|
||||
}
|
||||
if (spoolFilter === "loaded" && !spool.printer_host) return false;
|
||||
if (spoolFilter === "shelf" && spool.printer_host) return false;
|
||||
if (spoolFilter === "low" && (Number(spool.remaining_g) || 0) >= 100) return false;
|
||||
if (type && (spool.material_type || "").toLowerCase() !== type) return false;
|
||||
if (color && (spool.color || "").toLowerCase() !== color) return false;
|
||||
if (!q) return true;
|
||||
const hay = [
|
||||
spool.name, spool.chargen_nr, spool.code, spool.material_type, spool.color,
|
||||
@@ -598,6 +635,28 @@ function shownSpools() {
|
||||
});
|
||||
}
|
||||
|
||||
function fillSpoolMetaFilters() {
|
||||
const typeSel = document.getElementById("spool-filter-type");
|
||||
const colorSel = document.getElementById("spool-filter-color");
|
||||
if (!typeSel || !colorSel) return;
|
||||
const types = [...new Set(spools.map((s) => (s.material_type || "").trim()).filter(Boolean))]
|
||||
.sort((a, b) => a.localeCompare(b, "de"));
|
||||
const colors = [...new Set(spools.map((s) => (s.color || "").trim()).filter(Boolean))]
|
||||
.sort((a, b) => a.localeCompare(b, "de"));
|
||||
const curType = spoolTypeFilter;
|
||||
const curColor = spoolColorFilter;
|
||||
typeSel.innerHTML = '<option value="">Alle Sorten</option>' + types.map((t) =>
|
||||
`<option value="${escapeHtml(t)}">${escapeHtml(t)}</option>`
|
||||
).join("");
|
||||
colorSel.innerHTML = '<option value="">Alle Farben</option>' + colors.map((c) =>
|
||||
`<option value="${escapeHtml(c)}">${escapeHtml(c)}</option>`
|
||||
).join("");
|
||||
typeSel.value = types.includes(curType) ? curType : "";
|
||||
colorSel.value = colors.includes(curColor) ? curColor : "";
|
||||
spoolTypeFilter = typeSel.value;
|
||||
spoolColorFilter = colorSel.value;
|
||||
}
|
||||
|
||||
function shownSorten() {
|
||||
const q = sortenSearch.trim().toLowerCase();
|
||||
if (!q) return materials;
|
||||
@@ -630,38 +689,51 @@ function fillSelects() {
|
||||
materialSelect.value = currentMaterial;
|
||||
}
|
||||
|
||||
let spoolPage = 1;
|
||||
|
||||
function renderSpools() {
|
||||
document.querySelectorAll("#spool-filter .fchip").forEach((btn) => {
|
||||
btn.classList.toggle("on", (btn.dataset.filter || "all") === spoolFilter);
|
||||
});
|
||||
fillSelects();
|
||||
fillSpoolMetaFilters();
|
||||
|
||||
const body = document.getElementById("spool-rows");
|
||||
body.innerHTML = "";
|
||||
const shown = shownSpools();
|
||||
document.getElementById("spool-count").textContent = String(shown.length);
|
||||
const activeCount = spools.filter((s) => !isSpoolArchived(s) && !isSpoolEmpty(s)).length;
|
||||
document.getElementById("spool-count").textContent = String(
|
||||
spoolFilter === "archive" ? shown.length : activeCount
|
||||
);
|
||||
const note = document.getElementById("spool-list-note");
|
||||
const pager = document.getElementById("spool-pager");
|
||||
if (!spools.length) {
|
||||
note.textContent = "";
|
||||
body.innerHTML = '<tr><td class="empty" colspan="6"><div class="empty-state">' + icon("spool") + '<p>Noch keine Spule.</p><p class="tiny">„Neue Spule“ anlegen oder Code scannen.</p></div></td></tr>';
|
||||
renderPager(pager, null, () => {});
|
||||
return;
|
||||
}
|
||||
if (!shown.length) {
|
||||
note.textContent = "";
|
||||
body.innerHTML = '<tr><td class="empty" colspan="6"><div class="empty-state">' + icon("search") + '<p>Keine Spule passt.</p></div></td></tr>';
|
||||
renderPager(pager, null, () => {});
|
||||
return;
|
||||
}
|
||||
note.textContent = shown.length === spools.length
|
||||
? (shown.length === 1 ? "1 Spule" : shown.length + " Spulen")
|
||||
: shown.length + " von " + spools.length;
|
||||
note.textContent = spoolFilter === "archive"
|
||||
? (shown.length === 1 ? "1 archivierte Spule" : shown.length + " archivierte Spulen")
|
||||
: shown.length === activeCount
|
||||
? (shown.length === 1 ? "1 Spule" : shown.length + " Spulen")
|
||||
: shown.length + " von " + activeCount;
|
||||
|
||||
const ordered = [...shown].sort((a, b) => {
|
||||
const ah = a.printer_host || "zzz";
|
||||
const bh = b.printer_host || "zzz";
|
||||
return ah.localeCompare(bh, "de") || (Number(a.ace_slot) || 0) - (Number(b.ace_slot) || 0) || a.name.localeCompare(b.name, "de");
|
||||
});
|
||||
const paged = pageSlice(ordered, spoolPage, DEFAULT_PAGE_SIZE);
|
||||
spoolPage = paged.page;
|
||||
let lastPlace = null;
|
||||
ordered.forEach((spool) => {
|
||||
paged.items.forEach((spool) => {
|
||||
const group = spool.printer_host ? printerName(spool.printer_host) : "Regal";
|
||||
if (group !== lastPlace) {
|
||||
lastPlace = group;
|
||||
@@ -671,7 +743,7 @@ function renderSpools() {
|
||||
body.appendChild(head);
|
||||
}
|
||||
const tr = document.createElement("tr");
|
||||
tr.className = "pick";
|
||||
tr.className = "pick" + (isSpoolArchived(spool) || isSpoolEmpty(spool) ? " is-archived" : "");
|
||||
if (spoolPanelOpen && String(spool.id) === document.getElementById("spool-id").value) tr.classList.add("on");
|
||||
tr.innerHTML = "<td></td><td></td><td></td><td></td><td></td><td class=\"num\"></td>";
|
||||
tr.children[0].textContent = spool.name;
|
||||
@@ -694,6 +766,10 @@ function renderSpools() {
|
||||
tr.addEventListener("click", () => fill(spool));
|
||||
body.appendChild(tr);
|
||||
});
|
||||
renderPager(pager, paged, (p) => {
|
||||
spoolPage = p;
|
||||
renderSpools();
|
||||
});
|
||||
}
|
||||
|
||||
function renderSorten() {
|
||||
@@ -808,6 +884,7 @@ document.querySelectorAll(".mat-tabs [data-view]").forEach((btn) => {
|
||||
});
|
||||
|
||||
document.getElementById("spool-filter").addEventListener("click", (event) => {
|
||||
spoolPage = 1;
|
||||
const btn = event.target.closest("[data-filter]");
|
||||
if (!btn) return;
|
||||
spoolFilter = btn.dataset.filter || "all";
|
||||
@@ -815,6 +892,7 @@ document.getElementById("spool-filter").addEventListener("click", (event) => {
|
||||
});
|
||||
document.getElementById("spool-search").addEventListener("input", (event) => {
|
||||
spoolSearch = event.target.value || "";
|
||||
spoolPage = 1;
|
||||
renderSpools();
|
||||
});
|
||||
document.getElementById("sorten-search").addEventListener("input", (event) => {
|
||||
@@ -876,6 +954,52 @@ document.getElementById("spool-shelf").addEventListener("click", async () => {
|
||||
showNote("spool-note", error);
|
||||
}
|
||||
});
|
||||
document.getElementById("spool-empty").addEventListener("click", () => {
|
||||
const id = document.getElementById("spool-id").value;
|
||||
if (!id) return;
|
||||
armButton(document.getElementById("spool-empty"), "Als leer markieren?", async () => {
|
||||
try {
|
||||
const saved = await api("/spulen/" + id + "/leer", { method: "POST", json: {} });
|
||||
toast("Spule als leer archiviert.");
|
||||
await load();
|
||||
fill(saved);
|
||||
} catch (error) {
|
||||
showNote("spool-note", error);
|
||||
}
|
||||
});
|
||||
});
|
||||
document.getElementById("spool-archive").addEventListener("click", async () => {
|
||||
const id = document.getElementById("spool-id").value;
|
||||
if (!id) return;
|
||||
try {
|
||||
const saved = await api("/spulen/" + id, {
|
||||
method: "PATCH",
|
||||
json: { archived: true, printer_host: "", ace_slot: null },
|
||||
});
|
||||
toast("Spule archiviert.");
|
||||
await load();
|
||||
fill(saved);
|
||||
} catch (error) {
|
||||
showNote("spool-note", error);
|
||||
}
|
||||
});
|
||||
document.getElementById("spool-restore").addEventListener("click", async () => {
|
||||
const id = document.getElementById("spool-id").value;
|
||||
if (!id) return;
|
||||
try {
|
||||
const left = Number(document.getElementById("spool-left").value) || 0;
|
||||
const saved = await api("/spulen/" + id, {
|
||||
method: "PATCH",
|
||||
json: { archived: false, remaining_g: left > 0.5 ? left : 1000 },
|
||||
});
|
||||
toast("Spule wiederhergestellt.");
|
||||
spoolFilter = "all";
|
||||
await load();
|
||||
fill(saved);
|
||||
} catch (error) {
|
||||
showNote("spool-note", error);
|
||||
}
|
||||
});
|
||||
document.getElementById("spool-label").addEventListener("click", () => {
|
||||
const id = document.getElementById("spool-id").value;
|
||||
if (id) window.open("/etikett/" + id, "_blank", "noopener");
|
||||
@@ -890,6 +1014,16 @@ document.getElementById("spool-delete").addEventListener("click", () => {
|
||||
closeSpoolPanel();
|
||||
});
|
||||
});
|
||||
document.getElementById("spool-filter-type")?.addEventListener("change", (event) => {
|
||||
spoolPage = 1;
|
||||
spoolTypeFilter = event.target.value || "";
|
||||
renderSpools();
|
||||
});
|
||||
document.getElementById("spool-filter-color")?.addEventListener("change", (event) => {
|
||||
spoolPage = 1;
|
||||
spoolColorFilter = event.target.value || "";
|
||||
renderSpools();
|
||||
});
|
||||
|
||||
document.getElementById("sorten-new").addEventListener("click", () => {
|
||||
fillSorten(null);
|
||||
@@ -986,11 +1120,24 @@ load().then(() => {
|
||||
closeSpoolPanel();
|
||||
closeSortenPanel();
|
||||
const params = new URLSearchParams(location.search);
|
||||
const spoolId = params.get("spool");
|
||||
const spoolId = params.get("spule") || params.get("spool");
|
||||
const hostHint = params.get("host") || "";
|
||||
const slotHint = params.get("slot") || "";
|
||||
if (spoolId) {
|
||||
const spool = spools.find((row) => String(row.id) === spoolId);
|
||||
if (spool) fill(spool);
|
||||
else openByCode(spoolId);
|
||||
if (spool) {
|
||||
fill(spool);
|
||||
focusById("spool-id") || document.getElementById("spool-name")?.scrollIntoView({ behavior: "smooth", block: "center" });
|
||||
} else openByCode(spoolId);
|
||||
} else if (hostHint) {
|
||||
document.getElementById("spool-panel")?.removeAttribute("hidden");
|
||||
document.getElementById("spool-new")?.click?.();
|
||||
const hostField = document.getElementById("spool-printer");
|
||||
if (hostField) hostField.value = hostHint;
|
||||
const slotField = document.getElementById("spool-slot");
|
||||
if (slotField && slotHint) slotField.value = String(slotHint);
|
||||
document.getElementById("spool-name")?.scrollIntoView({ behavior: "smooth", block: "center" });
|
||||
toast("Drucker und Platz vorausgefüllt — Rolle wählen und speichern.");
|
||||
}
|
||||
}).catch((error) => showNote("spool-note", error));
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,611 @@
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
<div class="page-head">
|
||||
<div>
|
||||
<h1>Projekte</h1>
|
||||
<p class="tiny">Arbeitsmappen mit Ordner unter dem Slice-Pfad — G-code und Konstruktionsdaten.</p>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="seg" id="proj-filter" role="group" aria-label="Filter">
|
||||
<button type="button" class="on" data-filter="aktiv">Aktiv</button>
|
||||
<button type="button" data-filter="fertig">Fertig</button>
|
||||
<button type="button" data-filter="">Alle</button>
|
||||
</div>
|
||||
<button type="button" class="btn-primary" id="proj-new"><svg class="ico"><use href="#i-plus"/></svg>Neues Projekt</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="split edit-split is-idle" id="proj-layout">
|
||||
<section class="card">
|
||||
<div class="card-head lib-head">
|
||||
<svg class="ico head-ico"><use href="#i-folder"/></svg>
|
||||
<h2>Liste</h2>
|
||||
<span class="count-pill" id="proj-count">0</span>
|
||||
</div>
|
||||
<div class="table-wrap">
|
||||
<table>
|
||||
<thead><tr><th>Name</th><th>Status</th><th>Ordner</th><th class="num">Dateien</th><th class="num">Kosten</th></tr></thead>
|
||||
<tbody id="proj-rows"></tbody>
|
||||
</table>
|
||||
<div class="pager" id="proj-pager" hidden></div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="card edit-panel" id="proj-panel" hidden>
|
||||
<div class="mat-form-head">
|
||||
<h2 id="proj-title">Neues Projekt</h2>
|
||||
<button type="button" class="ghost tiny-btn" id="proj-edit-btn" hidden>Bearbeiten</button>
|
||||
<button type="button" class="icon-btn" id="proj-close" title="Schließen" aria-label="Schließen"></button>
|
||||
</div>
|
||||
|
||||
<form id="proj-form" novalidate hidden>
|
||||
<input id="proj-id" type="hidden">
|
||||
<div class="field"><label for="proj-name">Name</label><input id="proj-name" required autocomplete="off"></div>
|
||||
<div class="grid-2">
|
||||
<div class="field">
|
||||
<label for="proj-status">Status</label>
|
||||
<select id="proj-status">
|
||||
<option value="idee">Idee</option>
|
||||
<option value="bereit">Bereit</option>
|
||||
<option value="druckt">Druckt</option>
|
||||
<option value="fertig">Fertig</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label for="proj-folder">Ordner <span class="tip" title="Relativ unter dem Slice-Ordner, z. B. Projekte/2609_002 — kein D:\…"><svg class="ico"><use href="#i-info"/></svg></span></label>
|
||||
<input id="proj-folder" placeholder="Projekte/…" autocomplete="off">
|
||||
<p class="field-help">Leer = automatisch <code>Projekte/<Name></code>. Nur Relativpfad, kein Laufwerk.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field"><label for="proj-notes">Notiz</label><textarea id="proj-notes" rows="3"></textarea></div>
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn-primary" id="proj-save">Speichern</button>
|
||||
<button type="button" class="ghost" id="proj-cancel-edit" hidden>Abbrechen</button>
|
||||
<button type="button" class="warn" id="proj-delete" hidden><svg class="ico"><use href="#i-trash"/></svg>Löschen</button>
|
||||
</div>
|
||||
</form>
|
||||
<p id="proj-note" class="tiny"></p>
|
||||
|
||||
<div id="proj-detail" hidden>
|
||||
<div class="actions" style="margin-bottom:0.5rem">
|
||||
<a class="ghost" id="proj-files-link" href="/dateien" hidden>Dateien</a>
|
||||
</div>
|
||||
<div id="proj-stats" class="proj-stats"></div>
|
||||
<p id="proj-suggest" class="tiny" hidden></p>
|
||||
<p id="proj-meta" class="tiny"></p>
|
||||
|
||||
<div class="seg" id="proj-tabs" role="tablist" style="margin:0.75rem 0">
|
||||
<button type="button" class="on" data-tab="files">Druckdateien</button>
|
||||
<button type="button" data-tab="runs">Läufe</button>
|
||||
<button type="button" data-tab="assets">Weitere Dateien</button>
|
||||
</div>
|
||||
|
||||
<div id="proj-tab-files">
|
||||
<div class="actions" style="margin-bottom:0.5rem">
|
||||
<button type="button" class="btn-primary" id="proj-enqueue-all" hidden>Alle einreihen</button>
|
||||
</div>
|
||||
<div id="proj-gcodes" class="proj-file-list"></div>
|
||||
</div>
|
||||
|
||||
<div id="proj-tab-runs" hidden>
|
||||
<div id="proj-runs" class="proj-file-list"></div>
|
||||
<div class="pager" id="proj-runs-pager" hidden></div>
|
||||
</div>
|
||||
|
||||
<div id="proj-tab-assets" hidden>
|
||||
<p class="tiny">STEP, STL, PDF, SolidWorks usw. im Projektordner — nicht in der Druck-Bibliothek.</p>
|
||||
<div class="actions" style="margin-bottom:0.5rem">
|
||||
<label class="button ghost" for="proj-asset-file"><svg class="ico"><use href="#i-upload"/></svg>Hochladen</label>
|
||||
<input id="proj-asset-file" type="file" multiple hidden>
|
||||
</div>
|
||||
<div id="proj-assets" class="proj-file-list"></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block script %}
|
||||
<script>
|
||||
const STATUS_LABEL = { idee: "Idee", bereit: "Bereit", druckt: "Druckt", fertig: "Fertig" };
|
||||
let projects = [];
|
||||
let selectedId = null;
|
||||
let listFilter = "aktiv";
|
||||
let detailTab = "files";
|
||||
let runsPage = 0;
|
||||
let runsTotal = 0;
|
||||
const RUNS_PAGE = 20;
|
||||
/** idle | create | view | edit */
|
||||
let panelMode = "idle";
|
||||
let folderTouched = false;
|
||||
let projPage = 1;
|
||||
|
||||
document.getElementById("proj-close").innerHTML = icon("x");
|
||||
|
||||
function openPanel() {
|
||||
document.getElementById("proj-panel").hidden = false;
|
||||
document.getElementById("proj-layout").classList.remove("is-idle");
|
||||
document.getElementById("proj-panel").scrollIntoView({ block: "nearest", behavior: "smooth" });
|
||||
}
|
||||
|
||||
function closePanel() {
|
||||
panelMode = "idle";
|
||||
selectedId = null;
|
||||
document.getElementById("proj-panel").hidden = true;
|
||||
document.getElementById("proj-layout").classList.add("is-idle");
|
||||
document.getElementById("proj-form").hidden = true;
|
||||
document.getElementById("proj-detail").hidden = true;
|
||||
document.getElementById("proj-edit-btn").hidden = true;
|
||||
document.getElementById("proj-cancel-edit").hidden = true;
|
||||
document.getElementById("proj-delete").hidden = true;
|
||||
document.getElementById("proj-files-link").hidden = true;
|
||||
document.getElementById("proj-note").textContent = "";
|
||||
document.getElementById("proj-enqueue-all").hidden = true;
|
||||
history.replaceState(null, "", location.pathname);
|
||||
renderList();
|
||||
}
|
||||
|
||||
function setFormValues(project) {
|
||||
document.getElementById("proj-id").value = project ? project.id : "";
|
||||
document.getElementById("proj-name").value = project ? (project.name || "") : "";
|
||||
document.getElementById("proj-status").value = project ? (project.status || "idee") : "idee";
|
||||
document.getElementById("proj-folder").value = project ? (project.folder || "") : "";
|
||||
document.getElementById("proj-notes").value = project ? (project.notes || "") : "";
|
||||
}
|
||||
|
||||
function showCreate() {
|
||||
panelMode = "create";
|
||||
selectedId = null;
|
||||
folderTouched = false;
|
||||
setFormValues(null);
|
||||
document.getElementById("proj-title").textContent = "Neues Projekt";
|
||||
document.getElementById("proj-form").hidden = false;
|
||||
document.getElementById("proj-detail").hidden = true;
|
||||
document.getElementById("proj-edit-btn").hidden = true;
|
||||
document.getElementById("proj-cancel-edit").hidden = true;
|
||||
document.getElementById("proj-delete").hidden = true;
|
||||
document.getElementById("proj-files-link").hidden = true;
|
||||
document.getElementById("proj-note").textContent = "";
|
||||
document.getElementById("proj-enqueue-all").hidden = true;
|
||||
openPanel();
|
||||
renderList();
|
||||
document.getElementById("proj-name").focus();
|
||||
}
|
||||
|
||||
function showView(project) {
|
||||
panelMode = "view";
|
||||
selectedId = project.id;
|
||||
setFormValues(project);
|
||||
document.getElementById("proj-title").textContent = project.name || "Projekt";
|
||||
document.getElementById("proj-form").hidden = true;
|
||||
document.getElementById("proj-detail").hidden = false;
|
||||
document.getElementById("proj-edit-btn").hidden = false;
|
||||
document.getElementById("proj-cancel-edit").hidden = true;
|
||||
document.getElementById("proj-delete").hidden = true;
|
||||
const link = document.getElementById("proj-files-link");
|
||||
link.hidden = false;
|
||||
link.href = "/dateien?project=" + encodeURIComponent(project.id);
|
||||
document.getElementById("proj-note").textContent = "";
|
||||
openPanel();
|
||||
renderList();
|
||||
renderDetail(project);
|
||||
}
|
||||
|
||||
function showEdit(project) {
|
||||
panelMode = "edit";
|
||||
selectedId = project.id;
|
||||
folderTouched = true;
|
||||
setFormValues(project);
|
||||
document.getElementById("proj-title").textContent = "Bearbeiten";
|
||||
document.getElementById("proj-form").hidden = false;
|
||||
document.getElementById("proj-detail").hidden = true;
|
||||
document.getElementById("proj-edit-btn").hidden = true;
|
||||
document.getElementById("proj-cancel-edit").hidden = false;
|
||||
document.getElementById("proj-delete").hidden = false;
|
||||
document.getElementById("proj-files-link").hidden = true;
|
||||
openPanel();
|
||||
renderList();
|
||||
document.getElementById("proj-name").focus();
|
||||
}
|
||||
|
||||
function renderList() {
|
||||
const body = document.getElementById("proj-rows");
|
||||
const pager = document.getElementById("proj-pager");
|
||||
document.getElementById("proj-count").textContent = String(projects.length);
|
||||
if (!projects.length) {
|
||||
body.innerHTML = '<tr><td class="empty" colspan="5"><div class="empty-state">' + icon("folder")
|
||||
+ "<p>Noch kein Projekt.</p>"
|
||||
+ '<p><button type="button" class="btn-primary" id="proj-empty-new">Erstes Projekt anlegen</button></p>'
|
||||
+ "</div></td></tr>";
|
||||
document.getElementById("proj-empty-new")?.addEventListener("click", showCreate);
|
||||
renderPager(pager, null, () => {});
|
||||
return;
|
||||
}
|
||||
body.innerHTML = "";
|
||||
const paged = pageSlice(projects, projPage, DEFAULT_PAGE_SIZE);
|
||||
projPage = paged.page;
|
||||
paged.items.forEach((project) => {
|
||||
const tr = document.createElement("tr");
|
||||
tr.className = "pick" + (String(project.id) === String(selectedId) ? " on" : "");
|
||||
tr.innerHTML = "<td></td><td></td><td class=\"cell-path\"></td><td class=\"num\"></td><td class=\"num\"></td>";
|
||||
tr.children[0].textContent = project.name;
|
||||
let status = STATUS_LABEL[project.status] || project.status || "";
|
||||
if ((project.stats || {}).active_count > 0) status = STATUS_LABEL.druckt;
|
||||
tr.children[1].textContent = status;
|
||||
tr.children[2].textContent = project.folder || "—";
|
||||
tr.children[2].title = project.folder || "";
|
||||
tr.children[3].textContent = String(project.file_count ?? (project.files || []).length);
|
||||
const cost = (project.stats || {}).cost;
|
||||
tr.children[4].textContent = cost ? euro(cost) : "—";
|
||||
tr.addEventListener("click", () => openProject(project.id));
|
||||
body.appendChild(tr);
|
||||
});
|
||||
renderPager(pager, paged, (p) => {
|
||||
projPage = p;
|
||||
renderList();
|
||||
});
|
||||
}
|
||||
|
||||
function setTab(tab) {
|
||||
detailTab = tab;
|
||||
document.querySelectorAll("#proj-tabs [data-tab]").forEach((btn) => {
|
||||
btn.classList.toggle("on", btn.dataset.tab === tab);
|
||||
});
|
||||
document.getElementById("proj-tab-files").hidden = tab !== "files";
|
||||
document.getElementById("proj-tab-runs").hidden = tab !== "runs";
|
||||
document.getElementById("proj-tab-assets").hidden = tab !== "assets";
|
||||
if (tab === "runs" && selectedId) loadRuns(selectedId, 0);
|
||||
if (tab === "assets" && selectedId) loadAssets(selectedId);
|
||||
}
|
||||
|
||||
function renderDetail(project) {
|
||||
const stats = project.stats || {};
|
||||
const statsEl = document.getElementById("proj-stats");
|
||||
const chips = [
|
||||
[stats.run_count || 0, "Läufe"],
|
||||
[hours(stats.duration_s) || "0 min", "Zeit"],
|
||||
[grams(stats.weight_g || 0), "Filament"],
|
||||
[euro(stats.cost || 0), "Kosten"],
|
||||
];
|
||||
if (stats.files_total) {
|
||||
chips.push([stats.files_ok + "/" + stats.files_total, "Dateien ok"]);
|
||||
}
|
||||
statsEl.innerHTML = chips.map(([v, l]) =>
|
||||
`<div class="proj-stat"><strong>${escapeHtml(String(v))}</strong><span class="tiny">${escapeHtml(l)}</span></div>`
|
||||
).join("");
|
||||
|
||||
const meta = [];
|
||||
if (project.folder) meta.push(project.folder);
|
||||
if (project.created_at) meta.push("Angelegt " + formatDateTime(project.created_at));
|
||||
if (stats.last_run) {
|
||||
meta.push("Zuletzt " + formatDateTime(stats.last_run.started_at) + " · " + (stats.last_run.filename || ""));
|
||||
}
|
||||
document.getElementById("proj-meta").textContent = meta.join(" · ");
|
||||
|
||||
const suggest = document.getElementById("proj-suggest");
|
||||
if (stats.suggest_fertig) {
|
||||
suggest.hidden = false;
|
||||
suggest.innerHTML = 'Alle Dateien mindestens einmal ok gedruckt. <button type="button" class="ghost" id="proj-mark-fertig">Als fertig markieren?</button>';
|
||||
document.getElementById("proj-mark-fertig")?.addEventListener("click", async () => {
|
||||
try {
|
||||
await api("/projekte/" + project.id, { method: "PATCH", json: { status: "fertig" } });
|
||||
toast("Projekt als fertig markiert.", "good");
|
||||
await load();
|
||||
await openProject(project.id);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
suggest.hidden = true;
|
||||
suggest.textContent = "";
|
||||
}
|
||||
|
||||
const files = project.files || [];
|
||||
document.getElementById("proj-enqueue-all").hidden = !files.length;
|
||||
const gcodes = document.getElementById("proj-gcodes");
|
||||
if (!files.length) {
|
||||
gcodes.innerHTML = '<p class="tiny">Keine G-code/3MF-Dateien verknüpft. Dateien in den Projektordner legen oder unter Dateien verschieben.</p>';
|
||||
} else {
|
||||
gcodes.innerHTML = files.map((file) => {
|
||||
const mats = (file.filaments || []).map((f) => f.type || f.material_type || f.name || "").filter(Boolean);
|
||||
const mat = [...new Set(mats)].join(" / ");
|
||||
const metaBits = [
|
||||
mat,
|
||||
file.weight_g ? Math.round(file.weight_g) + " g" : "",
|
||||
file.printed ? file.printed + "× gedruckt" : "noch nie",
|
||||
file.queued ? file.queued + " in Queue" : "",
|
||||
file.ok_once ? "ok" : "",
|
||||
].filter(Boolean).join(" · ");
|
||||
const href = "/dateien?file=" + encodeURIComponent(file.id) + "&project=" + encodeURIComponent(project.id);
|
||||
return `<div class="proj-file-row">
|
||||
<a class="proj-file" href="${escapeHtml(href)}">${escapeHtml(file.name)}<span class="tiny">${escapeHtml(metaBits)}</span></a>
|
||||
<button type="button" class="ghost" data-enqueue="${file.id}">Einreihen</button>
|
||||
</div>`;
|
||||
}).join("");
|
||||
}
|
||||
setTab(detailTab);
|
||||
if (detailTab === "assets") loadAssets(project.id);
|
||||
if (detailTab === "runs") loadRuns(project.id, runsPage);
|
||||
}
|
||||
|
||||
async function loadRuns(projectId, offset) {
|
||||
const box = document.getElementById("proj-runs");
|
||||
const pager = document.getElementById("proj-runs-pager");
|
||||
runsPage = Math.max(0, offset || 0);
|
||||
try {
|
||||
const resp = await fetch(withToken("/api/v1/projekte/" + projectId + "/laeufe?limit=" + RUNS_PAGE + "&offset=" + runsPage), {
|
||||
credentials: "same-origin",
|
||||
headers: { Accept: "application/json" },
|
||||
});
|
||||
if (!resp.ok) throw new Error("Läufe laden fehlgeschlagen.");
|
||||
const rows = await resp.json();
|
||||
runsTotal = Number(resp.headers.get("X-Total-Count") || rows.length);
|
||||
if (!rows.length) {
|
||||
box.innerHTML = '<p class="tiny">Noch keine Läufe.</p>';
|
||||
pager.hidden = true;
|
||||
return;
|
||||
}
|
||||
box.innerHTML = rows.map((run) => {
|
||||
const state = (window.RUN_STATES && RUN_STATES[run.state]) || run.state || "";
|
||||
const cost = Number(run.filament_cost || 0) + Number(run.energy_cost || 0);
|
||||
const meta = [state, hours(run.duration_s), cost ? euro(cost) : "", formatDateTime(run.started_at)].filter(Boolean).join(" · ");
|
||||
return `<a class="proj-file" href="/protokoll/${run.id}">${escapeHtml(run.filename || "Lauf #" + run.id)}<span class="tiny">${escapeHtml(meta)}</span></a>`;
|
||||
}).join("");
|
||||
const pages = Math.max(1, Math.ceil(runsTotal / RUNS_PAGE));
|
||||
const page = Math.floor(runsPage / RUNS_PAGE) + 1;
|
||||
renderPager(pager, {
|
||||
items: rows, page, pages, total: runsTotal, pageSize: RUNS_PAGE,
|
||||
from: runsTotal ? runsPage + 1 : 0,
|
||||
to: Math.min(runsPage + rows.length, runsTotal),
|
||||
}, (p) => loadRuns(projectId, (p - 1) * RUNS_PAGE));
|
||||
} catch (error) {
|
||||
box.innerHTML = '<p class="tiny">' + escapeHtml(error.message || String(error)) + "</p>";
|
||||
}
|
||||
}
|
||||
|
||||
async function loadAssets(projectId) {
|
||||
const box = document.getElementById("proj-assets");
|
||||
try {
|
||||
const rows = await api("/projekte/" + projectId + "/assets");
|
||||
if (!rows.length) {
|
||||
box.innerHTML = '<p class="tiny">Noch keine weiteren Dateien.</p>';
|
||||
return;
|
||||
}
|
||||
box.innerHTML = rows.map((item) => {
|
||||
const href = withToken("/api/v1/projekte/" + projectId + "/assets/" + encodeURIComponent(item.rel).replace(/%2F/g, "/"));
|
||||
return `<div class="proj-asset">
|
||||
<a href="${escapeHtml(href)}" download>${escapeHtml(item.rel)}</a>
|
||||
<span class="tiny">${escapeHtml(sizeText(item.size_bytes))}</span>
|
||||
<button type="button" class="icon-btn" data-asset-del="${escapeHtml(item.rel)}" title="Löschen">${icon("trash")}</button>
|
||||
</div>`;
|
||||
}).join("");
|
||||
} catch (error) {
|
||||
box.innerHTML = '<p class="tiny">' + escapeHtml(error.message || String(error)) + "</p>";
|
||||
}
|
||||
}
|
||||
|
||||
function sizeText(bytes) {
|
||||
const n = Number(bytes) || 0;
|
||||
if (n < 1024) return n + " B";
|
||||
if (n < 1024 * 1024) return (n / 1024).toFixed(1).replace(".", ",") + " KB";
|
||||
return (n / (1024 * 1024)).toFixed(1).replace(".", ",") + " MB";
|
||||
}
|
||||
|
||||
async function enqueueFiles(projectId, fileIds) {
|
||||
const payload = { confirm: true };
|
||||
if (fileIds && fileIds.length) payload.file_ids = fileIds;
|
||||
const out = await api("/projekte/" + projectId + "/einreihen", { method: "POST", json: payload });
|
||||
toast((out.count || 0) + " in die Warteschlange.", "good");
|
||||
await openProject(projectId);
|
||||
}
|
||||
|
||||
async function openProject(id) {
|
||||
try {
|
||||
const row = await api("/projekte/" + id);
|
||||
showView(row);
|
||||
history.replaceState(null, "", "#" + id);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
}
|
||||
|
||||
async function load() {
|
||||
const q = listFilter ? ("?status=" + encodeURIComponent(listFilter)) : "";
|
||||
projects = await api("/projekte" + q);
|
||||
renderList();
|
||||
if (selectedId && (panelMode === "view" || panelMode === "edit")) {
|
||||
const still = projects.find((p) => String(p.id) === String(selectedId));
|
||||
if (still) {
|
||||
if (panelMode === "edit") {
|
||||
const row = await api("/projekte/" + selectedId);
|
||||
showEdit(row);
|
||||
} else {
|
||||
await openProject(selectedId);
|
||||
}
|
||||
} else {
|
||||
closePanel();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
document.getElementById("proj-filter").addEventListener("click", (event) => {
|
||||
const btn = event.target.closest("[data-filter]");
|
||||
if (!btn) return;
|
||||
listFilter = btn.dataset.filter || "";
|
||||
document.querySelectorAll("#proj-filter [data-filter]").forEach((b) => b.classList.toggle("on", b === btn));
|
||||
projPage = 1;
|
||||
load().catch((error) => showNote("proj-note", error));
|
||||
});
|
||||
|
||||
document.getElementById("proj-tabs").addEventListener("click", (event) => {
|
||||
const btn = event.target.closest("[data-tab]");
|
||||
if (!btn) return;
|
||||
setTab(btn.dataset.tab);
|
||||
});
|
||||
|
||||
document.getElementById("proj-new").addEventListener("click", () => {
|
||||
history.replaceState(null, "", location.pathname);
|
||||
showCreate();
|
||||
});
|
||||
document.getElementById("proj-close").addEventListener("click", closePanel);
|
||||
document.getElementById("proj-edit-btn").addEventListener("click", async () => {
|
||||
if (!selectedId) return;
|
||||
try {
|
||||
const row = await api("/projekte/" + selectedId);
|
||||
showEdit(row);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
document.getElementById("proj-cancel-edit").addEventListener("click", async () => {
|
||||
if (!selectedId) {
|
||||
closePanel();
|
||||
return;
|
||||
}
|
||||
await openProject(selectedId);
|
||||
});
|
||||
|
||||
document.getElementById("proj-folder").addEventListener("input", () => {
|
||||
folderTouched = true;
|
||||
});
|
||||
document.getElementById("proj-name").addEventListener("input", () => {
|
||||
if (folderTouched || document.getElementById("proj-id").value) return;
|
||||
const name = document.getElementById("proj-name").value.trim();
|
||||
const folderEl = document.getElementById("proj-folder");
|
||||
if (!name) {
|
||||
folderEl.value = "";
|
||||
return;
|
||||
}
|
||||
const slug = name
|
||||
.replace(/[^\w\- äöüÄÖÜß.]+/gi, "-")
|
||||
.replace(/\s+/g, "-")
|
||||
.replace(/-{2,}/g, "-")
|
||||
.replace(/^[-.]+|[-.]+$/g, "")
|
||||
.slice(0, 60) || "projekt";
|
||||
folderEl.value = "Projekte/" + slug;
|
||||
});
|
||||
|
||||
document.getElementById("proj-form").addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
const id = document.getElementById("proj-id").value;
|
||||
const name = document.getElementById("proj-name").value.trim();
|
||||
if (!name) {
|
||||
toast("Name fehlt.", "bad");
|
||||
document.getElementById("proj-name").focus();
|
||||
return;
|
||||
}
|
||||
const folderRaw = document.getElementById("proj-folder").value.trim();
|
||||
if (/^[a-zA-Z]:[\\/]/.test(folderRaw) || folderRaw.startsWith("\\\\") || folderRaw.includes(":")) {
|
||||
toast("Ordner nur relativ unter dem Slice-Pfad — z. B. Projekte/2609_002, kein D:\\…", "bad");
|
||||
document.getElementById("proj-folder").focus();
|
||||
return;
|
||||
}
|
||||
const payload = {
|
||||
name,
|
||||
status: document.getElementById("proj-status").value,
|
||||
notes: document.getElementById("proj-notes").value,
|
||||
folder: folderRaw,
|
||||
};
|
||||
const saveBtn = document.getElementById("proj-save");
|
||||
saveBtn.disabled = true;
|
||||
try {
|
||||
const saved = id
|
||||
? await api("/projekte/" + id, { method: "PATCH", json: payload })
|
||||
: await api("/projekte", { method: "POST", json: payload });
|
||||
toast(id ? "Projekt gespeichert." : "Projekt angelegt.", "good");
|
||||
folderTouched = true;
|
||||
await load();
|
||||
await openProject(saved.id);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
} finally {
|
||||
saveBtn.disabled = false;
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById("proj-delete").addEventListener("click", () => {
|
||||
const id = document.getElementById("proj-id").value;
|
||||
if (!id) return;
|
||||
armButton(document.getElementById("proj-delete"), "Ordner inkl. Inhalt?", async () => {
|
||||
try {
|
||||
await api("/projekte/" + id + "?force=1", { method: "DELETE" });
|
||||
toast("Projekt gelöscht.");
|
||||
closePanel();
|
||||
await load();
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById("proj-enqueue-all").addEventListener("click", () => {
|
||||
const id = selectedId;
|
||||
if (!id) return;
|
||||
armButton(document.getElementById("proj-enqueue-all"), "Alle einreihen?", async () => {
|
||||
try {
|
||||
await enqueueFiles(id, null);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById("proj-gcodes").addEventListener("click", (event) => {
|
||||
const btn = event.target.closest("[data-enqueue]");
|
||||
if (!btn) return;
|
||||
event.preventDefault();
|
||||
const id = selectedId;
|
||||
const fileId = Number(btn.dataset.enqueue);
|
||||
if (!id || !fileId) return;
|
||||
armButton(btn, "einreihen?", async () => {
|
||||
try {
|
||||
await enqueueFiles(id, [fileId]);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById("proj-asset-file").addEventListener("change", async (event) => {
|
||||
const id = selectedId;
|
||||
const files = [...(event.target.files || [])];
|
||||
event.target.value = "";
|
||||
if (!id || !files.length) return;
|
||||
try {
|
||||
for (const file of files) {
|
||||
const body = new FormData();
|
||||
body.append("file", file);
|
||||
await api("/projekte/" + id + "/assets", { method: "POST", body });
|
||||
}
|
||||
toast(files.length === 1 ? "Datei hochgeladen." : files.length + " Dateien hochgeladen.");
|
||||
await loadAssets(id);
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById("proj-assets").addEventListener("click", (event) => {
|
||||
const btn = event.target.closest("[data-asset-del]");
|
||||
if (!btn) return;
|
||||
const id = selectedId;
|
||||
const rel = btn.dataset.assetDel;
|
||||
if (!id || !rel) return;
|
||||
armButton(btn, "löschen?", async () => {
|
||||
await api("/projekte/" + id + "/assets/" + encodeURIComponent(rel).replace(/%2F/g, "/"), { method: "DELETE" });
|
||||
toast("Datei gelöscht.");
|
||||
await loadAssets(id);
|
||||
});
|
||||
});
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
await load();
|
||||
const hash = (location.hash || "").replace(/^#/, "");
|
||||
if (hash && /^\d+$/.test(hash)) await openProject(Number(hash));
|
||||
} catch (error) {
|
||||
showNote("proj-note", error);
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
{% endblock %}
|
||||
+121
-13
@@ -4,6 +4,10 @@
|
||||
<div>
|
||||
<h1>Protokoll</h1>
|
||||
<p class="tiny">Abgeschlossene und laufende Drucke mit Dauer, Material und Kosten.</p>
|
||||
<details class="tiny proto-help">
|
||||
<summary>Filament-Pause / doppelte Zeilen</summary>
|
||||
<p>Nach Runout kann der Drucker kurz zwei History-Zeilen erzeugen. „Läufe holen“ legt sie zusammen; sonst „Verbinden“.</p>
|
||||
</details>
|
||||
</div>
|
||||
<div class="page-head-side">
|
||||
<button type="button" id="sync"><svg class="ico"><use href="#i-refresh"/></svg>Läufe holen</button>
|
||||
@@ -23,10 +27,11 @@
|
||||
</div>
|
||||
<p id="run-note"></p>
|
||||
<div class="card table-wrap">
|
||||
<table>
|
||||
<table class="proto-table">
|
||||
<thead><tr><th>Drucker</th><th>Datei</th><th>Zustand</th><th>Dauer</th><th>Ist</th><th>Kosten</th><th>Urteil</th><th>Spule</th><th></th></tr></thead>
|
||||
<tbody id="run-rows"></tbody>
|
||||
</table>
|
||||
<div class="pager" id="run-pager" hidden></div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
@@ -37,6 +42,7 @@ const states = {
|
||||
};
|
||||
let runs = [];
|
||||
let spools = [];
|
||||
let runPage = 1;
|
||||
|
||||
function fillPrinterFilter() {
|
||||
const select = document.getElementById("run-filter-printer");
|
||||
@@ -65,6 +71,16 @@ function filteredRuns() {
|
||||
});
|
||||
}
|
||||
|
||||
function shortRunName(filename) {
|
||||
let name = (filename || "").split("/").pop() || "";
|
||||
if (!name) return "";
|
||||
name = name.replace(/^\d{8}-\d{6}-/, "");
|
||||
name = name.replace(/^\d{4}-\d{4}-/, "");
|
||||
name = name.replace(/\.gcode$/i, "");
|
||||
name = name.replace(/_\d+(?:\.\d+)?_(?:\d+h)?(?:\d+m)?(?:\d+s)?$/i, "");
|
||||
return name || (filename || "").split("/").pop() || "";
|
||||
}
|
||||
|
||||
function render() {
|
||||
fillPrinterFilter();
|
||||
const body = document.getElementById("run-rows");
|
||||
@@ -72,37 +88,78 @@ function render() {
|
||||
const shown = filteredRuns();
|
||||
if (!runs.length) {
|
||||
body.innerHTML = '<tr><td class="empty" colspan="9"><div class="empty-state">' + icon("list") + '<p>Noch kein Lauf.</p><p class="tiny">„Läufe holen“ liest die Drucker aus.</p></div></td></tr>';
|
||||
renderPager(document.getElementById("run-pager"), null, () => {});
|
||||
return;
|
||||
}
|
||||
if (!shown.length) {
|
||||
body.innerHTML = '<tr><td class="empty" colspan="9"><div class="empty-state">' + icon("filter") + '<p>Kein Lauf passt zum Filter.</p></div></td></tr>';
|
||||
renderPager(document.getElementById("run-pager"), null, () => {});
|
||||
return;
|
||||
}
|
||||
shown.forEach((run) => {
|
||||
const paged = pageSlice(shown, runPage, DEFAULT_PAGE_SIZE);
|
||||
runPage = paged.page;
|
||||
paged.items.forEach((run) => {
|
||||
const tr = document.createElement("tr");
|
||||
tr.className = "pick";
|
||||
tr.innerHTML = "<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>";
|
||||
tr.children[0].textContent = run.printer_name;
|
||||
tr.children[0].className = "proto-printer";
|
||||
const fileCell = tr.children[1];
|
||||
fileCell.className = "proto-file";
|
||||
const fullName = (run.filename || "").split("/").pop() || ("#" + run.id);
|
||||
const link = document.createElement("a");
|
||||
link.href = "/protokoll/" + run.id;
|
||||
link.className = "cell-file";
|
||||
link.title = (run.filename || "").split("/").pop() || ("#" + run.id);
|
||||
link.textContent = (run.filename || "").split("/").pop() || ("#" + run.id);
|
||||
link.title = fullName;
|
||||
link.textContent = shortRunName(run.filename) || fullName;
|
||||
fileCell.appendChild(link);
|
||||
if (run.file_id) {
|
||||
const fileLink = document.createElement("a");
|
||||
fileLink.href = "/dateien?file=" + encodeURIComponent(run.file_id);
|
||||
fileLink.className = "tiny";
|
||||
fileLink.textContent = "Datei";
|
||||
fileLink.style.marginLeft = "0.35rem";
|
||||
fileCell.appendChild(fileLink);
|
||||
}
|
||||
if (run.project_id) {
|
||||
const projLink = document.createElement("a");
|
||||
projLink.href = "/projekte#" + encodeURIComponent(run.project_id);
|
||||
projLink.className = "tiny";
|
||||
projLink.textContent = "Projekt";
|
||||
projLink.style.marginLeft = "0.35rem";
|
||||
fileCell.appendChild(projLink);
|
||||
}
|
||||
if (run.chargen_nr) {
|
||||
const code = document.createElement("div");
|
||||
code.className = "mono-badge";
|
||||
code.textContent = run.chargen_nr;
|
||||
fileCell.appendChild(code);
|
||||
}
|
||||
if ((run.spool_names || []).length > 1 || (run.segment_count || 0) > 1) {
|
||||
const swap = document.createElement("div");
|
||||
swap.className = "tiny warn-text";
|
||||
swap.textContent = "Rollenwechsel: " + (run.spool_names || []).join(" → ");
|
||||
fileCell.appendChild(swap);
|
||||
}
|
||||
if (run.merge_with_id) {
|
||||
const hint = document.createElement("div");
|
||||
hint.className = "tiny warn-text";
|
||||
hint.textContent = "Vermutlich Fortsetzung von/zu #" + run.merge_with_id;
|
||||
fileCell.appendChild(hint);
|
||||
}
|
||||
const stateKey = run.state === "in_progress" || run.state === "printing" ? "printing"
|
||||
: run.state === "paused" ? "paused"
|
||||
: run.state === "completed" ? "complete"
|
||||
: run.state === "error" ? "error"
|
||||
: run.state === "cancelled" || run.state === "interrupted" ? "cancelled"
|
||||
: "idle";
|
||||
tr.children[2].innerHTML = chipHtml(stateKey, states[run.state] || run.state);
|
||||
tr.children[3].textContent = hours(run.duration_s);
|
||||
let stateLabel = states[run.state] || run.state;
|
||||
if (run.state === "cancelled" && run.merge_with_id) stateLabel = "Teilabbruch (Runout?)";
|
||||
tr.children[2].innerHTML = chipHtml(stateKey, stateLabel);
|
||||
let durationText = hours(run.duration_s);
|
||||
if (run.pause_s && run.pause_s > 60) {
|
||||
durationText += " (Pause " + hours(run.pause_s) + ")";
|
||||
}
|
||||
tr.children[3].textContent = durationText;
|
||||
tr.children[3].className = "num";
|
||||
const used = Number(run.weight_used_g) || Number(run.weight_g) || 0;
|
||||
const planned = Number(run.weight_planned_g) || Number(run.weight_g) || 0;
|
||||
@@ -115,7 +172,11 @@ function render() {
|
||||
}
|
||||
const cost = Number(run.filament_cost || 0) + Number(run.energy_cost || 0);
|
||||
tr.children[5].textContent = cost ? euro(cost) : "";
|
||||
const verdictLabel = document.createElement("label");
|
||||
verdictLabel.className = "sr-only";
|
||||
verdictLabel.textContent = "Urteil";
|
||||
const verdict = document.createElement("select");
|
||||
verdict.setAttribute("aria-label", "Urteil");
|
||||
[["", "offen"], ["gut", "gut"], ["ausschuss", "Ausschuss"]].forEach(([value, label]) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = value;
|
||||
@@ -126,10 +187,12 @@ function render() {
|
||||
verdict.addEventListener("change", async () => {
|
||||
try {
|
||||
await api("/laeufe/" + run.id, { method: "PATCH", json: { verdict: verdict.value } });
|
||||
toast("Urteil gespeichert.");
|
||||
} catch (error) {
|
||||
showNote("run-note", error);
|
||||
}
|
||||
});
|
||||
tr.children[6].appendChild(verdictLabel);
|
||||
tr.children[6].appendChild(verdict);
|
||||
if (run.needs_spool || !run.deducted) {
|
||||
const select = document.createElement("select");
|
||||
@@ -164,11 +227,49 @@ function render() {
|
||||
}
|
||||
});
|
||||
tr.children[7].appendChild(select);
|
||||
} else if ((run.spool_names || []).length > 1) {
|
||||
tr.children[7].className = "proto-spool";
|
||||
tr.children[7].textContent = run.spool_names.join(" → ");
|
||||
tr.children[7].title = run.spool_names.join(" → ");
|
||||
} else {
|
||||
const spool = spools.find((item) => item.id === run.spool_id);
|
||||
tr.children[7].textContent = spool ? spool.name : "abgezogen";
|
||||
tr.children[7].className = "proto-spool";
|
||||
if (spool) {
|
||||
tr.children[7].innerHTML = linkTo("spule", spool.id, spool.name);
|
||||
tr.children[7].title = spool.name;
|
||||
} else if ((run.spool_names || []).length) {
|
||||
tr.children[7].textContent = run.spool_names[0];
|
||||
} else {
|
||||
tr.children[7].textContent = "abgezogen";
|
||||
}
|
||||
}
|
||||
if (run.file_id) {
|
||||
if (!tr.children[7].className) tr.children[7].className = "proto-spool";
|
||||
const actions = tr.children[8];
|
||||
actions.className = "proto-actions";
|
||||
if (run.merge_with_id) {
|
||||
const mergeBtn = document.createElement("button");
|
||||
mergeBtn.type = "button";
|
||||
mergeBtn.className = "ghost tiny-btn";
|
||||
mergeBtn.textContent = "Verbinden";
|
||||
mergeBtn.title = "Mit Lauf #" + run.merge_with_id + " verbinden";
|
||||
mergeBtn.addEventListener("click", () => {
|
||||
armButton(mergeBtn, "Mit #" + run.merge_with_id + " verbinden?", async () => {
|
||||
try {
|
||||
await api("/laeufe/" + run.id + "/verbinden", {
|
||||
method: "POST",
|
||||
json: { other_id: run.merge_with_id, confirm: true },
|
||||
});
|
||||
toast("Läufe verbunden.");
|
||||
await load();
|
||||
} catch (error) {
|
||||
toast(error.message, "bad");
|
||||
}
|
||||
});
|
||||
});
|
||||
actions.appendChild(mergeBtn);
|
||||
}
|
||||
const running = ["in_progress", "printing", "paused"].includes(run.state);
|
||||
if (run.file_id && !running) {
|
||||
const again = document.createElement("button");
|
||||
again.type = "button";
|
||||
again.className = "ghost tiny-btn";
|
||||
@@ -213,20 +314,27 @@ function render() {
|
||||
}
|
||||
});
|
||||
});
|
||||
tr.children[8].appendChild(again);
|
||||
actions.appendChild(again);
|
||||
}
|
||||
body.appendChild(tr);
|
||||
});
|
||||
renderPager(document.getElementById("run-pager"), paged, (p) => {
|
||||
runPage = p;
|
||||
render();
|
||||
});
|
||||
}
|
||||
|
||||
async function load() {
|
||||
[runs, spools] = await Promise.all([api("/laeufe"), api("/spulen")]);
|
||||
[runs, spools] = await Promise.all([api("/laeufe?limit=500"), api("/spulen")]);
|
||||
runPage = 1;
|
||||
render();
|
||||
}
|
||||
window.onDruckerLive = () => { load().catch(() => {}); };
|
||||
window.onQueueChanged = () => { load().catch(() => {}); };
|
||||
|
||||
["run-filter-printer", "run-filter-verdict", "run-filter-spool"].forEach((id) => {
|
||||
document.getElementById(id).addEventListener("change", render);
|
||||
document.getElementById(id).addEventListener("input", render);
|
||||
document.getElementById(id).addEventListener("change", () => { runPage = 1; render(); });
|
||||
document.getElementById(id).addEventListener("input", () => { runPage = 1; render(); });
|
||||
});
|
||||
|
||||
document.getElementById("sync").addEventListener("click", async () => {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<a class="ghost" id="csv-link" href="/api/v1/statistik.csv">CSV</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbar page-tools">
|
||||
<div class="toolbar page-tools stat-tools">
|
||||
<div class="segmented period-presets fchips" id="period" role="group" aria-label="Zeitraum">
|
||||
<button type="button" data-period="all" class="fchip on">Alles</button>
|
||||
<button type="button" data-period="day" class="fchip">Tag</button>
|
||||
@@ -19,20 +19,28 @@
|
||||
<button type="button" data-period="last_week" class="fchip">Letzte Woche</button>
|
||||
<button type="button" data-period="last_month" class="fchip">Letzter Monat</button>
|
||||
</div>
|
||||
<input type="date" id="since" title="Von" class="date-field">
|
||||
<input type="date" id="until" title="Bis" class="date-field">
|
||||
<select id="host"><option value="">Alle Drucker</option></select>
|
||||
<input type="text" id="material" placeholder="Sorte" size="10">
|
||||
<input type="text" id="brand" placeholder="Marke" size="10">
|
||||
<div class="tools-end"><button type="button" id="reload" class="ghost"><svg class="ico"><use href="#i-refresh"/></svg>Aktualisieren</button></div>
|
||||
<details class="stat-more">
|
||||
<summary>Weitere Filter</summary>
|
||||
<div class="stat-filters">
|
||||
<input type="date" id="since" title="Von" class="date-field">
|
||||
<input type="date" id="until" title="Bis" class="date-field">
|
||||
<select id="host"><option value="">Alle Drucker</option></select>
|
||||
<select id="project"><option value="">Alle Projekte</option></select>
|
||||
<input type="text" id="material" placeholder="Sorte" size="8" autocomplete="off">
|
||||
<input type="text" id="brand" placeholder="Marke" size="8" autocomplete="off">
|
||||
<input type="text" id="color" placeholder="Farbe" size="8" autocomplete="off">
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
<p id="stat-note"></p>
|
||||
<div id="stat" class="statistik"></div>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
<script>
|
||||
function kpi(label, value, hint, ico) {
|
||||
return `<div class="kpi"><div class="kpi-label">${ico ? icon(ico) : ""}${escapeHtml(label)}</div><div class="kpi-value">${value}</div>${hint ? '<div class="kpi-sub">' + escapeHtml(hint) + "</div>" : ""}</div>`;
|
||||
function kpi(label, value, hint, ico, extraClass) {
|
||||
const empty = !value || value === "—" || value === "0 %";
|
||||
const cls = ["kpi", extraClass || "", empty ? "kpi-empty" : ""].filter(Boolean).join(" ");
|
||||
return `<div class="${cls}"><div class="kpi-label">${ico ? icon(ico) : ""}${escapeHtml(label)}</div><div class="kpi-value">${value}</div>${hint ? '<div class="kpi-sub">' + escapeHtml(hint) + "</div>" : ""}</div>`;
|
||||
}
|
||||
|
||||
function isoDate(date) {
|
||||
@@ -165,10 +173,11 @@ function render(data) {
|
||||
<tr>
|
||||
<td>${escapeHtml(m.material_type || "—")}</td>
|
||||
<td>${escapeHtml(m.brand || "")}</td>
|
||||
<td>${escapeHtml(m.color || "")}</td>
|
||||
<td class="num">${grams(m.weight_g)}</td>
|
||||
<td class="num">${euro(m.cost)}</td>
|
||||
<td class="num">${m.jobs}</td>
|
||||
</tr>`).join("") || '<tr><td class="empty" colspan="5">Kein Spulenabzug im Zeitraum.</td></tr>';
|
||||
</tr>`).join("") || '<tr><td class="empty" colspan="6">Kein Spulenabzug im Zeitraum.</td></tr>';
|
||||
|
||||
const chartPrinters = (data.by_printer || []).map((p) => ({
|
||||
...p,
|
||||
@@ -180,16 +189,18 @@ function render(data) {
|
||||
}));
|
||||
|
||||
document.getElementById("stat").innerHTML = `
|
||||
<div class="kpi-row">
|
||||
<div class="kpi-row kpi-primary">
|
||||
${kpi("Läufe", String(jobs), "", "layers")}
|
||||
${kpi("Druckzeit", hours(o.duration_s), "", "clock")}
|
||||
${kpi("Verbrauch", grams(o.weight_g), "", "weight")}
|
||||
${kpi("Kosten", euro(o.cost), "", "euro")}
|
||||
${kpi("Erfolg", success + " %", (o.completed || 0) + " fertig · " + (o.failed || 0) + " abgebrochen", "circle-check")}
|
||||
${kpi("Ausschuss", scrap + " %", (o.scrap || 0) + " mit Urteil Ausschuss", "ban")}
|
||||
${kpi("Stück-Yield", o.yield_percent != null ? Math.round(o.yield_percent) + " %" : "—", (o.pieces_ok || 0) + " gut · " + (o.pieces_bad || 0) + " schlecht", "percent")}
|
||||
${kpi("€ / Teil", o.cost_per_part != null ? euro(o.cost_per_part) : "—", "Material + Strom ÷ gut", "tag")}
|
||||
${kpi("Schätztreue", ratio, data.estimate_count ? data.estimate_count + " Läufe mit Soll-Zeit" : "keine Soll-Zeit", "gauge")}
|
||||
</div>
|
||||
<div class="kpi-row kpi-secondary">
|
||||
${kpi("Ausschuss", scrap + " %", (o.scrap || 0) + " mit Urteil Ausschuss", "ban", "kpi-sm")}
|
||||
${kpi("Stück-Yield", o.yield_percent != null ? Math.round(o.yield_percent) + " %" : "—", (o.pieces_ok || 0) + " gut · " + (o.pieces_bad || 0) + " schlecht", "percent", "kpi-sm")}
|
||||
${kpi("€ / Teil", o.cost_per_part != null ? euro(o.cost_per_part) : "—", "Material + Strom ÷ gut", "tag", "kpi-sm")}
|
||||
${kpi("Schätztreue", ratio, data.estimate_count ? data.estimate_count + " Läufe mit Soll-Zeit" : "keine Soll-Zeit", "gauge", "kpi-sm")}
|
||||
</div>
|
||||
<div class="split">
|
||||
<div class="card">
|
||||
@@ -198,7 +209,7 @@ function render(data) {
|
||||
</div>
|
||||
<div class="card">
|
||||
<h2>Verbrauch je Material</h2>
|
||||
${barChart(chartMaterials, "weight_g", (m) => [m.material_type, m.brand].filter(Boolean).join(" · ") || "—")}
|
||||
${barChart(chartMaterials, "weight_g", (m) => [m.material_type, m.brand, m.color].filter(Boolean).join(" · ") || "—")}
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
@@ -218,30 +229,58 @@ function render(data) {
|
||||
<div class="card">
|
||||
<h2>Nach Material</h2>
|
||||
<div class="table-wrap"><table>
|
||||
<thead><tr><th>Sorte</th><th>Marke</th><th>Gramm</th><th>Kosten</th><th>Läufe</th></tr></thead>
|
||||
<thead><tr><th>Sorte</th><th>Marke</th><th>Farbe</th><th>Gramm</th><th>Kosten</th><th>Läufe</th></tr></thead>
|
||||
<tbody>${materials}</tbody>
|
||||
</table></div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
async function fillProjects() {
|
||||
const select = document.getElementById("project");
|
||||
if (!select || select.dataset.filled) return;
|
||||
try {
|
||||
const rows = await api("/projekte?status=");
|
||||
const current = select.value;
|
||||
rows.forEach((p) => {
|
||||
const opt = document.createElement("option");
|
||||
opt.value = p.id;
|
||||
opt.textContent = p.name;
|
||||
select.appendChild(opt);
|
||||
});
|
||||
select.dataset.filled = "1";
|
||||
if ([...select.options].some((o) => o.value === current)) select.value = current;
|
||||
} catch (error) { /* optional */ }
|
||||
}
|
||||
|
||||
async function load() {
|
||||
await fillProjects();
|
||||
const params = new URLSearchParams();
|
||||
const since = document.getElementById("since").value;
|
||||
const until = document.getElementById("until").value;
|
||||
const host = document.getElementById("host").value;
|
||||
const project = document.getElementById("project").value;
|
||||
const material = document.getElementById("material").value.trim();
|
||||
const brand = document.getElementById("brand").value.trim();
|
||||
const color = document.getElementById("color").value.trim();
|
||||
if (since) params.set("since", since);
|
||||
if (until) params.set("until", until);
|
||||
if (host) params.set("host", host);
|
||||
if (project) params.set("project_id", project);
|
||||
if (material) params.set("material", material);
|
||||
if (brand) params.set("brand", brand);
|
||||
if (color) params.set("color", color);
|
||||
const q = params.toString();
|
||||
document.getElementById("csv-link").href = "/api/v1/statistik.csv" + (q ? "?" + q : "");
|
||||
const data = await api("/statistik" + (q ? "?" + q : ""));
|
||||
render(data);
|
||||
}
|
||||
|
||||
let filterTimer = null;
|
||||
function scheduleLoad() {
|
||||
clearTimeout(filterTimer);
|
||||
filterTimer = setTimeout(() => load().catch((error) => showNote("stat-note", error)), 280);
|
||||
}
|
||||
|
||||
function applyPeriod(key) {
|
||||
const range = periodRange(key);
|
||||
document.getElementById("since").value = range.since;
|
||||
@@ -256,28 +295,19 @@ document.getElementById("period").addEventListener("click", (event) => {
|
||||
applyPeriod(button.dataset.period);
|
||||
});
|
||||
|
||||
document.getElementById("reload").addEventListener("click", () => {
|
||||
load().catch((error) => showNote("stat-note", error));
|
||||
});
|
||||
["since", "until"].forEach((id) => {
|
||||
document.getElementById(id).addEventListener("change", () => {
|
||||
clearPeriodActive();
|
||||
load().catch((error) => showNote("stat-note", error));
|
||||
scheduleLoad();
|
||||
});
|
||||
});
|
||||
document.getElementById("host").addEventListener("change", () => {
|
||||
load().catch((error) => showNote("stat-note", error));
|
||||
});
|
||||
["material", "brand"].forEach((id) => {
|
||||
document.getElementById("host").addEventListener("change", scheduleLoad);
|
||||
document.getElementById("project").addEventListener("change", scheduleLoad);
|
||||
["material", "brand", "color"].forEach((id) => {
|
||||
const node = document.getElementById(id);
|
||||
if (!node) return;
|
||||
node.addEventListener("change", () => load().catch((error) => showNote("stat-note", error)));
|
||||
node.addEventListener("keydown", (event) => {
|
||||
if (event.key === "Enter") {
|
||||
event.preventDefault();
|
||||
load().catch((error) => showNote("stat-note", error));
|
||||
}
|
||||
});
|
||||
node.addEventListener("input", scheduleLoad);
|
||||
node.addEventListener("change", scheduleLoad);
|
||||
});
|
||||
load().catch((error) => showNote("stat-note", error));
|
||||
</script>
|
||||
|
||||
Loaded 100 of 102 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user