+
+
+
+
+
+
+
+
+
diff --git a/GUI/src/vast/views/assets/zones.geojson b/GUI/src/vast/views/assets/zones.geojson
new file mode 100644
index 000000000..bddcf348b
--- /dev/null
+++ b/GUI/src/vast/views/assets/zones.geojson
@@ -0,0 +1,24 @@
+
+
+
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "properties": {"name": "Zone A"},
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[[34.75, 32.00], [34.90, 32.00], [34.90, 32.10], [34.75, 32.10], [34.75, 32.00]]]
+ }
+ },
+ {
+ "type": "Feature",
+ "properties": {"name": "Zone B"},
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[[34.90, 31.95], [35.05, 31.95], [35.05, 32.05], [34.90, 32.05], [34.90, 31.95]]]
+ }
+ }
+ ]
+}
diff --git a/GUI/src/vast/views/auth_status_view.py b/GUI/src/vast/views/auth_status_view.py
new file mode 100644
index 000000000..1a4ea8563
--- /dev/null
+++ b/GUI/src/vast/views/auth_status_view.py
@@ -0,0 +1,316 @@
+
+from __future__ import annotations
+import os, time, jwt, requests, json
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QPushButton,
+ QComboBox, QTableWidget, QTableWidgetItem, QTextEdit, QFrame,
+ QMessageBox, QProgressDialog
+)
+from PyQt6.QtCore import Qt, QTimer
+from PyQt6 import sip
+
+
+def _line():
+ line = QFrame()
+ line.setFrameShape(QFrame.Shape.HLine)
+ line.setFrameShadow(QFrame.Shadow.Sunken)
+ return line
+
+
+class AuthStatusView(QWidget):
+ def __init__(self, api, parent=None):
+ super().__init__(parent)
+ self.api = api
+ self.access_token = None
+ self.refresh_token = None
+ self.expiry_ts = None
+ self.all_data = []
+
+ self.setStyleSheet("""
+ QWidget {
+ background-color: #101010;
+ color: #e6e6e6;
+ font-family: 'Segoe UI', sans-serif;
+ font-size: 14px;
+ }
+ QLineEdit, QComboBox {
+ background-color: #1a1a1a;
+ color: #e6e6e6;
+ border: 1px solid #333;
+ border-radius: 4px;
+ padding: 6px;
+ }
+ QPushButton {
+ background-color: #2d89ef;
+ color: white;
+ border: none;
+ padding: 8px 14px;
+ border-radius: 6px;
+ font-weight: 600;
+ }
+ QPushButton:hover { background-color: #1e5fb4; }
+ QTableWidget {
+ background-color: #1a1a1a;
+ gridline-color: #333;
+ color: #e6e6e6;
+ border: 1px solid #333;
+ border-radius: 6px;
+ }
+ QTextEdit {
+ background-color: #181818;
+ border: 1px solid #333;
+ color: #cccccc;
+ font-family: Consolas, monospace;
+ font-size: 12px;
+ }
+ QLabel#Title {
+ font-size: 22px;
+ font-weight: 700;
+ color: #00bcd4;
+ }
+ QFrame#Card {
+ background-color: #141414;
+ border: 1px solid #333;
+ border-radius: 10px;
+ padding: 14px;
+ }
+ """)
+
+ layout = QVBoxLayout(self)
+ layout.setContentsMargins(20, 20, 20, 20)
+ layout.setSpacing(15)
+
+ title = QLabel("User Data Dashboard")
+ title.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ title.setObjectName("Title")
+ layout.addWidget(title)
+ layout.addWidget(_line())
+
+ login_card = QFrame()
+ login_card.setObjectName("Card")
+ login_layout = QHBoxLayout(login_card)
+ self.user_edit = QLineEdit()
+ self.user_edit.setPlaceholderText("Username")
+ self.pass_edit = QLineEdit()
+ self.pass_edit.setEchoMode(QLineEdit.EchoMode.Password)
+ self.pass_edit.setPlaceholderText("Password")
+ self.btn_login = QPushButton("Login")
+ login_layout.addWidget(self.user_edit)
+ login_layout.addWidget(self.pass_edit)
+ login_layout.addWidget(self.btn_login)
+ layout.addWidget(login_card)
+
+ token_card = QFrame()
+ token_card.setObjectName("Card")
+ token_layout = QVBoxLayout(token_card)
+ self.tokens_display = QTextEdit()
+ self.tokens_display.setReadOnly(True)
+ token_layout.addWidget(self.tokens_display)
+ layout.addWidget(token_card)
+ layout.addWidget(_line())
+
+ tables_env = os.getenv("TABLES_LIST", "devices")
+ self.tables = [t.strip() for t in tables_env.split(",") if t.strip()]
+ select_card = QFrame()
+ select_card.setObjectName("Card")
+ select_layout = QHBoxLayout(select_card)
+ self.table_combo = QComboBox()
+ self.table_combo.addItems(self.tables)
+ self.btn_load = QPushButton("Load Table Data")
+ select_layout.addWidget(QLabel("Select Table:"))
+ select_layout.addWidget(self.table_combo, 1)
+ select_layout.addWidget(self.btn_load)
+ layout.addWidget(select_card)
+
+ search_card = QFrame()
+ search_card.setObjectName("Card")
+ search_layout = QHBoxLayout(search_card)
+ self.search_edit = QLineEdit()
+ self.search_edit.setPlaceholderText("Search in table...")
+ search_layout.addWidget(self.search_edit)
+ layout.addWidget(search_card)
+
+ self.table_widget = QTableWidget()
+ layout.addWidget(self.table_widget, 1)
+
+ self.progress = QProgressDialog("Loading data...", None, 0, 0, self)
+ self.progress.setWindowTitle("Please Wait")
+ self.progress.setCancelButton(None)
+ self.progress.setWindowModality(Qt.WindowModality.ApplicationModal)
+ self.progress.setStyleSheet("""
+ QProgressDialog {
+ background-color: #222;
+ color: white;
+ border: 2px solid #00bcd4;
+ border-radius: 10px;
+ font-size: 16px;
+ padding: 15px;
+ }
+ """)
+ self.progress.close()
+
+ self.btn_login.clicked.connect(self._login)
+ self.btn_load.clicked.connect(self._load_table)
+ self.search_edit.textChanged.connect(self._filter_table)
+
+ self.timer = QTimer(self)
+ self.timer.timeout.connect(self._update_expiry_timer)
+ self.timer.start(1000)
+
+ def _login(self):
+ user = self.user_edit.text().strip()
+ password = self.pass_edit.text().strip()
+ if not user or not password:
+ QMessageBox.warning(self, "Missing Data", "Please enter both username and password.")
+ return
+ try:
+ url = f"{self.api.base}/auth/login"
+ data = {"username": user, "password": password}
+ r = requests.post(url, data=data, timeout=10)
+ if r.status_code == 200:
+ js = r.json()
+ old_token = self.access_token
+ self.access_token = js.get("access_token")
+ self.refresh_token = js.get("refresh_token")
+ self.api.http.headers.update({"Authorization": f"Bearer {self.access_token}"})
+ try:
+ payload = jwt.decode(self.access_token, options={"verify_signature": False})
+ self.expiry_ts = payload.get("exp")
+ except Exception:
+ self.expiry_ts = None
+ msg_prefix = "✅ Access Token updated!\n\n" if old_token and self.access_token != old_token else ""
+ self.tokens_display.setPlainText(
+ f"{msg_prefix}"
+ f"Access Token:\n{self.access_token}\n\n"
+ f"Refresh Token:\n{self.refresh_token}"
+ )
+ QMessageBox.information(self, "Login Successful", "User authenticated successfully.")
+ else:
+ QMessageBox.warning(self, "Login Failed", f"Error {r.status_code}: {r.text[:200]}")
+ except Exception as e:
+ QMessageBox.critical(self, "Error", f"Failed to login:\n{e}")
+
+ def _update_expiry_timer(self):
+ if not self.expiry_ts or sip.isdeleted(self.tokens_display):
+ return
+ now = int(time.time())
+ secs_left = self.expiry_ts - now
+ if secs_left < 0:
+ msg = "⚠ Token expired."
+ else:
+ mins, secs = divmod(secs_left, 60)
+ msg = f"Token expires in {mins:02d}:{secs:02d}"
+ self.tokens_display.setToolTip(msg)
+
+ def _load_table(self):
+ if not self.access_token:
+ if not sip.isdeleted(self):
+ QMessageBox.warning(self, "Not Authenticated", "Please login first.")
+ return
+
+ table_name = self.table_combo.currentText()
+ url = f"{self.api.base}/api/tables/{table_name}"
+
+ try:
+ if sip.isdeleted(self):
+ return
+ self.progress.show()
+ self.repaint()
+
+ r = self.api.http.get(url, timeout=20)
+
+ if r.status_code == 200:
+ data = r.json()
+ if not sip.isdeleted(self) and self.isVisible():
+ self._populate_table(data)
+ elif not sip.isdeleted(self):
+ QMessageBox.warning(self, "Request Failed", f"{r.status_code}: {r.text[:200]}")
+
+ except Exception as e:
+ if not sip.isdeleted(self):
+ QMessageBox.critical(self, "Error", f"Request failed:\n{e}")
+ finally:
+ if hasattr(self, "progress") and not sip.isdeleted(self.progress):
+ self.progress.close()
+
+
+ def _populate_table(self, data):
+ if sip.isdeleted(self) or sip.isdeleted(self.table_widget) or not self.isVisible():
+ return
+
+ # --- normalize input ---
+ if isinstance(data, str):
+ try:
+ data = json.loads(data)
+ except Exception:
+ data = [{"value": data}]
+ if isinstance(data, dict) and "rows" in data:
+ data = data["rows"]
+ if not isinstance(data, list):
+ data = [data] if data else []
+
+ # --- handle empty ---
+ if not data:
+ self.table_widget.clear()
+ self.table_widget.setRowCount(0)
+ self.table_widget.setColumnCount(0)
+ if not sip.isdeleted(self):
+ QMessageBox.information(self, "Empty", "No data found for this table.")
+ return
+
+ # --- normalize rows to dicts ---
+ normalized = []
+ for row in data:
+ if not isinstance(row, dict):
+ try:
+ row = dict(row)
+ except Exception:
+ row = {"value": str(row)}
+ normalized.append(row)
+ data = normalized
+
+ # --- build header keys ---
+ keys = sorted({k for row in data for k in row.keys()})
+ if sip.isdeleted(self.table_widget):
+ return
+
+ self.table_widget.setColumnCount(len(keys))
+ self.table_widget.setRowCount(len(data))
+ self.table_widget.setHorizontalHeaderLabels(keys)
+
+ # --- fill cells safely ---
+ for i, row in enumerate(data):
+ if sip.isdeleted(self.table_widget):
+ return
+ for j, key in enumerate(keys):
+ val = row.get(key, "")
+ try:
+ if isinstance(val, (dict, list)):
+ val = json.dumps(val, ensure_ascii=False, indent=2)
+ elif val is None:
+ val = ""
+ else:
+ val = str(val)
+
+ if len(val) > 1000:
+ val = val[:997] + "..."
+ item = QTableWidgetItem(val)
+ item.setToolTip(val[:3000])
+ self.table_widget.setItem(i, j, item)
+ except Exception as e:
+ if not sip.isdeleted(self.table_widget):
+ self.table_widget.setItem(i, j, QTableWidgetItem(f"[error: {e}]"))
+
+ # --- finish up ---
+ self.table_widget.resizeColumnsToContents()
+ self.all_data = data
+
+ def _filter_table(self):
+ if sip.isdeleted(self.table_widget):
+ return
+ text = self.search_edit.text().lower().strip()
+ if not text:
+ self._populate_table(self.all_data)
+ return
+ filtered = [r for r in self.all_data if any(text in str(v).lower() for v in r.values())]
+ self._populate_table(filtered)
diff --git a/GUI/src/vast/views/fruits_view.py b/GUI/src/vast/views/fruits_view.py
new file mode 100644
index 000000000..37b85a508
--- /dev/null
+++ b/GUI/src/vast/views/fruits_view.py
@@ -0,0 +1,426 @@
+# views/fruits_view.py
+from __future__ import annotations
+from typing import Optional, Tuple, Dict, List
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QComboBox,
+ QTableWidget, QTableWidgetItem, QAbstractItemView, QDoubleSpinBox,
+ QMessageBox, QHeaderView, QDialog, QLineEdit, QFrame
+)
+
+from dashboard_api import DashboardApi
+
+
+# ---------- thresholds ----------
+class ThresholdsEditorDialog(QDialog):
+ thresholdsSaved = pyqtSignal(dict) # {(task,label): threshold}
+
+ TASK_OPTIONS = ["ripeness", "disease", "size", "color"]
+
+ def __init__(self, api: DashboardApi, parent: QWidget | None = None):
+ super().__init__(parent)
+ self.api = api
+ self.setWindowTitle("Fruits — Task Thresholds")
+ self.setModal(True)
+ self.resize(820, 560)
+
+
+ self.setStyleSheet("""
+
+QLineEdit#search {
+ padding: 10px 12px; border: 1px solid #e8dccc; border-radius: 10px; background: #ffffff;
+}
+
+
+/* ====== status====== */
+QLabel#status { color: #6b7280; }
+QLabel.status-ok { color: #17803a; }
+QLabel.status-warn { color: #b25a00; }
+QLabel.status-err { color: #cc0022; }
+
+
+QPushButton, QToolButton {
+ padding: 10px 16px; border-radius: 12px; color: white; border: none; font-weight: 700;
+}
+QPushButton:disabled { background: #c8c8c8; color: #f5f5f5; }
+
+/* Add (🍌) */
+QPushButton#btn_add {
+ background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #f8e27a, stop:1 #d8c94a);
+ color: #3a3a00;
+}
+QPushButton#btn_add:hover { background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #ffef87, stop:1 #e3d65a); }
+
+/* Delete (🍒) */
+QPushButton#btn_delete {
+ background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #ff6a7a, stop:1 #e03d4f);
+}
+QPushButton#btn_delete:hover { background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #ff7f8d, stop:1 #ea5666); }
+
+/* Save (🥝) */
+QPushButton#btn_save {
+ background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #4bd27c, stop:1 #2fb765);
+}
+QPushButton#btn_save:hover { background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #5fe08b, stop:1 #3fcb75); }
+
+/* Close (🫐) */
+QPushButton#btn_close {
+ background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #6a7bff, stop:1 #4757e6);
+}
+QPushButton#btn_close:hover { background: qlineargradient(x1:0,y1:0,x2:1,y2:0, stop:0 #7d8bff, stop:1 #5b6cf0); }
+""")
+
+ root = QVBoxLayout(self)
+ root.setSpacing(12)
+
+ # Title
+ title = QLabel("Fruits — Task Thresholds (per task/label)")
+ title.setObjectName("title")
+ root.addWidget(title)
+
+ # Toolbar: search + actions
+ toolbar = QFrame()
+ toolbar.setObjectName("toolbar")
+ tl = QHBoxLayout(toolbar)
+ tl.setContentsMargins(12, 12, 12, 12)
+ tl.setSpacing(8)
+
+ self.txt_search = QLineEdit(placeholderText="Search by task or label…")
+ self.txt_search.setObjectName("search")
+
+ self.btn_add = QPushButton("🍌 Add row")
+ self.btn_delete = QPushButton("🍒 Delete selected")
+ self.btn_save = QPushButton("🥝 Save all")
+
+ self.btn_add.setObjectName("btn_add")
+ self.btn_delete.setObjectName("btn_delete")
+ self.btn_save.setObjectName("btn_save")
+
+ tl.addWidget(self.txt_search, 1)
+ tl.addStretch(0)
+ tl.addWidget(self.btn_add)
+ tl.addWidget(self.btn_delete)
+ tl.addWidget(self.btn_save)
+
+ root.addWidget(toolbar)
+
+ # Table
+ self.tbl = QTableWidget(0, 4, self)
+ self.tbl.setAlternatingRowColors(True)
+ self.tbl.setHorizontalHeaderLabels([
+ "Task", "Label (optional)", "Threshold (0..1)", "Updated By"
+ ])
+ hdr = self.tbl.horizontalHeader()
+ hdr.setStretchLastSection(True)
+ hdr.setSectionResizeMode(QHeaderView.ResizeMode.Interactive)
+ self.tbl.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
+ self.tbl.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
+ self.tbl.setEditTriggers(
+ QAbstractItemView.EditTrigger.DoubleClicked
+ | QAbstractItemView.EditTrigger.SelectedClicked
+ | QAbstractItemView.EditTrigger.EditKeyPressed
+ )
+
+ self.tbl.verticalHeader().setDefaultSectionSize(36)
+
+ root.addWidget(self.tbl, 1)
+
+ # Status + Close
+ bottom = QHBoxLayout()
+ self.lbl_status = QLabel("Add rows and click Save.")
+ self.lbl_status.setObjectName("status")
+ bottom.addWidget(self.lbl_status)
+ bottom.addStretch(1)
+ self.btn_close = QPushButton("🫐 Close")
+ self.btn_close.setObjectName("btn_close")
+ bottom.addWidget(self.btn_close)
+ root.addLayout(bottom)
+
+ # Signals
+ self.btn_add.clicked.connect(self.add_row)
+ self.btn_delete.clicked.connect(self.delete_selected)
+ self.btn_save.clicked.connect(self.save_all)
+ self.btn_close.clicked.connect(self.accept)
+ self.txt_search.textChanged.connect(self._apply_filter)
+
+ # Start with one empty row
+ self.add_row()
+
+ def load_rows(self, rows: List[Tuple[str, str, float, str]]):
+
+ self.tbl.setRowCount(0)
+ for t, l, thr, upd in rows:
+ self.add_row(t, l, thr, upd)
+ self.lbl_status.setText(f"Loaded {len(rows)} rows.")
+
+ # -------- Row ops --------
+ def add_row(
+ self,
+ task: str = "",
+ label: str = "",
+ threshold: float = 0.5,
+ updated_by: str = "gui"
+ ):
+ r = self.tbl.rowCount()
+ self.tbl.insertRow(r)
+
+ # Task (combobox)
+ cmb = QComboBox(self.tbl)
+ cmb.addItems(self.TASK_OPTIONS)
+ if task in self.TASK_OPTIONS:
+ cmb.setCurrentText(task)
+ self.tbl.setCellWidget(r, 0, cmb)
+
+ # Label (editable)
+ self._set_text_cell(r, 1, label)
+
+ # Threshold (spinbox)
+ spn = QDoubleSpinBox(self.tbl)
+ spn.setRange(0.0, 1.0)
+ spn.setSingleStep(0.01)
+ spn.setDecimals(2)
+ spn.setValue(float(threshold))
+ spn.setAlignment(Qt.AlignmentFlag.AlignRight)
+ self.tbl.setCellWidget(r, 2, spn)
+
+ # Updated By
+ self._set_text_cell(r, 3, updated_by or "gui")
+
+ self.lbl_status.setText("Row added.")
+
+ def delete_selected(self):
+ sel = self.tbl.selectionModel().selectedRows()
+ if not sel:
+ self._set_status("No row selected.", "warn")
+ return
+ for m in sel:
+ self.tbl.removeRow(m.row())
+ self._set_status("Row deleted.", "ok")
+
+ # -------- Helpers --------
+ def _set_text_cell(self, row: int, col: int, text: str):
+ item = QTableWidgetItem(text or "")
+ item.setFlags(item.flags() | Qt.ItemFlag.ItemIsEditable)
+ self.tbl.setItem(row, col, item)
+
+ def _read_row(self, r: int) -> Tuple[str, str, float, str]:
+ # Task
+ cmb = self.tbl.cellWidget(r, 0)
+ task = cmb.currentText() if isinstance(cmb, QComboBox) else ""
+
+ # Label (optional)
+ label_item = self.tbl.item(r, 1)
+ label = (label_item.text().strip() if label_item else "")
+
+ # Threshold
+ spn = self.tbl.cellWidget(r, 2)
+ threshold = float(spn.value()) if isinstance(spn, QDoubleSpinBox) else 0.0
+
+ # Updated By
+ updated_item = self.tbl.item(r, 3)
+ updated_by = (updated_item.text().strip() if updated_item else "")
+
+ return task, label, threshold, updated_by
+
+ def _apply_filter(self):
+ q = self.txt_search.text().strip().lower()
+ for r in range(self.tbl.rowCount()):
+ t, l, _, _ = self._read_row(r)
+ show = (q in t.lower()) or (q in (l or "").lower()) or (q == "")
+ self.tbl.setRowHidden(r, not show)
+
+ def _set_status(self, text: str, level: str = "info"):
+ # level: ok|warn|err|info
+ self.lbl_status.setText(text)
+ for cls in ["status-ok", "status-warn", "status-err"]:
+ self.lbl_status.setProperty("class", "")
+ if level == "ok":
+ self.lbl_status.setProperty("class", "status-ok")
+ elif level == "warn":
+ self.lbl_status.setProperty("class", "status-warn")
+ elif level == "err":
+ self.lbl_status.setProperty("class", "status-err")
+ self.lbl_status.style().unpolish(self.lbl_status)
+ self.lbl_status.style().polish(self.lbl_status)
+
+ def _validate(self) -> Tuple[bool, str, List[int]]:
+ """
+ Rules:
+ - Task: required
+ - Label: optional (dedup by (task,label))
+ - Threshold: 0..1
+ - No duplicate (task, label)
+ - At least one row
+ Returns: (ok, msg, bad_rows_indices)
+ """
+ seen = set()
+ bad_rows = []
+
+ for r in range(self.tbl.rowCount()):
+ t, l, thr, _ = self._read_row(r)
+ if not t:
+ bad_rows.append(r)
+ return False, f"Row {r+1}: Task is empty.", bad_rows
+ if not (0.0 <= thr <= 1.0):
+ bad_rows.append(r)
+ return False, f"Row {r+1}: Threshold must be between 0 and 1.", bad_rows
+
+ key = (t, l or "")
+ if key in seen:
+ bad_rows.append(r)
+ return False, f"Row {r+1}: Duplicate (task,label)=({t},{l or '∅'}).", bad_rows
+ seen.add(key)
+
+ if self.tbl.rowCount() == 0:
+ return False, "No rows to save.", []
+
+ return True, "", []
+
+ # -------- Save --------
+ def save_all(self):
+ ok, msg, bad_rows = self._validate()
+
+ if not ok:
+ if bad_rows:
+ self.tbl.selectRow(bad_rows[0])
+ QMessageBox.warning(self, "Validation error", msg)
+ self._set_status(msg, "err")
+ return
+
+ # Build mapping: {(task,label): threshold}
+ mapping: Dict[Tuple[str, str], float] = {}
+ for r in range(self.tbl.rowCount()):
+ t, l, thr, _ = self._read_row(r)
+ key = (t, l or "")
+ mapping[key] = thr
+
+ # Disable buttons during save
+ self.btn_save.setEnabled(False)
+ self.btn_add.setEnabled(False)
+ self.btn_delete.setEnabled(False)
+
+ def _normalize_ok_set(ok_raw) -> set[tuple[str, str]]:
+ ok: set[tuple[str, str]] = set()
+ for item in ok_raw or []:
+ if isinstance(item, (list, tuple)):
+ ok.add((str(item[0]) if len(item)>0 else "", str(item[1]) if len(item)>1 else ""))
+ return ok
+
+ def _normalize_fail_list(fail_raw):
+ pairs = []
+ for item in fail_raw or []:
+ if isinstance(item, (list, tuple)) and len(item) >= 1:
+ key = item[0]
+ reason = item[1] if len(item) > 1 else "unknown"
+ if isinstance(key, (list, tuple)) and len(key) >= 1:
+ key_str = f"{key[0]},{key[1] if len(key)>1 else ''}"
+ else:
+ key_str = str(key)
+ pairs.append((key_str, str(reason)))
+ else:
+ pairs.append((str(item), "unknown"))
+ return pairs
+
+ try:
+ report = self.api.bulk_set_task_thresholds_labeled(mapping, updated_by="gui")
+ ok_keys = _normalize_ok_set(report.get("ok", []))
+ fail_pairs = _normalize_fail_list(report.get("fail", []))
+
+ total = len(mapping)
+ failed = len(fail_pairs)
+ succeeded = len(ok_keys) if ok_keys else (total - failed)
+
+ if failed == 0:
+ self._set_status(f"Saved {succeeded}/{total} thresholds ✓", "ok")
+ QMessageBox.information(self, "Saved", f"All {total} thresholds saved successfully.")
+ self.thresholdsSaved.emit({k: v for k, v in mapping.items()})
+ else:
+ lines = "\n".join(f"- {k}: {reason}" for k, reason in fail_pairs[:10])
+ more = "" if failed <= 10 else f"\n(+{failed-10} more...)"
+ self._set_status(f"Partial save: {succeeded}/{total} saved, {failed} failed.", "warn")
+ QMessageBox.warning(self, "Partial save", f"Saved {succeeded}/{total}.\nFailed:\n{lines}{more}")
+
+ except Exception as e:
+ import traceback
+ traceback.print_exc()
+ QMessageBox.critical(self, "Error", f"Failed to save thresholds:\n{type(e).__name__}: {e}")
+ self._set_status("Failed to save thresholds.", "err")
+ finally:
+ self.btn_save.setEnabled(True)
+ self.btn_add.setEnabled(True)
+ self.btn_delete.setEnabled(True)
+
+
+
+class FruitsView(QWidget):
+ thresholdsSaved = pyqtSignal(dict) # {(task,label): threshold}
+
+ def __init__(self, api: DashboardApi, parent=None):
+ super().__init__(parent)
+ self.api = api
+
+ root = QVBoxLayout(self)
+ root.setSpacing(10)
+
+ title = QLabel("Fruits")
+ title.setStyleSheet("font-size: 22px; font-weight: 700;")
+ root.addWidget(title)
+
+
+ row = QHBoxLayout()
+ lbl = QLabel("Manage task thresholds per task/label.")
+ self.btn_open_editor = QPushButton("Change thresholds…")
+ row.addWidget(lbl, 1)
+ row.addStretch(0)
+ row.addWidget(self.btn_open_editor)
+ root.addLayout(row)
+
+ line = QFrame()
+ line.setFrameShape(QFrame.Shape.HLine)
+ line.setStyleSheet("color:#e5e7eb;")
+ root.addWidget(line)
+
+
+ self.lbl_status = QLabel("Click “Change thresholds…” to edit.")
+ self.lbl_status.setStyleSheet("color:#555;")
+ root.addWidget(self.lbl_status)
+
+
+ self.btn_open_editor.clicked.connect(self.open_thresholds_dialog)
+ # ─────────────────────────────────────────────
+ # Metrics Section (Grafana panels)
+ # ─────────────────────────────────────────────
+ metrics_title = QLabel("Fruit Alerts Metrics")
+ metrics_title.setStyleSheet("font-size: 18px; font-weight: 600; margin-top: 15px;")
+ root.addWidget(metrics_title)
+
+ grafana_host = os.getenv("GRAFANA_HOST", "grafana")
+ base = f"http://{grafana_host}:3000"
+
+ panel_urls = [
+ QUrl(f"{base}/d-solo/fruit-metrics/fruit-alerts?orgId=1&panelId=1&refresh=10s&theme=light"),
+ QUrl(f"{base}/d-solo/fruit-metrics/fruit-alerts?orgId=1&panelId=2&refresh=10s&theme=light"),
+ QUrl(f"{base}/d-solo/fruit-metrics/fruit-alerts?orgId=1&panelId=3&refresh=10s&theme=light"),
+ QUrl(f"{base}/d-solo/fruit-metrics/fruit-alerts?orgId=1&panelId=4&refresh=10s&theme=light"),
+ ]
+
+ metrics_box = QVBoxLayout()
+ metrics_box.setSpacing(10)
+ root.addLayout(metrics_box)
+
+ for url in panel_urls:
+ view = QWebEngineView(self)
+ view.setMinimumHeight(300)
+ view.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+ view.setUrl(url)
+ metrics_box.addWidget(view)
+
+ def open_thresholds_dialog(self):
+ dlg = ThresholdsEditorDialog(self.api, self)
+
+ # rows = self.api.get_current_thresholds() -> List[Tuple[str,str,float,str]]
+ # dlg.load_rows(rows)
+
+ dlg.thresholdsSaved.connect(self.thresholdsSaved.emit)
+ dlg.exec() # modal
+ self.lbl_status.setText("Threshold editor closed.")
diff --git a/GUI/src/vast/views/ground_view.py b/GUI/src/vast/views/ground_view.py
new file mode 100644
index 000000000..d4da6f80e
--- /dev/null
+++ b/GUI/src/vast/views/ground_view.py
@@ -0,0 +1,597 @@
+from __future__ import annotations
+import os
+from dataclasses import dataclass
+from typing import Optional, Any, Dict, List
+
+from PyQt6.QtCore import Qt, QTimer, QSize, QRectF
+from PyQt6.QtGui import QPixmap, QKeyEvent, QPainter, QColor, QPen, QFont
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton,
+ QProgressBar, QMessageBox, QSizePolicy, QFrame
+)
+
+# GUI never touches MinIO directly – it uses DashboardApi only.
+from vast.dashboard_api import DashboardApi
+
+GROUND_BUCKET = os.getenv("GROUND_BUCKET", "ground")
+GROUND_PREFIX = os.getenv("GROUND_PREFIX", "")
+
+DB_API_BASE = os.getenv("DB_API_BASE", "http://127.0.0.1:8001")
+MINIO_ENDPOINT = os.getenv("MINIO_ENDPOINT", "127.0.0.1:9001")
+MINIO_SECURE = os.getenv("MINIO_SECURE", "false")
+MINIO_ACCESS_KEY = os.getenv("MINIO_ACCESS_KEY", "minioadmin")
+MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY", "minioadmin123")
+GROUND_BUCKET = os.getenv("GROUND_BUCKET", "ground")
+GROUND_PREFIX = os.getenv("GROUND_PREFIX", "")
+GATEWAY_URL = os.getenv("GATEWAY_URL", "http://127.0.0.1:8000")
+# ----------------------------
+# PHI data model
+# ----------------------------
+@dataclass
+class PhiSnapshot:
+ phi: Optional[float] # 0..100 or None
+ density: Optional[float]
+ coverage: Optional[float]
+ severity_avg: Optional[float] # usually 0..1 (clamped)
+ trend: Optional[float]
+ week_start: Optional[str]
+ source: str = "" # textual hint of data source (NOT shown in UI)
+
+
+def _phi_band_color(v: float) -> str:
+ # 80..100 = green, 50..79 = amber, else red
+ if v >= 80:
+ return "#16a34a" # green-600
+ if v >= 50:
+ return "#f59e0b" # amber-500
+ return "#dc2626" # red-600
+
+
+def _safe_float(x) -> Optional[float]:
+ try:
+ if x is None:
+ return None
+ return float(x)
+ except Exception:
+ return None
+
+
+# ----------------------------
+# Visual PHI circle (pie)
+# ----------------------------
+class PhiCircleWidget(QWidget):
+ """
+ Draws a pie:
+ - red slice = severity in [0..1]
+ - green slice = 1 - severity (healthy remainder)
+ Always draws red on top so it's never hidden.
+ Also draws the severity percentage text centered on the pie.
+ """
+ def __init__(self, parent=None):
+ super().__init__(parent)
+ self._severity = 0.0 # 0..1
+ self.setAttribute(Qt.WidgetAttribute.WA_OpaquePaintEvent, True)
+ self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+ self.setToolTip("Red slice = severity (0..1). Green = healthy remainder.")
+
+ def sizeHint(self):
+ return QSize(120, 120)
+
+ def minimumSizeHint(self):
+ return QSize(100, 100)
+
+ def setSeverity(self, value: float) -> None:
+ try:
+ v = float(value)
+ except Exception:
+ v = 0.0
+ self._severity = max(0.0, min(1.0, v))
+ self.update() # ensure repaint
+
+ def paintEvent(self, event) -> None:
+ try:
+ painter = QPainter(self)
+ painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
+ painter.setPen(Qt.PenStyle.NoPen)
+
+ pad = 10
+ size = min(self.width(), self.height()) - 2 * pad
+ if size <= 0:
+ return
+ cx = (self.width() - size) / 2
+ cy = (self.height() - size) / 2
+ rect = QRectF(cx, cy, size, size)
+
+ start = 90 * 16 # 12 o'clock (Qt: 0° is 3 o'clock)
+ full = -360 * 16
+
+ s = self._severity
+ # Degenerate cases
+ if s <= 1e-6:
+ painter.setBrush(QColor("#16a34a"))
+ painter.drawEllipse(rect)
+ elif s >= 1 - 1e-6:
+ painter.setBrush(QColor("#dc2626"))
+ painter.drawEllipse(rect)
+ else:
+ span_red = int(round(full * s)) # negative (clockwise)
+ span_green = full - span_red # the remainder
+
+ # Draw green remainder first
+ painter.setBrush(QColor("#16a34a"))
+ painter.drawPie(rect, start + span_red, span_green)
+
+ # Draw red slice on top (so it's always visible)
+ painter.setBrush(QColor("#dc2626"))
+ painter.drawPie(rect, start, span_red)
+
+ # Outline
+ pen = QPen(QColor("#334155"))
+ pen.setWidth(2)
+ painter.setPen(pen)
+ painter.setBrush(Qt.BrushStyle.NoBrush)
+ painter.drawEllipse(rect)
+
+ # Percentage text (centered)
+ percent_text = f"{int(round(s * 100))}%"
+ font = QFont()
+ font.setBold(True)
+ font.setPointSize(int(size * 0.22)) # responsive sizing
+ painter.setFont(font)
+
+ # Soft shadow for readability
+ painter.setPen(QColor(0, 0, 0, 160))
+ painter.drawText(rect, Qt.AlignmentFlag.AlignCenter, percent_text)
+ # Foreground text
+ painter.setPen(QColor("#ffffff"))
+ painter.drawText(rect, Qt.AlignmentFlag.AlignCenter, percent_text)
+
+ except Exception as e:
+ print(f"[PhiCircleWidget] paintEvent error: {e}")
+
+
+# ----------------------------
+# GroundView
+# ----------------------------
+class GroundView(QWidget):
+ """
+ Gallery mode:
+ - Loads all object keys from MinIO via DashboardApi.
+ - Keeps current index; supports Prev/Next buttons and keyboard arrows.
+ - On image change, fetches bytes and refreshes PHI for that key.
+ """
+
+ def __init__(self, api: DashboardApi, parent=None):
+ super().__init__(parent)
+ self.api = api
+
+ # State for gallery
+ self._keys: List[str] = []
+ self._idx: int = -1
+
+ # ---------- UI ----------
+ root = QVBoxLayout(self)
+ root.setContentsMargins(12, 12, 12, 12)
+ root.setSpacing(10)
+
+ title = QLabel("🌿 Ground — Gallery & PHI")
+ title.setStyleSheet("font-size:20px;font-weight:800;color:#0f172a;")
+ root.addWidget(title)
+
+ # Toolbar
+ toolbar = QHBoxLayout()
+ self.btn_refresh_list = QPushButton("Reload list")
+ self.btn_refresh_list.clicked.connect(self.reload_keys)
+
+ self.btn_prev = QPushButton("◀ Prev")
+ self.btn_prev.clicked.connect(self.prev_image)
+ self.btn_next = QPushButton("Next ▶")
+ self.btn_next.clicked.connect(self.next_image)
+
+ self.btn_show_phi = QPushButton("Show PHI")
+ self.btn_show_phi.clicked.connect(self.refresh_phi_current)
+
+ self.counter_label = QLabel("(0 / 0)")
+ self.counter_label.setStyleSheet("color:#475569;font-size:12px;")
+
+ toolbar.addWidget(self.btn_refresh_list)
+ toolbar.addSpacing(8)
+ toolbar.addWidget(self.btn_prev)
+ toolbar.addWidget(self.btn_next)
+ toolbar.addSpacing(16)
+ toolbar.addWidget(self.btn_show_phi)
+ toolbar.addStretch(1)
+ toolbar.addWidget(self.counter_label)
+ root.addLayout(toolbar)
+
+ # Image frame
+ img_frame = QFrame()
+ img_frame.setStyleSheet("background:#f8fafc;border:1px solid #cbd5e1;border-radius:10px;")
+ img_layout = QVBoxLayout(img_frame)
+ img_layout.setContentsMargins(8, 8, 8, 8)
+ img_layout.setSpacing(6)
+
+ self.image_label = QLabel("(No image loaded yet)")
+ self.image_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.image_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+ self.image_label.setMinimumHeight(260)
+ img_layout.addWidget(self.image_label)
+
+ self.img_meta = QLabel("")
+ self.img_meta.setStyleSheet("color:#475569;font-size:12px;")
+ img_layout.addWidget(self.img_meta)
+
+ root.addWidget(img_frame, stretch=2)
+
+ # PHI area
+ phi_frame = QFrame()
+ phi_frame.setStyleSheet("background:#ffffff;border:1px solid #cbd5e1;border-radius:10px;")
+ phi_layout = QVBoxLayout(phi_frame)
+ phi_layout.setContentsMargins(12, 12, 12, 12)
+ phi_layout.setSpacing(8)
+
+ # Row with headline + (trimmed) details
+ row = QHBoxLayout()
+ self.phi_label = QLabel("PHI: –")
+ self.phi_label.setStyleSheet("font-size:16px;font-weight:700;color:#0f172a;")
+ row.addWidget(self.phi_label)
+ row.addStretch(1)
+ self.phi_details = QLabel("") # will show severity/coverage/trend (without src)
+ self.phi_details.setStyleSheet("color:#475569;font-size:12px;")
+ row.addWidget(self.phi_details)
+ phi_layout.addLayout(row)
+
+ # PHI progress (axis-like) + pie at its side
+ self.phi_bar = QProgressBar()
+ self.phi_bar.setRange(0, 100)
+ self.phi_bar.setValue(0)
+ self.phi_bar.setFormat("%v")
+ self._style_phi_bar(None)
+
+ phi_row2 = QHBoxLayout()
+ phi_row2.setContentsMargins(0, 0, 0, 0)
+ phi_row2.setSpacing(10)
+ phi_row2.addWidget(self.phi_bar, stretch=1)
+
+ self.phi_circle = PhiCircleWidget()
+ self.phi_circle.setFixedSize(120, 120)
+ phi_row2.addWidget(self.phi_circle)
+
+ phi_layout.addLayout(phi_row2)
+
+ legend = QLabel(" = Severity | = Healthy")
+ legend.setStyleSheet("color:#64748b;font-size:11px;")
+ phi_layout.addWidget(legend)
+
+ root.addWidget(phi_frame, stretch=1)
+
+ # Auto-refresh PHI every 2 min
+ self.timer = QTimer(self)
+ self.timer.setInterval(120_000)
+ self.timer.timeout.connect(self.refresh_phi_current)
+ self.timer.start()
+
+ # Initial load
+ QTimer.singleShot(200, self.reload_keys)
+
+ # So arrow keys work even without inner focus
+ self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+
+ # ----------------------------
+ # Styling helpers
+ # ----------------------------
+ def _style_phi_bar(self, value: Optional[float]) -> None:
+ color = "#64748b" if value is None else _phi_band_color(float(value))
+ self.phi_bar.setStyleSheet(
+ f"QProgressBar {{ border:1px solid #cbd5e1;border-radius:6px;height:18px; }} "
+ f"QProgressBar::chunk {{ background:{color}; border-radius:6px; }}"
+ )
+
+ def _warn(self, msg: str) -> None:
+ # Non-blocking warning box
+ try:
+ def _show():
+ try:
+ box = QMessageBox(self)
+ box.setIcon(QMessageBox.Icon.Warning)
+ box.setWindowTitle("Ground")
+ box.setText(str(msg))
+ box.setStandardButtons(QMessageBox.StandardButton.Ok)
+ box.setWindowModality(Qt.WindowModality.NonModal)
+ box.show()
+ except BaseException:
+ print(f"[GroundView] WARN(fallback): {msg}")
+ QTimer.singleShot(0, _show)
+ except BaseException:
+ print(f"[GroundView] WARN: {msg}")
+
+ def _try_api(self, names: List[str], *args, **kwargs) -> Any:
+ # Try a list of API method names until one succeeds.
+ for name in names:
+ fn = getattr(self.api, name, None)
+ if callable(fn):
+ try:
+ return fn(*args, **kwargs)
+ except Exception as e:
+ print(f"[GroundView] API call {name} failed: {e}")
+ return None
+
+ # ----------------------------
+ # Gallery: load keys & navigation
+ # ----------------------------
+ def reload_keys(self) -> None:
+ """Load all object keys from MinIO (sorted newest→oldest)."""
+ try:
+ objs = self._try_api(
+ ["list_minio_objects", "list_objects"],
+ bucket=GROUND_BUCKET, prefix=GROUND_PREFIX, limit=1000
+ )
+ keys: List[str] = []
+ if isinstance(objs, list):
+ # Sort by last_modified/LastModified desc when available
+ def _lm(o):
+ if not isinstance(o, dict):
+ return ""
+ return o.get("last_modified") or o.get("LastModified") or ""
+ try:
+ objs = sorted(objs, key=_lm, reverse=True)
+ except Exception:
+ pass
+ for o in objs:
+ if isinstance(o, dict):
+ for f in ("key", "name", "object_name", "path"):
+ v = o.get(f)
+ if isinstance(v, str) and v.strip():
+ keys.append(v.strip())
+ break
+
+ self._keys = keys
+ self._idx = 0 if self._keys else -1
+ self._update_counter()
+ self._update_nav_buttons()
+ if self._idx >= 0:
+ self.load_current_image()
+ else:
+ self._set_image(None)
+ self.img_meta.setText("No objects found in MinIO.")
+ self._render_phi_none()
+
+ except Exception as e:
+ self._warn(f"reload_keys error: {e}")
+
+ def _update_counter(self) -> None:
+ total = len(self._keys)
+ pos = (self._idx + 1) if self._idx >= 0 else 0
+ self.counter_label.setText(f"({pos} / {total})")
+
+ def _update_nav_buttons(self) -> None:
+ has = bool(self._keys)
+ for b in (self.btn_prev, self.btn_next, self.btn_show_phi):
+ b.setEnabled(has)
+
+ def prev_image(self) -> None:
+ if not self._keys:
+ return
+ self._idx = (self._idx - 1) % len(self._keys)
+ self._update_counter()
+ self.load_current_image()
+
+ def next_image(self) -> None:
+ if not self._keys:
+ return
+ self._idx = (self._idx + 1) % len(self._keys)
+ self._update_counter()
+ self.load_current_image()
+
+ def keyPressEvent(self, event: QKeyEvent) -> None:
+ if event.key() in (Qt.Key.Key_Left, Qt.Key.Key_A):
+ self.prev_image()
+ event.accept()
+ return
+ if event.key() in (Qt.Key.Key_Right, Qt.Key.Key_D):
+ self.next_image()
+ event.accept()
+ return
+ super().keyPressEvent(event)
+
+ # ----------------------------
+ # Image load + PHI for current key
+ # ----------------------------
+ def _set_image(self, pix: Optional[QPixmap]) -> None:
+ if pix is None or pix.isNull():
+ self.image_label.setText("(No image)")
+ self.image_label.setPixmap(QPixmap())
+ return
+ target_size: QSize = self.image_label.size()
+ if target_size.width() <= 4 or target_size.height() <= 4:
+ self.image_label.setPixmap(pix)
+ self.image_label.setText("")
+ return
+ scaled = pix.scaled(
+ target_size.width(),
+ target_size.height(),
+ Qt.AspectRatioMode.KeepAspectRatio,
+ Qt.TransformationMode.SmoothTransformation,
+ )
+ self.image_label.setPixmap(scaled)
+ self.image_label.setText("")
+
+ def resizeEvent(self, e):
+ super().resizeEvent(e)
+ pix = self.image_label.pixmap()
+ if pix is not None and not pix.isNull():
+ self._set_image(pix)
+
+ def load_current_image(self) -> None:
+ """Load image bytes for current key and refresh PHI."""
+ try:
+ if self._idx < 0 or self._idx >= len(self._keys):
+ self._set_image(None)
+ self.img_meta.setText("No selection.")
+ self._render_phi_none()
+ return
+
+ key = self._keys[self._idx]
+ getter = getattr(self.api, "get_image_bytes_from_minio", None)
+ if not callable(getter):
+ self._warn("DashboardApi.get_image_bytes_from_minio is missing.")
+ self._set_image(None)
+ self._render_phi_none()
+ return
+
+ data = None
+ try:
+ data = getter(key, bucket=GROUND_BUCKET)
+ except TypeError:
+ data = getter(key)
+ except Exception as e:
+ self._warn(f"Failed fetching image bytes: {e}")
+ data = None
+
+ if not data:
+ self._set_image(None)
+ self.img_meta.setText(f"Failed to read: {GROUND_BUCKET}/{key}")
+ self._render_phi_none()
+ return
+
+ pix = QPixmap()
+ if not pix.loadFromData(data):
+ self._set_image(None)
+ self.img_meta.setText(f"Unsupported bytes: {GROUND_BUCKET}/{key}")
+ self._render_phi_none()
+ return
+
+ self._set_image(pix)
+ self.img_meta.setText(f"{GROUND_BUCKET}/{key}")
+
+ # After image displayed, refresh PHI
+ self._refresh_phi_for_key(key)
+
+ except Exception as e:
+ self._warn(f"load_current_image error: {e}")
+ self._render_phi_none()
+
+ # ----------------------------
+ # PHI flow
+ # ----------------------------
+ def _map_phi_dict(self, d: Dict[str, Any], source: str) -> PhiSnapshot:
+ return PhiSnapshot(
+ phi=_safe_float(d.get("phi")),
+ density=_safe_float(d.get("density")),
+ coverage=_safe_float(d.get("coverage")),
+ severity_avg=_safe_float(d.get("severity_avg")),
+ trend=_safe_float(d.get("trend")),
+ week_start=str(d.get("week_start")) if d.get("week_start") is not None else None,
+ source=source,
+ )
+
+ def _render_phi_none(self) -> None:
+ self.phi_label.setText("PHI: –")
+ self.phi_details.setText("No PHI available.")
+ self.phi_bar.setValue(0)
+ self._style_phi_bar(None)
+ self.phi_circle.setSeverity(0.0)
+
+ def _refresh_phi_for_key(self, key: str) -> None:
+ """Best-effort PHI for the specific image key. Fully guarded."""
+ try:
+ # 1) Exact by key
+ d = self._try_api(["get_phi_for_image"], key)
+ if isinstance(d, dict) and (d.get("phi") is not None or d.get("severity_avg") is not None):
+ return self._render_phi(self._map_phi_dict(d, "phi_by_key"))
+
+ # 2) Current image
+ d = self._try_api(["get_phi_for_current_image"])
+ if isinstance(d, dict) and (d.get("phi") is not None or d.get("severity_avg") is not None):
+ return self._render_phi(self._map_phi_dict(d, "phi_current"))
+
+ # 3) Weekly/global
+ d = self._try_api(["get_weekly_phi"])
+ if isinstance(d, dict) and (d.get("phi") is not None or d.get("severity_avg") is not None):
+ return self._render_phi(self._map_phi_dict(d, "weekly"))
+
+ # 4) Derive roughly from latest rows as last resort
+ rows = self._try_api(["get_latest_rows", "get_latest_detections", "get_latest_ground_rows"], limit=1) or []
+ if rows and isinstance(rows, list) and isinstance(rows[0], dict):
+ sev = None
+ cov = None
+ for k in ("severity_avg", "severity", "mean_severity"):
+ sev = _safe_float(rows[0].get(k))
+ if sev is not None:
+ break
+ for k in ("coverage", "plant_coverage"):
+ cov = _safe_float(rows[0].get(k))
+ if cov is not None:
+ break
+
+ phi_val = None
+ if sev is not None:
+ s = sev if sev <= 1.0 else min(sev, 10.0) / 10.0
+ phi_val = max(0.0, min(100.0, 100.0 * (1.0 - s)))
+ elif cov is not None:
+ c = max(0.0, min(1.0, cov))
+ phi_val = 100.0 * c
+
+ if phi_val is not None:
+ snap = PhiSnapshot(
+ phi=phi_val, density=None, coverage=cov, severity_avg=sev,
+ trend=None, week_start=None, source="derived_from_rows"
+ )
+ return self._render_phi(snap)
+
+ # Nothing available
+ self._render_phi_none()
+ # self._warn("No PHI available for this image.")
+ except Exception as e:
+ # self._warn(f"_refresh_phi_for_key error: {e}")
+ self._render_phi_none()
+
+ def _render_phi(self, snap: PhiSnapshot) -> None:
+ if snap is None or snap.phi is None:
+ self._render_phi_none()
+ return
+
+ # Progress bar + label
+ val = max(0, min(100, int(round(snap.phi))))
+ self.phi_label.setText(f"PHI: {val}")
+ parts = []
+ # keep useful metrics, but DO NOT show 'src=' anymore
+ if snap.density is not None:
+ parts.append(f"density={snap.density:.2f}")
+ if snap.coverage is not None:
+ parts.append(f"coverage={snap.coverage:.2f}")
+ if snap.severity_avg is not None:
+ parts.append(f"severity={snap.severity_avg:.2f}")
+ if snap.trend is not None:
+ parts.append(f"trend={snap.trend:+.2f}")
+ if snap.week_start:
+ parts.append(f"week={snap.week_start}")
+ self.phi_details.setText(" | ".join(parts)) # no src here
+ self.phi_bar.setValue(val)
+ self._style_phi_bar(val)
+
+ # Circle severity (normalized to 0..1)
+ sev = snap.severity_avg
+ try:
+ sev = float(sev) if sev is not None else 0.0
+ except Exception:
+ sev = 0.0
+ sev_norm = sev if sev <= 1.0 else min(sev, 10.0) / 10.0
+ self.phi_circle.setSeverity(max(0.0, min(1.0, sev_norm)))
+
+ def refresh_phi_current(self) -> None:
+ """Called by the 'Show PHI' button; uses current image key safely."""
+ try:
+ if 0 <= self._idx < len(self._keys):
+ key = self._keys[self._idx]
+ if not isinstance(key, str) or not key.strip():
+ self._render_phi_none()
+ # self._warn("No valid image key selected.")
+ return
+ self._refresh_phi_for_key(key)
+ else:
+ self._render_phi_none()
+ # self._warn("No image selected yet. Click 'Reload list' or 'Next'.")
+ except Exception as e:
+ self._render_phi_none()
+ self._warn(f"Show PHI failed: {e}")
diff --git a/services/sounds/API-development/src/__init__.py b/GUI/src/vast/views/irrigation/__init__.py
similarity index 100%
rename from services/sounds/API-development/src/__init__.py
rename to GUI/src/vast/views/irrigation/__init__.py
diff --git a/GUI/src/vast/views/irrigation/dashboard_bar.py b/GUI/src/vast/views/irrigation/dashboard_bar.py
new file mode 100644
index 000000000..9c27077f4
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/dashboard_bar.py
@@ -0,0 +1,127 @@
+from PyQt6.QtWidgets import QWidget, QHBoxLayout, QLabel, QVBoxLayout, QFrame
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QFont
+from datetime import datetime
+
+class DashboardBar(QWidget):
+ def __init__(self, parent=None):
+ super().__init__(parent)
+
+ # Clean minimalistic style: no background, only bottom border
+ self.setStyleSheet("""
+ QWidget {
+ background: transparent;
+ border-bottom: 1px solid #e5e7eb;
+ }
+ QLabel.title {
+ color: #6b7280;
+ font-size: 10pt;
+ font-weight: 500;
+ }
+ QLabel.value {
+ color: #111827;
+ font-size: 18pt;
+ font-weight: 600;
+ }
+ """)
+
+ layout = QHBoxLayout(self)
+ layout.setContentsMargins(20, 16, 20, 16)
+ layout.setSpacing(32)
+
+ # Helper: metric block
+ def metric(title_text, value_text, big=True):
+ container = QWidget()
+ v = QVBoxLayout(container)
+ v.setContentsMargins(0, 0, 0, 0)
+ v.setSpacing(2)
+
+ title = QLabel(title_text)
+ title.setProperty("class", "title")
+
+ value = QLabel(value_text)
+ value.setProperty("class", "value" if big else "title")
+
+ v.addWidget(title)
+ v.addWidget(value)
+ return container, value
+
+ # Metric 1
+ block, self.active_value = metric("Active Sprinklers", "0")
+ layout.addWidget(block)
+
+ layout.addWidget(self._separator())
+
+ # Metric 2
+ block, self.area_value = metric("Irrigated Area", "0%")
+ layout.addWidget(block)
+
+ layout.addWidget(self._separator())
+
+ # Metric 3
+ block, self.time_value = metric("Last Update", "--", big=False)
+ layout.addWidget(block)
+
+ layout.addStretch()
+
+ # Status container (clean version)
+ self.status_container = QWidget()
+ s = QHBoxLayout(self.status_container)
+ s.setContentsMargins(0, 0, 0, 0)
+ s.setSpacing(6)
+
+ self.status_indicator = QLabel("●")
+ self.status_indicator.setStyleSheet("color: #dc2626; font-size: 12px;")
+
+ self.status_text = QLabel("Disconnected")
+ self.status_text.setFont(QFont('Segoe UI', 10))
+ self.status_text.setStyleSheet("color: #dc2626; font-weight: 600;")
+
+ s.addWidget(self.status_indicator)
+ s.addWidget(self.status_text)
+ layout.addWidget(self.status_container)
+
+ def _separator(self):
+ sep = QFrame()
+ sep.setFrameShape(QFrame.Shape.VLine)
+ sep.setStyleSheet("color: #e5e7eb;")
+ sep.setFixedWidth(1)
+ return sep
+
+ def update_status(self, active_count, area_percent, last_update, healthy):
+ self.active_value.setText(str(active_count))
+ self.area_value.setText(f"{area_percent:.1f}%")
+
+ if last_update:
+ try:
+ if isinstance(last_update, str):
+ last_dt = datetime.fromisoformat(last_update.replace('Z', '+00:00'))
+ else:
+ last_dt = last_update
+
+ now = datetime.now(last_dt.tzinfo) if last_dt.tzinfo else datetime.now()
+ delta = now - last_dt
+ seconds = int(delta.total_seconds())
+
+ if seconds < 60:
+ t = f"{seconds}s ago"
+ elif seconds < 3600:
+ t = f"{seconds // 60}m ago"
+ else:
+ t = f"{seconds // 3600}h ago"
+
+ self.time_value.setText(t)
+ except:
+ self.time_value.setText("--")
+ else:
+ self.time_value.setText("--")
+
+ # Status indicator styling
+ if healthy:
+ self.status_indicator.setStyleSheet("color: #16a34a; font-size: 12px;")
+ self.status_text.setText("Connected")
+ self.status_text.setStyleSheet("color: #16a34a; font-weight: 600;")
+ else:
+ self.status_indicator.setStyleSheet("color: #dc2626; font-size: 12px;")
+ self.status_text.setText("Disconnected")
+ self.status_text.setStyleSheet("color: #dc2626; font-weight: 600;")
diff --git a/GUI/src/vast/views/irrigation/history_panel.py b/GUI/src/vast/views/irrigation/history_panel.py
new file mode 100644
index 000000000..e5556a911
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/history_panel.py
@@ -0,0 +1,34 @@
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QTableWidget, QTableWidgetItem, QLabel, QHeaderView
+from PyQt6.QtCore import Qt
+
+class HistoryPanel(QWidget):
+ def __init__(self, parent=None):
+ super().__init__(parent)
+ self.setWindowFlags(Qt.WindowType.Widget)
+ self.setFixedWidth(400)
+ layout = QVBoxLayout(self)
+ self.title = QLabel("Sprinkler History")
+ self.title.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ layout.addWidget(self.title)
+ self.table = QTableWidget(0, 6)
+ self.table.setHorizontalHeaderLabels(['Timestamp','Device','Decision','Confidence','Dry Ratio','Image'])
+ # self.table.horizontalHeader().setSectionResizeMode(QTableWidget.ResizeMode.Stretch)
+ self.table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch)
+ self.table.setAlternatingRowColors(True)
+ self.table.setStyleSheet('alternate-background-color: #f9fafb; background: white;')
+ self.table.verticalHeader().hide()
+ self.table.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
+ layout.addWidget(self.table)
+
+ def show_history(self, records):
+ self.table.setRowCount(0)
+ for row in records:
+ r = self.table.rowCount()
+ self.table.insertRow(r)
+ self.table.setItem(r,0, QTableWidgetItem(str(row['ts'])))
+ self.table.setItem(r,1, QTableWidgetItem(row['device_id']))
+ dec_item = QTableWidgetItem(row['decision'])
+ self.table.setItem(r,2, dec_item)
+ self.table.setItem(r,3, QTableWidgetItem(f"{row['confidence']:.2f}"))
+ self.table.setItem(r,4, QTableWidgetItem(f"{row['dry_ratio']:.2f}"))
+ self.table.setItem(r,5, QTableWidgetItem("View Image"))
diff --git a/GUI/src/vast/views/irrigation/irrigation_dashboard.py b/GUI/src/vast/views/irrigation/irrigation_dashboard.py
new file mode 100644
index 000000000..7b59b1c9c
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/irrigation_dashboard.py
@@ -0,0 +1,969 @@
+# from pathlib import Path
+# import sys, random
+
+# # Add current directory to path to allow direct execution
+# script_dir = Path(__file__).parent
+# sys.path.insert(0, str(script_dir))
+
+# from PyQt6.QtWidgets import (
+# QApplication, QWidget, QVBoxLayout, QDialog, QFormLayout, QScrollArea,
+# QComboBox, QLineEdit, QHBoxLayout, QPushButton, QTableWidget, QTableWidgetItem,
+# QHeaderView, QProgressBar, QDialogButtonBox, QGraphicsDropShadowEffect, QLabel
+# )
+# from map_widget import MapWidget
+# from history_panel import HistoryPanel
+# # from .sprinkler_details_dialog import SprinklerDetailsDialog
+# from sprinkler_details_dialog_new import SprinklerDetailsDialogNew
+# from dashboard_bar import DashboardBar
+# from PyQt6.QtGui import QPixmap, QMovie, QFont, QColor, QIcon
+# from PyQt6.QtCore import Qt, QTimer, QSize, QPropertyAnimation, QRect, QEasingCurve
+
+# import psycopg2
+# from psycopg2.extras import RealDictCursor
+
+# # ----------------------- DB helpers (unchanged) -----------------------
+# def get_db_connection():
+# return psycopg2.connect(
+# # host="postgres",
+# host = "localhost",
+# port=5432,
+# user="missions_user",
+# password="pg123",
+# dbname="missions_db",
+# cursor_factory=RealDictCursor
+# )
+
+# # NOTE: original fetch functions retained (they must exist and behave the same)
+# # For brevity we keep their original implementations from the provided file.
+
+# def fetch_sprinkler_history(limit=500):
+# query = f"""
+# SELECT e.device_id, e.dry_ratio, e.decision, e.confidence, e.patch_count, e.extra,
+# p.prev_state, e.ts
+# FROM soil_moisture_events e
+# LEFT JOIN irrigation_policies p ON e.device_id = p.device_id
+# ORDER BY e.ts DESC
+# LIMIT {limit}
+# """
+# with get_db_connection() as conn:
+# with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+# cur.execute(query)
+# rows = cur.fetchall()
+
+# for row in rows:
+# prev_state = row.get('prev_state') or 'stop'
+# decision = row['decision']
+# if decision == "noop":
+# new_state = prev_state
+# elif decision in ("run", "stop"):
+# new_state = decision
+# else:
+# new_state = "stop"
+# row['prev_state'] = prev_state
+# row['new_state'] = new_state
+
+# return rows
+
+
+# def fetch_sprinkler_data():
+# query = """
+# SELECT e.device_id, e.dry_ratio, e.decision, e.confidence, e.patch_count, e.extra,
+# e.ts, p.prev_state
+# FROM soil_moisture_events e
+# LEFT JOIN irrigation_policies p ON e.device_id = p.device_id
+# WHERE e.ts = (
+# SELECT MAX(ts)
+# FROM soil_moisture_events e2
+# WHERE e2.device_id = e.device_id
+# )
+# ORDER BY e.device_id
+# """
+
+# with get_db_connection() as conn:
+# with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+# cur.execute(query)
+# rows = cur.fetchall()
+
+# for row in rows:
+# prev_state = row.get('prev_state') or 'stop'
+# decision = row['decision']
+# if decision == "noop":
+# new_state = prev_state
+# elif decision in ("run", "stop"):
+# new_state = decision
+# else:
+# new_state = "stop"
+# row['prev_state'] = prev_state
+# row['new_state'] = new_state
+
+# return rows
+
+
+# # ----------------------- UI Components -----------------------
+# class ImageModal(QDialog):
+# """Modal to show image with dark overlay and details"""
+# def __init__(self, parent, pixmap: QPixmap, details: dict):
+# super().__init__(parent)
+# self.setModal(True)
+# self.setWindowFlag(Qt.WindowType.FramelessWindowHint)
+# self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+
+# self.main = QWidget(self)
+# self.main.setStyleSheet("background: white; border-radius: 12px;")
+# layout = QVBoxLayout(self.main)
+# self.main.setLayout(layout)
+
+# img_label = QLabel()
+# max_w = int(parent.width() * 0.8)
+# max_h = int(parent.height() * 0.8)
+# img_label.setPixmap(pixmap.scaled(max_w, max_h, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation))
+# img_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+# layout.addWidget(img_label)
+
+# info = QLabel(f"Timestamp: {details.get('ts')} — Decision: {details.get('decision')} — Confidence: {details.get('confidence'):.2f}")
+# layout.addWidget(info)
+
+# btns = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+# btns.rejected.connect(self.close)
+# layout.addWidget(btns)
+
+# # position central
+# w, h = int(parent.width()*0.85), int(parent.height()*0.85)
+# self.setGeometry((parent.width()-w)//2, (parent.height()-h)//2, w, h)
+# self.main.setGeometry(0, 0, w, h)
+
+# class FloatingDetailsCard(QWidget):
+# """Floating centered card (replaces drawer)"""
+# def __init__(self, parent, device_id, details):
+# super().__init__(parent)
+# self.device_id = device_id
+# self.details = details
+# self.setWindowFlags(Qt.WindowType.FramelessWindowHint)
+# self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+
+# self.card = QWidget(self)
+# self.card.setStyleSheet("""
+# background: white;
+# border-radius: 14px;
+# """)
+
+# shadow = QGraphicsDropShadowEffect(self.card)
+# shadow.setBlurRadius(30)
+# shadow.setOffset(0, 8)
+# shadow.setColor(QColor(0,0,0,100))
+# self.card.setGraphicsEffect(shadow)
+
+# # layout
+# l = QVBoxLayout(self.card)
+# l.setContentsMargins(20, 20, 20, 20)
+# # title with gradient-like color
+# title = QLabel(f"Sprinkler {device_id}")
+# title.setFont(QFont('Segoe UI', 14, QFont.Weight.Bold))
+# title.setStyleSheet("color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #06b6d4, stop:1 #0891b2);")
+# l.addWidget(title)
+
+# # status row
+# status_row = QHBoxLayout()
+# status_dot = QLabel('●')
+# status_dot.setFont(QFont('Arial', 16))
+# status_color = '#10b981' if details.get('active') else '#6b7280'
+# status_dot.setStyleSheet(f"color: {status_color}")
+# status_row.addWidget(status_dot)
+# status_row.addWidget(QLabel('Active' if details.get('active') else 'Inactive'))
+# status_row.addStretch()
+# l.addLayout(status_row)
+
+# # dry ratio progress
+# dry_label = QLabel('💧 Dry Ratio')
+# l.addWidget(dry_label)
+# pb = QProgressBar()
+# pb.setRange(0, 100)
+# pb.setValue(int(details.get('dry_ratio',0)*100))
+# pb.setTextVisible(True)
+# pb.setFormat('%.0f%%' % (pb.value(),))
+# pb.setFixedHeight(18)
+# pb.setStyleSheet("border-radius:9px;")
+# l.addWidget(pb)
+
+# # confidence with color
+# conf = details.get('confidence',0)
+# conf_label = QLabel(f'🎯 Confidence: {conf:.2f}')
+# if conf >= 0.75:
+# conf_color = '#10b981'
+# elif conf >= 0.4:
+# conf_color = '#f59e0b'
+# else:
+# conf_color = '#ef4444'
+# conf_label.setStyleSheet(f'color: {conf_color}; font-weight: bold')
+# l.addWidget(conf_label)
+
+# # decision
+# decision_label = QLabel(f'⚙️ Decision: {details.get("decision")}')
+# l.addWidget(decision_label)
+
+# # button row (bottom)
+# btn_row = QHBoxLayout()
+# btn_row.setSpacing(16)
+# btn_row.addStretch()
+# # Show History button
+# self.show_history_btn = QPushButton('Show History')
+# self.show_history_btn.setStyleSheet('background:#06b6d4; color:white; padding:8px; border-radius:8px')
+# btn_row.addWidget(self.show_history_btn)
+# # Close button
+# self.close_btn = QPushButton('Close')
+# self.close_btn.clicked.connect(self.close_card)
+# self.close_btn.setFixedWidth(120)
+# self.close_btn.setStyleSheet('background:#3b82f6; color:white; padding:8px; border-radius:10px')
+# btn_row.addWidget(self.close_btn)
+# l.addLayout(btn_row)
+
+# # size and position
+# w, h = int(parent.width()*0.6), int(parent.height()*0.5)
+# self.setGeometry((parent.width()-w)//2, (parent.height()-h)//2, w, h)
+# self.card.setGeometry(0,0,w,h)
+
+# # fade-in animation
+# self.opacity_anim = QPropertyAnimation(self, b"windowOpacity")
+# self.opacity_anim.setDuration(220)
+# self.opacity_anim.setStartValue(0.0)
+# self.opacity_anim.setEndValue(1.0)
+# self.setWindowOpacity(0.0)
+# self.opacity_anim.start()
+
+# def close_card(self):
+# self.close()
+
+# class IrrigationDashboard(QWidget):
+# def __init__(self):
+# super().__init__()
+# print("[DEBUG] IrrigationDashboard.__init__ called")
+# self.setWindowTitle("Irrigation Dashboard 🌾")
+# self.setGeometry(100, 100, 1100, 820)
+# QApplication.setFont(QFont('Roboto', 10))
+# main = QVBoxLayout(self)
+# main.setContentsMargins(0,0,0,0)
+# self.setStyleSheet("""
+# QWidget#root { background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 #f0f9ff, stop:1 #e0f2fe); }
+# QLabel.title { font-family: 'Segoe UI'; font-weight: bold; font-size: 18px; color: #111827 }
+# """)
+# self.setObjectName('root')
+
+# # MapWidget replaces map logic
+# print("[DEBUG] Creating DashboardBar...")
+# self.dashboard_bar = DashboardBar(self)
+# main.addWidget(self.dashboard_bar)
+# print("[DEBUG] Creating MapWidget...")
+# self.map_widget = MapWidget(self, map_path=str(script_dir / "map_field.jpg"))
+# self.sprinklers = {} # device_id -> info, for non-map logic (details, etc.)
+# # print("[DEBUG] Creating HistoryPanel...")
+# # self.history_panel = HistoryPanel(self)
+# # self.history_panel.hide()
+
+# # Create map layout with minimal margins to push sprinklers down
+# map_container = QWidget()
+# map_layout = QVBoxLayout(map_container)
+# map_layout.setContentsMargins(0, 10, 0, 0) # Minimal top margin (10px instead of default)
+# map_layout.setSpacing(0)
+# map_layout.addWidget(self.map_widget)
+
+# main.addWidget(map_container, stretch=3)
+# # main.addWidget(self.history_panel, stretch=1)
+
+# # timer for data refresh
+# print("[DEBUG] Setting up timer...")
+# self.timer = QTimer()
+# self.timer.timeout.connect(self.safe_update_data)
+# # Delay first update to avoid issues during init
+# self.timer.singleShot(1000, self.safe_update_data)
+# self.timer.start(3000)
+# print("[DEBUG] IrrigationDashboard.__init__ completed")
+
+# def resizeEvent(self, event):
+# super().resizeEvent(event)
+# # Delegate map resizing to MapWidget
+# if hasattr(self, 'map_widget') and self.map_widget:
+# self.map_widget.resizeEvent(event)
+
+# def set_sprinkler_state(self, s, active):
+# btn: QPushButton = s['widget']
+# # create / reuse label for movie
+# if 'label' not in s:
+# lbl = QLabel(btn)
+# lbl.setAlignment(Qt.AlignmentFlag.AlignCenter)
+# lbl.setGeometry(0,0,btn.width(),btn.height())
+# lbl.raise_() # Raise label above button to display image
+# s['label'] = lbl
+# lbl = s['label']
+
+# if active:
+# movie = QMovie(str(script_dir / 'sprinkler_on.gif'))
+# movie.setScaledSize(QSize(btn.width(), btn.height()))
+# lbl.setMovie(movie)
+# movie.start()
+# lbl.raise_() # Ensure label stays on top
+# lbl.show()
+# btn.setStyleSheet(self.sprinkler_style(active=True))
+# s['movie'] = movie
+# else:
+# # static image
+# pix = QPixmap(str(script_dir / 'sprinkler_off.png')) if (script_dir / 'sprinkler_off.png').exists() else QPixmap(btn.width(), btn.height())
+# if pix.isNull():
+# pix = QPixmap(btn.width(), btn.height()); pix.fill(QColor('#6b7280'))
+# lbl.setPixmap(pix.scaled(btn.size(), Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation))
+# lbl.raise_() # Ensure label stays on top
+# lbl.show()
+# btn.setStyleSheet(self.sprinkler_style(active=False))
+# s['movie'] = None
+# s['active'] = active
+
+# def sprinkler_style(self, active=False):
+# # circular button with colored background (not transparent)
+# base = f"""
+# QPushButton {{
+# width: 56px; height:56px; border-radius:28px;
+
+# font-weight: bold;
+# color: white;
+# }}
+# QPushButton:hover {{ }}
+# """
+# return base
+
+# def update_history(self):
+# # Populate filters (preserve current selection) and refresh table
+# rows = fetch_sprinkler_history()
+# prev_dev = self.filter_device.currentText() if self.filter_device.count()>0 else 'All'
+# prev_dec = self.filter_decision.currentText() if self.filter_decision.count()>0 else 'All'
+
+# unique_devices = sorted({row['device_id'] for row in rows})
+# unique_decisions = sorted({row['decision'] for row in rows})
+
+# # repopulate while preserving selection when possible
+# self.filter_device.blockSignals(True)
+# self.filter_decision.blockSignals(True)
+# self.filter_device.clear(); self.filter_device.addItem('All'); self.filter_device.addItems(unique_devices)
+# self.filter_decision.clear(); self.filter_decision.addItem('All'); self.filter_decision.addItems(unique_decisions)
+# idx = self.filter_device.findText(prev_dev)
+# if idx >= 0:
+# self.filter_device.setCurrentIndex(idx)
+# idx = self.filter_decision.findText(prev_dec)
+# if idx >= 0:
+# self.filter_decision.setCurrentIndex(idx)
+# self.filter_device.blockSignals(False)
+# self.filter_decision.blockSignals(False)
+
+# # apply currently selected filters to populate the table
+# self.apply_filters()
+
+# def apply_filters(self):
+# # fetch and filter rows locally
+# rows = fetch_sprinkler_history()
+# dev = self.filter_device.currentText()
+# dec = self.filter_decision.currentText()
+# if dev and dev != 'All':
+# rows = [r for r in rows if r.get('device_id') == dev]
+# if dec and dec != 'All':
+# rows = [r for r in rows if r.get('decision') == dec]
+
+# # date filter
+# try:
+# dfrom = self.filter_date_from.date().toPyDate()
+# dto = self.filter_date_to.date().toPyDate()
+# # only apply if user set meaningful range (non-default)
+# if dfrom and dto and dfrom <= dto:
+# rows = [r for r in rows if r.get('ts') and dfrom <= r['ts'].date() <= dto]
+# except Exception:
+# pass
+
+# # numeric filters
+# try:
+# drymin = float(self.filter_dry_min.text()) if self.filter_dry_min.text() else None
+# confmin = float(self.filter_conf_min.text()) if self.filter_conf_min.text() else None
+# if drymin is not None:
+# rows = [r for r in rows if r.get('dry_ratio', 0) >= drymin]
+# if confmin is not None:
+# rows = [r for r in rows if r.get('confidence', 0) >= confmin]
+# except Exception:
+# pass
+
+# self.populate_history_table(rows)
+
+# def populate_history_table(self, rows):
+# self.history_table.setRowCount(0)
+# for row in rows:
+# r = self.history_table.rowCount()
+# self.history_table.insertRow(r)
+# self.history_table.setItem(r,0, QTableWidgetItem(str(row['ts'])))
+# self.history_table.setItem(r,1, QTableWidgetItem(row['device_id']))
+# dec_item = QTableWidgetItem(row['decision'])
+# if row['decision']=='run': dec_item.setBackground(QColor('#10b981'))
+# elif row['decision']=='stop': dec_item.setBackground(QColor('#ef4444'))
+# else: dec_item.setBackground(QColor('#f59e0b'))
+# self.history_table.setItem(r,2, dec_item)
+# self.history_table.setItem(r,3, QTableWidgetItem(f"{row['confidence']:.2f}"))
+# self.history_table.setItem(r,4, QTableWidgetItem(f"{row['dry_ratio']:.2f}"))
+# view_btn = QPushButton('View Image')
+# view_btn.clicked.connect(lambda _checked, rr=row: self.show_image_modal(rr))
+# self.history_table.setCellWidget(r,5, view_btn)
+
+# def show_image_modal(self, row):
+# # for demo: try to load an image from disk or show placeholder
+# img_path = script_dir / 'sprinkler_image_placeholder.jpg'
+# if img_path.exists():
+# pix = QPixmap(str(img_path))
+# else:
+# pix = QPixmap(400,300)
+# pix.fill(QColor('#ddd'))
+# m = ImageModal(self, pix, row)
+# m.exec()
+
+# def update_data(self):
+# try:
+# rows = fetch_sprinkler_data()
+# healthy = True
+# except Exception as e:
+# print('Error fetching data:', e)
+# import traceback
+# traceback.print_exc()
+# rows = []
+# healthy = False
+
+# # Update sprinklers on map
+# active_count = 0
+# irrigated_area = 0.0
+# last_update = '--'
+# max_timestamp = None
+# for i, row in enumerate(rows):
+# device_id = row['device_id']
+# dry_ratio = row['dry_ratio']
+# decision = row['decision']
+# confidence = row['confidence']
+# new_state = row['new_state']
+# active = new_state == 'run'
+# if active:
+# active_count += 1
+# irrigated_area += dry_ratio if active else 0
+
+# # Track the most recent timestamp across all sprinklers
+# ts = row.get('ts')
+# if ts and (max_timestamp is None or ts > max_timestamp):
+# max_timestamp = ts
+
+# # MapWidget handles display and GIF/image ONLY (no shapes)
+# if device_id not in self.map_widget.sprinklers:
+# rel_x = (100 + i*120 + random.randint(-20, 20)) / max(1, self.map_widget.map_pixmap.width())
+# rel_y = (300 + random.randint(-100, 100)) / max(1, self.map_widget.map_pixmap.height())
+# rel_size = 0.025
+# btn = self.map_widget.add_sprinkler(device_id, rel_x, rel_y, rel_size, active, name=device_id)
+# try:
+# btn.clicked.connect(lambda _e, d=device_id: self.show_details(d))
+# except Exception as e:
+# print(f"[ERROR] Failed to connect clicked signal for {device_id}: {e}")
+
+# s = self.map_widget.sprinklers[device_id]
+# # ALWAYS set sprinkler state on every update - ensures images/GIFs shown for new sprinklers added after startup
+# self.set_sprinkler_state(s, active)
+# s.update({'dry_ratio': dry_ratio, 'decision': decision, 'confidence': confidence})
+# # Update main window's sprinkler info for details dialog
+# self.sprinklers[device_id] = s
+
+# # Set last_update to the most recent timestamp
+# if max_timestamp:
+# last_update = str(max_timestamp)
+
+# total_area = len(rows)
+# irrigated_percent = (irrigated_area / total_area * 100) if total_area else 0.0
+# self.dashboard_bar.update_status(active_count, irrigated_percent, last_update, healthy)
+
+# def safe_update_data(self):
+# """Safe wrapper for update_data that catches exceptions"""
+# try:
+# self.update_data()
+# except Exception as e:
+# print(f"[ERROR] safe_update_data failed: {e}")
+# import traceback
+# traceback.print_exc()
+
+# def show_details(self, device_id):
+# print(f"[DEBUG] show_details() called for device_id={device_id}")
+# if device_id not in self.sprinklers:
+# print(f"[DEBUG] Device {device_id} not found in sprinklers dict")
+# return
+# # Close previous details dialog if open
+# if hasattr(self, '_details_card') and self._details_card:
+# print(f"[DEBUG] Closing previous details card")
+# self._details_card.close()
+# s = self.sprinklers[device_id]
+# details = {
+# 'active': s.get('active', False),
+# 'dry_ratio': s.get('dry_ratio', 0),
+# 'confidence': s.get('confidence', 0),
+# 'decision': s.get('decision', 'noop')
+# }
+# print(f"[DEBUG] Creating new SprinklerDetailsDialogNew with details: {details}")
+# # Use new tabbed dialog
+# card = SprinklerDetailsDialogNew(self, device_id, details)
+# card.history_requested.connect(lambda d: self.show_history_panel(d))
+# self._details_card = card
+# print(f"[DEBUG] Calling card.show()")
+# card.show()
+# print(f"[DEBUG] Dialog shown")
+
+# def show_history_panel(self, device_id):
+# # Close previous details dialog if open
+# if hasattr(self, '_details_card') and self._details_card:
+# self._details_card.close()
+# # Fetch last 10 records for this sprinkler
+# all_history = fetch_sprinkler_history(limit=100)
+# records = [r for r in all_history if r['device_id'] == device_id][:10]
+# self.history_panel.show_history(records)
+# self.history_panel.show()
+# self.map_widget.setFixedWidth(int(self.width() * 0.6))
+# # Add close button to history panel
+# if not hasattr(self.history_panel, 'close_btn'):
+# from PyQt6.QtWidgets import QPushButton
+# close_btn = QPushButton('Close History')
+# close_btn.setStyleSheet('background:#ef4444; color:white; padding:6px; border-radius:8px')
+# close_btn.clicked.connect(self.hide_history_panel)
+# layout = self.history_panel.layout()
+# layout.addWidget(close_btn)
+# self.history_panel.close_btn = close_btn
+
+# def hide_history_panel(self):
+# self.history_panel.hide()
+# self.map_widget.setFixedWidth(self.width())
+# # Ensure details dialog can be reopened after closing history
+# self._details_card = None
+
+# def on_history_clicked(self, row, col):
+# # show full details card when any non-button cell is clicked
+# try:
+# device = self.history_table.item(row,1).text()
+# if device:
+# self.show_details(device)
+# except Exception:
+# pass
+
+# if __name__ == '__main__':
+# app = QApplication(sys.argv)
+# window = IrrigationDashboard()
+# window.show()
+# sys.exit(app.exec())
+
+
+from pathlib import Path
+import sys, random
+from PyQt6.QtWidgets import (
+ QApplication, QWidget, QVBoxLayout, QDialog, QFormLayout, QScrollArea,
+ QComboBox, QLineEdit, QHBoxLayout, QPushButton, QTableWidget, QTableWidgetItem,
+ QHeaderView, QProgressBar, QDialogButtonBox, QGraphicsDropShadowEffect, QLabel
+)
+from .map_widget import MapWidget
+from .history_panel import HistoryPanel
+from .sprinkler_details_dialog_new import SprinklerDetailsDialogNew
+from .dashboard_bar import DashboardBar
+from PyQt6.QtGui import QPixmap, QMovie, QFont, QColor, QIcon
+from PyQt6.QtCore import Qt, QTimer, QSize, QPropertyAnimation, QRect, QEasingCurve
+
+import psycopg2
+from psycopg2.extras import RealDictCursor
+
+# ----------------------- DB helpers (unchanged) -----------------------
+def get_db_connection():
+ return psycopg2.connect(
+ host="postgres",
+ port=5432,
+ user="missions_user",
+ password="pg123",
+ dbname="missions_db",
+ cursor_factory=RealDictCursor
+ )
+
+# NOTE: original fetch functions retained (they must exist and behave the same)
+# For brevity we keep their original implementations from the provided file.
+
+def fetch_sprinkler_history(limit=500):
+ query = f"""
+ SELECT e.device_id, e.dry_ratio, e.decision, e.confidence, e.patch_count, e.extra,
+ p.prev_state, e.ts
+ FROM soil_moisture_events e
+ LEFT JOIN irrigation_policies p ON e.device_id = p.device_id
+ ORDER BY e.ts DESC
+ LIMIT {limit}
+ """
+ with get_db_connection() as conn:
+ with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+ cur.execute(query)
+ rows = cur.fetchall()
+
+ for row in rows:
+ prev_state = row.get('prev_state') or 'stop'
+ decision = row['decision']
+ if decision == "noop":
+ new_state = prev_state
+ elif decision in ("run", "stop"):
+ new_state = decision
+ else:
+ new_state = "stop"
+ row['prev_state'] = prev_state
+ row['new_state'] = new_state
+
+ return rows
+
+
+def fetch_sprinkler_data():
+ query = """
+ SELECT e.device_id, e.dry_ratio, e.decision, e.confidence, e.patch_count, e.extra,
+ e.ts, p.prev_state
+ FROM soil_moisture_events e
+ LEFT JOIN irrigation_policies p ON e.device_id = p.device_id
+ WHERE e.ts = (
+ SELECT MAX(ts)
+ FROM soil_moisture_events e2
+ WHERE e2.device_id = e.device_id
+ )
+ ORDER BY e.device_id
+ """
+
+ with get_db_connection() as conn:
+ with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+ cur.execute(query)
+ rows = cur.fetchall()
+
+ for row in rows:
+ prev_state = row.get('prev_state') or 'stop'
+ decision = row['decision']
+ if decision == "noop":
+ new_state = prev_state
+ elif decision in ("run", "stop"):
+ new_state = decision
+ else:
+ new_state = "stop"
+ row['prev_state'] = prev_state
+ row['new_state'] = new_state
+
+ return rows
+
+
+script_dir = Path(__file__).parent
+
+# # ----------------------- UI Components -----------------------
+# class ImageModal(QDialog):
+# """Modal to show image with dark overlay and details"""
+# def __init__(self, parent, pixmap: QPixmap, details: dict):
+# super().__init__(parent)
+# self.setModal(True)
+# self.setWindowFlag(Qt.WindowType.FramelessWindowHint)
+# self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+
+# self.main = QWidget(self)
+# self.main.setStyleSheet("background: white; border-radius: 12px;")
+# layout = QVBoxLayout(self.main)
+# self.main.setLayout(layout)
+
+# img_label = QLabel()
+# max_w = int(parent.width() * 0.8)
+# max_h = int(parent.height() * 0.8)
+# img_label.setPixmap(pixmap.scaled(max_w, max_h, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation))
+# img_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+# layout.addWidget(img_label)
+
+# info = QLabel(f"Timestamp: {details.get('ts')} — Decision: {details.get('decision')} — Confidence: {details.get('confidence'):.2f}")
+# layout.addWidget(info)
+
+# btns = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+# btns.rejected.connect(self.close)
+# layout.addWidget(btns)
+
+# # position central
+# w, h = int(parent.width()*0.85), int(parent.height()*0.85)
+# self.setGeometry((parent.width()-w)//2, (parent.height()-h)//2, w, h)
+# self.main.setGeometry(0, 0, w, h)
+
+class IrrigationDashboard(QWidget):
+ def __init__(self):
+ super().__init__()
+ self.setWindowTitle("Irrigation Dashboard 🌾")
+ self.setGeometry(100, 100, 1100, 820)
+ QApplication.setFont(QFont('Roboto', 10))
+ main = QVBoxLayout(self)
+ main.setContentsMargins(0,0,0,0)
+ self.setStyleSheet("""
+ QWidget#root { background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 #f0f9ff, stop:1 #e0f2fe); }
+ QLabel.title { font-family: 'Segoe UI'; font-weight: bold; font-size: 18px; color: #111827 }
+ """)
+ self.setObjectName('root')
+
+ # MapWidget replaces map logic
+ self.dashboard_bar = DashboardBar(self)
+ main.addWidget(self.dashboard_bar)
+ self.map_widget = MapWidget(self, map_path=str(script_dir / "map_field.jpg"))
+ self.sprinklers = {} # device_id -> info, for non-map logic (details, etc.)
+ self.history_panel = HistoryPanel(self)
+ self.history_panel.hide()
+
+ # Create map layout with minimal margins to push sprinklers down
+ map_container = QWidget()
+ map_layout = QVBoxLayout(map_container)
+ map_layout.setContentsMargins(0, 10, 0, 0) # Minimal top margin (10px instead of default)
+ map_layout.setSpacing(0)
+ map_layout.addWidget(self.map_widget)
+
+ main.addWidget(map_container, stretch=3)
+ main.addWidget(self.history_panel, stretch=1)
+
+ # timer for data refresh
+ self.timer = QTimer()
+ self.timer.timeout.connect(self.update_data)
+ self.timer.start(3000)
+ self.update_data()
+
+ def resizeEvent(self, event):
+ super().resizeEvent(event)
+ # Delegate map resizing to MapWidget
+ if hasattr(self, 'map_widget') and self.map_widget:
+ self.map_widget.resizeEvent(event)
+
+ def set_sprinkler_state(self, s, active):
+ #print(f"Setting sprinkler {s['name']} state to {'active' if active else 'inactive'}")
+ btn: QPushButton = s['widget']
+ # create / reuse label for movie
+ if 'label' not in s:
+ lbl = QLabel(btn)
+ lbl.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ lbl.setGeometry(0,0,btn.width(),btn.height())
+ s['label'] = lbl
+ lbl = s['label']
+
+ if active:
+ movie = QMovie(str(script_dir / 'sprinkler_on.gif'))
+ movie.setScaledSize(QSize(btn.width(), btn.height()))
+ lbl.setMovie(movie)
+ movie.start()
+ lbl.show()
+ btn.setStyleSheet(self.sprinkler_style(active=True))
+ s['movie'] = movie
+ else:
+ # static image
+ pix = QPixmap(str(script_dir / 'sprinkler_off.png')) if (script_dir / 'sprinkler_off.png').exists() else QPixmap(btn.width(), btn.height())
+ if pix.isNull():
+ pix = QPixmap(btn.width(), btn.height()); pix.fill(QColor('#6b7280'))
+ lbl.setPixmap(pix.scaled(btn.size(), Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation))
+ lbl.show()
+ btn.setStyleSheet(self.sprinkler_style(active=False))
+ s['movie'] = None
+ s['active'] = active
+
+ def sprinkler_style(self, active=False):
+ #background: {"#86c7db26" if active else "#6b72801c"};
+ # circular button with shadow and badge placeholder
+ base = f"""
+ QPushButton {{
+ width: 120px; height:120px; border-radius:28px;
+
+ font-weight: bold;
+ color: white;
+ }}
+ QPushButton:hover {{ }}
+ """
+ return base
+
+ # def update_history(self):
+ # # Populate filters (preserve current selection) and refresh table
+ # rows = fetch_sprinkler_history()
+ # prev_dev = self.filter_device.currentText() if self.filter_device.count()>0 else 'All'
+ # prev_dec = self.filter_decision.currentText() if self.filter_decision.count()>0 else 'All'
+
+ # unique_devices = sorted({row['device_id'] for row in rows})
+ # unique_decisions = sorted({row['decision'] for row in rows})
+
+ # # repopulate while preserving selection when possible
+ # self.filter_device.blockSignals(True)
+ # self.filter_decision.blockSignals(True)
+ # self.filter_device.clear(); self.filter_device.addItem('All'); self.filter_device.addItems(unique_devices)
+ # self.filter_decision.clear(); self.filter_decision.addItem('All'); self.filter_decision.addItems(unique_decisions)
+ # idx = self.filter_device.findText(prev_dev)
+ # if idx >= 0:
+ # self.filter_device.setCurrentIndex(idx)
+ # idx = self.filter_decision.findText(prev_dec)
+ # if idx >= 0:
+ # self.filter_decision.setCurrentIndex(idx)
+ # self.filter_device.blockSignals(False)
+ # self.filter_decision.blockSignals(False)
+
+ # # apply currently selected filters to populate the table
+ # self.apply_filters()
+
+ # def apply_filters(self):
+ # # fetch and filter rows locally
+ # rows = fetch_sprinkler_history()
+ # dev = self.filter_device.currentText()
+ # dec = self.filter_decision.currentText()
+ # if dev and dev != 'All':
+ # rows = [r for r in rows if r.get('device_id') == dev]
+ # if dec and dec != 'All':
+ # rows = [r for r in rows if r.get('decision') == dec]
+
+ # # date filter
+ # try:
+ # dfrom = self.filter_date_from.date().toPyDate()
+ # dto = self.filter_date_to.date().toPyDate()
+ # # only apply if user set meaningful range (non-default)
+ # if dfrom and dto and dfrom <= dto:
+ # rows = [r for r in rows if r.get('ts') and dfrom <= r['ts'].date() <= dto]
+ # except Exception:
+ # pass
+
+ # # numeric filters
+ # try:
+ # drymin = float(self.filter_dry_min.text()) if self.filter_dry_min.text() else None
+ # confmin = float(self.filter_conf_min.text()) if self.filter_conf_min.text() else None
+ # if drymin is not None:
+ # rows = [r for r in rows if r.get('dry_ratio', 0) >= drymin]
+ # if confmin is not None:
+ # rows = [r for r in rows if r.get('confidence', 0) >= confmin]
+ # except Exception:
+ # pass
+
+ # self.populate_history_table(rows)
+
+ # def populate_history_table(self, rows):
+ # self.history_table.setRowCount(0)
+ # for row in rows:
+ # r = self.history_table.rowCount()
+ # self.history_table.insertRow(r)
+ # self.history_table.setItem(r,0, QTableWidgetItem(str(row['ts'])))
+ # self.history_table.setItem(r,1, QTableWidgetItem(row['device_id']))
+ # dec_item = QTableWidgetItem(row['decision'])
+ # if row['decision']=='run': dec_item.setBackground(QColor('#10b981'))
+ # elif row['decision']=='stop': dec_item.setBackground(QColor('#ef4444'))
+ # else: dec_item.setBackground(QColor('#f59e0b'))
+ # self.history_table.setItem(r,2, dec_item)
+ # self.history_table.setItem(r,3, QTableWidgetItem(f"{row['confidence']:.2f}"))
+ # self.history_table.setItem(r,4, QTableWidgetItem(f"{row['dry_ratio']:.2f}"))
+ # view_btn = QPushButton('View Image')
+ # view_btn.clicked.connect(lambda _checked, rr=row: self.show_image_modal(rr))
+ # self.history_table.setCellWidget(r,5, view_btn)
+
+ # def show_image_modal(self, row):
+ # # for demo: try to load an image from disk or show placeholder
+ # img_path = script_dir / 'sprinkler_image_placeholder.jpg'
+ # if img_path.exists():
+ # pix = QPixmap(str(img_path))
+ # else:
+ # pix = QPixmap(400,300)
+ # pix.fill(QColor('#ddd'))
+ # m = ImageModal(self, pix, row)
+ # m.exec()
+
+ def update_data(self):
+ try:
+ rows = fetch_sprinkler_data()
+ healthy = True
+ except Exception as e:
+ print('Error fetching data:', e)
+ rows = []
+ healthy = False
+
+ # Update sprinklers on map
+ active_count = 0
+ irrigated_area = 0.0
+ last_update = '--'
+ max_timestamp = None
+ for i, row in enumerate(rows):
+ device_id = row['device_id']
+ dry_ratio = row['dry_ratio']
+ decision = row['decision']
+ confidence = row['confidence']
+ new_state = row['new_state']
+ active = new_state == 'run'
+ if active:
+ active_count += 1
+ irrigated_area += dry_ratio if active else 0
+
+ # Track the most recent timestamp across all sprinklers
+ ts = row.get('ts')
+ if ts and (max_timestamp is None or ts > max_timestamp):
+ max_timestamp = ts
+
+ # MapWidget handles display and GIF/image ONLY (no shapes)
+ if device_id not in self.map_widget.sprinklers:
+ rel_x = (100 + i*233 + random.randint(-20, 20)) / max(1, self.map_widget.map_pixmap.width())
+ rel_y = (550 + random.randint(-230, 230)) / max(1, self.map_widget.map_pixmap.height())
+ rel_size = 0.025
+ btn = self.map_widget.add_sprinkler(device_id, rel_x, rel_y, rel_size, active, name=device_id)
+ btn.clicked.connect(lambda _e, d=device_id: self.show_details(d))
+ s = self.map_widget.sprinklers[device_id]
+ # Always set sprinkler state to ensure image/GIF is shown, never fallback to shapes
+ self.set_sprinkler_state(s, active)
+ s.update({'dry_ratio': dry_ratio, 'decision': decision, 'confidence': confidence})
+ # Update main window's sprinkler info for details dialog
+ self.sprinklers[device_id] = s
+
+ # Set last_update to the most recent timestamp
+ if max_timestamp:
+ last_update = str(max_timestamp)
+
+ total_area = len(rows)
+ irrigated_percent = (irrigated_area / total_area * 100) if total_area else 0.0
+ self.dashboard_bar.update_status(active_count, irrigated_percent, last_update, healthy)
+
+ def show_details(self, device_id):
+ if device_id not in self.sprinklers:
+ return
+ # Close previous details dialog if open
+ if hasattr(self, '_details_card') and self._details_card:
+ self._details_card.close()
+ s = self.sprinklers[device_id]
+ details = {
+ 'active': s.get('active', False),
+ 'dry_ratio': s.get('dry_ratio', 0),
+ 'confidence': s.get('confidence', 0),
+ 'decision': s.get('decision', 'noop')
+ }
+ # Use new tabbed dialog
+ card = SprinklerDetailsDialogNew(self, device_id, details)
+ card.history_requested.connect(lambda d: self.show_history_panel(d))
+ self._details_card = card
+ card.show()
+
+ # def show_history_panel(self, device_id):
+ # # Close previous details dialog if open
+ # if hasattr(self, '_details_card') and self._details_card:
+ # self._details_card.close()
+ # # Fetch last 10 records for this sprinkler
+ # all_history = fetch_sprinkler_history(limit=100)
+ # records = [r for r in all_history if r['device_id'] == device_id][:10]
+ # self.history_panel.show_history(records)
+ # self.history_panel.show()
+ # self.map_widget.setFixedWidth(int(self.width() * 0.6))
+ # # Add close button to history panel
+ # if not hasattr(self.history_panel, 'close_btn'):
+ # from PyQt6.QtWidgets import QPushButton
+ # close_btn = QPushButton('Close History')
+ # close_btn.setStyleSheet('background:#ef4444; color:white; padding:6px; border-radius:8px')
+ # close_btn.clicked.connect(self.hide_history_panel)
+ # layout = self.history_panel.layout()
+ # layout.addWidget(close_btn)
+ # self.history_panel.close_btn = close_btn
+
+ # def hide_history_panel(self):
+ # self.history_panel.hide()
+ # self.map_widget.setFixedWidth(self.width())
+ # # Ensure details dialog can be reopened after closing history
+ # self._details_card = None
+
+ # def on_history_clicked(self, row, col):
+ # # show full details card when any non-button cell is clicked
+ # try:
+ # device = self.history_table.item(row,1).text()
+ # if device:
+ # self.show_details(device)
+ # except Exception:
+ # pass
+
+if __name__ == '__main__':
+ app = QApplication(sys.argv)
+ window = IrrigationDashboard()
+ window.show()
+ sys.exit(app.exec())
diff --git a/GUI/src/vast/views/irrigation/irrigation_view.py b/GUI/src/vast/views/irrigation/irrigation_view.py
new file mode 100644
index 000000000..5eefcf05d
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/irrigation_view.py
@@ -0,0 +1,42 @@
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QLabel
+from PyQt6.QtCore import Qt
+from .irrigation_dashboard import IrrigationDashboard
+from dashboard_api import DashboardApi
+
+
+class IrrigationView(QWidget):
+ """Wrapper to integrate IrrigationDashboard into MainWindow"""
+
+ def __init__(self, api: DashboardApi, parent=None):
+ super().__init__(parent)
+ print("[DEBUG] IrrigationView.__init__ called")
+ self.api = api
+
+ print("[DEBUG] Creating layout...")
+ layout = QVBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.setSpacing(0)
+
+ # Create the irrigation dashboard
+ print("[DEBUG] Creating IrrigationDashboard...")
+ try:
+ self.dashboard = IrrigationDashboard()
+ print("[DEBUG] IrrigationDashboard created successfully")
+ print("[DEBUG] Adding dashboard to layout...")
+ layout.addWidget(self.dashboard)
+ except Exception as e:
+ print(f"[ERROR] Failed to create IrrigationDashboard: {e}")
+ import traceback
+ traceback.print_exc()
+ # Create error placeholder
+ error_label = QLabel(f"Failed to load Irrigation Dashboard:\n{str(e)}")
+ error_label.setStyleSheet("color: red; padding: 20px;")
+ layout.addWidget(error_label)
+
+ print("[DEBUG] Setting stylesheet...")
+ self.setStyleSheet("""
+ QWidget {
+ background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 #f0f9ff, stop:1 #e0f2fe);
+ }
+ """)
+ print("[DEBUG] IrrigationView.__init__ completed")
diff --git a/GUI/src/vast/views/irrigation/map_field.jpg b/GUI/src/vast/views/irrigation/map_field.jpg
new file mode 100644
index 000000000..5c528b122
Binary files /dev/null and b/GUI/src/vast/views/irrigation/map_field.jpg differ
diff --git a/GUI/src/vast/views/irrigation/map_widget.py b/GUI/src/vast/views/irrigation/map_widget.py
new file mode 100644
index 000000000..a93cb2114
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/map_widget.py
@@ -0,0 +1,104 @@
+from pathlib import Path
+from PyQt6.QtWidgets import QWidget, QPushButton, QLabel
+from PyQt6.QtGui import QPixmap, QMovie, QColor
+from PyQt6.QtCore import Qt, QSize
+
+script_dir = Path(__file__).parent
+
+class MapWidget(QWidget):
+ def __init__(self, parent=None, map_path=None):
+ super().__init__(parent)
+ self.sprinklers = {}
+ self.map_pixmap = QPixmap(map_path) if map_path else QPixmap()
+ self.map_label = QLabel(self)
+ self.map_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.map_label.setStyleSheet('background: transparent;')
+ self.map_label.setPixmap(self.map_pixmap)
+ self.map_aspect = self.map_pixmap.width() / self.map_pixmap.height() if not self.map_pixmap.isNull() else 16/9
+ self.last_scaled_pixmap = self.map_pixmap
+ self.resizeEvent(None)
+
+ def resizeEvent(self, event):
+ if self.map_pixmap.isNull():
+ return
+ available_w = max(100, self.width() - 40)
+ scaled_h = int(available_w / self.map_aspect)
+ scaled_pixmap = self.map_pixmap.scaled(available_w, scaled_h, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation)
+ self.last_scaled_pixmap = scaled_pixmap
+ self.map_label.setPixmap(scaled_pixmap)
+ self.map_label.setFixedHeight(scaled_pixmap.height())
+ self.map_label.setGeometry(0, 0, available_w, scaled_h)
+ for s in self.sprinklers.values():
+ # Increased size: multiplied rel_size by 1.5 and increased minimum from 40 to 60
+ new_size = max(int(s['rel_size'] * scaled_pixmap.width() * 1.5), 60)
+ new_x = int(s['rel_x'] * scaled_pixmap.width() - new_size/2)
+ new_y = int(s['rel_y'] * scaled_pixmap.height() - new_size/2)
+ s['widget'].setGeometry(new_x, new_y, new_size, new_size)
+ if s.get('movie') and isinstance(s['movie'], QMovie):
+ s['movie'].setScaledSize(QSize(new_size, new_size))
+
+ def add_sprinkler(self, device_id, rel_x, rel_y, rel_size=0.025, active=False, name=None):
+ btn = QPushButton('', self)
+ btn.setObjectName(f'spr_{device_id}')
+ btn.setToolTip(name or device_id)
+ btn.setFixedSize(120, 120)
+ btn.setStyleSheet(self.sprinkler_style(active))
+ btn.installEventFilter(self)
+ self.sprinklers[device_id] = {
+ 'widget': btn, 'movie': None, 'active': active,
+ 'rel_x': rel_x, 'rel_y': rel_y, 'rel_size': rel_size,
+ 'name': name or device_id
+ }
+ self.set_sprinkler_state(self.sprinklers[device_id], active)
+ self.resizeEvent(None)
+ return btn
+
+ def eventFilter(self, obj, event):
+ # Show tooltip on hover
+ if event.type() == event.Type.Enter:
+ for s in self.sprinklers.values():
+ if s['widget'] is obj:
+ obj.setToolTip(s.get('name', ''))
+ return super().eventFilter(obj, event)
+
+ def set_sprinkler_state(self, s, active):
+ btn = s['widget']
+ if 'label' not in s:
+ lbl = QLabel(btn)
+ lbl.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ lbl.setGeometry(0,0,btn.width(),btn.height())
+ s['label'] = lbl
+ lbl = s['label']
+ if active:
+ movie = QMovie(str(script_dir / 'sprinkler_on.gif'))
+ movie.setScaledSize(QSize(btn.width(), btn.height()))
+ lbl.setMovie(movie)
+ movie.start()
+ lbl.show()
+ btn.setStyleSheet(self.sprinkler_style(True))
+ s['movie'] = movie
+ else:
+ pix = QPixmap(str(script_dir / 'sprinkler_off.png'))
+ if pix.isNull():
+ pix = QPixmap(btn.width(), btn.height()); pix.fill(QColor('#6b7280'))
+ lbl.setPixmap(pix.scaled(btn.size(), Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation))
+ lbl.show()
+ btn.setStyleSheet(self.sprinkler_style(False))
+ s['movie'] = None
+ s['active'] = active
+
+ def sprinkler_style(self, active=False):
+ base = f"""
+ QPushButton {{
+ width: 120px; height: 120px; border-radius: 60px; background: {'#10b981' if active else '#6b7280'};
+ font-weight: bold;
+ color: white;
+ }}
+ QPushButton:hover {{}}
+ """
+ return base
+
+ def show_tooltip(self, device_id):
+ s = self.sprinklers.get(device_id)
+ if s:
+ s['widget'].setToolTip(s.get('name', device_id))
diff --git a/GUI/src/vast/views/irrigation/sprinkler_details_dialog.py b/GUI/src/vast/views/irrigation/sprinkler_details_dialog.py
new file mode 100644
index 000000000..837b648b4
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/sprinkler_details_dialog.py
@@ -0,0 +1,21 @@
+# from PyQt6.QtWidgets import QDialog, QVBoxLayout, QLabel, QPushButton
+# from PyQt6.QtCore import Qt
+
+# class SprinklerDetailsDialog(QDialog):
+# def __init__(self, parent, device_id, details):
+# super().__init__(parent)
+# self.setWindowTitle(f"Sprinkler {device_id} Details")
+# self.setModal(True)
+# layout = QVBoxLayout(self)
+# self.label = QLabel(f"Details for {device_id}")
+# layout.addWidget(self.label)
+# self.details_label = QLabel(str(details))
+# layout.addWidget(self.details_label)
+# self.show_history_btn = QPushButton("Show History")
+# layout.addWidget(self.show_history_btn)
+# self.show_history_btn.clicked.connect(self.on_show_history)
+# self.history_callback = None
+
+# def on_show_history(self):
+# if self.history_callback:
+# self.history_callback()
diff --git a/GUI/src/vast/views/irrigation/sprinkler_details_dialog_new.py b/GUI/src/vast/views/irrigation/sprinkler_details_dialog_new.py
new file mode 100644
index 000000000..4b43dc205
--- /dev/null
+++ b/GUI/src/vast/views/irrigation/sprinkler_details_dialog_new.py
@@ -0,0 +1,834 @@
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QProgressBar,
+ QTableWidget, QTableWidgetItem, QLineEdit, QFormLayout, QScrollArea, QGraphicsDropShadowEffect
+)
+from PyQt6.QtCore import Qt, QPropertyAnimation, pyqtSignal, QTimer
+from PyQt6.QtGui import QFont, QColor, QPixmap
+import psycopg2
+from psycopg2.extras import RealDictCursor
+from datetime import datetime
+from io import BytesIO
+try:
+ from minio import Minio
+ MINIO_AVAILABLE = True
+except ImportError:
+ MINIO_AVAILABLE = False
+
+# DB connection helper (same as in main app)
+def get_db_connection():
+ return psycopg2.connect(
+ # host="postgres",
+ host="postgres",
+ port=5432,
+ user="missions_user",
+ password="pg123",
+ dbname="missions_db",
+ cursor_factory=RealDictCursor
+ )
+
+# MinIO connection helper
+def get_minio_client():
+ """Get MinIO client for accessing imagery bucket."""
+ if not MINIO_AVAILABLE:
+ print("[DEBUG] MinIO client not available (minio package not installed)")
+ return None
+ try:
+ # Try multiple endpoints for flexibility
+ endpoints = [
+ "minio-hot:9000", # Docker internal
+ "localhost:9001", # Desktop/host
+ "127.0.0.1:9001", # Loopback
+ ]
+
+ for endpoint in endpoints:
+ try:
+ client = Minio(
+ endpoint=endpoint,
+ access_key="minioadmin",
+ secret_key="minioadmin123",
+ secure=False
+ )
+ # Test connection
+ client.list_buckets()
+ print(f"[DEBUG] MinIO connected successfully at {endpoint}")
+ return client
+ except Exception as e:
+ print(f"[DEBUG] MinIO endpoint {endpoint} failed: {type(e).__name__}")
+ continue
+
+ print("[DEBUG] MinIO: all endpoints failed")
+ return None
+ except Exception as e:
+ print(f"[DEBUG] MinIO connection error: {e}")
+ return None
+
+def fetch_image_from_minio(image_path: str) -> bytes:
+ """
+ Fetch an image from MinIO 'imagery' bucket.
+
+ Args:
+ image_path: The key/path to the image in MinIO (e.g., 'folder/image.jpg')
+
+ Returns:
+ Image bytes, or None if fetch fails
+ """
+ if not MINIO_AVAILABLE:
+ print("MinIO client not available")
+ return None
+
+ try:
+ client = get_minio_client()
+ if client is None:
+ return None
+
+ response = client.get_object("imagery", image_path)
+ image_bytes = response.read()
+ return image_bytes
+ except Exception as e:
+ print(f"Error fetching image from MinIO: {e}")
+ return None
+
+class SprinklerDetailsDialogNew(QWidget):
+ """Tabbed sprinkler details dialog with Details, History, Parameters, Last Image, and Close tabs."""
+
+ history_requested = pyqtSignal(str) # device_id
+ parameters_saved = pyqtSignal(str, dict) # device_id, params
+
+ def __init__(self, parent, device_id, details):
+ super().__init__(parent)
+ print(f"[DEBUG] SprinklerDetailsDialogNew.__init__ called for device_id={device_id}")
+ self.device_id = device_id
+ self.details = details
+ self.current_tab = 'Details'
+ self.edited_params = {}
+
+ self.setWindowFlags(Qt.WindowType.FramelessWindowHint)
+ self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+
+ print(f"[DEBUG] Setting up window for {device_id}")
+
+ # Main card
+ self.card = QWidget(self)
+ self.card.setStyleSheet("""
+ background: white;
+ border-radius: 14px;
+ """)
+
+ shadow = QGraphicsDropShadowEffect(self.card)
+ shadow.setBlurRadius(30)
+ shadow.setOffset(0, 8)
+ shadow.setColor(QColor(0, 0, 0, 100))
+ self.card.setGraphicsEffect(shadow)
+
+ # Main layout
+ main_layout = QVBoxLayout(self.card)
+ main_layout.setContentsMargins(20, 20, 20, 20)
+ main_layout.setSpacing(14)
+
+ # Header section with title only
+ header_layout = QVBoxLayout()
+ header_layout.setContentsMargins(0, 0, 0, 0)
+ header_layout.setSpacing(4)
+
+ # Title
+ title = QLabel(f"Sprinkler {device_id}")
+ title.setFont(QFont('Segoe UI', 16, QFont.Weight.Bold))
+ title.setStyleSheet("color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #06b6d4, stop:1 #0891b2);")
+ header_layout.addWidget(title)
+
+ main_layout.addLayout(header_layout)
+
+ # Content area (will be replaced based on active tab)
+ self.content_area = QWidget()
+ self.content_layout = QVBoxLayout(self.content_area)
+ self.content_layout.setContentsMargins(0, 0, 0, 0)
+ main_layout.addWidget(self.content_area, stretch=1)
+
+ # Buttons row at bottom
+ btn_row = QHBoxLayout()
+ btn_row.setSpacing(12)
+ btn_row.addStretch()
+
+ self.tab_buttons = {}
+ self.create_tab_buttons(btn_row)
+
+ main_layout.addLayout(btn_row)
+
+ # Sizing and positioning
+ w, h = int(parent.width() * 0.6), int(parent.height() * 0.65)
+ self.setGeometry((parent.width() - w) // 2, (parent.height() - h) // 2, w, h)
+ self.card.setGeometry(0, 0, w, h)
+
+ # Fade-in animation
+ self.opacity_anim = QPropertyAnimation(self, b"windowOpacity")
+ self.opacity_anim.setDuration(220)
+ self.opacity_anim.setStartValue(0.0)
+ self.opacity_anim.setEndValue(1.0)
+ self.setWindowOpacity(0.0)
+ self.opacity_anim.start()
+
+ print(f"[DEBUG] Dialog initialized, showing Details tab")
+ # Show Details tab initially
+ self.show_tab('Details')
+
+ def create_tab_buttons(self, layout):
+ """Create all 5 tab buttons and add them to the layout."""
+ tabs = ['Details', 'History', 'Parameters', 'Last Image', 'Close']
+ for tab in tabs:
+ btn = QPushButton(tab)
+ btn.setFixedHeight(36)
+ btn.setMinimumWidth(100)
+ btn.setCursor(Qt.CursorShape.PointingHandCursor)
+ btn.setStyleSheet(self.get_button_style(tab == self.current_tab))
+ btn.clicked.connect(lambda checked, t=tab: self.switch_tab(t))
+ self.tab_buttons[tab] = btn
+ # Add all buttons to layout
+ layout.addWidget(btn)
+
+ def get_button_style(self, active=False):
+ if active:
+ return """
+ QPushButton {
+ background: #06b6d4;
+ color: white;
+ border: none;
+ border-radius: 8px;
+ font-weight: bold;
+ padding: 8px 16px;
+ }
+ """
+ else:
+ return """
+ QPushButton {
+ background: #e5e7eb;
+ color: #374151;
+ border: none;
+ border-radius: 8px;
+ padding: 8px 16px;
+ }
+ QPushButton:hover {
+ background: #d1d5db;
+ }
+ """
+
+ def switch_tab(self, tab_name):
+ """Switch to a different tab."""
+ print(f"[DEBUG] switch_tab() called: {tab_name}")
+ if tab_name == 'Close':
+ self.close()
+ return
+
+ self.current_tab = tab_name
+
+ # Clear current content safely using takeAt and deleteLater
+ while self.content_layout.count():
+ item = self.content_layout.takeAt(0)
+ if item.widget():
+ item.widget().deleteLater()
+
+ # Show selected tab
+ self.show_tab(tab_name)
+
+ # Update button styling
+ self.update_button_styles()
+ print(f"[DEBUG] Switched to {tab_name} tab")
+
+ def update_button_styles(self):
+ """Update button styles: active button highlighted, others normal."""
+ for tab_name, btn in self.tab_buttons.items():
+ btn.setStyleSheet(self.get_button_style(tab_name == self.current_tab))
+
+ def show_tab(self, tab_name):
+ """Display content for a tab."""
+ if tab_name == 'Details':
+ self.show_details_tab()
+ elif tab_name == 'History':
+ self.show_history_tab()
+ elif tab_name == 'Parameters':
+ self.show_parameters_tab()
+ elif tab_name == 'Last Image':
+ self.show_last_image_tab()
+
+ def show_details_tab(self):
+ """Display the details tab with improved layout and styling."""
+ # Status section
+ status_container = QWidget()
+ status_layout = QHBoxLayout(status_container)
+ status_layout.setContentsMargins(0, 0, 0, 0)
+ status_layout.setSpacing(10)
+
+ status_dot = QLabel('●')
+ status_dot.setFont(QFont('Arial', 14))
+ status_color = '#10b981' if self.details.get('active') else '#9ca3af'
+ status_dot.setStyleSheet(f"color: {status_color}")
+
+ status_text = QLabel('Active' if self.details.get('active') else 'Inactive')
+ status_text.setFont(QFont('Segoe UI', 11, QFont.Weight.Bold))
+ status_text.setStyleSheet(f"color: {status_color}")
+
+ status_layout.addWidget(status_dot)
+ status_layout.addWidget(status_text)
+ status_layout.addStretch()
+
+ self.content_layout.addWidget(status_container)
+ self.content_layout.addSpacing(12)
+
+ # Soil Moisture section
+ moisture_label = QLabel('Soil Moisture')
+ moisture_label.setFont(QFont('Segoe UI', 11, QFont.Weight.Bold))
+ moisture_label.setStyleSheet("color: #1f2937;")
+ self.content_layout.addWidget(moisture_label)
+
+ dry_ratio = self.details.get('dry_ratio', 0)
+ moisture_percent = int(dry_ratio * 100)
+
+ # Percentage label above bar
+ moisture_value_label = QLabel(f"{moisture_percent}%")
+ moisture_value_label.setFont(QFont('Segoe UI', 10, QFont.Weight.Bold))
+ moisture_value_label.setStyleSheet("color: #06b6d4;")
+ self.content_layout.addWidget(moisture_value_label)
+
+ # Progress bar
+ moisture_bar = QProgressBar()
+ moisture_bar.setRange(0, 100)
+ moisture_bar.setValue(moisture_percent)
+ moisture_bar.setFixedHeight(12)
+ moisture_bar.setStyleSheet("""
+ QProgressBar {
+ border: 1px solid #e5e7eb;
+ border-radius: 6px;
+ background: #f3f4f6;
+ }
+ QProgressBar::chunk {
+ background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
+ stop:0 #06b6d4, stop:1 #0891b2);
+ border-radius: 5px;
+ }
+ """)
+ self.content_layout.addWidget(moisture_bar)
+ self.content_layout.addSpacing(16)
+
+ # Confidence section
+ confidence_label = QLabel('Model Confidence')
+ confidence_label.setFont(QFont('Segoe UI', 11, QFont.Weight.Bold))
+ confidence_label.setStyleSheet("color: #1f2937;")
+ self.content_layout.addWidget(confidence_label)
+
+ conf = self.details.get('confidence', 0)
+ conf_percent = int(conf * 100)
+
+ # Determine color based on confidence
+ if conf >= 0.75:
+ conf_color = '#10b981'
+ elif conf >= 0.4:
+ conf_color = '#f59e0b'
+ else:
+ conf_color = '#ef4444'
+
+ # Percentage label above bar
+ conf_value_label = QLabel(f"{conf_percent}%")
+ conf_value_label.setFont(QFont('Segoe UI', 10, QFont.Weight.Bold))
+ conf_value_label.setStyleSheet(f"color: {conf_color};")
+ self.content_layout.addWidget(conf_value_label)
+
+ # Confidence progress bar
+ conf_bar = QProgressBar()
+ conf_bar.setRange(0, 100)
+ conf_bar.setValue(conf_percent)
+ conf_bar.setFixedHeight(12)
+ conf_bar.setStyleSheet(f"""
+ QProgressBar {{
+ border: 1px solid #e5e7eb;
+ border-radius: 6px;
+ background: #f3f4f6;
+ }}
+ QProgressBar::chunk {{
+ background: {conf_color};
+ border-radius: 5px;
+ }}
+ """)
+ self.content_layout.addWidget(conf_bar)
+ self.content_layout.addSpacing(16)
+
+ # Decision section
+ decision = self.details.get('decision', 'noop')
+ # Replace 'noop' with 'no operation'
+ if decision == 'noop':
+ decision = 'no operation'
+
+ decision_label = QLabel('Decision')
+ decision_label.setFont(QFont('Segoe UI', 11, QFont.Weight.Bold))
+ decision_label.setStyleSheet("color: #1f2937;")
+ self.content_layout.addWidget(decision_label)
+
+ # Decision badge
+ decision_badge = QLabel(decision.upper())
+ decision_badge.setFont(QFont('Segoe UI', 10, QFont.Weight.Bold))
+ decision_badge.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ decision_badge.setFixedHeight(32)
+
+ if decision == 'run':
+ badge_color = '#10b981'
+ bg_color = '#d1fae5'
+ elif decision == 'stop':
+ badge_color = '#ef4444'
+ bg_color = '#fee2e2'
+ else: # no operation
+ badge_color = '#f59e0b'
+ bg_color = '#fef3c7'
+
+ decision_badge.setStyleSheet(f"""
+ background: {bg_color};
+ color: {badge_color};
+ border-radius: 6px;
+ padding: 6px;
+ """)
+ self.content_layout.addWidget(decision_badge)
+
+ self.content_layout.addStretch()
+
+ def show_history_tab(self):
+ """Display the history tab with a beautifully styled table inside the dialog."""
+ records = []
+ try:
+ # Direct database query to avoid import issues
+ query = """
+ SELECT e.device_id, e.dry_ratio, e.decision, e.confidence, e.patch_count, e.ts
+ FROM soil_moisture_events e
+ WHERE e.device_id = %s
+ ORDER BY e.ts DESC
+ LIMIT 10
+ """
+ with get_db_connection() as conn:
+ with conn.cursor() as cur:
+ cur.execute(query, (self.device_id,))
+ records = cur.fetchall()
+ # Convert tuples to dicts if needed
+ if records and not isinstance(records[0], dict):
+ columns = ['device_id', 'dry_ratio', 'decision', 'confidence', 'patch_count', 'ts']
+ records = [dict(zip(columns, row)) for row in records]
+ except Exception as e:
+ print(f"Error fetching history: {e}")
+ records = []
+
+ # Add title label
+ title = QLabel('Last 10 Events')
+ title.setFont(QFont('Segoe UI', 9, QFont.Weight.Bold))
+ title.setStyleSheet("color: #374151; margin-bottom: 8px;")
+ self.content_layout.addWidget(title)
+
+ # History table with better column layout
+ table = QTableWidget(0, 5)
+ table.setHorizontalHeaderLabels(['Time', 'Soil %', 'Confidence %', 'Decision', 'Patches'])
+ table.setAlternatingRowColors(True)
+ table.setColumnWidth(0, 270) # Time
+ table.setColumnWidth(1, 70) # Soil %
+ table.setColumnWidth(2, 70) # Confidence %
+ table.setColumnWidth(3, 130) # Decision (increased from 100 to 130)
+ table.setColumnWidth(4, 70) # Patches
+ table.resizeRowsToContents()
+ table.setWordWrap(True)
+ # Set minimum row height for better visibility
+ table.verticalHeader().setDefaultSectionSize(32)
+
+ # Professional styling with better padding
+ table.setStyleSheet("""
+ QTableWidget {
+ background: white;
+ alternate-background-color: #f9fafb;
+ gridline-color: #e5e7eb;
+ border: 1px solid #e5e7eb;
+ border-radius: 6px;
+ }
+ QHeaderView::section {
+ background: #f3f4f6;
+ padding: 12px;
+ border: none;
+ font-weight: bold;
+ color: #374151;
+ border-right: 1px solid #d1d5db;
+ }
+ QTableWidget::item {
+ padding: 12px;
+ border-bottom: 1px solid #e5e7eb;
+ }
+ """)
+ table.verticalHeader().hide()
+ table.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
+ table.setSelectionMode(QTableWidget.SelectionMode.SingleSelection)
+
+ # Populate rows
+ for row in records:
+ r = table.rowCount()
+ table.insertRow(r)
+
+ # Column 0: Timestamp
+ ts_item = QTableWidgetItem(str(row['ts']))
+ ts_item.setFont(QFont('Courier', 9))
+ ts_item.setForeground(QColor('#6b7280'))
+ table.setItem(r, 0, ts_item)
+
+ # Column 1: Soil Moisture % (dry_ratio as %)
+ dry_percent = int(row['dry_ratio'] * 100)
+ moisture_item = QTableWidgetItem(f"{dry_percent}%")
+ moisture_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
+ moisture_item.setFont(QFont('Courier', 9))
+ table.setItem(r, 1, moisture_item)
+
+ # Column 2: Confidence %
+ conf_percent = int(row['confidence'] * 100)
+ conf_item = QTableWidgetItem(f"{conf_percent}%")
+ conf_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
+ conf_item.setFont(QFont('Courier', 9))
+ table.setItem(r, 2, conf_item)
+
+ # Column 3: Decision with color coding
+ decision = row['decision']
+ if decision == 'noop':
+ decision = 'no operation'
+
+ # Use shorter display text for better fit in cell
+ decision_text = {
+ 'run': 'RUN',
+ 'stop': 'STOP',
+ 'no operation': 'NO OPERATION'
+ }.get(decision, decision.upper())
+
+ dec_item = QTableWidgetItem(decision_text)
+ dec_item.setFont(QFont('Segoe UI', 9, QFont.Weight.Bold))
+ dec_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
+
+ # Set background and text colors with proper contrast
+ if decision == 'run':
+ dec_item.setBackground(QColor("#dde9e5"))
+ dec_item.setForeground(QColor("#58b7e4")) # White text on green
+ elif decision == 'stop':
+ dec_item.setBackground(QColor('#fee2e2')) # Light red background
+ dec_item.setForeground(QColor('#dc2626')) # Dark red text
+ else: # no operation
+ dec_item.setBackground(QColor('#f59e0b'))
+ dec_item.setForeground(QColor('#1f2937')) # Dark text for better contrast on orange
+
+ table.setItem(r, 3, dec_item)
+
+ # Column 4: Patches (patch count)
+ patch_item = QTableWidgetItem(f"{row.get('patch_count', 0)}")
+ patch_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
+ patch_item.setFont(QFont('Courier', 9))
+ table.setItem(r, 4, patch_item)
+
+ self.content_layout.addWidget(table, stretch=1)
+
+ def show_parameters_tab(self):
+ """Display the parameters tab with editable fields."""
+ try:
+ params = self.fetch_parameters()
+ except Exception:
+ params = {}
+
+ # Form for parameters
+ form = QFormLayout()
+ form.setSpacing(16)
+ form.setContentsMargins(0, 0, 0, 0)
+
+ # Define input styling
+ input_style = """
+ QLineEdit {
+ border: 2px solid #e5e7eb;
+ border-radius: 8px;
+ padding: 6px;
+ background: #f9fafb;
+ color: #1f2937;
+ font-size: 11pt;
+ font-weight: 500;
+ }
+ QLineEdit:focus {
+ border: 2px solid #06b6d4;
+ background: #ffffff;
+ }
+ QLineEdit:hover {
+ border: 2px solid #d1d5db;
+ }
+ """
+
+ # Define label styling
+ label_style = """
+ color: #374151;
+ font-weight: bold;
+ font-size: 11pt;
+ """
+
+ self.param_inputs = {}
+
+ # Dry Ratio High
+ dry_high_label = QLabel('Dry Ratio High:')
+ dry_high_label.setStyleSheet(label_style)
+ dry_high_input = QLineEdit()
+ dry_high_input.setText(str(params.get('dry_ratio_high', 0.7)))
+ dry_high_input.setStyleSheet(input_style)
+ dry_high_input.setMinimumHeight(40)
+ self.param_inputs['dry_ratio_high'] = dry_high_input
+ form.addRow(dry_high_label, dry_high_input)
+
+ # Dry Ratio Low
+ dry_low_label = QLabel('Dry Ratio Low:')
+ dry_low_label.setStyleSheet(label_style)
+ dry_low_input = QLineEdit()
+ dry_low_input.setText(str(params.get('dry_ratio_low', 0.4)))
+ dry_low_input.setStyleSheet(input_style)
+ dry_low_input.setMinimumHeight(40)
+ self.param_inputs['dry_ratio_low'] = dry_low_input
+ form.addRow(dry_low_label, dry_low_input)
+
+ # Min Patches
+ min_patches_label = QLabel('Min Patches:')
+ min_patches_label.setStyleSheet(label_style)
+ min_patches_input = QLineEdit()
+ min_patches_input.setText(str(params.get('min_patches', 1)))
+ min_patches_input.setStyleSheet(input_style)
+ min_patches_input.setMinimumHeight(40)
+ self.param_inputs['min_patches'] = min_patches_input
+ form.addRow(min_patches_label, min_patches_input)
+
+ # Duration (minutes)
+ # duration_label = QLabel('Duration (min):')
+ # duration_label.setStyleSheet(label_style)
+ # duration_input = QLineEdit()
+ # duration_input.setText(str(params.get('duration_min', 30)))
+ # duration_input.setStyleSheet(input_style)
+ # duration_input.setMinimumHeight(40)
+ # self.param_inputs['duration_min'] = duration_input
+ # form.addRow(duration_label, duration_input)
+
+ # Save button
+ save_btn = QPushButton('Save Parameters')
+ save_btn.setStyleSheet("""
+ QPushButton {
+ background: #10b981;
+ color: white;
+ border: none;
+ border-radius: 8px;
+ padding: 12px 16px;
+ font-weight: bold;
+ font-size: 11pt;
+ }
+ QPushButton:hover {
+ background: #059669;
+ }
+ QPushButton:pressed {
+ background: #047857;
+ }
+ """)
+ save_btn.setMinimumHeight(44)
+ save_btn.clicked.connect(self.save_parameters)
+
+ scroll = QScrollArea()
+ scroll_widget = QWidget()
+ scroll_widget.setLayout(form)
+ scroll.setWidget(scroll_widget)
+ scroll.setWidgetResizable(True)
+ scroll.setStyleSheet("QScrollArea { border: none; background: transparent; }")
+
+ self.content_layout.addWidget(scroll)
+ self.content_layout.addSpacing(12)
+ self.content_layout.addWidget(save_btn)
+
+ def fetch_parameters(self):
+ """Fetch parameters from irrigation_policies table."""
+ try:
+ with get_db_connection() as conn:
+ with conn.cursor() as cur:
+ query = """
+ SELECT dry_ratio_high, dry_ratio_low, min_patches, duration_min
+ FROM irrigation_policies
+ WHERE device_id = %s
+ """
+ cur.execute(query, (self.device_id,))
+ row = cur.fetchone()
+
+ if row:
+ # Handle both tuple and dict-like responses
+ if isinstance(row, (tuple, list)):
+ return {
+ 'dry_ratio_high': float(row[0]) if row[0] is not None else 0.7,
+ 'dry_ratio_low': float(row[1]) if row[1] is not None else 0.4,
+ 'min_patches': int(row[2]) if row[2] is not None else 1,
+ 'duration_min': int(row[3]) if row[3] is not None else 30
+ }
+ else:
+ # Dictionary-like response
+ return {
+ 'dry_ratio_high': float(row.get('dry_ratio_high', 0.7)),
+ 'dry_ratio_low': float(row.get('dry_ratio_low', 0.4)),
+ 'min_patches': int(row.get('min_patches', 1)),
+ 'duration_min': int(row.get('duration_min', 30))
+ }
+ except Exception as e:
+ print(f"Error fetching parameters: {type(e).__name__}: {str(e)}")
+ return {}
+
+ def save_parameters(self):
+ """Save parameters to irrigation_policies table."""
+ try:
+ # Validate and convert inputs
+ dry_ratio_high = float(self.param_inputs['dry_ratio_high'].text())
+ dry_ratio_low = float(self.param_inputs['dry_ratio_low'].text())
+ min_patches = int(self.param_inputs['min_patches'].text())
+ duration_min = 10 #int(self.param_inputs['duration_min'].text())
+
+ # Basic validation
+ if not (0 <= dry_ratio_high <= 1):
+ raise ValueError("Dry Ratio High must be between 0 and 1")
+ if not (0 <= dry_ratio_low <= 1):
+ raise ValueError("Dry Ratio Low must be between 0 and 1")
+ if min_patches < 0:
+ raise ValueError("Min Patches must be positive")
+ if duration_min < 0:
+ raise ValueError("Duration must be positive")
+
+ with get_db_connection() as conn:
+ with conn.cursor() as cur:
+ query = """
+ INSERT INTO irrigation_policies
+ (device_id, dry_ratio_high, dry_ratio_low, min_patches, duration_min)
+ VALUES (%s, %s, %s, %s, %s)
+ ON CONFLICT (device_id) DO UPDATE SET
+ dry_ratio_high = EXCLUDED.dry_ratio_high,
+ dry_ratio_low = EXCLUDED.dry_ratio_low,
+ min_patches = EXCLUDED.min_patches,
+ duration_min = EXCLUDED.duration_min
+ """
+ cur.execute(query, (self.device_id, dry_ratio_high, dry_ratio_low, min_patches, duration_min))
+ conn.commit()
+
+ # Show success message
+ msg_label = QLabel("✓ Parameters saved successfully!")
+ msg_label.setStyleSheet("color: #10b981; font-weight: bold; padding: 8px;")
+ self.content_layout.addWidget(msg_label)
+ print(f"Parameters saved for device {self.device_id}")
+
+ except ValueError as ve:
+ print(f"Validation error: {ve}")
+ msg_label = QLabel(f"✗ Validation error: {ve}")
+ msg_label.setStyleSheet("color: #ef4444; font-weight: bold; padding: 8px;")
+ self.content_layout.addWidget(msg_label)
+ except Exception as e:
+ print(f"Error saving parameters: {type(e).__name__}: {str(e)}")
+ msg_label = QLabel(f"✗ Error: {type(e).__name__}")
+ msg_label.setStyleSheet("color: #ef4444; font-weight: bold; padding: 8px;")
+ self.content_layout.addWidget(msg_label)
+
+ def show_last_image_tab(self):
+ """Display the last image tab with image from MinIO."""
+ print(f"[DEBUG] show_last_image_tab() called for {self.device_id}")
+ try:
+ # Query database for the most recent image path
+ query = """
+ SELECT extra->>'image_path' as image_path, ts
+ FROM soil_moisture_events
+ WHERE device_id = %s AND extra->>'image_path' IS NOT NULL
+ ORDER BY ts DESC
+ LIMIT 1
+ """
+ with get_db_connection() as conn:
+ with conn.cursor() as cur:
+ cur.execute(query, (self.device_id,))
+ row = cur.fetchone()
+ print(f"[DEBUG] Query result: {row}")
+
+ if row and row.get('image_path'):
+ image_path = row['image_path']
+ ts = row.get('ts', 'Unknown')
+ print(f"[DEBUG] Found image path: {image_path}, ts: {ts}")
+
+ # Fetch image from MinIO
+ image_bytes = fetch_image_from_minio(image_path)
+
+ if image_bytes:
+ print(f"[DEBUG] Successfully fetched image, size: {len(image_bytes)} bytes")
+ # Display the image
+ pixmap = QPixmap()
+ pixmap.loadFromData(image_bytes)
+
+ if not pixmap.isNull():
+ # Create container for image display
+ image_container = QWidget()
+ image_layout = QVBoxLayout(image_container)
+ image_layout.setContentsMargins(0, 0, 0, 0)
+ image_layout.setSpacing(12)
+
+ # Timestamp label
+ ts_label = QLabel(f"Timestamp: {ts}")
+ ts_label.setFont(QFont('Segoe UI', 10, QFont.Weight.Bold))
+ ts_label.setStyleSheet("color: #6b7280;")
+ image_layout.addWidget(ts_label)
+
+ # Image path label
+ path_label = QLabel(f"Path: {image_path}")
+ path_label.setFont(QFont('Courier', 9))
+ path_label.setStyleSheet("color: #9ca3af; word-wrap: true;")
+ path_label.setWordWrap(True)
+ image_layout.addWidget(path_label)
+
+ # Scale image to fit in dialog
+ max_width = int(self.card.width() * 0.8)
+ max_height = 400
+ scaled_pixmap = pixmap.scaledToWidth(
+ max_width,
+ Qt.TransformationMode.SmoothTransformation
+ )
+ if scaled_pixmap.height() > max_height:
+ scaled_pixmap = scaled_pixmap.scaledToHeight(
+ max_height,
+ Qt.TransformationMode.SmoothTransformation
+ )
+
+ # Image label
+ img_label = QLabel()
+ img_label.setPixmap(scaled_pixmap)
+ img_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ img_label.setStyleSheet("border: 1px solid #e5e7eb; border-radius: 6px;")
+ image_layout.addWidget(img_label, stretch=1)
+
+ self.content_layout.addWidget(image_container, stretch=1)
+ print(f"[DEBUG] Image displayed successfully")
+ return
+ else:
+ error_msg = "Failed to load image from bytes"
+ print(f"[DEBUG] {error_msg}")
+ self.show_image_error(error_msg)
+ return
+ else:
+ error_msg = f"Could not fetch image from MinIO: {image_path}"
+ print(f"[DEBUG] {error_msg}")
+ self.show_image_error(error_msg)
+ return
+ else:
+ # No image path found in recent events
+ error_msg = "No image data available for this device"
+ print(f"[DEBUG] {error_msg}")
+ self.show_image_error(error_msg)
+ return
+ except Exception as e:
+ error_msg = f"Error fetching image: {str(e)}"
+ print(f"[DEBUG] {error_msg}")
+ import traceback
+ traceback.print_exc()
+ self.show_image_error(error_msg)
+
+ def show_image_error(self, error_message: str):
+ """Display error message in the image tab."""
+ error_container = QWidget()
+ error_layout = QVBoxLayout(error_container)
+ error_layout.setContentsMargins(0, 0, 0, 0)
+ error_layout.addStretch()
+
+ error_label = QLabel(error_message)
+ error_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ error_label.setFont(QFont('Segoe UI', 12))
+ error_label.setStyleSheet("color: #f59e0b; padding: 20px;")
+ error_label.setWordWrap(True)
+ error_layout.addWidget(error_label)
+
+ error_layout.addStretch()
+ self.content_layout.addWidget(error_container, stretch=1)
diff --git a/GUI/src/vast/views/irrigation/sprinkler_off.png b/GUI/src/vast/views/irrigation/sprinkler_off.png
new file mode 100644
index 000000000..1807f873c
Binary files /dev/null and b/GUI/src/vast/views/irrigation/sprinkler_off.png differ
diff --git a/GUI/src/vast/views/irrigation/sprinkler_on.gif b/GUI/src/vast/views/irrigation/sprinkler_on.gif
new file mode 100644
index 000000000..4401de4bd
Binary files /dev/null and b/GUI/src/vast/views/irrigation/sprinkler_on.gif differ
diff --git a/GUI/src/vast/views/leaf_diseases.py b/GUI/src/vast/views/leaf_diseases.py
new file mode 100644
index 000000000..7b9fe59fb
--- /dev/null
+++ b/GUI/src/vast/views/leaf_diseases.py
@@ -0,0 +1,708 @@
+# leaf_diseases.py (compact, fixed + Grafana integration)
+# UI: English, Comments: English, 4 spaces indent.
+
+from __future__ import annotations
+from collections import Counter, defaultdict
+from datetime import datetime, time, timezone
+from typing import Iterable, Optional, Tuple
+
+from PyQt6.QtCore import QDate, QTimer, Qt, QPointF, pyqtSignal, QUrl
+from PyQt6.QtGui import QPainter, QPen, QColor
+from PyQt6.QtWidgets import (
+ QCalendarWidget, QDialog, QDialogButtonBox, QFrame, QHBoxLayout, QLabel,
+ QPushButton, QScrollArea, QSizePolicy, QSpacerItem, QVBoxLayout, QWidget, QDateEdit, QProgressBar
+)
+from PyQt6.QtWebEngineWidgets import QWebEngineView
+
+from dashboard_api import DashboardApi
+
+# ──────────────────────────────
+# Small utils
+# ──────────────────────────────
+
+
+
+def _color_for_pct(pct: float) -> str:
+ """Traffic-light color by percentage."""
+ return "#22c55e" if pct < 20 else ("#f59e0b" if pct <= 50 else "#ef4444")
+
+def _is_sick(v) -> bool:
+ """Normalize truthy sick flags from DB."""
+ return v in [True, "true", "t", "1", 1, "yes", "y"]
+
+def _ts_to_date(ts: str) -> Optional[datetime.date]:
+ """Parse ISO ts (supports 'Z')."""
+ try:
+ return datetime.fromisoformat(ts.replace("Z", "+00:00")).date()
+ except Exception:
+ return None
+
+def _json_rows(payload) -> list:
+ """Accept list or any common envelope {data/items/rows/...}."""
+ if isinstance(payload, list):
+ return payload
+ if isinstance(payload, dict):
+ for k in ("data", "results", "items", "records", "rows"):
+ v = payload.get(k)
+ if isinstance(v, list):
+ return v
+ return []
+
+def _clear_layout(layout) -> None:
+ """Remove all widgets from a layout."""
+ while layout.count():
+ itm = layout.takeAt(0)
+ w = itm.widget()
+ if w:
+ w.deleteLater()
+
+# Styles (one place)
+APP_STYLES = """
+QWidget {
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #0a0f1f, stop:1 #060913);
+ color: #e5e7eb; font-family: ui-sans-serif, system-ui, 'Segoe UI', Roboto, sans-serif;
+}
+QScrollArea { border: none; background: transparent; }
+QLabel { color: #e5e7eb; background: transparent; }
+
+QPushButton {
+ background: #0f1a33; border: 1px solid #1f2b49; border-radius: 12px;
+ color: #e5e7eb; padding: 10px 20px; font-weight: 600; font-size: 13px;
+}
+QPushButton:hover { background: #1a2a4a; border: 1px solid #3d5a8f; }
+QPushButton:pressed { background: #0a1220; }
+
+QDateEdit { background: transparent; border: none; color: #e5e7eb; padding: 6px 10px; font-size: 13px; }
+QDateEdit::drop-down { border: none; background: transparent; width: 20px; }
+
+QFrame.card {
+ background: qradialgradient(cx:0.9, cy:-0.1, radius:1.2, fx:0.9, fy:-0.1,
+ stop:0 #243b55, stop:0.35 #111827, stop:1 #0b1220);
+ border: 1px solid #1f2937; border-radius: 16px; padding: 16px;
+}
+
+/* nicer disease chips */
+.Tag {
+ background: #0b1220; border: 1px solid #1f2937;
+ border-radius: 999px; padding: 6px 12px; font-size: 12px;
+}
+.Tag:hover { border-color: #334155; box-shadow: 0 0 0 2px rgba(99,102,241,.15); }
+
+/* progress bars */
+QProgressBar {
+ background: #0b1220; border: 1px solid #1f2937; border-radius: 999px;
+ min-height: 14px; max-height: 14px; text-align: center;
+}
+QProgressBar::chunk {
+ border-radius: 999px;
+}
+"""
+
+
+# ──────────────────────────────
+# Clickables
+# ──────────────────────────────
+
+class ClickableRow(QFrame):
+ clicked = pyqtSignal(str)
+ def __init__(self, key: str, parent: Optional[QWidget] = None) -> None:
+ super().__init__(parent)
+ self.key = key
+ self.setStyleSheet("QFrame { background: transparent; }")
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
+ def mousePressEvent(self, e): # noqa: N802
+ self.clicked.emit(self.key)
+ super().mousePressEvent(e)
+
+ClickableTag = ClickableRow # identical behavior
+
+# ──────────────────────────────
+# Tiny sparkline
+# ──────────────────────────────
+
+class TrendSparkline(QFrame):
+ """Minimal line chart for percentages (0..100)."""
+ def __init__(self, parent: Optional[QWidget] = None) -> None:
+ super().__init__(parent)
+ self._series: list[float] = []
+ self.setMinimumHeight(160)
+ self.setStyleSheet("QFrame { background: #0b1220; border: 1px solid #1f2937; border-radius: 16px; }")
+ def set_series(self, values: Iterable[float]) -> None:
+ self._series = list(values) if values else []
+ self.update()
+ def paintEvent(self, _): # noqa: N802
+ super().paintEvent(_)
+ if not self._series:
+ return
+ p = QPainter(self); p.setRenderHints(QPainter.RenderHint.Antialiasing, True)
+ w, h = self.width(), self.height()
+ L, T, R, B = 16, 12, 16, 20
+ cw, ch = max(1, w - L - R), max(1, h - T - B)
+ pen_axis = QPen(QColor("#1f2937")); pen_axis.setWidth(1); p.setPen(pen_axis)
+ p.drawLine(L, h - B, w - R, h - B); p.drawLine(L, T, L, h - B)
+ n = len(self._series); dx = cw / max(1, n - 1); pts = []
+ for i, val in enumerate(self._series):
+ v = max(0.0, min(100.0, float(val)))
+ pts.append(QPointF(L + i * dx, T + (100.0 - v) / 100.0 * ch))
+ pen_line = QPen(QColor("#6366f1")); pen_line.setWidth(2); p.setPen(pen_line)
+ for i in range(1, len(pts)): p.drawLine(pts[i - 1], pts[i])
+ p.setPen(Qt.PenStyle.NoPen); p.setBrush(QColor("#6366f1"))
+ for idx in (0, len(pts) - 1): p.drawEllipse(pts[idx], 3.5, 3.5)
+
+# ──────────────────────────────
+# Date range dialog
+# ──────────────────────────────
+
+class DateRangeDialog(QDialog):
+ """Two calendars (From/To) + clear/today/OK/Cancel."""
+ def __init__(self, parent: Optional[QWidget] = None, start: Optional[QDate] = None, end: Optional[QDate] = None):
+ super().__init__(parent)
+ self.setWindowTitle("Select Date Range")
+ self.setModal(True)
+ self.setMinimumWidth(460)
+ self.setStyleSheet("""
+ QDialog { background: #0b1220; color: #e5e7eb; }
+ QLabel { background: transparent; color: #e5e7eb; }
+ QCalendarWidget QWidget { background: transparent; color: #e5e7eb; }
+ QCalendarWidget QAbstractItemView { selection-background-color: #1e3a5f; }
+ QDialogButtonBox QPushButton {
+ background: #0f1a33; border: 1px solid #1f2b49; border-radius: 8px;
+ color: #e5e7eb; padding: 6px 12px; font-weight: 600;
+ }
+ QDialogButtonBox QPushButton:hover { background: #1a2a4a; border-color: #3d5a8f; }
+ """)
+ main = QVBoxLayout(self); row = QHBoxLayout(); main.addLayout(row)
+ min_allowed, max_allowed = QDate(2000, 1, 1), QDate(2100, 12, 31)
+
+ def _calendar(lbl: str) -> QCalendarWidget:
+ box = QVBoxLayout(); box.addWidget(QLabel(lbl))
+ cal = QCalendarWidget(self)
+ cal.setNavigationBarVisible(True); cal.setGridVisible(True)
+ cal.setMinimumDate(min_allowed); cal.setMaximumDate(max_allowed)
+ box.addWidget(cal); return box, cal
+
+ left_box, self.cal_from = _calendar("From Date")
+ right_box, self.cal_to = _calendar("To Date")
+ row.addLayout(left_box); row.addItem(QSpacerItem(16, 1, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)); row.addLayout(right_box)
+ today = QDate.currentDate(); self.cal_from.setSelectedDate(start or today.addDays(-7)); self.cal_to.setSelectedDate(end or today)
+ buttons = QDialogButtonBox(self)
+ self._btn_clear = buttons.addButton("Clear", QDialogButtonBox.ButtonRole.ActionRole)
+ self._btn_today = buttons.addButton("Today", QDialogButtonBox.ButtonRole.ActionRole)
+ buttons.addButton(QDialogButtonBox.StandardButton.Ok); buttons.addButton(QDialogButtonBox.StandardButton.Cancel)
+ self._btn_clear.clicked.connect(self._on_clear); self._btn_today.clicked.connect(self._on_today)
+ buttons.accepted.connect(self.accept); buttons.rejected.connect(self.reject)
+ main.addWidget(buttons)
+
+ def _on_today(self): t = QDate.currentDate(); self.cal_from.setSelectedDate(t); self.cal_to.setSelectedDate(t)
+ def _on_clear(self): self.cal_from.setSelectedDate(QDate()); self.cal_to.setSelectedDate(QDate())
+
+ def selectedRange(self) -> Tuple[Optional[QDate], Optional[QDate]]:
+ f, t = self.cal_from.selectedDate(), self.cal_to.selectedDate()
+ if not f.isValid() or not t.isValid(): return None, None
+ return (t, f) if f > t else (f, t)
+
+# ──────────────────────────────
+# Main View
+# ──────────────────────────────
+
+class LeafDiseaseView(QWidget):
+ """
+ Compact dashboard: date filtering, top devices, top diseases,
+ device details (per-disease % of total device images).
+ When clicking on disease or device, shows details below inline.
+ """
+
+ def __init__(self, api: DashboardApi, parent: Optional[QWidget] = None) -> None:
+ super().__init__(parent)
+ self.api = api
+ self._raw: list[dict] = []
+ self._types: dict[str, str] = {} # { "1": "Blight", ... }
+ self._filters_timer = QTimer(self); self._filters_timer.setSingleShot(True)
+ self._filters_timer.setInterval(250); self._filters_timer.timeout.connect(self._apply_filters_and_update)
+ self._setup_ui()
+ self._load_types(); self._load_reports()
+
+ # ───────── UI / build ─────────
+
+ def _setup_ui(self) -> None:
+ self.setStyleSheet(APP_STYLES)
+ scroll = QScrollArea(); scroll.setWidgetResizable(True); scroll.setFrameShape(QFrame.Shape.NoFrame)
+ container = QWidget(); main = QVBoxLayout(container); main.setSpacing(20); main.setContentsMargins(24, 24, 24, 24)
+
+ # Top section: header, controls, KPIs, cards
+ main.addWidget(self._header())
+ main.addWidget(self._controls())
+ main.addWidget(self._kpis())
+ main.addWidget(self._cards())
+
+ # Details section (shown below when clicking)
+ self.device_card = self._device_details_card()
+ self.device_card.setVisible(False)
+ main.addWidget(self.device_card)
+
+ self.grafana_card = self._grafana_details_card()
+ self.grafana_card.setVisible(False)
+ main.addWidget(self.grafana_card)
+
+ main.addStretch()
+ scroll.setWidget(container)
+ wrap = QVBoxLayout(self); wrap.setContentsMargins(0, 0, 0, 0); wrap.addWidget(scroll)
+
+ def _header(self) -> QWidget:
+ frame = QFrame(); h = QHBoxLayout(frame)
+ h.setContentsMargins(0, 0, 0, 0)
+ title = QLabel("Field Status: Report")
+ title.setStyleSheet("font-size: 22px; font-weight: 700; letter-spacing: 0.3px;")
+ btn = QPushButton("🔄 Refresh"); btn.clicked.connect(self._refresh)
+ h.addWidget(title); h.addStretch(); h.addWidget(btn); return frame
+
+ def _refresh(self): self._load_types(); self._load_reports()
+
+ def _controls(self) -> QWidget:
+ box = QFrame(); box.setObjectName("controls"); box.setStyleSheet(
+ "QFrame#controls { background: #0f1a33; border: 1px solid #1f2b49; border-radius: 12px; padding: 10px; }"
+ )
+ h = QHBoxLayout(box); h.setSpacing(20)
+ min_allowed, max_allowed = QDate(2000, 1, 1), QDate(2100, 12, 31)
+ h.addWidget(QLabel("Date Range:"))
+ self.date_from = QDateEdit(); self.date_from.setCalendarPopup(True); self.date_from.setDisplayFormat("dd/MM/yyyy")
+ self.date_from.setDate(QDate.currentDate().addDays(-7)); self.date_from.setMinimumDate(min_allowed); self.date_from.setMaximumDate(max_allowed)
+ self.date_to = QDateEdit(); self.date_to.setCalendarPopup(True); self.date_to.setDisplayFormat("dd/MM/yyyy")
+ self.date_to.setDate(QDate.currentDate()); self.date_to.setMinimumDate(min_allowed); self.date_to.setMaximumDate(max_allowed)
+ self.range_btn = QPushButton("📅 Select Range"); self.range_btn.clicked.connect(self._open_range_dialog)
+ for w in (self.date_from, QLabel("–"), self.date_to, self.range_btn): h.addWidget(w)
+ h.addStretch(); self.range_info = QLabel("Last 7 Days"); self.range_info.setStyleSheet("color: #94a3b8; font-size: 12px;"); h.addWidget(self.range_info)
+ self.date_from.dateChanged.connect(self._range_changed); self.date_to.dateChanged.connect(self._range_changed)
+ self._update_range_info(); return box
+
+ def _kpis(self) -> QWidget:
+ frame = QFrame(); h = QHBoxLayout(frame); h.setSpacing(16); h.setContentsMargins(0, 0, 0, 0)
+ self.kpi_healthy = self._kpi_card("Overall Healthy %", "0%", "#22c55e")
+ self.kpi_images = self._kpi_card("Images Analyzed", "0", "#6366f1")
+ self.kpi_devices = self._kpi_card("Active Devices", "0", "#f59e0b")
+ for k in (self.kpi_healthy, self.kpi_images, self.kpi_devices): h.addWidget(k)
+ return frame
+
+ def _cards(self) -> QWidget:
+ frame = QFrame(); h = QHBoxLayout(frame); h.setSpacing(16); h.setContentsMargins(0, 0, 0, 0)
+ self.devices_card = self._devices_card(); self.diseases_card = self._diseases_card()
+ h.addWidget(self.devices_card, 2); h.addWidget(self.diseases_card, 1); return frame
+
+ # Small UI helpers
+ def _kpi_card(self, title: str, value: str, color: str) -> QWidget:
+ card = QFrame(); card.setProperty("class", "card"); v = QVBoxLayout(card); v.setSpacing(8)
+ t = QLabel(title); t.setStyleSheet("font-size: 13px; color: #94a3b8;")
+ val = QLabel(value); val.setObjectName("value"); val.setStyleSheet(f"font-size: 28px; font-weight: 700; color: {color};")
+ v.addWidget(t); v.addWidget(val); return card
+
+ def _devices_card(self) -> QWidget:
+ card = QFrame(); card.setProperty("class", "card"); v = QVBoxLayout(card); v.setSpacing(12)
+ title = QLabel("Disease Severity by Device (Top 5)")
+ title.setStyleSheet("font-size: 16px; font-weight: 700; letter-spacing: .2px;")
+ self.devices_container = QWidget(); self.devices_layout = QVBoxLayout(self.devices_container)
+ self.devices_layout.setSpacing(10); self.devices_layout.setContentsMargins(0,0,0,0)
+ note = QLabel("Bar color by severity: Green/Orange/Red • Length represents percentage")
+ note.setStyleSheet("font-size: 12px; color: #94a3b8; margin-top: 8px;")
+ v.addWidget(title); v.addWidget(self.devices_container); v.addStretch(); v.addWidget(note); return card
+
+ def _diseases_card(self) -> QWidget:
+ card = QFrame(); card.setProperty("class", "card"); v = QVBoxLayout(card); v.setSpacing(12)
+ title = QLabel("Top 3 Most Common Diseases")
+ title.setStyleSheet("font-size: 16px; font-weight: 700; letter-spacing: .2px;")
+ self.diseases_container = QWidget(); self.diseases_layout = QVBoxLayout(self.diseases_container)
+ self.diseases_layout.setSpacing(10); self.diseases_layout.setContentsMargins(0,0,0,0)
+ note = QLabel("Click on a disease to view detailed Grafana analytics below")
+ note.setStyleSheet("font-size: 12px; color: #94a3b8; margin-top: 8px;")
+ v.addWidget(title); v.addWidget(self.diseases_container); v.addStretch(); v.addWidget(note); return card
+
+ def _device_details_card(self) -> QWidget:
+ """Card that shows disease breakdown for selected device"""
+ card = QFrame(); card.setProperty("class", "card"); v = QVBoxLayout(card); v.setSpacing(12)
+
+ # Header with close button
+ header = QHBoxLayout()
+ self.device_title = QLabel("Device Details")
+ self.device_title.setStyleSheet("font-size: 16px; font-weight: 700;")
+ header.addWidget(self.device_title)
+ header.addStretch()
+
+ close_btn = QPushButton("✕ Close")
+ close_btn.setStyleSheet("padding: 4px 8px; font-size: 11px;")
+ close_btn.clicked.connect(lambda: self.device_card.setVisible(False))
+ header.addWidget(close_btn)
+
+ v.addLayout(header)
+
+ self.device_box = QWidget(); self.device_layout = QVBoxLayout(self.device_box)
+ self.device_layout.setSpacing(10); self.device_layout.setContentsMargins(0,0,0,0)
+ note = QLabel("% represents sick images with this disease out of ALL images from this device")
+ note.setStyleSheet("font-size: 12px; color: #94a3b8; margin-top: 8px;")
+ v.addWidget(self.device_box); v.addStretch(); v.addWidget(note)
+ return card
+
+ def _grafana_details_card(self) -> QWidget:
+ """Card that shows embedded Grafana dashboard for selected disease"""
+ card = QFrame(); card.setProperty("class", "card"); v = QVBoxLayout(card); v.setSpacing(12)
+ v.setContentsMargins(16, 16, 16, 16)
+
+ # Header with title and close button
+ header = QHBoxLayout()
+ self.grafana_title = QLabel("Disease Analysis")
+ self.grafana_title.setStyleSheet("font-size: 16px; font-weight: 700;")
+ header.addWidget(self.grafana_title)
+ header.addStretch()
+
+ refresh_btn = QPushButton("🔄 Refresh")
+ refresh_btn.setStyleSheet("padding: 4px 8px; font-size: 11px;")
+ refresh_btn.clicked.connect(self._refresh_grafana)
+ header.addWidget(refresh_btn)
+
+ close_btn = QPushButton("✕ Close")
+ close_btn.setStyleSheet("padding: 4px 8px; font-size: 11px;")
+ close_btn.clicked.connect(lambda: self.grafana_card.setVisible(False))
+ header.addWidget(close_btn)
+
+ v.addLayout(header)
+
+ # Grafana WebView (embedded)
+ self.grafana_web = QWebEngineView()
+ self.grafana_web.setMinimumHeight(700) # Good size for viewing
+ v.addWidget(self.grafana_web)
+
+ # Status label
+ self.grafana_status = QLabel("📊 Loading dashboard...")
+ self.grafana_status.setStyleSheet("padding: 5px; color: #94a3b8; font-size: 11px;")
+ v.addWidget(self.grafana_status)
+
+ self.grafana_web.loadFinished.connect(self._on_grafana_loaded)
+
+ return card
+
+ def _refresh_grafana(self):
+ """Refresh the embedded Grafana dashboard"""
+ self.grafana_status.setText("📊 Refreshing dashboard...")
+ self.grafana_web.reload()
+
+ def _on_grafana_loaded(self, success: bool):
+ """Called when Grafana page finishes loading"""
+ if success:
+ self.grafana_status.setText("✅ Dashboard loaded | Auto-refresh every 10 seconds")
+ else:
+ self.grafana_status.setText("❌ Error loading dashboard - Ensure Grafana is running")
+
+ # ───────── Data fetch ─────────
+
+ def _load_types(self) -> None:
+ """Fetch leaf_disease_types -> self._types {id:str -> name:str}."""
+ try:
+ url = f"{self.api.base}/api/tables/leaf_disease_types"
+ resp = self.api.http.get(url, timeout=10)
+ mapping = {
+ str(r.get("id")): str(r.get("name"))
+ for r in _json_rows(resp.json())
+ if isinstance(r, dict) and r.get("id") is not None and r.get("name")
+ }
+ if mapping:
+ self._types = mapping
+ print(f"[LeafDiseaseView] Loaded {len(self._types)} disease types.")
+ except Exception as e:
+ print(f"[LeafDiseaseView] Failed loading disease types: {e}")
+
+ def _load_reports(self) -> None:
+ """Fetch reports -> self._raw and update."""
+ try:
+ url = f"{self.api.base}/api/tables/leaf_reports"
+ print(f"[LeafDiseaseView] Requesting: {url}")
+ resp = self.api.http.get(url)
+ rows = _json_rows(resp.json()) if resp.status_code == 200 else []
+ if rows and isinstance(rows[0], str): # stringified JSON rows support
+ import json
+ rows = [json.loads(x) if isinstance(x, str) else x for x in rows]
+ self._raw = [r for r in rows if isinstance(r, dict)]
+ self._update_all(self._filter_by_dates(self._raw))
+ except Exception as e:
+ print(f"[LeafDiseaseView] Error: {e}")
+ self._update_all([])
+
+ # ───────── Filters & triggers ─────────
+
+ def _range_changed(self, *_):
+ self._update_range_info()
+ self._filters_timer.start()
+ # If Grafana card is open and we have a selected disease, reload with new range
+ if getattr(self, "grafana_card", None) and self.grafana_card.isVisible():
+ if hasattr(self, "_sel_disease"):
+ self._on_disease_clicked(self._sel_disease)
+
+ def _open_range_dialog(self):
+ dlg = DateRangeDialog(self, start=self.date_from.date(), end=self.date_to.date())
+ if dlg.exec() == QDialog.DialogCode.Accepted:
+ f, t = dlg.selectedRange()
+ if f and t:
+ self.date_from.setDate(f)
+ self.date_to.setDate(t)
+ else:
+ self.date_from.setDate(QDate.currentDate().addDays(-7))
+ self.date_to.setDate(QDate.currentDate())
+ self._range_changed()
+
+ def _update_range_info(self):
+ txt = f"{self.date_from.date().toString('dd/MM')} → {self.date_to.date().toString('dd/MM')}"
+ self.range_info.setText(txt)
+ self.range_btn.setText(f"📅 {txt}")
+
+ def _apply_filters_and_update(self):
+ self._update_all(self._filter_by_dates(self._raw))
+
+ def _filter_by_dates(self, data: list[dict]) -> list[dict]:
+ """Inclusive date-only filter using QDate edits."""
+ d_from, d_to = self.date_from.date().toPyDate(), self.date_to.date().toPyDate()
+ out = []
+ for r in data:
+ ts = r.get("ts")
+ if ts:
+ d = _ts_to_date(ts)
+ if d and not (d_from <= d <= d_to):
+ continue
+ out.append(r)
+ print(f"[KPI-DBG] filter_by_dates: kept={len(out)} of {len(data)}")
+ return out
+
+ def _grafana_range_params(self) -> str:
+ """
+ Build Grafana from/to range based on current date_from/date_to widgets.
+
+ Grafana expects timestamps in milliseconds since epoch.
+ We take:
+ - from = start of date_from day (00:00)
+ - to = end of date_to day (23:59:59.999)
+ """
+ d_from = self.date_from.date().toPyDate()
+ d_to = self.date_to.date().toPyDate()
+
+ # Start of day (UTC)
+ start_dt = datetime.combine(d_from, time.min).replace(tzinfo=timezone.utc)
+ # End of day (UTC)
+ end_dt = datetime.combine(d_to, time.max).replace(tzinfo=timezone.utc)
+
+ start_ms = int(start_dt.timestamp() * 1000)
+ end_ms = int(end_dt.timestamp() * 1000)
+
+ return f"&from={start_ms}&to={end_ms}&timezone=browser"
+
+ # ───────── Update UI ─────────
+
+ def _update_all(self, filtered: list[dict]) -> None:
+ self._update_kpis(filtered)
+ self._update_devices(filtered)
+ self._update_diseases(filtered)
+ if self.device_card.isVisible() and hasattr(self, "_sel_dev"):
+ self._render_device(self._sel_dev, filtered)
+
+ def _update_kpis(self, data: list[dict]) -> None:
+ total = len(data)
+ if total == 0:
+ self.kpi_healthy.findChild(QLabel, "value").setText("0%")
+ self.kpi_images.findChild(QLabel, "value").setText("0")
+ self.kpi_devices.findChild(QLabel, "value").setText("0")
+ return
+ sick = sum(1 for r in data if _is_sick(r.get("sick")))
+ healthy_pct = (total - sick) / total * 100
+ devices = len({str(r.get("device_id")) for r in data if r.get("device_id")})
+ self.kpi_healthy.findChild(QLabel, "value").setText(f"{healthy_pct:.1f}%")
+ self.kpi_images.findChild(QLabel, "value").setText(f"{total:,}")
+ self.kpi_devices.findChild(QLabel, "value").setText(str(devices))
+
+ # ── Devices: top-5 ──
+
+ def _update_devices(self, data: list[dict]) -> None:
+ _clear_layout(self.devices_layout)
+ if not data:
+ return
+ stats = defaultdict(lambda: {"total": 0, "sick": 0})
+ for r in data:
+ dev = r.get("device_id")
+ if not dev:
+ continue
+ s = stats[str(dev)]
+ s["total"] += 1
+ if _is_sick(r.get("sick")):
+ s["sick"] += 1
+ pairs = [(dev, (s["sick"] / s["total"] * 100.0 if s["total"] else 0.0)) for dev, s in stats.items()]
+ for dev, pct in sorted(pairs, key=lambda x: x[1], reverse=True)[:5]:
+ row = self._build_bar_row(title=str(dev), pct=pct, right_text=f"{pct:.1f}%")
+ row.clicked.connect(self._on_device_clicked)
+ self.devices_layout.addWidget(row)
+
+ def _on_device_clicked(self, device_id: str) -> None:
+ """When device is clicked, hide Grafana and show device details"""
+ self._sel_dev = device_id
+ self.grafana_card.setVisible(False) # Hide Grafana if open
+ self._render_device(device_id, self._filter_by_dates(self._raw))
+
+ def _render_device(self, device_id: str, data: list[dict]) -> None:
+ """
+ Shows diseases for selected device.
+ IMPORTANT: % = (sick images with this disease) / (ALL images from device) * 100
+ """
+ _clear_layout(self.device_layout)
+
+ # Get all images from this device
+ device_data = [r for r in data if str(r.get("device_id", "")) == str(device_id)]
+ total_device_images = len(device_data)
+
+ if total_device_images == 0:
+ self.device_card.setVisible(False)
+ return
+
+ # Count sick images per disease type
+ disease_sick_counts = defaultdict(int)
+ for r in device_data:
+ if _is_sick(r.get("sick")):
+ did = r.get("leaf_disease_type_id")
+ if did is not None:
+ disease_sick_counts[str(did)] += 1
+
+ self.device_title.setText(f"Device: {device_id} – Disease Breakdown")
+
+ # Calculate % of total device images
+ rows = []
+ for did, sick_count in disease_sick_counts.items():
+ pct = (sick_count / total_device_images * 100.0) if total_device_images else 0.0
+ rows.append((self._disease_name(did), pct, sick_count, total_device_images))
+
+ # Sort by percentage and display
+ for name, pct, sick_cnt, total_imgs in sorted(rows, key=lambda x: x[1], reverse=True):
+ txt = f"{pct:.1f}% ({sick_cnt}/{total_imgs} images)"
+ self.device_layout.addWidget(self._build_bar_row(title=name, pct=pct, right_text=txt))
+
+ self.device_card.setVisible(True)
+
+ # ── Diseases: top-3 ──
+
+ def _update_diseases(self, data: list[dict]) -> None:
+ _clear_layout(self.diseases_layout)
+ if not data:
+ return
+ counter: Counter[str] = Counter()
+ for r in data:
+ if _is_sick(r.get("sick")):
+ did = r.get("leaf_disease_type_id")
+ if did is not None:
+ counter[str(did)] += 1
+ total_sick = sum(counter.values()) or 1
+ palette = ["#f97316", "#eab308", "#ef4444"]
+ for i, (did, cnt) in enumerate(counter.most_common(3)):
+ name = self._disease_name(did)
+ pct = cnt / total_sick * 100.0
+ color = palette[i] if i < len(palette) else "#6366f1"
+ self.diseases_layout.addWidget(
+ self._build_tag(name=name, disease_id=str(did), color=color, pct=pct, count=cnt)
+ )
+
+ # ── Disease details: Shows embedded Grafana below ──
+
+ def _on_disease_clicked(self, disease_id: str) -> None:
+ """When disease is clicked, hide device details and show Grafana below"""
+ disease_name = self._disease_name(disease_id)
+ print(f"[LeafDiseaseView] Showing Grafana for disease: {disease_name} (ID: {disease_id})")
+
+ # Save selected disease so we can refresh on range change if needed
+ self._sel_disease = disease_id
+
+ # Hide device card if open
+ self.device_card.setVisible(False)
+
+ # Update Grafana title and load dashboard
+ self.grafana_title.setText(f"📊 Disease Analysis: {disease_name}")
+
+ # Build Grafana URL with disease_id + date range
+ range_params = self._grafana_range_params()
+ grafana_url = (
+ f"http://host.docker.internal:3000/d/leaf-disease-detail/"
+ f"leaf-disease-analysis"
+ f"?orgId=1&refresh=10s&kiosk=tv"
+ f"&var-disease_id={disease_id}"
+ f"{range_params}"
+ )
+
+ print(f"[LeafDiseaseView] Loading Grafana: {grafana_url}")
+ self.grafana_status.setText("📊 Loading dashboard...")
+ self.grafana_web.setUrl(QUrl(grafana_url))
+
+ # Show Grafana card
+ self.grafana_card.setVisible(True)
+
+ # ───────── Reusable tiny builders ─────────
+ def _build_bar_row(self, title: str, pct: float, right_text: str) -> ClickableRow:
+ """
+ Generic row: title | QProgressBar (color by pct) | right text.
+ Bar length represents the percentage value.
+ """
+ row = ClickableRow(title)
+ h = QHBoxLayout(row)
+ h.setSpacing(10)
+ h.setContentsMargins(0, 0, 0, 0)
+
+ # left title
+ name = QLabel(title)
+ name.setStyleSheet("font-weight: 600; min-width: 180px;")
+ h.addWidget(name)
+
+ # middle: progress bar (VALUE = pct, so bar length represents percentage)
+ pb = QProgressBar()
+ pb.setRange(0, 100)
+ pb.setValue(int(max(0, min(100, pct))))
+ pb.setTextVisible(False)
+
+ # color chunk dynamically by severity
+ chunk_color = _color_for_pct(pct) # green/orange/red
+ pb.setStyleSheet(
+ "QProgressBar { background: #0b1220; border: 1px solid #1f2937; "
+ "border-radius: 999px; min-height: 14px; max-height: 14px; } "
+ f"QProgressBar::chunk {{ background: {chunk_color}; border-radius: 999px; }}"
+ )
+ h.addWidget(pb, 1)
+
+ # right label
+ r = QLabel(right_text)
+ r.setStyleSheet("color: #94a3b8; min-width: 110px;")
+ r.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
+ h.addWidget(r)
+
+ return row
+
+ def _build_tag(self, name: str, disease_id: str, color: str, pct: float, count: int) -> ClickableTag:
+ row = ClickableTag(disease_id)
+ h = QHBoxLayout(row)
+ h.setSpacing(8)
+ h.setContentsMargins(0, 0, 0, 0)
+
+ tag = QFrame()
+ tag.setStyleSheet("background: #0b1220; border: 1px solid #1f2937; border-radius: 999px; padding: 6px 10px;")
+ tag_h = QHBoxLayout(tag)
+ tag_h.setSpacing(8)
+ tag_h.setContentsMargins(6, 4, 6, 4)
+
+ dot = QLabel("●")
+ dot.setStyleSheet(f"color: {color}; font-size: 16px;")
+ disp = name if len(name) <= 25 else name[:25] + "…"
+ tag_h.addWidget(dot)
+ tag_h.addWidget(QLabel(disp))
+
+ h.addWidget(tag)
+ h.addStretch()
+
+ pct_lbl = QLabel(f"{pct:.0f}% ({count} reports)")
+ pct_lbl.setStyleSheet("color: #94a3b8; font-size: 13px;")
+ h.addWidget(pct_lbl)
+
+ row.clicked.connect(self._on_disease_clicked)
+ return row
+
+ # ───────── Naming ─────────
+
+ def _disease_name(self, disease_id: str | int | None) -> str:
+ if disease_id is None:
+ return "Unknown Disease"
+ return self._types.get(str(disease_id), f"Disease #{disease_id}")
\ No newline at end of file
diff --git a/GUI/src/vast/views/sound_view.py b/GUI/src/vast/views/notification_view.py
similarity index 82%
rename from GUI/src/vast/views/sound_view.py
rename to GUI/src/vast/views/notification_view.py
index f41d21690..a1552fd15 100644
--- a/GUI/src/vast/views/sound_view.py
+++ b/GUI/src/vast/views/notification_view.py
@@ -5,7 +5,7 @@
from PyQt6.QtWebEngineWidgets import QWebEngineView
from PyQt6.QtCore import QUrl
-class SoundView(QWidget):
+class NotificationView(QWidget):
def __init__(self, parent=None):
super().__init__(parent)
layout = QVBoxLayout(self)
@@ -14,7 +14,7 @@ def __init__(self, parent=None):
web_view = QWebEngineView(self)
notification_api_url = "http://notification_api:5000"
- print(f"[SoundView] Loading URL: {notification_api_url}")
+ print(f"[NotificationView] Loading URL: {notification_api_url}")
web_view.setUrl(QUrl(notification_api_url))
layout.addWidget(web_view)
\ No newline at end of file
diff --git a/GUI/src/vast/views/security/analytics/analytics_page.py b/GUI/src/vast/views/security/analytics/analytics_page.py
new file mode 100644
index 000000000..0bf2ae31e
--- /dev/null
+++ b/GUI/src/vast/views/security/analytics/analytics_page.py
@@ -0,0 +1,561 @@
+from __future__ import annotations
+from datetime import date
+
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox,
+ QPushButton, QDateEdit, QFrame, QSizePolicy,
+ QGraphicsDropShadowEffect, QSplitter, QLineEdit, QMessageBox, QApplication
+)
+from PyQt6.QtCore import Qt, QDate
+from PyQt6.QtGui import QColor
+from PyQt6 import QtCore
+
+from orthophoto_canvas.ui.viewer_factory import create_orthophoto_viewer
+from src.vast.views.security.analytics.map_layers.region_layer import RegionLayer
+from src.vast.views.security.analytics.map_layers.device_layer import DeviceLayer
+from src.vast.views.security.analytics.analytics_provider import (
+ load_all_devices, load_all_regions,
+ get_region_analytics, get_device_analytics
+)
+from src.vast.views.security.analytics.popup_panel import AnalyticsPanel
+from src.vast.views.security.analytics import analytics_provider as ap
+
+
+class AgGuardMessageBox(QFrame):
+ def __init__(self, parent=None, title="Message", text=""):
+ super().__init__(parent)
+
+ self.setWindowFlags(
+ Qt.WindowType.Dialog |
+ Qt.WindowType.FramelessWindowHint |
+ Qt.WindowType.WindowStaysOnTopHint
+ )
+ # no translucent background → no black corners
+ self.setAutoFillBackground(True)
+ pal = self.palette()
+ pal.setColor(self.backgroundRole(), QColor("#fefefe"))
+ self.setPalette(pal)
+
+ # Light drop shadow
+ shadow = QGraphicsDropShadowEffect()
+ shadow.setBlurRadius(28)
+ shadow.setOffset(0, 3)
+ shadow.setColor(QColor(200, 200, 200, 90))
+ self.setGraphicsEffect(shadow)
+
+ self.setStyleSheet("""
+ QFrame {
+ background-color: #fefefe;
+ border-radius: 16px;
+ border: 1px solid #f3f4f6;
+ }
+ QLabel#title {
+ font-size: 18px;
+ font-weight: 700;
+ color: #1f2937;
+ }
+ QLabel#text {
+ font-size: 14px;
+ color: #4b5563;
+ }
+ QPushButton#ok_btn {
+ background-color: #10b981;
+ color: white;
+ border-radius: 10px;
+ padding: 6px 18px;
+ font-weight: 600;
+ min-width: 80px;
+ }
+ QPushButton#ok_btn:hover {
+ background-color: #059669;
+ }
+ """)
+
+ layout = QVBoxLayout(self)
+ layout.setContentsMargins(22, 22, 22, 22)
+ layout.setSpacing(14)
+
+ title_lbl = QLabel(title)
+ title_lbl.setObjectName("title")
+
+ text_lbl = QLabel(text)
+ text_lbl.setObjectName("text")
+ text_lbl.setWordWrap(True)
+
+ btn = QPushButton("OK")
+ btn.setObjectName("ok_btn")
+ btn.clicked.connect(self.close)
+
+ layout.addWidget(title_lbl)
+ layout.addWidget(text_lbl)
+ layout.addStretch()
+ layout.addWidget(btn, alignment=Qt.AlignmentFlag.AlignRight)
+
+ self.adjustSize()
+ self.setMinimumWidth(360)
+
+ def show_centered(self):
+ if self.parent():
+ parent_geo = self.parent().geometry()
+ x = parent_geo.x() + (parent_geo.width() - self.width()) // 2
+ y = parent_geo.y() + (parent_geo.height() - self.height()) // 2
+ self.move(x, y)
+ self.show()
+
+
+class GeoAnalyticsView(QWidget):
+ """Geo-Analytics Dashboard with fixed analytics panel and multi-selection."""
+
+ def __init__(self, parent: QWidget | None = None):
+ super().__init__(parent)
+ self.current_mode = "region"
+ self.start_date: date | None = None
+ self.end_date: date | None = None
+ self.selected_regions = set()
+ self.selected_devices = set()
+
+ # ─────────────────────────────
+ # GLOBAL STYLE
+ # ─────────────────────────────
+ self.setStyleSheet("""
+ QWidget {
+ background-color: #f9fafb;
+ font-family: 'Segoe UI', 'DejaVu Sans', Arial, sans-serif;
+ color: #111827;
+ font-size: 14px;
+ }
+ QComboBox, QDateEdit {
+ background-color: #ffffff;
+ border: 1px solid #d1d5db;
+ border-radius: 8px;
+ padding: 4px 10px;
+ font-size: 13px;
+ height: 32px;
+ min-width: 120px;
+ color: #111827;
+ }
+ QComboBox:hover, QDateEdit:hover {
+ border-color: #9ca3af;
+ background-color: #f9fafb;
+ }
+ QPushButton#apply_btn {
+ background-color: #10b981;
+ color: white;
+ border-radius: 6px;
+ font-weight: 600;
+ padding: 6px 12px;
+ }
+ QPushButton#apply_btn:hover { background-color: #059669; }
+ """)
+
+ # ─────────────────────────────
+ # ROOT LAYOUT
+ # ─────────────────────────────
+ root = QVBoxLayout(self)
+ root.setContentsMargins(16, 16, 16, 16)
+ root.setSpacing(12)
+ self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+
+ # Header
+ header = QLabel("🗺️ Geo-Analytics Dashboard")
+ header.setStyleSheet("font-size:22px;font-weight:700;color:#0f172a;")
+ root.addWidget(header)
+
+ # ─────────────────────────────
+ # FILTER BAR
+ # ─────────────────────────────
+ filter_frame = QFrame()
+ filter_frame.setStyleSheet("""
+ QFrame {
+ background-color: #ffffff;
+ border: 1px solid #d1d5db;
+ border-radius: 12px;
+ padding: 10px 14px;
+ }
+ """)
+ shadow = QGraphicsDropShadowEffect()
+ shadow.setBlurRadius(12)
+ shadow.setOffset(0, 2)
+ shadow.setColor(QColor(0, 0, 0, 40))
+ filter_frame.setGraphicsEffect(shadow)
+
+ filter_bar = QHBoxLayout(filter_frame)
+ filter_bar.setSpacing(14)
+ filter_bar.setContentsMargins(10, 6, 10, 6)
+
+ lbl_mode = QLabel("Mode:")
+ self.mode_combo = QComboBox()
+ self.mode_combo.addItems(["Region", "Device"])
+ self.mode_combo.currentTextChanged.connect(self._on_mode_changed)
+
+ lbl_date = QLabel("Date range:")
+ self.start_picker = QDateEdit(QDate.currentDate().addMonths(-1))
+ self.start_picker.setCalendarPopup(True)
+ arrow_lbl = QLabel("→")
+ self.end_picker = QDateEdit(QDate.currentDate())
+ self.end_picker.setCalendarPopup(True)
+
+ apply_btn = QPushButton("Apply Filters")
+ apply_btn.setObjectName("apply_btn")
+ apply_btn.clicked.connect(self._apply_filters)
+
+ filter_bar.addWidget(lbl_mode)
+ filter_bar.addWidget(self.mode_combo)
+ filter_bar.addSpacing(12)
+ filter_bar.addWidget(lbl_date)
+ filter_bar.addWidget(self.start_picker)
+ filter_bar.addWidget(arrow_lbl)
+ filter_bar.addWidget(self.end_picker)
+ filter_bar.addSpacing(12)
+ filter_bar.addWidget(apply_btn)
+ filter_bar.addStretch()
+ root.addWidget(filter_frame)
+
+ # ─────────────────────────────
+ # AI QUERY BAR
+ # ─────────────────────────────
+ query_frame = QFrame()
+ query_frame.setStyleSheet("""
+ QFrame {
+ background-color: #ffffff;
+ border: 1px solid #e5e7eb;
+ border-radius: 18px;
+ padding: 10px 12px;
+ }
+ QLineEdit {
+ background-color: qlineargradient(
+ x1:0, y1:0, x2:0, y2:1,
+ stop:0 #ffffff, stop:1 #f9fafb
+ );
+ border: 1px solid #d1d5db;
+ border-radius: 18px;
+ padding: 8px 16px;
+ font-size: 14px;
+ color: #111827;
+ selection-background-color: #bae6fd;
+ }
+ QLineEdit:focus {
+ border-color: #10b981;
+ background-color: #ffffff;
+ box-shadow: 0 0 0 3px rgba(16,185,129,0.2);
+ }
+ QPushButton#send_btn {
+ background-color: #10b981;
+ color: white;
+ font-weight: 600;
+ border-radius: 18px;
+ padding: 0 18px;
+ border: none;
+ min-width: 80px;
+ height: 38px;
+ }
+ QPushButton#send_btn:hover {
+ background-color: #059669;
+ }
+ """)
+
+ query_layout = QHBoxLayout(query_frame)
+ query_layout.setSpacing(8)
+ query_layout.setContentsMargins(10, 6, 10, 6)
+
+ self.query_input = QLineEdit()
+ self.query_input.setPlaceholderText("Ask anything — e.g. 'Show regions with most intrusions this month'")
+ self.query_input.setClearButtonEnabled(True)
+ self.query_input.setMinimumWidth(420)
+ self.query_input.setFixedHeight(38)
+
+ self.query_send = QPushButton("Send")
+ self.query_send.setObjectName("send_btn")
+ self.query_send.clicked.connect(self._on_query_sent)
+
+ query_layout.addWidget(self.query_input, stretch=1)
+ query_layout.addWidget(self.query_send)
+
+ query_shadow = QGraphicsDropShadowEffect()
+ query_shadow.setBlurRadius(22)
+ query_shadow.setOffset(0, 3)
+ query_shadow.setColor(QColor(0, 0, 0, 50))
+ query_frame.setGraphicsEffect(query_shadow)
+
+ # ─────────────────────────────
+ # MAIN SPLITTER (map + analytics)
+ # ─────────────────────────────
+ splitter = QSplitter(Qt.Orientation.Horizontal)
+ splitter.setChildrenCollapsible(False)
+ splitter.setHandleWidth(6)
+ splitter.setStretchFactor(0, 3)
+ splitter.setStretchFactor(1, 1)
+ splitter.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+ splitter.setStyleSheet("""
+ QSplitter::handle {
+ background-color: #e5e7eb;
+ }
+ QSplitter::handle:hover {
+ background-color: #10b981;
+ }
+ """)
+
+ # ─────────────────────────────
+ # LEFT SIDE — map card + query box
+ # ─────────────────────────────
+ map_container = QWidget()
+ map_container_layout = QVBoxLayout(map_container)
+ map_container_layout.setContentsMargins(0, 0, 0, 0)
+ map_container_layout.setSpacing(0)
+
+ # Outer shell (white card with strong round corners + shadow)
+ map_shell = QFrame()
+ map_shell.setObjectName("mapShell")
+ map_shell.setStyleSheet("""
+ QFrame#mapShell {
+ background-color: #ffffff;
+ border-radius: 24px;
+ border: 1px solid #e5e7eb;
+ }
+ """)
+ map_shell_shadow = QGraphicsDropShadowEffect()
+ map_shell_shadow.setBlurRadius(26)
+ map_shell_shadow.setOffset(0, 8)
+ map_shell_shadow.setColor(QColor(15, 23, 42, 55))
+ map_shell.setGraphicsEffect(map_shell_shadow)
+
+ shell_layout = QVBoxLayout(map_shell)
+ shell_layout.setContentsMargins(14, 14, 14, 14)
+ shell_layout.setSpacing(10)
+
+ # Inner rounded frame that actually clips the map
+ map_frame = QFrame()
+ map_frame.setObjectName("mapFrame")
+ map_frame.setStyleSheet("""
+ QFrame#mapFrame {
+ background-color: #020617; /* dark slate */
+ border-radius: 18px;
+ border: none;
+ }
+ """)
+ map_frame.setContentsMargins(0, 0, 0, 0)
+ map_frame_layout = QVBoxLayout(map_frame)
+ map_frame_layout.setContentsMargins(0, 0, 0, 0)
+ map_frame_layout.setSpacing(0)
+
+ tiles_root = "./src/vast/orthophoto_canvas/data/tiles"
+ self.viewer = create_orthophoto_viewer(tiles_root, forced_scheme=None, parent=self)
+
+ # Make the view itself frameless and rounded
+ self.viewer.setFrameShape(QFrame.Shape.NoFrame)
+ self.viewer.setStyleSheet("""
+ QGraphicsView {
+ background-color: transparent;
+ border: none;
+ }
+ QGraphicsView::viewport {
+ border-radius: 18px; /* real rounded viewport */
+ background-color: #020617;
+ }
+ """)
+ self.viewer.setAttribute(Qt.WidgetAttribute.WA_StyledBackground, True)
+
+ # Optional static background instead of tiles
+ self.viewer.set_custom_background_image(
+ "./src/vast/orthophoto_canvas/ui/fields.png",
+ hide_tiles=True
+ )
+ self.viewer.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+
+ map_frame_layout.addWidget(self.viewer, stretch=1)
+
+ # Query bar sits under the map, inside the same shell
+ query_frame.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+
+ shell_layout.addWidget(map_frame, stretch=1)
+ shell_layout.addWidget(query_frame, stretch=0)
+
+ map_container_layout.addWidget(map_shell)
+ splitter.addWidget(map_container)
+
+
+ # ─────────────────────────────
+ # RIGHT SIDE — analytics panel
+ # ─────────────────────────────
+ self.analytics_panel = AnalyticsPanel("All Regions", {}, parent=self)
+ self.analytics_panel.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding)
+ splitter.addWidget(self.analytics_panel)
+
+ root.addWidget(splitter, stretch=1)
+
+ # ─────────────────────────────
+ # MAP LAYERS
+ # ─────────────────────────────
+ self.region_layer = RegionLayer(self.viewer, on_select=self._on_region_selected)
+ self.device_layer = DeviceLayer(self.viewer, on_select=self._on_device_selected)
+
+ # Initial load
+ self._load_regions()
+ self._update_analytics_panel()
+ self._initial_fit_done = False
+ QtCore.QTimer.singleShot(0, self._fit_map_to_container)
+
+ # Ensure map always fills its container nicely
+ def resizeEvent(self, event):
+ super().resizeEvent(event)
+ QtCore.QTimer.singleShot(0, self._fit_map_to_container)
+
+ def _fit_map_to_container(self):
+ """
+ Make the map fill the entire map container (no gray bars).
+ Run after layouts/child resizes using QTimer.singleShot.
+ """
+ if not hasattr(self, "viewer") or self.viewer is None:
+ return
+
+ scene_rect = self.viewer.scene.sceneRect()
+ if scene_rect.isNull():
+ return
+
+ self.viewer.fitInView(scene_rect, Qt.AspectRatioMode.KeepAspectRatioByExpanding)
+ self.viewer.centerOn(scene_rect.center())
+
+ # ─────────────────────────────
+ # FREE TEXT QUERY HANDLER
+ # ─────────────────────────────
+ def _on_query_sent(self):
+ prompt = self.query_input.text().strip()
+ if not prompt:
+ QMessageBox.information(self, "Empty query", "Please type a query first.")
+ return
+
+ # Change button state
+ self.query_send.setEnabled(False)
+ self.query_send.setText("...")
+ QApplication.processEvents()
+
+ try:
+ result = ap.select_entities_from_prompt(prompt)
+ except Exception as e:
+ dlg = AgGuardMessageBox(
+ self,
+ title="Invalid Query",
+ text="We couldn't understand your request.\nPlease try rephrasing your query or using clearer terms."
+ )
+ dlg.show_centered()
+
+ # restore state and abort
+ self.query_send.setEnabled(True)
+ self.query_send.setText("Send")
+ return
+
+ # Restore state
+ self.query_send.setEnabled(True)
+ self.query_send.setText("Send")
+
+ if not result["ids"]:
+ QMessageBox.information(self, "No results", "No matching regions or devices found.")
+ return
+
+ if result["target"] == "region":
+ self.current_mode = "region"
+ self.mode_combo.setCurrentText("Region")
+ self._update_layer_visibility()
+ self.device_layer.clear()
+ self.selected_regions = set(map(int, result["ids"]))
+ self.region_layer.clear()
+ self._load_regions(self.start_picker.date().toPyDate(),
+ self.end_picker.date().toPyDate())
+
+ elif result["target"] == "device":
+ self.current_mode = "device"
+ self.mode_combo.setCurrentText("Device")
+ self._update_layer_visibility()
+ self.region_layer.clear()
+ self.selected_devices = set(map(str, result["ids"]))
+ self.device_layer.clear()
+ self._load_devices(
+ self.start_picker.date().toPyDate(),
+ self.end_picker.date().toPyDate(),
+ selected_ids=self.selected_devices
+ )
+
+ self._update_analytics_panel()
+
+ # ─────────────────────────────
+ # MODE / FILTERS
+ # ─────────────────────────────
+ def _on_mode_changed(self, text: str):
+ self.current_mode = text.lower()
+ if self.current_mode == "region":
+ self.device_layer.clear()
+ else:
+ self.region_layer.clear()
+ self._update_layer_visibility()
+ self._apply_filters()
+
+ def _apply_filters(self):
+ self.start_date = self.start_picker.date().toPyDate()
+ self.end_date = self.end_picker.date().toPyDate()
+ self.region_layer.clear()
+ self.device_layer.clear()
+ self.selected_regions.clear()
+ self.selected_devices.clear()
+ self._update_layer_visibility()
+ if self.current_mode == "region":
+ self._load_regions(self.start_date, self.end_date)
+ else:
+ self._load_devices(self.start_date, self.end_date)
+ self._update_analytics_panel()
+
+ # ─────────────────────────────
+ # LOADERS
+ # ─────────────────────────────
+ def _load_regions(self, start_date=None, end_date=None):
+ regions = load_all_regions()
+ self.region_names = {r["id"]: r["name"] for r in regions}
+ for region in regions:
+ self.region_layer.add_region(region, start_date, end_date, selected_ids=self.selected_regions)
+
+ def _load_devices(self, start_date=None, end_date=None, selected_ids=None):
+ devices = load_all_devices()
+ for device in devices:
+ device_id = device["device_id"]
+ selected = selected_ids and device_id in selected_ids
+ self.device_layer.add_device(device, start_date, end_date, selected=selected)
+
+ # ─────────────────────────────
+ # SELECTION HANDLERS
+ # ─────────────────────────────
+ def _on_region_selected(self, region_id: int, selected: bool):
+ if selected:
+ self.selected_regions.add(region_id)
+ else:
+ self.selected_regions.discard(region_id)
+ self._update_analytics_panel()
+
+ def _on_device_selected(self, device_id: str, selected: bool):
+ if selected:
+ self.selected_devices.add(device_id)
+ else:
+ self.selected_devices.discard(device_id)
+ self._update_analytics_panel()
+
+ # ─────────────────────────────
+ # ANALYTICS UPDATE
+ # ─────────────────────────────
+ def _update_analytics_panel(self):
+ if self.current_mode == "region":
+ region_list = list(self.selected_regions)
+ data = get_region_analytics(region_list or None, self.start_date, self.end_date)
+ title = "All Regions" if not region_list else ", ".join(
+ self.region_names.get(rid, str(rid)) for rid in region_list)
+ self.analytics_panel.update_data(title, data)
+ else:
+ device_list = list(self.selected_devices)
+ data = get_device_analytics(device_list or None, self.start_date, self.end_date)
+ title = "All Devices" if not device_list else ", ".join(device_list)
+ self.analytics_panel.update_data(title, data)
+
+ def _update_layer_visibility(self):
+ if self.current_mode == "region":
+ self.region_layer.setVisible(True)
+ self.device_layer.setVisible(False)
+ else:
+ self.region_layer.setVisible(False)
+ self.device_layer.setVisible(True)
diff --git a/GUI/src/vast/views/security/analytics/analytics_provider.py b/GUI/src/vast/views/security/analytics/analytics_provider.py
new file mode 100644
index 000000000..9c9b9a599
--- /dev/null
+++ b/GUI/src/vast/views/security/analytics/analytics_provider.py
@@ -0,0 +1,333 @@
+
+
+from datetime import date
+from sqlalchemy import create_engine, text
+from datetime import datetime, timedelta
+
+# ─────────────────────────────────────────────
+# Database Connection
+# ─────────────────────────────────────────────
+engine = create_engine(
+ "postgresql+psycopg2://missions_user:pg123@postgres:5432/missions_db",
+ echo=False
+)
+
+# ─────────────────────────────────────────────
+# Load all regions & devices
+# ─────────────────────────────────────────────
+def load_all_regions() -> list[dict]:
+ """Return all regions with ID, name, and geometry."""
+ query = text("""
+ SELECT id, name, ST_AsGeoJSON(geom) AS geom
+ FROM regions
+ ORDER BY id;
+ """)
+ with engine.connect() as conn:
+ return [dict(row) for row in conn.execute(query).mappings().all()]
+
+
+def load_all_devices() -> list[dict]:
+ """Return all devices with ID, model, owner, and coordinates."""
+ query = text("""
+ SELECT device_id, model, owner, active,
+ location_lat, location_lon
+ FROM devices
+ WHERE owner = 'security'
+ ORDER BY device_id;
+ """)
+ with engine.connect() as conn:
+ return [dict(row) for row in conn.execute(query).mappings().all()]
+
+# ─────────────────────────────────────────────
+# DEVICE ANALYTICS (supports multiple or all devices)
+# ─────────────────────────────────────────────
+def get_device_analytics(device_ids=None, start_date=None, end_date=None) -> dict:
+ """
+ Return aggregated alert analytics for one or more devices.
+ If device_ids is None or empty, aggregates all devices.
+ """
+ if isinstance(device_ids, str):
+ device_ids = [device_ids]
+
+ # Default to full current year range if missing
+ if not start_date:
+ start_date = date.today().replace(day=1, month=1)
+ if not end_date:
+ end_date = date.today()
+
+ # Convert to datetime range that includes the entire end day
+ start_dt = datetime.combine(start_date, datetime.min.time())
+ end_dt = datetime.combine(end_date + timedelta(days=1), datetime.min.time())
+
+
+ with engine.connect() as conn:
+ params = {"device_ids": device_ids or [],
+ "start_date": start_dt,
+ "end_date": end_dt}
+
+
+ if device_ids:
+ device_filter = "AND device_id = ANY(:device_ids)"
+ else:
+ device_filter = "" # ← no filter means aggregate all devices
+ params.pop("device_ids", None)
+
+
+ # Alerts by Type
+ q_by_type = text(f"""
+ SELECT alert_type, COUNT(*) AS count
+ FROM alerts
+ WHERE started_at BETWEEN :start_date AND :end_date
+ {device_filter}
+ GROUP BY alert_type
+ ORDER BY count DESC;
+ """)
+ by_type = {r["alert_type"] or "Unknown": r["count"]
+ for r in conn.execute(q_by_type, params).mappings().all()}
+
+ # Alerts per Month
+ q_month = text(f"""
+ WITH months AS (
+ SELECT TO_CHAR(gs, 'YYYY-MM') AS month
+ FROM generate_series(
+ date_trunc('month', CAST(:start_date AS timestamp)),
+ date_trunc('month', CAST(:end_date AS timestamp)),
+ interval '1 month'
+ ) AS gs
+ ),
+ alert_counts AS (
+ SELECT TO_CHAR(started_at, 'YYYY-MM') AS month, COUNT(*) AS count
+ FROM alerts
+ WHERE started_at BETWEEN :start_date AND :end_date
+ {device_filter}
+ GROUP BY TO_CHAR(started_at, 'YYYY-MM')
+ )
+ SELECT m.month, COALESCE(ac.count, 0) AS count
+ FROM months m
+ LEFT JOIN alert_counts ac ON ac.month = m.month
+ ORDER BY m.month;
+ """)
+ per_month = {r["month"]: r["count"]
+ for r in conn.execute(q_month, params).mappings().all()}
+
+ # Totals & averages
+ q_total = text(f"""
+ SELECT COUNT(*) AS total,
+ AVG(severity)::numeric(10,2) AS avg_severity,
+ AVG(confidence)::numeric(10,2) AS avg_confidence
+ FROM alerts
+ WHERE started_at BETWEEN :start_date AND :end_date
+ {device_filter};
+ """)
+ total = conn.execute(q_total, params).mappings().first() or {}
+ q_avg_duration = text(f"""
+ SELECT alert_type,
+ ROUND(AVG(EXTRACT(EPOCH FROM (ended_at - started_at)) / 60.0), 2) AS avg_minutes
+ FROM alerts
+ WHERE started_at BETWEEN :start_date AND :end_date
+ {device_filter}
+ AND ended_at IS NOT NULL
+ GROUP BY alert_type
+ ORDER BY avg_minutes DESC;
+ """)
+
+ avg_duration = {
+ r["alert_type"] or "Unknown": float(r["avg_minutes"] or 0)
+ for r in conn.execute(q_avg_duration, params).mappings().all()
+ }
+
+
+ return {
+ "alerts_by_type": by_type,
+ "alerts_per_month": per_month,
+ "total_alerts": total.get("total", 0),
+ "avg_severity": float(total.get("avg_severity") or 0),
+ "avg_confidence": float(total.get("avg_confidence") or 0),
+ "avg_duration_per_type": avg_duration, # ← NEW
+ }
+
+# ─────────────────────────────────────────────
+# REGION ANALYTICS (supports multiple or all regions)
+# ─────────────────────────────────────────────
+def get_region_analytics(region_ids=None, start_date=None, end_date=None) -> dict:
+ """
+ Aggregates analytics for one or more regions (using PostGIS ST_Intersects).
+ If region_ids is None or empty, aggregates all regions.
+ """
+ if isinstance(region_ids, (str, int)):
+ region_ids = [region_ids]
+
+ # Default to full current year range if missing
+ if not start_date:
+ start_date = date.today().replace(day=1, month=1)
+ if not end_date:
+ end_date = date.today()
+
+ # Convert to datetime range that includes the entire end day
+ start_dt = datetime.combine(start_date, datetime.min.time())
+ end_dt = datetime.combine(end_date + timedelta(days=1), datetime.min.time())
+
+
+ with engine.connect() as conn:
+ params = {
+ "region_ids": region_ids or [],
+ "start_date": start_dt,
+ "end_date": end_dt,
+}
+
+
+ # Optional region filter
+ if region_ids:
+ region_filter = "AND r.id = ANY(:region_ids)"
+ else:
+ region_filter = "" # no filter → aggregate all regions
+ params.pop("region_ids", None)
+
+ # Alerts by Type
+ q_by_type = text(f"""
+ SELECT a.alert_type, COUNT(*) AS count
+ FROM alerts a
+ JOIN devices d ON a.device_id = d.device_id
+ JOIN regions r
+ ON ST_Intersects(ST_Buffer(r.geom, 0.0002), ST_SetSRID(ST_MakePoint(d.location_lon, d.location_lat), 4326))
+ WHERE a.started_at BETWEEN :start_date AND :end_date
+ {region_filter}
+ GROUP BY a.alert_type
+ ORDER BY count DESC;
+ """)
+ print(q_by_type,region_filter)
+ by_type = {r["alert_type"] or "Unknown": r["count"]
+ for r in conn.execute(q_by_type, params).mappings().all()}
+
+ # Alerts per Month
+ q_month = text(f"""
+ WITH months AS (
+ SELECT TO_CHAR(gs, 'YYYY-MM') AS month
+ FROM generate_series(
+ date_trunc('month', CAST(:start_date AS timestamp)),
+ date_trunc('month', CAST(:end_date AS timestamp)),
+ interval '1 month'
+ ) AS gs
+ ),
+ alert_counts AS (
+ SELECT TO_CHAR(a.started_at, 'YYYY-MM') AS month, COUNT(*) AS count
+ FROM alerts a
+ JOIN devices d ON a.device_id = d.device_id
+ JOIN regions r
+ ON ST_Intersects(ST_Buffer(r.geom, 0.0002), ST_SetSRID(ST_MakePoint(d.location_lon, d.location_lat), 4326))
+ WHERE a.started_at BETWEEN :start_date AND :end_date
+ {region_filter}
+ GROUP BY TO_CHAR(a.started_at, 'YYYY-MM')
+ )
+ SELECT m.month, COALESCE(ac.count, 0) AS count
+ FROM months m
+ LEFT JOIN alert_counts ac ON ac.month = m.month
+ ORDER BY m.month;
+ """)
+ per_month = {r["month"]: r["count"]
+ for r in conn.execute(q_month, params).mappings().all()}
+
+ # Totals & averages
+ q_total = text(f"""
+ SELECT COUNT(*) AS total,
+ AVG(a.severity)::numeric(10,2) AS avg_severity,
+ AVG(a.confidence)::numeric(10,2) AS avg_confidence
+ FROM alerts a
+ JOIN devices d ON a.device_id = d.device_id
+ JOIN regions r
+ ON ST_Intersects(ST_Buffer(r.geom, 0.0002), ST_SetSRID(ST_MakePoint(d.location_lon, d.location_lat), 4326))
+ WHERE a.started_at BETWEEN :start_date AND :end_date
+ {region_filter};
+ """)
+ total = conn.execute(q_total, params).mappings().first() or {}
+
+ q_avg_duration = text(f"""
+ SELECT a.alert_type,
+ ROUND(AVG(EXTRACT(EPOCH FROM (a.ended_at - a.started_at)) / 60.0), 2) AS avg_minutes
+ FROM alerts a
+ JOIN devices d ON a.device_id = d.device_id
+ JOIN regions r
+ ON ST_Intersects(
+ ST_Buffer(r.geom, 0.0002),
+ ST_SetSRID(ST_MakePoint(d.location_lon, d.location_lat), 4326)
+ )
+ WHERE a.started_at BETWEEN :start_date AND :end_date
+ {region_filter}
+ AND a.ended_at IS NOT NULL
+ GROUP BY a.alert_type
+ ORDER BY avg_minutes DESC;
+ """)
+ avg_duration = {
+ r["alert_type"] or "Unknown": float(r["avg_minutes"] or 0)
+ for r in conn.execute(q_avg_duration, params).mappings().all()
+ }
+
+
+ return {
+ "alerts_by_type": by_type,
+ "alerts_per_month": per_month,
+ "total_alerts": total.get("total", 0),
+ "avg_severity": float(total.get("avg_severity") or 0),
+ "avg_confidence": float(total.get("avg_confidence") or 0),
+ "avg_duration_per_type": avg_duration, # ← NEW
+ }
+
+
+# ─────────────────────────────────────────────
+# NATURAL LANGUAGE QUERY SUPPORT
+# ─────────────────────────────────────────────
+from src.vast.views.security.analytics.sql_generator import generate_sql_from_prompt
+
+
+
+def select_entities_from_prompt(prompt: str) -> dict:
+ """
+ Uses the AI SQL generator to convert free-text query → SQL,
+ executes it, and returns matching entity IDs.
+
+ Returns a dict:
+ {
+ "target": "region" | "device" | None,
+ "ids": [list of IDs]
+ }
+ """
+ sql, params = generate_sql_from_prompt(prompt)
+ print(sql,params)
+ if not sql:
+ return {"target": None, "ids": []}
+
+ with engine.connect() as conn:
+ rows = [r[0] for r in conn.execute(text(sql), params)]
+
+
+ sql_lower = sql.lower()
+ if "area" in sql_lower or "region" in sql_lower:
+ target = "region"
+ elif "device_id" in sql_lower:
+ target = "device"
+ else:
+ target = "region" if "from regions" in sql_lower else "device"
+
+ import re
+
+ if target == "region":
+ # Normalize region names to lowercase without spaces/underscores for fuzzy match
+ def normalize(name: str) -> str:
+ return re.sub(r'[^a-z0-9]', '', name.lower())
+
+ region_map = {normalize(r["name"]): r["id"] for r in load_all_regions()}
+
+ mapped = []
+ for r in rows:
+ if isinstance(r, (int, float)):
+ mapped.append(int(r))
+ elif isinstance(r, str):
+ key = normalize(r)
+ if key in region_map:
+ mapped.append(region_map[key])
+ rows = mapped
+
+
+ return {"target": target, "ids": rows}
+
+
diff --git a/services/sounds/API-development/src/backend/__init__.py b/GUI/src/vast/views/security/analytics/map_layers/__init__.py
similarity index 100%
rename from services/sounds/API-development/src/backend/__init__.py
rename to GUI/src/vast/views/security/analytics/map_layers/__init__.py
diff --git a/GUI/src/vast/views/security/analytics/map_layers/device_layer.py b/GUI/src/vast/views/security/analytics/map_layers/device_layer.py
new file mode 100644
index 000000000..127249c81
--- /dev/null
+++ b/GUI/src/vast/views/security/analytics/map_layers/device_layer.py
@@ -0,0 +1,179 @@
+from PyQt6.QtWidgets import QGraphicsTextItem, QGraphicsDropShadowEffect
+from PyQt6.QtGui import QColor, QFont
+from PyQt6.QtCore import Qt
+from src.vast.orthophoto_canvas.ui.sensors_layer import TILE_SIZE, _latlon_to_xy_at_max_zoom
+
+from PyQt6.QtWidgets import QGraphicsTextItem, QGraphicsDropShadowEffect, QGraphicsColorizeEffect
+from PyQt6.QtGui import QColor, QFont, QFontMetrics
+from PyQt6.QtCore import Qt, QPropertyAnimation, QEasingCurve
+
+
+# ─────────────────────────────────────────────
+# 🗺️ Device Layer
+# ─────────────────────────────────────────────
+class DeviceLayer:
+ """Draws device (camera) markers on the orthophoto scene."""
+
+ def __init__(self, viewer, on_select=None):
+ self.viewer = viewer
+ self.scene = viewer.scene
+ self.devices = {}
+ self.on_select = on_select
+
+ # Match RegionLayer & AlertLayer → use MAX zoom base tiles
+ z = viewer.max_zoom_fs
+ self._x_min_base = viewer.ts.z_ranges[z][0]
+ self._y_min_base = viewer.ts.z_ranges[z][2]
+
+ def add_device(self, device: dict, start_date=None, end_date=None, selected=False):
+
+ """Add a device marker to the orthophoto scene."""
+ lat = device.get("location_lat")
+ lon = device.get("location_lon")
+
+ # Convert to base XY in max zoom coordinate space
+ pos = _latlon_to_xy_at_max_zoom(self.viewer, lat, lon)
+ if not pos:
+ print(f"[DeviceLayer] ⚠️ Device {device.get('device_id')} outside field bounds")
+ return
+
+ xb, yb = pos
+ scene_x = (xb - self._x_min_base) * TILE_SIZE
+ scene_y = (yb - self._y_min_base) * TILE_SIZE
+ marker = _Camera360Marker(
+ device["device_id"],
+ device.get("active", True),
+ self.on_select,
+ radius=10.0, # tweak for size
+ )
+ marker.setPos(scene_x, scene_y)
+ self.scene.addItem(marker)
+
+ self.devices[device["device_id"]] = marker
+
+ if selected:
+ marker.selected = True
+ marker.setFont(QFont("Noto Color Emoji", 18))
+ marker.setDefaultTextColor(marker.selected_color)
+ marker.setGraphicsEffect(marker.halo)
+ marker.pulse.start()
+
+ print(f"[DeviceLayer] ✅ Added device '{device['device_id']}' at ({scene_x:.1f}, {scene_y:.1f})")
+
+ def clear(self):
+ """Remove all device markers."""
+ for item in self.devices.values():
+ self.scene.removeItem(item)
+ self.devices.clear()
+ print("[DeviceLayer] Cleared all devices")
+ def setVisible(self, visible: bool):
+ """Show or hide all device markers."""
+ for item in self.devices.values():
+ item.setVisible(visible)
+ print(f"[DeviceLayer] Visibility set to {visible}")
+from PyQt6.QtWidgets import QGraphicsObject, QGraphicsDropShadowEffect
+from PyQt6.QtGui import QColor, QPen, QBrush, QPainter
+from PyQt6.QtCore import QRectF, QPropertyAnimation, QEasingCurve, pyqtSlot
+
+
+class _Camera360Marker(QGraphicsObject):
+ """360° camera marker: donut + center dot + glow + pulse."""
+
+ def __init__(self, device_id: str, active: bool, on_select=None, radius: float = 10.0):
+ super().__init__()
+ self.device_id = device_id
+ self.active = active
+ self.on_select = on_select
+ self.selected = False
+ self._radius = radius
+
+ # Colors
+ self.normal_color = QColor("#10b981") if active else QColor("#9ca3af") # green / gray
+ self.alert_color = QColor("#ef4444") # red for alerts if you use it
+ self.selected_color = QColor("#ffffff")
+
+ # We draw in local coords around (0,0); QGraphicsView will position us
+ self.setZValue(1000)
+ self.setFlag(self.GraphicsItemFlag.ItemIgnoresTransformations, True) # stay same size on zoom
+ self.setAcceptHoverEvents(True)
+
+ # Drop shadow halo for glow
+ self.halo = QGraphicsDropShadowEffect()
+ self.halo.setBlurRadius(32)
+ self.halo.setOffset(0, 0)
+ self.halo.setColor(QColor(16, 185, 129, 180))
+ self.setGraphicsEffect(None) # only on selection
+
+ # Pulse animation on opacity
+ self.pulse = QPropertyAnimation(self, b"opacity")
+ self.pulse.setDuration(1000)
+ self.pulse.setStartValue(1.0)
+ self.pulse.setEndValue(0.6)
+ self.pulse.setEasingCurve(QEasingCurve.Type.InOutQuad)
+ self.pulse.setLoopCount(-1)
+
+ # ─────────────────────────────────────────────
+ # Required overrides
+ # ─────────────────────────────────────────────
+ def boundingRect(self) -> QRectF:
+ # a bit larger than radius to accommodate the stroke + halo
+ r = self._radius + 4
+ return QRectF(-r, -r, 2 * r, 2 * r)
+
+ def paint(self, painter: QPainter, option, widget=None):
+ painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
+
+ # Base color depends on state
+ base = self.normal_color if not self.selected else self.normal_color
+
+ # Outer ring (donut)
+ outer_r = self._radius
+ inner_r = self._radius * 0.55
+
+ # Outer circle stroke
+ pen = QPen(base)
+ pen.setWidthF(2.0 if not self.selected else 3.0)
+ painter.setPen(pen)
+ painter.setBrush(Qt.BrushStyle.NoBrush)
+ painter.drawEllipse(QRectF(-outer_r, -outer_r, 2 * outer_r, 2 * outer_r))
+
+ # Soft filled ring (semi-transparent)
+ ring_color = QColor(base.red(), base.green(), base.blue(), 80)
+ painter.setBrush(QBrush(ring_color))
+ painter.setPen(Qt.PenStyle.NoPen)
+ painter.drawEllipse(QRectF(-outer_r, -outer_r, 2 * outer_r, 2 * outer_r))
+
+ # Cut inner circle to make donut effect (by drawing a solid inner circle of background color)
+ inner_bg = QColor("#0f172a") # same tone as map background / dark outline
+ painter.setBrush(inner_bg)
+ painter.drawEllipse(QRectF(-inner_r, -inner_r, 2 * inner_r, 2 * inner_r))
+
+ # Center dot – represents the physical camera
+ center_r = inner_r * 0.5
+ painter.setBrush(base if not self.selected else self.selected_color)
+ painter.setPen(Qt.PenStyle.NoPen)
+ painter.drawEllipse(QRectF(-center_r, -center_r, 2 * center_r, 2 * center_r))
+
+ # ─────────────────────────────────────────────
+ # Interaction
+ # ─────────────────────────────────────────────
+ def mousePressEvent(self, event):
+ self.toggle_selected()
+ if self.on_select:
+ self.on_select(self.device_id, self.selected)
+ super().mousePressEvent(event)
+
+ @pyqtSlot()
+ def toggle_selected(self):
+ self.selected = not self.selected
+
+ if self.selected:
+ # enable glow + pulse
+ self.setGraphicsEffect(self.halo)
+ self.pulse.start()
+ else:
+ # disable glow + pulse
+ self.setGraphicsEffect(None)
+ self.pulse.stop()
+ self.setOpacity(1.0)
+ self.update()
diff --git a/GUI/src/vast/views/security/analytics/map_layers/region_layer.py b/GUI/src/vast/views/security/analytics/map_layers/region_layer.py
new file mode 100644
index 000000000..b457c5e6c
--- /dev/null
+++ b/GUI/src/vast/views/security/analytics/map_layers/region_layer.py
@@ -0,0 +1,186 @@
+from __future__ import annotations
+
+import json
+from typing import List, Optional, Tuple
+
+from PyQt6.QtWidgets import QGraphicsPolygonItem
+from PyQt6.QtGui import QColor, QPen, QPolygonF
+from PyQt6.QtCore import Qt, QPointF
+
+from src.vast.orthophoto_canvas.ui.sensors_layer import (
+ TILE_SIZE,
+ _latlon_to_xy_at_max_zoom,
+)
+
+
+class RegionLayer:
+ """
+ Draws farm regions as interactive polygons positioned by GPS coordinates.
+ Uses tile-based projection when possible, and falls back to a linear
+ lon/lat → scene mapping based on the known map coverage if needed.
+ """
+
+ def __init__(self, viewer, on_select=None):
+ self.viewer = viewer
+ self.scene = viewer.scene
+ self.regions: List[QGraphicsPolygonItem] = []
+ self.on_select = on_select
+
+ # Base tile indices at MAX zoom (same as OrthophotoViewer scene)
+ z = viewer.max_zoom_fs
+ self._x_min_base = viewer.ts.z_ranges[z][0]
+ self._y_min_base = viewer.ts.z_ranges[z][2]
+
+ # Scene boundary in scene coordinates (0,0) → (width,height)
+ width = (viewer.ts.z_ranges[z][1] - self._x_min_base + 1) * TILE_SIZE
+ height = (viewer.ts.z_ranges[z][3] - self._y_min_base + 1) * TILE_SIZE
+ self._scene_width = width
+ self._scene_height = height
+
+ # For reference; not used for clipping anymore
+ self.scene_bounds = (0, 0, width, height)
+
+ # 🔹 Map lon/lat bounds – SAME as you used in your SQL
+ # [COVERAGE z=18] lon:[34.844513..34.855499] lat:[31.895049..31.904376]
+ self._map_min_lon = 34.844513
+ self._map_max_lon = 34.855499
+ self._map_min_lat = 31.895049
+ self._map_max_lat = 31.904376
+
+ # ─────────────────────────────────────────────
+ # Helper: robust projection
+ # ─────────────────────────────────────────────
+ def _project_lon_lat(self, lon: float, lat: float) -> Optional[Tuple[float, float]]:
+ """
+ Try the original tile-based projection first.
+ If it fails (None), fall back to a simple linear mapping
+ from [min_lon..max_lon] × [min_lat..max_lat] → [0..width] × [0..height].
+ """
+ # 1) Try existing helper – keeps consistency with tiles/sensors when it works
+ pos = _latlon_to_xy_at_max_zoom(self.viewer, lat, lon)
+ if pos:
+ xb, yb = pos
+ sx = (xb - self.viewer._x_min_base) * TILE_SIZE
+ sy = (yb - self.viewer._y_min_base) * TILE_SIZE
+ return sx, sy
+
+ # 2) Fallback: linear mapping using known map bounds
+ # Guard against division by zero
+ if (
+ self._map_max_lon == self._map_min_lon
+ or self._map_max_lat == self._map_min_lat
+ ):
+ return None
+
+ # Normalize lon/lat into [0,1]
+ x_norm = (lon - self._map_min_lon) / (self._map_max_lon - self._map_min_lon)
+ y_norm = (lat - self._map_min_lat) / (self._map_max_lat - self._map_min_lat)
+
+ # Clip just in case (should already be in [0,1])
+ x_norm = max(0.0, min(1.0, x_norm))
+ y_norm = max(0.0, min(1.0, y_norm))
+
+ # Scene coords: x grows right, y grows down → flip y
+ sx = x_norm * self._scene_width
+ sy = (1.0 - y_norm) * self._scene_height
+
+ return sx, sy
+
+ # ─────────────────────────────────────────────
+ def add_region(self, region: dict, start_date=None, end_date=None, selected_ids=None):
+ """Add a region polygon to the orthophoto map."""
+ try:
+ geom_json = json.loads(region["geom"])
+ except Exception as e:
+ print(f"[RegionLayer] ❌ Invalid geometry for {region.get('name')}: {e}")
+ return
+
+ if not geom_json.get("coordinates"):
+ print(f"[RegionLayer] ⚠️ Region {region.get('name')} missing coordinates")
+ return
+
+ coords = geom_json["coordinates"]
+ gtype = geom_json.get("type")
+
+ # Handle Polygon / MultiPolygon
+ if gtype == "Polygon":
+ outer_ring = coords[0]
+ elif gtype == "MultiPolygon":
+ # Pick the largest polygon’s outer ring
+ outer_ring = max(coords, key=lambda c: len(c[0]))[0]
+ else:
+ print(f"[RegionLayer] ⚠️ Unsupported geom type {gtype} for {region.get('name')}")
+ return
+
+ if len(outer_ring) < 3:
+ print(f"[RegionLayer] ⚠️ Region {region.get('name')} has too few points")
+ return
+
+ # ── Project region to scene coordinates
+ scene_points: list[QPointF] = []
+ print(f"[RegionLayer] ▶ Projecting region '{region.get('name')}'...")
+ for lon, lat in outer_ring:
+ proj = self._project_lon_lat(lon, lat)
+ print(f" - vertex lon={lon:.6f}, lat={lat:.6f} -> {proj}")
+ if not proj:
+ continue
+ sx, sy = proj
+ scene_points.append(QPointF(sx, sy))
+
+ if len(scene_points) < 3:
+ print(f"[RegionLayer] ⚠️ Region {region.get('name')} has too few valid projected points")
+ return
+
+ polygon = QPolygonF(scene_points)
+
+ # ── Create graphics item
+ item = QGraphicsPolygonItem(polygon)
+ item.region_id = region["id"]
+ item.region_name = region["name"]
+ item.selected = False
+ item.setZValue(900)
+
+ pen = QPen(QColor("#111827"))
+ pen.setWidthF(8)
+ item.setPen(pen)
+
+ is_selected = (selected_ids is not None) and (region["id"] in selected_ids)
+ base_alpha = 100 if is_selected else 40
+ item.setBrush(QColor(37, 99, 235, base_alpha))
+ item.selected = bool(is_selected)
+
+ item.setAcceptHoverEvents(True)
+ item.setFlag(QGraphicsPolygonItem.GraphicsItemFlag.ItemIsSelectable, True)
+
+ item.mousePressEvent = lambda e, it=item: self._toggle_selection(it)
+ self.scene.addItem(item)
+ self.regions.append(item)
+
+ print(
+ f"[RegionLayer] ✅ Added region '{item.region_name}' "
+ f"(ID {item.region_id}) with {len(scene_points)} vertices"
+ )
+
+ # ─────────────────────────────────────────────
+ def _toggle_selection(self, item: QGraphicsPolygonItem):
+ """Toggle fill color when selected and trigger callback."""
+ item.selected = not item.selected
+ item.setBrush(QColor(37, 99, 235, 100 if item.selected else 40))
+
+ if self.on_select:
+ self.on_select(item.region_id, item.selected)
+
+ # ─────────────────────────────────────────────
+ def clear(self):
+ """Remove all region items from the scene."""
+ for item in self.regions:
+ self.scene.removeItem(item)
+ self.regions.clear()
+ print("[RegionLayer] Cleared all regions")
+
+ # ─────────────────────────────────────────────
+ def setVisible(self, visible: bool):
+ """Show or hide all region polygons."""
+ for item in self.regions:
+ item.setVisible(visible)
+ print(f"[RegionLayer] Visibility set to {visible}")
diff --git a/GUI/src/vast/views/security/analytics/popup_panel.py b/GUI/src/vast/views/security/analytics/popup_panel.py
new file mode 100644
index 000000000..f2586e39a
--- /dev/null
+++ b/GUI/src/vast/views/security/analytics/popup_panel.py
@@ -0,0 +1,278 @@
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QLabel, QFrame, QGridLayout, QSizePolicy
+from PyQt6.QtGui import QColor, QPainter
+from PyQt6.QtCore import Qt, QMargins
+from PyQt6.QtCharts import (
+ QChart, QChartView, QBarSeries, QBarSet, QBarCategoryAxis,
+ QValueAxis, QLineSeries, QCategoryAxis
+)
+from PyQt6.QtCharts import QPieSeries # local import to avoid top clutter
+
+class AnalyticsPanel(QWidget):
+ """Fixed right-side analytics dashboard panel (2×2 grid layout)."""
+
+ def __init__(self, title: str, data: dict, parent: QWidget | None = None):
+ super().__init__(parent)
+
+ # ─────────────────────────────
+ # Palette
+ # ─────────────────────────────
+ self.green = "#10b981"
+ self.black = "#111827"
+ self.gray = "#6b7280"
+ self.bg_light = "#f9fafb"
+
+ # ─────────────────────────────
+ # Layout
+ # ─────────────────────────────
+ self.setMinimumWidth(480)
+ layout = QVBoxLayout(self)
+ layout.setContentsMargins(10, 10, 10, 10)
+ layout.setSpacing(12)
+
+ # Title
+ self.title_label = QLabel(title)
+ self.title_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.title_label.setStyleSheet(f"font-size:20pt;font-weight:700;color:{self.green};")
+ layout.addWidget(self.title_label)
+
+ # 2×2 grid
+ self.grid = QGridLayout()
+ self.grid.setSpacing(10)
+ layout.addLayout(self.grid, stretch=1)
+
+ # Populate initial data
+ self._populate(data)
+
+ # ─────────────────────────────
+ def update_data(self, title: str, data: dict):
+ self.title_label.setText(title)
+ self._populate(data)
+
+ # ─────────────────────────────
+ def _populate(self, data: dict):
+ # Clear old widgets
+ for i in reversed(range(self.grid.count())):
+ item = self.grid.itemAt(i).widget()
+ if item:
+ item.setParent(None)
+
+ # Create 4 panels
+ # bar_panel = self._section("Alerts by Type", self._make_bar_chart(data.get("alerts_by_type", {})))
+ bar_panel = self._section("Alerts by Type", self._make_pie_chart(data.get("alerts_by_type", {})))
+
+ line_panel = self._section("Alerts per Month", self._make_line_chart(data.get("alerts_per_month", {})))
+ summary_panel = self._section("Summary", self._make_summary_panel(
+ data.get("total_alerts", 0),
+ data.get("avg_severity", 0),
+ data.get("avg_confidence", 0)
+ ))
+ # details_panel = self._section("Details", self._placeholder("More analytics coming soon..."))
+ details_panel = self._section(
+ "Avg Alert Duration (min)",
+ self._make_bar_chart(data.get("avg_duration_per_type", {}))
+)
+
+ # Add to 2×2 grid
+ self.grid.addWidget(bar_panel, 0, 0)
+ self.grid.addWidget(line_panel, 0, 1)
+ self.grid.addWidget(summary_panel, 1, 0)
+ self.grid.addWidget(details_panel, 1, 1)
+
+ # Equal stretch
+ self.grid.setRowStretch(0, 1)
+ self.grid.setRowStretch(1, 1)
+ self.grid.setColumnStretch(0, 1)
+ self.grid.setColumnStretch(1, 1)
+
+ # ─────────────────────────────
+ def _section(self, header_text: str, widget: QWidget):
+ section = QFrame()
+ section.setStyleSheet(f"QFrame {{ background:{self.bg_light}; border-radius:10px; }}")
+ vbox = QVBoxLayout(section)
+ vbox.setContentsMargins(8, 8, 8, 8)
+ vbox.setSpacing(6)
+ header = QLabel(header_text)
+ header.setStyleSheet(f"color:{self.gray};font-weight:600;font-size:11pt;")
+ vbox.addWidget(header)
+ vbox.addWidget(widget)
+ section.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+ return section
+
+ # ─────────────────────────────
+ # 🔹 Helper: compute nice Y-axis
+ # ─────────────────────────────
+ def _setup_nice_y_axis(self, data_values):
+ axis_y = QValueAxis()
+
+ if not data_values:
+ axis_y.setRange(0, 3)
+ axis_y.setTickInterval(1)
+ return axis_y
+
+ max_val = max(data_values)
+ upper = max_val * 1.2
+ if upper <= 3:
+ upper = 3.0
+
+ # Pick a "nice" step: 1, 2, 5, 10, 20, 50, ...
+ nice_steps = [1, 2, 5, 10, 20, 50, 100, 200, 500, 1000]
+ step = next((s for s in nice_steps if upper / s <= 6), 1000)
+ upper = (int(upper / step) + 1) * step
+
+ axis_y.setRange(0, upper)
+ axis_y.setTickInterval(step)
+ axis_y.setLabelFormat("%.1f" if any(v < 10 for v in data_values) else "%.0f")
+ # axis_y.setLabelFormat("%.0f")
+ axis_y.setMinorTickCount(0)
+ return axis_y
+
+ # ─────────────────────────────
+ def _make_bar_chart(self, data: dict):
+ if not data:
+ return self._placeholder("No data")
+
+ chart = QChart()
+ chart.legend().setVisible(False)
+ chart.setBackgroundVisible(False)
+ chart.setMargins(QMargins(8, 8, 8, 8))
+
+ # Bar series
+ bar_set = QBarSet("Alerts")
+ for v in data.values():
+ bar_set.append(float(v))
+ series = QBarSeries()
+ series.append(bar_set)
+ chart.addSeries(series)
+
+ # X-axis
+ axis_x = QBarCategoryAxis()
+ axis_x.append(list(data.keys()))
+
+ # Y-axis (nice scaling)
+ axis_y = self._setup_nice_y_axis(list(data.values()))
+
+ chart.addAxis(axis_x, Qt.AlignmentFlag.AlignBottom)
+ chart.addAxis(axis_y, Qt.AlignmentFlag.AlignLeft)
+ series.attachAxis(axis_x)
+ series.attachAxis(axis_y)
+
+ bar_set.setColor(QColor(self.green))
+
+ # Chart view
+ view = QChartView(chart)
+ view.setRenderHint(QPainter.RenderHint.Antialiasing)
+ view.setMinimumHeight(200)
+ view.setStyleSheet("background:transparent;")
+ return view
+ # ─────────────────────────────
+ def _make_pie_chart(self, data: dict):
+ """Create a pie chart (e.g., Alerts by Type) with distinct green shades."""
+ if not data:
+ return self._placeholder("No data")
+
+ chart = QChart()
+ chart.legend().setVisible(True)
+ chart.legend().setAlignment(Qt.AlignmentFlag.AlignBottom)
+ chart.setBackgroundVisible(False)
+ chart.setMargins(QMargins(8, 8, 8, 8))
+
+ # Pie series
+ series = QPieSeries()
+ total = sum(data.values()) or 1
+
+ # Define a clearer set of green shades (light → dark)
+ green_shades = [
+ QColor("#A7F3D0"), # light mint
+ QColor("#6EE7B7"), # medium mint
+ QColor("#34D399"), # base green
+ QColor("#10B981"), # emerald
+ QColor("#059669"), # dark green
+ QColor("#047857"), # deeper green
+ ]
+
+ max_val = max(data.values()) if data else 0
+
+ for i, (key, val) in enumerate(data.items()):
+ slice_ = series.append(f"{key} ({val})", float(val))
+ slice_.setLabelVisible(True)
+
+ # Pick shade cyclically
+ color = green_shades[i % len(green_shades)]
+ slice_.setBrush(color)
+ slice_.setPen(QColor("#ffffff")) # white borders
+ slice_.setLabelColor(QColor(self.black))
+
+ # Slightly explode only the largest slice
+ # if val == max_val:
+ # slice_.setExploded(True)
+ # slice_.setLabelFont(self.font())
+
+ chart.addSeries(series)
+ chart.setAnimationOptions(QChart.AnimationOption.AllAnimations)
+
+ # Chart view
+ view = QChartView(chart)
+ view.setRenderHint(QPainter.RenderHint.Antialiasing)
+ view.setMinimumHeight(200)
+ view.setStyleSheet("background:transparent;")
+ return view
+
+
+
+ # ─────────────────────────────
+ def _make_line_chart(self, data: dict):
+ if not data:
+ return self._placeholder("No data")
+
+ sorted_items = sorted(data.items())
+ chart = QChart()
+ chart.legend().setVisible(False)
+ chart.setBackgroundVisible(False)
+ chart.setMargins(QMargins(8, 8, 8, 8))
+
+ # Create line series
+ series = QLineSeries()
+ for i, (_, val) in enumerate(sorted_items):
+ series.append(i, float(val))
+ pen = series.pen()
+ pen.setColor(QColor(self.green))
+ pen.setWidth(3)
+ series.setPen(pen)
+ chart.addSeries(series)
+
+ # X-axis (months)
+ axis_x = QCategoryAxis()
+ for i, (month, _) in enumerate(sorted_items):
+ axis_x.append(month, i)
+
+ # Y-axis (nice scaling)
+ axis_y = self._setup_nice_y_axis(list(data.values()))
+
+ chart.addAxis(axis_x, Qt.AlignmentFlag.AlignBottom)
+ chart.addAxis(axis_y, Qt.AlignmentFlag.AlignLeft)
+ series.attachAxis(axis_x)
+ series.attachAxis(axis_y)
+
+ view = QChartView(chart)
+ view.setRenderHint(QPainter.RenderHint.Antialiasing)
+ view.setMinimumHeight(200)
+ view.setStyleSheet("background:transparent;")
+ return view
+
+ # ─────────────────────────────
+ def _make_summary_panel(self, total, avg_sev, avg_conf):
+ label = QLabel(
+ f"Total Alerts: {total}
+
" + f"Avg Severity: {avg_sev:.2f}
" + f"Avg Confidence: {avg_conf:.2f}" + ) + label.setAlignment(Qt.AlignmentFlag.AlignCenter) + label.setStyleSheet(f"font-size:12pt;color:{self.black};") + return label + + # ───────────────────────────── + def _placeholder(self, text: str): + lbl = QLabel(text) + lbl.setAlignment(Qt.AlignmentFlag.AlignCenter) + lbl.setStyleSheet("color:#9ca3af;font-size:10pt;font-style:italic;") + return lbl diff --git a/GUI/src/vast/views/security/analytics/sql_generator.py b/GUI/src/vast/views/security/analytics/sql_generator.py new file mode 100644 index 000000000..99580f666 --- /dev/null +++ b/GUI/src/vast/views/security/analytics/sql_generator.py @@ -0,0 +1,393 @@ + + +# #!/usr/bin/env python3 +# # -*- coding: utf-8 -*- + +""" +Free-text → DSL → validated SQL generator for AgGuard analytics dashboard. +Uses your internal DSL schema: +{ + "source": "alerts", + "_ops": [ + {"op": "select", "columns": ["..."]}, + {"op": "where", "cond": { ... }}, + {"op": "group_by", "columns": ["..."]}, + {"op": "having", "cond": { ... }}, + {"op": "order_by", "columns": ["..."], "directions": ["ASC"|"DESC"]}, + {"op": "limit", "limit": 50} + ] +} +""" + +import os, json +from openai import OpenAI +from dotenv import load_dotenv +from jsonschema import validate, ValidationError + +# ────────────────────────────────────────────── +# 🔑 Initialize client +# ────────────────────────────────────────────── +load_dotenv() +client = OpenAI(api_key=os.getenv("OPENAI_API_KEY")) + +# ────────────────────────────────────────────── +# 🧩 DSL schema (the one your DSL actually uses) +# ────────────────────────────────────────────── +QUERY_SCHEMA = { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "title": "DSLQueryPlan", + "type": "object", + "properties": { + "source": {"type": "string"}, + "_ops": { + "type": "array", + "items": { + "type": "object", + "properties": { + "op": { + "type": "string", + "enum": [ + "select", "where", "group_by", + "having", "order_by", "limit", "offset" + ] + }, + "columns": { + "type": "array", + "items": { + "type": "string", + + }, + "minItems": 1, + "maxItems": 2, + "uniqueItems": True + }, + "cond": {"type": "object"}, + "directions": { + "type": "array", + "items": {"type": "string", "enum": ["ASC", "DESC"]} + }, + "limit": {"type": "integer", "minimum": 1, "maximum": 500}, + "offset": {"type": "integer", "minimum": 0} + }, + "required": ["op"], + "additionalProperties": True + } + } + }, + "required": ["source", "_ops"], + "additionalProperties": False +} + + + +SYSTEM_PROMPT = """ +You are an expert DSL generator for the AgGuard Analytics Dashboard. +Your task: convert a natural-language request into a strict JSON object +compatible with the AgGuard DSL (no SQL, JSON only). + +──────────────────────── +TABLE: alerts +──────────────────────── +CREATE TABLE alerts ( + alert_id TEXT PRIMARY KEY, + alert_type TEXT, + device_id TEXT, + started_at TIMESTAMPTZ, + ended_at TIMESTAMPTZ, + confidence DOUBLE PRECISION, + area TEXT, + lat DOUBLE PRECISION, + lon DOUBLE PRECISION, + severity INT DEFAULT 1, + image_url TEXT, + vod TEXT, + hls TEXT, + ack BOOLEAN DEFAULT FALSE, + meta JSONB, + created_at TIMESTAMPTZ DEFAULT now(), + updated_at TIMESTAMPTZ DEFAULT now() +); + +Use only these columns. Do not invent new columns or tables. + +──────────────────────── +DSL STRUCTURE +──────────────────────── +The output MUST follow this shape: + +{ + "source": "alerts", + "_ops": [ + {"op": "select", "columns": ["..."]}, + {"op": "where", "cond": { ... }}, + {"op": "group_by", "columns": ["..."]}, + {"op": "having", "cond": { ... }}, + {"op": "order_by", "columns": ["..."], "directions": ["ASC"|"DESC"]}, + {"op": "limit", "limit": 50}, + {"op": "offset", "offset": 0} + ] +} + +Rules for fields: +- "source" must always be "alerts". +- "_ops" is an ordered array of operations. +- "op" is one of: "select", "where", "group_by", "having", "order_by", "limit", "offset". +- "columns" is ALWAYS an array of strings (1–2 items, no duplicates). + - For functions/expressions in SELECT/GROUP_BY/ORDER_BY, write SQL text strings, e.g.: + "COUNT(alert_id)", "COUNT(*)", "DATE_TRUNC('month', started_at)". + - Never put {"func": ...} objects inside "columns". +- "directions" aligns with "columns" and contains only "ASC" or "DESC". +- "limit" is 1–500; "offset" is >= 0. + +SELECT rules (very important): +- When selecting entities, SELECT must contain only: + - ["device_id"], or + - ["area"]. +- Never put aggregates or functions into SELECT (no COUNT(*), SUM, etc. in SELECT). + +──────────────────────── +CONDITION TREE FORMAT +──────────────────────── +Conditions ("cond") are boolean trees: + +1. Logical AND: + { "all": [
Please select a sensor to view details
" + ) + + # -------------------------------------------------------- + def _load_sensor_list(self): + """ + Load only sensors that have data: + - event_logs_sensors OR + - sensors_anomalies_modal OR + - sensor_anomalies + """ + try: + r = self.api.http.get(f"{self.api.base}/api/tables/sensors") + sensors = r.json().get("rows", []) + + self.sensor_dropdown.clear() + self.sensor_dropdown.addItem("-- Select Sensor --", None) + + for s in sensors: + sid = s.get("sensor_id") + sname = s.get("sensor_name", "") + + # ---------- check if this sensor has real data ---------- + has_data = False + + # check modal anomalies + r_modal = self.api.http.get( + f"{self.api.base}/api/tables/sensors_anomalies_modal?sensor_id={sid}&limit=1" + ).json().get("rows", []) + if r_modal: + has_data = True + + # check sensor anomalies table + if not has_data: + r_anoms = self.api.http.get( + f"{self.api.base}/api/tables/sensor_anomalies?sensor={sid}&limit=1" + ).json().get("rows", []) + if r_anoms: + has_data = True + + # check logs + if not has_data: + r_logs = self.api.http.get( + f"{self.api.base}/api/tables/event_logs_sensors?device_id={sid}&limit=1" + ).json().get("rows", []) + if r_logs: + has_data = True + + # add only if data exists + if has_data: + display = f"{sid} – {sname}" + self.sensor_dropdown.addItem(display, sid) + + except Exception as e: + print(f"[SensorDetailsTab] Failed to load sensors list: {e}") + + # -------------------------------------------------------- + def _on_load_clicked(self): + selected_id = self.sensor_dropdown.currentData() + if not selected_id: + self.web.setHtml("Please select a sensor
") + return + self.load_sensor(str(selected_id)) + + # -------------------------------------------------------- + def load_sensor(self, sensor_id: str): + self.sensor_id = sensor_id + self.refresh_data() + + # -------------------------------------------------------- + def refresh_data(self): + if not self.sensor_id: + return + try: + # Sensors + r_sensor = self.api.http.get(f"{self.api.base}/api/tables/sensors?sensor_id={self.sensor_id}") + sensors = r_sensor.json().get("rows", []) + sensor_data = sensors[0] if sensors else {} + + # Logs + r_logs = self.api.http.get( + f"{self.api.base}/api/tables/event_logs_sensors?device_id={self.sensor_id}&order_by=start_ts&order_dir=desc" + ).json().get("rows", []) + + # Modal anomalies + r_modal = self.api.http.get( + f"{self.api.base}/api/tables/sensors_anomalies_modal?sensor_id={self.sensor_id}&order_by=ts&order_dir=desc" + ).json().get("rows", []) + + # Sensor anomalies + r_anoms = self.api.http.get( + f"{self.api.base}/api/tables/sensor_anomalies?sensor={self.sensor_id}&limit=50&order_by=ts&order_dir=desc" + ).json().get("rows", []) + + # Active alert + active_alert = next((a for a in r_logs if a.get("end_ts") is None), None) + + chart_html = self._build_plot(r_anoms) + page_html = self._build_html(sensor_data, r_logs, r_modal, active_alert, chart_html) + + self.web.setHtml(page_html) + + except Exception as e: + traceback.print_exc() + self.web.setHtml(f"Error: {e}
") + + # -------------------------------------------------------- + def _build_plot(self, anoms): + if not anoms: + return "No data available for this sensor
"
+
+ timestamps = [a.get("ts") for a in anoms]
+ values = [a.get("value") for a in anoms]
+
+ fig = go.Figure()
+ fig.add_trace(go.Scatter(
+ x=timestamps, y=values, mode="lines+markers",
+ line=dict(color="#2563eb", width=2),
+ marker=dict(size=4)
+ ))
+
+ fig.update_layout(
+ template="plotly_white",
+ height=240,
+ margin=dict(l=20, r=20, t=20, b=20),
+ xaxis_title="Timestamp",
+ yaxis_title="Value",
+ font=dict(family="Inter,Segoe UI,sans-serif", size=10)
+ )
+
+ return fig.to_html(include_plotlyjs="cdn", full_html=False)
+
+ # --------------------------------------------------------
+ def _build_html(self, sensor_data, logs, modal, active_alert, chart_html):
+ sensor_name = sensor_data.get("sensor_name", self.sensor_id)
+
+ active_html = ""
+ if active_alert:
+ sev = active_alert.get("severity", "warn").capitalize()
+ issue = active_alert.get("issue_type", "Unknown")
+ started = active_alert.get("start_ts", "")[:19]
+ active_html = f"""
+
+ """
+
+ combined = []
+ for l in logs:
+ combined.append({
+ "time": l.get("start_ts"),
+ "issue": l.get("issue_type"),
+ "severity": l.get("severity"),
+ "source": "event_logs_sensors"
+ })
+
+ for m in modal:
+ is_anomaly = m.get("anomaly") not in (0, "0", False, "false", None)
+ combined.append({
+ "time": m.get("ts"),
+ "issue": "Model anomaly detected" if is_anomaly else "Model normal",
+ "severity": "critical" if is_anomaly else "info",
+ "source": "sensors_anomalies_modal"
+ })
+
+ combined.sort(key=lambda x: x.get("time") or "", reverse=True)
+
+ rows = "".join([
+ f"Sensor: {sensor_name}
+{active_html} +Sensor Readings
{chart_html}Alerts History
+| Time | Issue | Severity | Source |
|---|
+ ID: {sensor.get('sensor_id')}
+ Type: {sensor.get('sensor_type')}
+ Status: {sensor.get('status', 'Unknown')}
+ Latitude: {sensor.get('lat', 'N/A')}
+ Longitude: {sensor.get('lon', 'N/A')}
+ """ + header = QLabel(sensor_details) + header.setWordWrap(True) + layout.addWidget(header) + + alerts = sensor.get("All Alerts", []) + layout.addSpacing(10) + + body = QWidget() + body_layout = QVBoxLayout(body) + body_layout.setSpacing(8) + + if alerts: + for a in sorted(alerts, key=lambda x: x.get("start_ts", ""), reverse=True): + card = QFrame() + severity = a.get("severity", "info") + border_color = { + "critical": "#FF4444", + "error": "#FF8800", + "warn": "#FFCC00", + }.get(severity, "#44AA44") + + card.setStyleSheet(f""" + QFrame {{ + border-radius: 8px; + border: 2px solid {border_color}; + background-color: #FFF; + padding: 6px; + margin: 2px; + }} + """) + + form = QFormLayout(card) + start = a.get("start_ts", "")[:19] + end = a.get("end_ts", "") + form.addRow("Start:", QLabel(start)) + form.addRow("End:", QLabel(end if end else "[ACTIVE]")) + form.addRow("Issue:", QLabel(a.get("issue_type", ""))) + form.addRow("Severity:", QLabel(a.get("severity", ""))) + + details = a.get("details", {}) + for k, v in details.items(): + form.addRow(f"{k.title()}:", QLabel(str(v))) + + body_layout.addWidget(card) + else: + body_layout.addWidget(QLabel("No alerts.")) + + scroll = QScrollArea() + scroll.setWidgetResizable(True) + scroll.setWidget(body) + layout.addWidget(scroll) + + btns = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok) + btns.accepted.connect(self.accept) + layout.addWidget(btns) + + +# ============================================================ +# MAIN VIEW +# ============================================================ +class SensorsView(QWidget): + def __init__(self, api, parent=None): + super().__init__(parent) + self.api = api + self.all_sensors = [] + + self._build_ui() + self.load_sensors() + + self.timer = QTimer(self) + self.timer.timeout.connect(self.load_sensors) + self.timer.start(30000) + + def _build_ui(self): + main_layout = QVBoxLayout(self) + header = QHBoxLayout() + + title = QLabel("🌡️ Unified Sensor Alerts Dashboard") + title.setStyleSheet("font-size:22px; font-weight:700; color:#111;") + header.addWidget(title) + header.addStretch() + + self.filter_box = QComboBox() + self.filter_box.addItems(["All", "Info", "Warning", "Error", "Critical"]) + self.filter_box.currentTextChanged.connect(self._apply_filters) + header.addWidget(self.filter_box) + + self.search_box = QLineEdit() + self.search_box.setPlaceholderText("Search sensors...") + self.search_box.textChanged.connect(self._apply_filters) + self.search_box.setFixedWidth(220) + header.addWidget(self.search_box) + + # ← REMOVED refresh button completely + + main_layout.addLayout(header) + + self.scroll = QScrollArea() + self.scroll.setWidgetResizable(True) + self.container = QWidget() + self.grid = QGridLayout(self.container) + self.grid.setSpacing(12) + self.scroll.setWidget(self.container) + main_layout.addWidget(self.scroll) + + self.setLayout(main_layout) + + # ------------------------------------------------------------ def load_sensors(self): try: - data = self.api.http.get(f"{self.api.base}/api/files").json() - except Exception as e: - print(f"[SensorsView] API error: {e}") - data = [] - - if not data: - self.table.setRowCount(0) - self.table.setColumnCount(1) - self.table.setHorizontalHeaderLabels(["No data"]) + res_sensors = self.api.http.get(f"{self.api.base}/api/tables/sensors").json() + res_anoms = self.api.http.get(f"{self.api.base}/api/tables/sensors_anomalies_modal").json() + res_logs = self.api.http.get(f"{self.api.base}/api/tables/event_logs_sensors").json() + + sensors = res_sensors.get("rows", []) + anomalies = res_anoms.get("rows", []) + alerts = res_logs.get("rows", []) + + except: + traceback.print_exc() + return + + # --------------- map anomalies --------------- + anomaly_latest = {} + for a in anomalies: + sid = a.get("sensor_id") + if not sid: + continue + prev = anomaly_latest.get(sid) + if prev is None or a.get("ts", "") > prev.get("ts", ""): + anomaly_latest[sid] = a + + # --------------- map alerts --------------- + alerts_by_sensor = {} + for alert in alerts: + dev = alert.get("device_id") + if not dev: + continue + if alert.get("end_ts"): + continue + alerts_by_sensor.setdefault(dev, []).append(alert) + + # --------------- merge --------------- + merged = [] + for s in sensors: + sensor_id = s.get("sensor_id") + name = s.get("sensor_name") + s_type = s.get("sensor_type") + + alerts_for_s = alerts_by_sensor.get(name, []) + active = [a for a in alerts_for_s if not a.get("end_ts")] + + if active: + latest = sorted(active, key=lambda x: x.get("start_ts", ""), reverse=True)[0] + sev_alert = latest.get("severity", "info").lower() + issue_alert = latest.get("issue_type", "") + else: + sev_alert = "info" + issue_alert = None + + anom = anomaly_latest.get(sensor_id) + if anom and anom.get("anomaly", 0) > 0: + sev_anom = "error" + issue_anom = "Anomaly detected" + else: + sev_anom = "info" + issue_anom = None + + sev_final = sev_alert + issue_final = issue_alert or "No active alerts" + if SEVERITY_RANK[sev_anom] > SEVERITY_RANK[sev_alert]: + sev_final = sev_anom + issue_final = issue_anom + + all_alerts = alerts_for_s.copy() + if anom: + all_alerts.append({ + "start_ts": anom.get("ts"), + "severity": sev_anom, + "issue_type": "anomaly_modal", + "details": {"anomaly": anom.get("anomaly")} + }) + + merged.append({ + "sensor_id": sensor_id, + "sensor_name": name, + "sensor_type": s_type, + "Issue": issue_final, + "Severity": sev_final, + "All Alerts": all_alerts, + "status": s.get("status"), + "lat": s.get("lat"), + "lon": s.get("lon"), + }) + + self.all_sensors = merged + self._apply_filters() + + # ------------------------------------------------------------ + def _render_cards(self, sensors): + for i in reversed(range(self.grid.count())): + w = self.grid.itemAt(i).widget() + if w: + w.setParent(None) + + if not sensors: + lbl = QLabel("No sensors found") + lbl.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.grid.addWidget(lbl, 0, 0) return - keys = list(data[0].keys()) - self.table.setColumnCount(len(keys)) - self.table.setHorizontalHeaderLabels(keys) - self.table.setRowCount(len(data)) + cols = 3 + for i, s in enumerate(sensors): + card = SensorCard(s, self._show_alert_history) + r, c = divmod(i, cols) + self.grid.addWidget(card, r, c) + + # ------------------------------------------------------------ + def _apply_filters(self): + text = self.search_box.text().lower().strip() + filt = self.filter_box.currentText().lower() + + filtered = [] + for s in self.all_sensors: + name = str(s.get("sensor_name", "")).lower() + t = str(s.get("sensor_type", "")).lower() + sev = s.get("Severity", "").lower() + + if text and text not in name and text not in t: + continue + if filt != "all" and filt not in sev: + continue + filtered.append(s) + + self._render_cards(filtered) - for r, row in enumerate(data): - for c, key in enumerate(keys): - self.table.setItem(r, c, QTableWidgetItem(str(row[key]))) + # ------------------------------------------------------------ + def _show_alert_history(self, sensor): + dlg = AlertDialog(sensor) + dlg.exec() diff --git a/GUI/src/vast/views/sound/map_background.png b/GUI/src/vast/views/sound/map_background.png new file mode 100644 index 000000000..2f71da42e Binary files /dev/null and b/GUI/src/vast/views/sound/map_background.png differ diff --git a/GUI/src/vast/views/sound/sound_view.py b/GUI/src/vast/views/sound/sound_view.py new file mode 100644 index 000000000..1d47cd9c9 --- /dev/null +++ b/GUI/src/vast/views/sound/sound_view.py @@ -0,0 +1,1997 @@ +from PyQt6.QtWidgets import ( + QWidget, QVBoxLayout, QHBoxLayout, QLabel, QGridLayout, + QComboBox, QPushButton, QLineEdit, QDateEdit, + QFrame, QMessageBox, QTabWidget, QTableWidget, + QTableWidgetItem, QHeaderView, QAbstractItemView, + QStackedWidget, QSizePolicy, QCheckBox, QToolBar, QScrollArea +) +from PyQt6.QtCore import Qt, QDate, QUrl, QTimer, pyqtSignal, QSize +from PyQt6.QtGui import QPixmap, QColor, QCursor, QPainter, QFont +from PyQt6.QtMultimedia import QMediaPlayer, QAudioOutput +from PyQt6.QtWebEngineWidgets import QWebEngineView +from dashboard_api import DashboardApi +import matplotlib.pyplot as plt +from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas +from matplotlib.figure import Figure +import numpy as np +from datetime import datetime, timedelta +from vast.dashboard_api import DashboardApi +import requests +import os +import math +import tempfile + +MINIO_BASE = os.getenv("MINIO_PUBLIC_BASE", "http://minio-hot:9000") + +def normalize_minio_url(url: str) -> str: + if not url: + return "" + if url.startswith("http://") or url.startswith("https://"): + return url + url = url.lstrip("/") + if url.startswith("sounds/"): + url = "sound/" + url + return f"{MINIO_BASE.rstrip('/')}/{url}" + + +# ========================================================== +# Audio Waveform Visualizer +# ========================================================== +class AudioWaveform(QWidget): + def __init__(self, parent=None): + super().__init__(parent) + self.setMinimumHeight(180) + self.setMaximumHeight(220) + self.bars = [] + self.animation_offset = 0 + self.is_playing = False + + self.timer = QTimer(self) + self.timer.timeout.connect(self.animate) + + self.setStyleSheet(""" + background: qlineargradient(x1:0, y1:0, x2:1, y2:1, + stop:0 #0f0c29, stop:0.5 #302b63, stop:1 #24243e); + border: none; + border-radius: 12px; + """) + + self.default_text = "🎵 Press Play to Visualize Audio 🎵" + + def start_animation(self): + self.is_playing = True + self.bars = [0.2 + (i % 5) * 0.15 for i in range(100)] + self.timer.start(40) + + def stop_animation(self): + self.is_playing = False + self.timer.stop() + self.bars = [] + self.update() + + def animate(self): + if not self.is_playing: + return + + self.animation_offset = (self.animation_offset + 2) % 360 + + for i in range(len(self.bars)): + wave1 = math.sin((self.animation_offset + i * 8) * math.pi / 180) + wave2 = math.cos((self.animation_offset + i * 12) * math.pi / 180) + self.bars[i] = 0.25 + abs(wave1 * 0.35) + abs(wave2 * 0.25) + + self.update() + + def paintEvent(self, event): + painter = QPainter(self) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) + + width = self.width() + height = self.height() + + if not self.bars: + painter.setPen(QColor(150, 180, 230, 200)) + font = painter.font() + font.setPointSize(14) + font.setBold(True) + painter.setFont(font) + painter.drawText(0, 0, width, height, + Qt.AlignmentFlag.AlignCenter, + self.default_text) + return + + bar_width = width / len(self.bars) + center_y = height / 2 + + gradient_colors = [ + (QColor(102, 126, 234), QColor(118, 75, 162)), + (QColor(67, 233, 123), QColor(56, 249, 215)), + (QColor(251, 200, 212), QColor(151, 149, 240)), + (QColor(250, 208, 196), QColor(255, 209, 255)) + ] + + for i, amplitude in enumerate(self.bars): + x = i * bar_width + bar_height = amplitude * (height - 30) + y_top = center_y - bar_height / 2 + y_bottom = center_y + bar_height / 2 + + gradient_idx = (i // 25) % len(gradient_colors) + color1, color2 = gradient_colors[gradient_idx] + + from PyQt6.QtGui import QLinearGradient + gradient = QLinearGradient(x, y_top, x, y_bottom) + gradient.setColorAt(0, color1) + gradient.setColorAt(1, color2) + + painter.setPen(Qt.PenStyle.NoPen) + painter.setBrush(gradient) + + bar_rect_width = max(2, bar_width - 1.5) + painter.drawRoundedRect( + int(x + 0.75), int(y_top), + int(bar_rect_width), int(bar_height), + 3, 3 + ) + + glow = QColor(255, 255, 255, 30) + painter.setBrush(glow) + painter.drawRoundedRect( + int(x + bar_width * 0.2), int(y_top + 2), + int(bar_rect_width * 0.3), int(bar_height * 0.4), + 2, 2 + ) + + +# ========================================================== +# Microphone Button Widget +# ========================================================== +class MicrophoneButton(QPushButton): + def __init__(self, mic_id: str, mic_name: str, mic_type: str, parent=None): + super().__init__(parent) + self.mic_id = mic_id + self.mic_name = mic_name + self.mic_type = mic_type + self.is_selected = False + + if mic_type == "audio": + self.setFixedSize(70, 70) + self.shape_style = "border-radius: 35px;" + else: + self.setFixedSize(70, 70) + self.shape_style = "border-radius: 8px;" + + self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + + self.base_color = "#000000" + self.selected_color = "#0078d4" + self.hover_color = "#222222" + self.disabled_color = "#888888" + + self.update_style() + self.setText(f"{mic_id.upper()}") + self.setToolTip(f"{mic_name}
Type: {mic_type}
Click to select") + + def update_style(self): + if not self.isEnabled(): + color = self.disabled_color + border = "#555" + elif self.is_selected: + color = self.selected_color + border = "#1e90ff" + else: + color = self.base_color + border = "white" + + self.setStyleSheet(f""" + QPushButton {{ + background-color: {color}; + color: white; + border: 3px solid {border}; + {self.shape_style} + font-size: 15px; + font-weight: bold; + padding: 4px; + }} + QPushButton:hover {{ + background-color: {self.hover_color}; + }} + """) + + def set_selected(self, selected: bool): + self.is_selected = selected + self.update_style() + + def set_disabled_state(self, disabled: bool): + self.setEnabled(not disabled) + self.update_style() + + +# ========================================================== +# Interactive Map with Image +# ========================================================== +class ImageMapView(QWidget): + def __init__(self, parent=None, api=None): + super().__init__(parent) + self.api = api + self.main_layout = QVBoxLayout(self) + self.main_layout.setContentsMargins(20, 20, 20, 20) + self.main_layout.setSpacing(15) + + self.selected_mics = [] + self.selected_type = None + self.mic_buttons = {} + + self.stacked_widget = QStackedWidget() + + self.map_page = QWidget() + layout = QVBoxLayout(self.map_page) + layout.setContentsMargins(0, 0, 0, 0) + layout.setSpacing(15) + + control_panel = QFrame() + control_panel.setStyleSheet(""" + QFrame { + background-color: white; + border: 2px solid #d1d5da; + border-radius: 8px; + padding: 10px; + } + """) + control_layout = QHBoxLayout(control_panel) + + self.selection_label = QLabel("Select microphones to view recordings") + self.selection_label.setStyleSheet("font-weight: bold; color: #333;") + + self.view_button = QPushButton("View Selected Recordings") + self.view_button.setEnabled(False) + self.view_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + self.view_button.setStyleSheet(""" + QPushButton { + background-color: #28a745; + color: white; + border-radius: 6px; + padding: 10px 20px; + font-weight: bold; + } + QPushButton:hover:enabled { + background-color: #218838; + } + QPushButton:disabled { + background-color: #CCCCCC; + } + """) + self.view_button.clicked.connect(self.view_selected_recordings) + + self.clear_button = QPushButton("✕ Clear Selection") + self.clear_button.setEnabled(False) + self.clear_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + self.clear_button.setStyleSheet(""" + QPushButton { + background-color: #dc3545; + color: white; + border-radius: 6px; + padding: 10px 20px; + font-weight: bold; + } + QPushButton:hover:enabled { + background-color: #c82333; + } + QPushButton:disabled { + background-color: #CCCCCC; + } + """) + self.clear_button.clicked.connect(self.clear_selection) + + control_layout.addWidget(self.selection_label) + control_layout.addStretch() + control_layout.addWidget(self.clear_button) + control_layout.addWidget(self.view_button) + + subtitle = QLabel("Click on microphones to select them (same type only)") + subtitle.setAlignment(Qt.AlignmentFlag.AlignCenter) + subtitle.setStyleSheet("font-size: 14px; color: #666; padding: 5px;") + + self.map_container = QWidget() + self.map_container.setMinimumSize(800, 600) + self.map_container.setStyleSheet(""" + background-color: #e8f4f8; + border: 3px solid #4A90E2; + border-radius: 15px; + """) + + self.background_label = QLabel(self.map_container) + self.background_label.setGeometry(0, 0, 800, 600) + self.background_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + + self._load_map_image() + + self.microphones = [ + {"id": "MIC-01", "name": "Environment Mic", "type": "audio", "position": (200, 150)}, + {"id": "MIC-02", "name": "Plant Ultrasound", "type": "ultrasound", "position": (500, 300)}, + {"id": "MIC-03", "name": "Environment Mic", "type": "audio", "position": (350, 450)} + ] + + for mic in self.microphones: + btn = MicrophoneButton(mic["id"], mic["name"], mic["type"], self.map_container) + btn.move(mic["position"][0], mic["position"][1]) + btn.clicked.connect(lambda checked, m=mic, b=btn: self.on_microphone_clicked(m, b)) + self.mic_buttons[mic["id"]] = btn + + legend = QLabel("🎤 circle = Audio Sensor • 🔊 square = Ultrasound Sensor") + legend.setAlignment(Qt.AlignmentFlag.AlignCenter) + legend.setStyleSheet(""" + font-size: 14px; + font-weight: 500; + padding: 10px; + background-color: white; + border: 2px solid #ddd; + border-radius: 8px; + color: #333; + """) + + layout.addWidget(control_panel) + layout.addWidget(subtitle) + layout.addWidget(self.map_container, 1) + layout.addWidget(legend) + + self.stacked_widget.addWidget(self.map_page) + self.recordings_page = None + + self.main_layout.addWidget(self.stacked_widget) + + def _load_map_image(self): + possible_paths = [ + "map_background.png", + "./map_background.png", + "../map_background.png", + os.path.join(os.getcwd(), "map_background.png"), + os.path.join(os.path.dirname(__file__), "map_background.png") + ] + + image_loaded = False + for path in possible_paths: + if os.path.exists(path): + pixmap = QPixmap(path) + if not pixmap.isNull(): + scaled = pixmap.scaled(800, 600, Qt.AspectRatioMode.KeepAspectRatio, + Qt.TransformationMode.SmoothTransformation) + self.background_label.setPixmap(scaled) + image_loaded = True + break + + if not image_loaded: + self.background_label.setStyleSheet("font-size: 16px; color: #888; background-color: #d0e8f2;") + self.background_label.setText("Sensor Locations\n\n(Map image not found)") + + def on_microphone_clicked(self, mic_data, button): + mic_id = mic_data["id"] + mic_type = mic_data["type"] + + if mic_id in self.selected_mics: + self.selected_mics.remove(mic_id) + button.set_selected(False) + + if not self.selected_mics: + self.selected_type = None + self.enable_all_buttons() + + self.update_selection_display() + return + + if self.selected_type is None: + self.selected_type = mic_type + self.disable_other_type_buttons(mic_type) + + if mic_type == self.selected_type: + self.selected_mics.append(mic_id) + button.set_selected(True) + self.update_selection_display() + + def disable_other_type_buttons(self, allowed_type): + for mic in self.microphones: + if mic["type"] != allowed_type: + self.mic_buttons[mic["id"]].set_disabled_state(True) + + def enable_all_buttons(self): + for btn in self.mic_buttons.values(): + btn.set_disabled_state(False) + + def clear_selection(self): + self.selected_mics = [] + self.selected_type = None + for btn in self.mic_buttons.values(): + btn.set_selected(False) + btn.set_disabled_state(False) + self.update_selection_display() + + def update_selection_display(self): + count = len(self.selected_mics) + if count == 0: + self.selection_label.setText("Select microphones to view recordings") + self.view_button.setEnabled(False) + self.clear_button.setEnabled(False) + else: + type_text = "Audio" if self.selected_type == "audio" else "Ultrasound" + self.selection_label.setText( + f"Selected {count} {type_text} microphone(s): {', '.join([m.upper() for m in self.selected_mics])}" + ) + self.view_button.setEnabled(True) + self.clear_button.setEnabled(True) + + def view_selected_recordings(self): + if not self.selected_mics: + return + + selected_mic_data = [mic for mic in self.microphones if mic["id"] in self.selected_mics] + + if self.recordings_page: + self.stacked_widget.removeWidget(self.recordings_page) + self.recordings_page.deleteLater() + + self.recordings_page = QWidget() + recordings_layout = QVBoxLayout(self.recordings_page) + recordings_layout.setContentsMargins(0, 0, 0, 0) + recordings_layout.setSpacing(0) + + header_container = QWidget() + color = "#4A90E2" if self.selected_type == "audio" else "#50C878" + header_container.setStyleSheet(f"background-color: {color};") + header_layout = QHBoxLayout(header_container) + header_layout.setContentsMargins(10, 10, 10, 10) + + back_button = QPushButton("← Back to Map") + back_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + back_button.setStyleSheet(""" + QPushButton { + background-color: rgba(255, 255, 255, 0.2); + color: white; + border: 2px solid white; + border-radius: 6px; + padding: 8px 16px; + font-weight: bold; + } + QPushButton:hover { background-color: rgba(255, 255, 255, 0.3); } + """) + back_button.clicked.connect(self.show_map) + + mic_names = ", ".join([m["name"] for m in selected_mic_data]) + header = QLabel(f"Recordings: {mic_names}") + header.setAlignment(Qt.AlignmentFlag.AlignCenter) + header.setStyleSheet("font-size: 20px; font-weight: bold; color: white;") + + header_layout.addWidget(back_button) + header_layout.addWidget(header, 1) + header_layout.addStretch() + + type_text = "AUDIO" if self.selected_type == "audio" else "ULTRASOUND" + mic_ids = ", ".join([m["id"].upper() for m in selected_mic_data]) + subtitle = QLabel(f"Type: {type_text} • Microphones: {mic_ids}") + subtitle.setAlignment(Qt.AlignmentFlag.AlignCenter) + subtitle.setStyleSheet(""" + font-size: 13px; color: white; padding: 5px; + background-color: rgba(0, 0, 0, 0.2); + """) + + recordings_layout.addWidget(header_container) + recordings_layout.addWidget(subtitle) + + mic_ids_list = [m["id"] for m in selected_mic_data] + sound_tab = RecordingsTab( + mic_ids=mic_ids_list, + recording_type=self.selected_type, + parent=self, + api=self.api, + ) + recordings_layout.addWidget(sound_tab) + + self.stacked_widget.addWidget(self.recordings_page) + self.stacked_widget.setCurrentWidget(self.recordings_page) + + def show_map(self): + self.stacked_widget.setCurrentWidget(self.map_page) + + +# ========================================================== +# Recordings Tab +# ========================================================== +class RecordingsTab(QWidget): + def __init__(self, mic_ids=None, recording_type="audio", parent=None, api=None): + super().__init__(parent) + self.mic_ids = mic_ids if mic_ids else [] + self.recording_type = recording_type + self.api = api + + if recording_type == "ultrasound": + self.api_url = "http://db_api_service:8001/api/files/plant-predictions/" + else: + self.api_url = "http://db_api_service:8001/api/files/audio-aggregates/" + + layout = QVBoxLayout(self) + layout.setContentsMargins(20, 20, 20, 20) + layout.setSpacing(15) + + filter_frame = self._create_filter_frame() + + list_label = QLabel("Available Recordings") + list_label.setStyleSheet("font-size: 16px; font-weight: bold; color: #333; padding: 5px;") + + self.file_table = self._create_table() + + waveform_container = self._create_waveform_container() + + self.status_label = QLabel("Ready") + self.status_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.status_label.setStyleSheet(""" + font-size: 13px; color: #666; padding: 8px; + background-color: #f6f8fa; border-radius: 6px; border: 1px solid #d1d5da; + """) + + self.player = QMediaPlayer() + self.audio_output = QAudioOutput() + self.audio_output.setVolume(1.0) + self.player.setAudioOutput(self.audio_output) + self.player.playbackStateChanged.connect(self.on_playback_state_changed) + self._current_temp_file = None + self._current_play_btn = None + self._current_stop_btn = None + + layout.addWidget(filter_frame) + layout.addWidget(list_label) + layout.addWidget(self.file_table, 1) + + if self.recording_type == "audio": + layout.addWidget(waveform_container) + + layout.addWidget(self.status_label) + + self.refresh_button.clicked.connect(self.update_list) + self.update_list() + + def _create_filter_frame(self): + filter_frame = QFrame() + filter_frame.setStyleSheet(""" + QFrame { background-color: #ffffff; border-radius: 12px; padding: 15px; } + """) + filters_layout = QVBoxLayout(filter_frame) + filters_layout.setSpacing(12) + + filter_row = QHBoxLayout() + filter_row.setSpacing(8) + filter_row.setContentsMargins(0, 0, 0, 0) + + type_label = QLabel("Type:") + type_label.setStyleSheet("font-weight: bold; color: #333; font-size: 11px;") + filter_row.addWidget(type_label) + + self.noise_filter = QComboBox() + self.noise_filter.setMaximumWidth(180) + self.noise_filter.setStyleSheet(""" + QComboBox { + padding: 6px 10px; + border: 1px solid #d1d5da; + border-radius: 4px; + background: white; + font-size: 12px; + } + QComboBox:hover { border: 1px solid #4A90E2; } + """) + + if self.recording_type == "ultrasound": + self.noise_filter.addItems([ + "All signals", "Drought-stressed plant", + "Empty Pot", "Greenhouse Noises" + ]) + else: + self.noise_filter.addItems([ + "All types", "predatory_animals", "non_predatory_animals", + "birds", "fire", "footsteps", "insects", "screaming", + "shotgun", "stormy_weather", "streaming_water", "vehicle", "Other" + ]) + + filter_row.addWidget(self.noise_filter) + + date_label = QLabel(" From:") + date_label.setStyleSheet("font-weight: bold; color: #333; font-size: 11px;") + filter_row.addWidget(date_label) + + today = QDate.currentDate() + first_day = QDate(today.year(), today.month(), 1) + + self.date_from = QDateEdit() + self.date_from.setCalendarPopup(True) + self.date_from.setDate(first_day) + self.date_from.setMaximumWidth(120) + self.date_from.setStyleSheet(""" + QDateEdit { + padding: 6px 8px; + border: 1px solid #d1d5da; + border-radius: 4px; + background: white; + font-size: 12px; + } + """) + filter_row.addWidget(self.date_from) + + filter_row.addWidget(QLabel("→")) + + self.date_to = QDateEdit() + self.date_to.setCalendarPopup(True) + self.date_to.setDate(today) + self.date_to.setMaximumWidth(120) + self.date_to.setStyleSheet(self.date_from.styleSheet()) + filter_row.addWidget(self.date_to) + + self.search_box = QLineEdit() + self.search_box.setPlaceholderText("Search filename...") + self.search_box.setMaximumWidth(200) + self.search_box.setStyleSheet(""" + QLineEdit { + padding: 6px 10px; + border: 1px solid #d1d5da; + border-radius: 4px; + background: white; + font-size: 12px; + } + QLineEdit:focus { border: 1px solid #4A90E2; } + """) + filter_row.addWidget(self.search_box) + + filter_row.addStretch() + + filter_row.addWidget(QLabel("sort by:")) + self.sort_by = QComboBox() + self.sort_by.addItems(["date", "name", "device"]) + self.sort_by.setMaximumWidth(130) + self.sort_by.setStyleSheet(""" + QComboBox { + padding: 6px 10px; + border: 1px solid #d1d5da; + border-radius: 4px; + background: white; + font-size: 12px; + } + """) + filter_row.addWidget(self.sort_by) + + self.refresh_button = QPushButton("🔄 Refresh") + self.refresh_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + self.refresh_button.setStyleSheet(""" + QPushButton { + background-color: #4A90E2; + color: white; + border-radius: 6px; + padding: 8px 16px; + font-weight: bold; + font-size: 12px; + } + QPushButton:hover { background-color: #357ABD; } + """) + filter_row.addWidget(self.refresh_button) + + filters_layout.addLayout(filter_row) + + return filter_frame + + def _create_table(self): + table = QTableWidget() + + if self.recording_type == "ultrasound": + table.setColumnCount(6) + table.setHorizontalHeaderLabels([ + "File", "Device", "Predicted Label", "Confidence", "Watering Status", "Format" + ]) + else: + table.setColumnCount(6) + table.setHorizontalHeaderLabels([ + "File", "Device", "Predicted Label", "Probability", "Format", "Actions" + ]) + + header = table.horizontalHeader() + header.setStretchLastSection(False) + for i in range(table.columnCount()): + header.setSectionResizeMode(i, QHeaderView.ResizeMode.Stretch) + + table.setStyleSheet(""" + QTableWidget { + background: #ffffff; + border: 2px solid #d1d5da; + border-radius: 10px; + gridline-color: #e1e4e8; + font-size: 14px; + } + QTableWidget::item { padding: 8px; } + QTableWidget::item:hover { background-color: #f6f8fa; } + QTableWidget::item:selected { background-color: #d6eaff; color: #0366d6; } + QHeaderView::section { + background-color: #f6f8fa; + padding: 10px; + border: 1px solid #d1d5da; + font-weight: bold; + color: #24292e; + } + """) + + table.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) + table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) + table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers) + table.verticalHeader().setVisible(False) + + return table + + def _create_waveform_container(self): + waveform_container = QFrame() + waveform_container.setStyleSheet(""" + QFrame { + background-color: transparent; + border: none; + padding: 0px; + } + """) + + waveform_layout = QVBoxLayout(waveform_container) + waveform_layout.setSpacing(5) + + self.waveform = AudioWaveform() + self.waveform.setMinimumHeight(100) + self.waveform.setMaximumHeight(120) + + waveform_layout.addWidget(self.waveform) + + return waveform_container + + def on_playback_state_changed(self, state): + if state == QMediaPlayer.PlaybackState.PlayingState: + self.waveform.start_animation() + elif state == QMediaPlayer.PlaybackState.StoppedState: + self.waveform.stop_animation() + if self.status_label.text().startswith("Playing:"): + self.status_label.setText("Finished") + if hasattr(self, '_current_play_btn') and self._current_play_btn: + self._reset_button_pair(self._current_play_btn, self._current_stop_btn) + self._current_play_btn = None + self._current_stop_btn = None + + def _map_ultrasound_label(self, raw: str) -> str: + if not raw: + return "Unknown" + lower = raw.lower() + if "tomato" in lower or "tobacco" in lower: + return "Drought-stressed plant" + return raw + + def update_list(self): + self.file_table.setRowCount(0) + self.file_table.verticalHeader().setDefaultSectionSize(60) + self.status_label.setText("Loading...") + + params = { + "date_from": self.date_from.date().toString("yyyy-MM-dd"), + "date_to": self.date_to.date().toString("yyyy-MM-dd"), + "search": self.search_box.text().strip(), + "sort_by": self.sort_by.currentText(), + "limit": 100 + } + + filter_value = self.noise_filter.currentText() + if self.recording_type == "ultrasound": + if filter_value in ("Empty Pot", "Greenhouse Noises"): + params["predicted_class"] = filter_value + else: + if filter_value not in ("All types", "All signals"): + params["type"] = filter_value + + if self.mic_ids: + params["device_ids"] = ",".join(self.mic_ids) + + try: + # Check if API is available and authenticated + if not self.api or not hasattr(self.api, 'http'): + self.status_label.setText("⚠ API connection not available") + QMessageBox.warning( + self, + "Authentication Required", + "Please login first to access recordings." + ) + return + + # Use the authenticated session + response = self.api.http.get(self.api_url, params=params, timeout=10) + response.raise_for_status() + data = response.json() + + print(f"[DEBUG] Successfully fetched {len(data)} records from {self.api_url}") + for f in data: + row = self.file_table.rowCount() + self.file_table.insertRow(row) + self.file_table.setRowHeight(row, 60) + + filename = f.get("filename") or f.get("file", "") + is_compressed = f.get("is_compressed", False) + + text_color = QColor("#888888") if is_compressed else QColor("#000000") + + if self.recording_type == "ultrasound": + device_id = f.get("device_id", "N/A") + pred_class_raw = f.get("predicted_class", "Unknown") + pred_class = self._map_ultrasound_label(pred_class_raw) + confidence = f.get("confidence", 0) + watering_status = f.get("watering_status", "N/A") + url = normalize_minio_url(f.get("url", "")) + + format_str = "OPUS (Compressed)" if is_compressed else "WAV (Original)" + + item0 = QTableWidgetItem(filename) + item0.setForeground(text_color) + self.file_table.setItem(row, 0, item0) + + item1 = QTableWidgetItem(device_id) + item1.setForeground(text_color) + self.file_table.setItem(row, 1, item1) + + item2 = QTableWidgetItem(pred_class) + item2.setForeground(text_color) + self.file_table.setItem(row, 2, item2) + + item3 = QTableWidgetItem(f"{confidence:.2%}") + item3.setForeground(text_color) + self.file_table.setItem(row, 3, item3) + + item4 = QTableWidgetItem(watering_status) + item4.setForeground(text_color) + self.file_table.setItem(row, 4, item4) + + item5 = QTableWidgetItem(format_str) + item5.setForeground(text_color) + self.file_table.setItem(row, 5, item5) + else: + device_id = f.get("device_id", "N/A") + label = f.get("predicted_label", "Unknown") + prob = f.get("probability", 0) + url = normalize_minio_url(f.get("url", "")) + + format_str = "OPUS (Compressed)" if is_compressed else "WAV (Original)" + + item0 = QTableWidgetItem(filename) + item0.setForeground(text_color) + self.file_table.setItem(row, 0, item0) + + item1 = QTableWidgetItem(device_id) + item1.setForeground(text_color) + self.file_table.setItem(row, 1, item1) + + item2 = QTableWidgetItem(label) + item2.setForeground(text_color) + self.file_table.setItem(row, 2, item2) + + item3 = QTableWidgetItem(f"{prob:.2%}") + item3.setForeground(text_color) + self.file_table.setItem(row, 3, item3) + + item4 = QTableWidgetItem(format_str) + item4.setForeground(text_color) + self.file_table.setItem(row, 4, item4) + + if self.recording_type == "audio": + control_widget = QWidget() + control_layout = QHBoxLayout(control_widget) + control_layout.setContentsMargins(2, 2, 2, 2) + control_layout.setSpacing(6) + + play_btn = QPushButton("▶") + play_btn.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + play_btn.setFixedSize(35, 30) + + if is_compressed: + play_btn.setStyleSheet(""" + QPushButton { + background-color: #888888; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover:enabled { background-color: #666666; } + QPushButton:disabled { background-color: #cccccc; color: #888888; } + """) + play_btn.setToolTip("Compressed OPUS file - may have compatibility issues") + else: + play_btn.setStyleSheet(""" + QPushButton { + background-color: #0078d4; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover:enabled { background-color: #005fa3; } + QPushButton:disabled { background-color: #cccccc; color: #888888; } + """) + + stop_btn = QPushButton("⏹") + stop_btn.setCursor(QCursor(Qt.CursorShape.PointingHandCursor)) + stop_btn.setFixedSize(35, 30) + stop_btn.setEnabled(False) + stop_btn.setStyleSheet(""" + QPushButton { + background-color: #6c757d; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:disabled { background-color: #b0b0b0; } + QPushButton:hover:enabled { background-color: #c82333; } + """) + + play_btn.setProperty("row", row) + stop_btn.setProperty("row", row) + + play_btn.clicked.connect( + lambda checked=False, u=url, fname=filename, pb=play_btn, sb=stop_btn, compressed=is_compressed: + self.play_row_audio(u, fname, pb, sb, compressed) + ) + stop_btn.clicked.connect( + lambda checked=False, pb=play_btn, sb=stop_btn: + self.stop_row_audio(pb, sb) + ) + + control_layout.addWidget(play_btn) + control_layout.addWidget(stop_btn) + + self.file_table.setCellWidget(row, 5, control_widget) + + if self.file_table.rowCount() == 0: + self.file_table.insertRow(0) + empty_item = QTableWidgetItem("No recordings found") + empty_item.setForeground(QColor("#999")) + self.file_table.setItem(0, 0, empty_item) + self.file_table.setSpan(0, 0, 1, 6) + + self.status_label.setText(f"✓ Loaded {len(data)} recordings") + + except requests.exceptions.HTTPError as e: + if e.response.status_code == 401: + self.status_label.setText("⚠ Authentication required") + QMessageBox.warning(self, "Authentication Error", + "API requires authentication. Please check your credentials.") + else: + self.status_label.setText(f"⚠ HTTP Error {e.response.status_code}") + QMessageBox.warning(self, "HTTP Error", + f"Server returned error {e.response.status_code}:\n{str(e)}") + except requests.exceptions.Timeout: + self.status_label.setText("⚠ Request timeout") + QMessageBox.warning(self, "Timeout", "Request timed out. Please try again.") + except requests.exceptions.ConnectionError: + self.status_label.setText("⚠ Connection error") + QMessageBox.warning(self, "Connection Error", + "Could not connect to server. Check your connection.") + except Exception as e: + self.status_label.setText("⚠ Error loading data") + QMessageBox.warning(self, "Error", f"Failed to load recordings:\n{str(e)}") + + def play_row_audio(self, url, filename, play_btn, stop_btn, is_compressed=False): + if not url: + QMessageBox.warning(self, "No URL", "Audio file URL not available") + return + + self.player.stop() + self.waveform.stop_animation() + + try: + if self._current_temp_file: + if os.path.exists(self._current_temp_file): + os.remove(self._current_temp_file) + except Exception: + pass + self._current_temp_file = None + + playback_url = url + if url.startswith("http://localhost") or url.startswith("http://127.0.0.1"): + parts = url.split("/", 3) + if len(parts) > 3: + path = parts[3] + playback_url = f"http://minio-hot:9000/{path}" + + if is_compressed: + reply = QMessageBox.question( + self, + "Compressed File", + "This is a compressed OPUS file. Playback may not work properly.\n\nContinue anyway?", + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + try: + session = self.api.http if (self.api and getattr(self.api, "http", None)) else requests + resp = session.get(playback_url, timeout=15) + resp.raise_for_status() + suffix = ".ogg" if is_compressed else ".wav" + tmp = tempfile.NamedTemporaryFile(delete=False, suffix=suffix) + tmp.write(resp.content) + tmp.flush() + tmp_path = tmp.name + tmp.close() + self._current_temp_file = tmp_path + except requests.exceptions.RequestException as e: + self.status_label.setText("⚠ Unable to download file") + QMessageBox.warning(self, "Download Error", f"Could not download audio file:\n{e}") + return + except Exception as e: + self.status_label.setText("⚠ Error downloading file") + QMessageBox.warning(self, "Error", f"Failed to download audio file:\n{e}") + return + + try: + self._reset_all_buttons() + + play_btn.setEnabled(False) + play_btn.setStyleSheet(""" + QPushButton { + background-color: #888888; + color: white; + border-radius: 4px; + font-weight: bold; + } + """) + + stop_btn.setEnabled(True) + stop_btn.setStyleSheet(""" + QPushButton { + background-color: #dc3545; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover { background-color: #c82333; } + """) + + self.player.setSource(QUrl.fromLocalFile(self._current_temp_file)) + self.player.play() + self.waveform.start_animation() + self.status_label.setText(f"Playing: {filename}") + + self._current_play_btn = play_btn + self._current_stop_btn = stop_btn + + except Exception as e: + self.status_label.setText("⚠ Playback error") + QMessageBox.warning(self, "Playback Error", f"Playback failed:\n{e}") + self._reset_all_buttons() + + def stop_row_audio(self, play_btn, stop_btn): + self.player.stop() + self.waveform.stop_animation() + self.status_label.setText("⏹ Stopped") + self._reset_button_pair(play_btn, stop_btn) + + def _reset_button_pair(self, play_btn, stop_btn): + if play_btn.toolTip() and "Compressed" in play_btn.toolTip(): + play_btn.setStyleSheet(""" + QPushButton { + background-color: #888888; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover:enabled { background-color: #666666; } + QPushButton:disabled { background-color: #cccccc; color: #888888; } + """) + else: + play_btn.setStyleSheet(""" + QPushButton { + background-color: #0078d4; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover:enabled { background-color: #005fa3; } + QPushButton:disabled { background-color: #cccccc; color: #888888; } + """) + play_btn.setEnabled(True) + + stop_btn.setEnabled(False) + stop_btn.setStyleSheet(""" + QPushButton { + background-color: #6c757d; + color: white; + border-radius: 4px; + font-weight: bold; + } + QPushButton:disabled { background-color: #b0b0b0; } + QPushButton:hover:enabled { background-color: #c82333; } + """) + + def _reset_all_buttons(self): + if self.recording_type != "audio": + return + + actions_col = 5 + for row in range(self.file_table.rowCount()): + widget = self.file_table.cellWidget(row, actions_col) + if widget: + layout = widget.layout() + if layout and layout.count() >= 2: + play_btn = layout.itemAt(0).widget() + stop_btn = layout.itemAt(1).widget() + if play_btn and stop_btn and isinstance(play_btn, QPushButton): + self._reset_button_pair(play_btn, stop_btn) + + +# ========================================================== +# Sound Analytics View - NEW TAB from first document +# ========================================================== +class SoundAnalyticsView(QWidget): + """Sound detection dashboard with filtering by time range and sound type""" + + SOUND_TYPES = [ + "non_predatory_animals", + "predatory_animals", + "birds", + "fire", + "footsteps", + "insects", + "screaming", + "shotgun", + "stormy_weather", + "streaming_water", + "vehicle" + ] + + CYAN_PALETTE = [ + '#003366', '#004d99', '#0066cc', '#1a80e5', + '#3399ff', '#53A0E5', '#66b3ff', '#80ccff', + '#99e6ff', '#b3f0ff', '#ccf7ff' + ] + + PRIMARY_CYAN = '#53A0E5' + ACCENT_CYAN = '#3399ff' + + LIGHT_THEME = { + 'bg': '#f8f9fa', + 'card': '#ffffff', + 'text': '#333333', + 'border': '#e0e0e0', + 'primary': PRIMARY_CYAN, + 'accent': ACCENT_CYAN + } + + DARK_THEME = { + 'bg': '#1e1e1e', + 'card': '#2d2d2d', + 'text': '#e0e0e0', + 'border': '#444444', + 'primary': '#64B5F6', + 'accent': ACCENT_CYAN + } + + def __init__(self, api: DashboardApi, parent=None): + super().__init__(parent) + self.api = api + + print(f"[INIT] API object: {self.api}", flush=True) + print(f"[INIT] API has http: {hasattr(self.api, 'http')}", flush=True) + + try: + test_query = "SELECT 1 as test" + result = self.api.run_query(test_query) + print(f"[INIT] DB test result: {result}", flush=True) + except Exception as e: + print(f"[INIT] DB connection error: {e}", flush=True) + + self.current_time_range = 'day' + self.current_sound_types = [] + self.is_dark_theme = False + self.current_theme = self.LIGHT_THEME.copy() + + self.setWindowTitle("Sound Detection Analytics") + self.setMinimumSize(QSize(1350, 1000)) + + main_layout = QVBoxLayout() + main_layout.setContentsMargins(0, 0, 0, 0) + main_layout.setSpacing(0) + + content_frame = QFrame() + content_layout = QVBoxLayout() + content_layout.setContentsMargins(12, 12, 12, 12) + content_layout.setSpacing(12) + + filter_frame = QFrame() + filter_frame.setStyleSheet(""" + QFrame { + background-color: white; + border: 1px solid #e8e8e8; + border-radius: 8px; + } + """) + filter_frame.setMaximumHeight(450) + filter_layout = QVBoxLayout() + filter_layout.setContentsMargins(12, 10, 12, 10) + filter_layout.setSpacing(15) + + time_row = QHBoxLayout() + time_label = QLabel("Time Range:") + time_label.setFont(QFont("Arial", 10, QFont.Weight.Bold)) + time_row.addWidget(time_label) + self.time_filter = QComboBox() + self.time_filter.addItems(['1 Day', '1 Week', '1 Month']) + self.time_filter.setCurrentText('1 Day') + self.time_filter.currentTextChanged.connect(self._on_filter_changed) + self.time_filter.setMinimumWidth(140) + time_row.addWidget(self.time_filter) + time_row.addStretch() + filter_layout.addLayout(time_row) + + sound_header_row = QHBoxLayout() + sound_label = QLabel("Sound Types (select multiple):") + sound_label.setFont(QFont("Arial", 10, QFont.Weight.Bold)) + sound_header_row.addWidget(sound_label) + + self.selection_label = QLabel("All sounds selected") + self.selection_label.setStyleSheet(f"color: {self.PRIMARY_CYAN}; font-weight: bold;") + sound_header_row.addWidget(self.selection_label) + sound_header_row.addStretch() + + clear_btn = QPushButton("Clear All") + clear_btn.setMaximumWidth(100) + clear_btn.clicked.connect(self._clear_sound_selection) + sound_header_row.addWidget(clear_btn) + + apply_btn = QPushButton("Apply Filter") + apply_btn.setMaximumWidth(100) + apply_btn.setStyleSheet(f""" + QPushButton {{ + background-color: {self.PRIMARY_CYAN}; + color: white; + font-weight: bold; + }} + QPushButton:hover {{ + background-color: {self.CYAN_PALETTE[2]}; + }} + """) + apply_btn.clicked.connect(self._refresh_data) + sound_header_row.addWidget(apply_btn) + filter_layout.addLayout(sound_header_row) + + checkbox_container = QFrame() + checkbox_container.setObjectName("checkboxContainer") + checkbox_container.setStyleSheet(f""" + QFrame#checkboxContainer {{ + background-color: white; + border: 2px solid {self.PRIMARY_CYAN}; + border-radius: 6px; + max-height: 350px; + }} + """) + checkbox_layout = QGridLayout() + checkbox_layout.setSpacing(5) + checkbox_layout.setContentsMargins(10, 10, 10, 10) + + self.sound_checkboxes = {} + for idx, sound_name in enumerate(self.SOUND_TYPES): + checkbox = QCheckBox(sound_name) + checkbox.stateChanged.connect(self._on_sound_checkbox_changed) + self.sound_checkboxes[sound_name] = checkbox + row = idx // 3 + col = idx % 3 + checkbox_layout.addWidget(checkbox, row, col) + + checkbox_container.setLayout(checkbox_layout) + filter_layout.addWidget(checkbox_container) + filter_frame.setLayout(filter_layout) + content_layout.addWidget(filter_frame) + + calendar_frame = self._create_activity_calendar() + content_layout.addWidget(calendar_frame) + + grid = QGridLayout() + grid.setSpacing(12) + grid.setRowStretch(0, 1) + grid.setRowStretch(1, 1) + grid.setRowStretch(2, 1) + grid.setColumnStretch(0, 1) + grid.setColumnStretch(1, 1) + + def make_chart_frame(title, canvas): + frame = self._create_chart_frame(title, canvas) + frame.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) + frame.setMinimumHeight(320) + frame.setMaximumHeight(320) + return frame + + self.dist_canvas = self._create_canvas(figsize=(6, 5)) + grid.addWidget(make_chart_frame("Sound Distribution (Count)", self.dist_canvas), 0, 0) + + self.timeline_canvas = self._create_canvas(figsize=(6, 5)) + grid.addWidget(make_chart_frame("Detection Timeline", self.timeline_canvas), 0, 1) + + self.heatmap_canvas = self._create_canvas(figsize=(6, 5)) + grid.addWidget(make_chart_frame("Sound Heatmap - Activity Patterns", self.heatmap_canvas), 1, 0) + + self.correlation_canvas = self._create_canvas(figsize=(6, 5)) + grid.addWidget(make_chart_frame("Correlation Explorer", self.correlation_canvas), 1, 1) + + self.confidence_canvas = self._create_canvas(figsize=(6, 5)) + grid.addWidget(make_chart_frame("Model Health Monitor", self.confidence_canvas), 2, 0) + + stats_frame = self._create_stats_frame() + stats_frame.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) + stats_frame.setMinimumHeight(320) + stats_frame.setMaximumHeight(320) + grid.addWidget(stats_frame, 2, 1) + + content_layout.addLayout(grid, stretch=10) + content_frame.setLayout(content_layout) + + scroll_area = QScrollArea() + scroll_area.setWidgetResizable(True) + scroll_area.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn) + scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + scroll_area.setWidget(content_frame) + + main_layout.addWidget(scroll_area) + self.setLayout(main_layout) + + self.refresh_timer = QTimer() + self.refresh_timer.timeout.connect(self._refresh_data) + self.refresh_timer.start(30000) + + self._refresh_data() + + def _create_activity_calendar(self) -> QFrame: + frame = QFrame() + frame.setStyleSheet(""" + QFrame { + background-color: white; + border: 1px solid #e8e8e8; + border-radius: 8px; + } + """) + frame.setMaximumHeight(120) + + layout = QVBoxLayout() + layout.setContentsMargins(12, 12, 12, 12) + layout.setSpacing(8) + + title = QLabel("Activity Calendar (Last 30 Days)") + title.setFont(QFont("Arial", 10, QFont.Weight.Bold)) + layout.addWidget(title) + + calendar_grid = QHBoxLayout() + calendar_grid.setSpacing(2) + + today = datetime.now().date() + for i in range(30): + date = today - timedelta(days=29-i) + day_box = QFrame() + day_box.setMinimumSize(QSize(20, 20)) + day_box.setMaximumSize(QSize(20, 20)) + + intensity = np.random.rand() + color = self._get_intensity_color(intensity) + + day_box.setStyleSheet(f""" + QFrame {{ + background-color: {color}; + border: 1px solid #ddd; + border-radius: 2px; + }} + """) + + day_label = QLabel(str(date.day)) + day_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + day_label.setFont(QFont("Arial", 6)) + day_layout = QVBoxLayout() + day_layout.setContentsMargins(0, 0, 0, 0) + day_layout.addWidget(day_label) + day_box.setLayout(day_layout) + + calendar_grid.addWidget(day_box) + + calendar_grid.addStretch() + layout.addLayout(calendar_grid) + frame.setLayout(layout) + return frame + + def _get_intensity_color(self, intensity: float) -> str: + if intensity < 0.2: + return self.CYAN_PALETTE[0] + elif intensity < 0.4: + return self.CYAN_PALETTE[2] + elif intensity < 0.6: + return self.CYAN_PALETTE[4] + elif intensity < 0.8: + return self.CYAN_PALETTE[7] + else: + return self.CYAN_PALETTE[10] + + def _create_canvas(self, figsize=(5.5, 4.5)): + canvas = FigureCanvas(Figure(figsize=figsize, dpi=90)) + canvas.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) + return canvas + + def _create_chart_frame(self, title: str, widget: QWidget) -> QFrame: + frame = QFrame() + frame.setStyleSheet(""" + QFrame { + background-color: white; + border: 1px solid #e8e8e8; + border-radius: 8px; + } + """) + + layout = QVBoxLayout() + layout.setContentsMargins(12, 12, 12, 12) + layout.setSpacing(8) + + title_label = QLabel(title) + title_label.setFont(QFont("Arial", 11, QFont.Weight.Bold)) + title_label.setStyleSheet(f"color: {self.PRIMARY_CYAN}; margin-bottom: 4px;") + layout.addWidget(title_label) + + layout.addWidget(widget, 1) + frame.setLayout(layout) + return frame + + def _create_stats_frame(self) -> QFrame: + frame = QFrame() + frame.setStyleSheet(""" + QFrame { + background-color: white; + border: 1px solid #e8e8e8; + border-radius: 8px; + } + """) + + layout = QVBoxLayout() + layout.setContentsMargins(12, 12, 12, 12) + layout.setSpacing(10) + + title_label = QLabel("Statistics") + title_label.setFont(QFont("Arial", 11, QFont.Weight.Bold)) + title_label.setStyleSheet(f"color: {self.PRIMARY_CYAN}; margin-bottom: 6px;") + layout.addWidget(title_label) + + stats_grid = QGridLayout() + stats_grid.setSpacing(10) + stats_grid.setRowStretch(0, 1) + stats_grid.setRowStretch(1, 1) + stats_grid.setColumnStretch(0, 1) + stats_grid.setColumnStretch(1, 1) + + self.stat_boxes = {} + + stat_names = [ + ("Total Files", "total_files"), + ("Unknown Type", "unknown_count"), + ("Avg Confidence", "avg_confidence"), + ("Avg Processing", "avg_processing_ms") + ] + + for idx, (label, key) in enumerate(stat_names): + row = idx // 2 + col = idx % 2 + box = self._create_stat_box(label) + self.stat_boxes[key] = box + stats_grid.addWidget(box, row, col) + + layout.addLayout(stats_grid, 1) + frame.setLayout(layout) + return frame + + def _create_stat_box(self, label: str) -> QFrame: + box = QFrame() + box.setStyleSheet(""" + QFrame { + background-color: #fafafa; + border: 2px solid #e8e8e8; + border-radius: 8px; + } + """) + + layout = QVBoxLayout() + layout.setContentsMargins(12, 12, 12, 12) + layout.setSpacing(8) + layout.setAlignment(Qt.AlignmentFlag.AlignCenter) + + label_widget = QLabel(label) + label_widget.setFont(QFont("Arial", 9, QFont.Weight.Bold)) + label_widget.setStyleSheet("color: #666;") + label_widget.setAlignment(Qt.AlignmentFlag.AlignCenter) + layout.addWidget(label_widget) + + value_widget = QLabel("--") + value_widget.setFont(QFont("Arial", 22, QFont.Weight.Bold)) + value_widget.setStyleSheet(f"color: {self.PRIMARY_CYAN};") + value_widget.setAlignment(Qt.AlignmentFlag.AlignCenter) + layout.addWidget(value_widget) + + box.setLayout(layout) + box._label = label_widget + box._value = value_widget + return box + + def _on_sound_checkbox_changed(self): + selected = [] + for sound_name, checkbox in self.sound_checkboxes.items(): + if checkbox.isChecked(): + selected.append(sound_name) + + self.current_sound_types = selected + + if not selected: + self.selection_label.setText("All sounds selected") + elif len(selected) == 1: + self.selection_label.setText(f"1 sound type selected: {selected[0]}") + else: + self.selection_label.setText(f"{len(selected)} sound types selected") + + def _clear_sound_selection(self): + for checkbox in self.sound_checkboxes.values(): + checkbox.setChecked(False) + + self.current_sound_types = [] + self.selection_label.setText("All sounds selected") + self.time_filter.setCurrentText('1 Day') + self.current_time_range = 'day' + self._refresh_data() + + def _on_filter_changed(self): + time_map = {'1 Day': 'day', '1 Week': 'week', '1 Month': 'month'} + self.current_time_range = time_map.get(self.time_filter.currentText(), 'day') + self._refresh_data() + + def _refresh_data(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + + self._clear_canvas(self.dist_canvas) + self._clear_canvas(self.timeline_canvas) + self._clear_canvas(self.confidence_canvas) + + self._update_distribution_chart() + self._update_timeline_chart() + self._update_heatmap_chart() + self._update_correlation_chart() + self._update_confidence_chart() + self._update_stats_boxes() + except Exception as e: + print(f"[SoundAnalyticsView] Refresh error: {e}", flush=True) + + def _update_distribution_chart(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + data = self.api.get_audio_distribution( + self.current_time_range, + limit=15, + sound_types=sound_filter + ) + + print(f"[DEBUG] Distribution data: {len(data) if data else 0} items", flush=True) + + if not data: + self._show_no_data(self.dist_canvas) + return + + labels = [d['head_pred_label'] for d in data] + counts = [d['count'] for d in data] + + self.dist_canvas.figure.clear() + ax = self.dist_canvas.figure.add_subplot(111) + + colors = [self.CYAN_PALETTE[i % len(self.CYAN_PALETTE)] for i in range(len(labels))] + bars = ax.bar(range(len(labels)), counts, color=colors, edgecolor='black', linewidth=0.5) + + ax.set_xticks(range(len(labels))) + ax.set_xticklabels(labels, rotation=45, ha='right', fontsize=8) + ax.set_ylabel('Count', fontsize=9, fontweight='bold') + ax.grid(True, alpha=0.3, linestyle='--', axis='y') + + for bar in bars: + height = bar.get_height() + ax.text(bar.get_x() + bar.get_width()/2., height, + f'{int(height)}', + ha='center', va='bottom', fontsize=8, fontweight='bold') + + self.dist_canvas.figure.tight_layout() + self.dist_canvas.draw() + print("[DEBUG] Distribution chart drawn successfully", flush=True) + + except Exception as e: + print(f"[ERROR] Distribution chart error: {e}", flush=True) + import traceback + traceback.print_exc() + self._show_no_data(self.dist_canvas) + + def _update_timeline_chart(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + data = self.api.get_audio_timeline( + self.current_time_range, + sound_types=sound_filter + ) + + print(f"[DEBUG] Timeline data: {len(data) if data else 0} items", flush=True) + + if not data: + self._show_no_data(self.timeline_canvas) + return + + timeline_dict = {} + for row in data: + time_bucket = row['time_bucket'] + count = row['count'] + if time_bucket not in timeline_dict: + timeline_dict[time_bucket] = 0 + timeline_dict[time_bucket] += count + + sorted_times = sorted(timeline_dict.keys()) + times = [str(t)[:16] for t in sorted_times] + counts = [timeline_dict[t] for t in sorted_times] + + self.timeline_canvas.figure.clear() + ax = self.timeline_canvas.figure.add_subplot(111) + + ax.plot(times, counts, marker='o', linewidth=2, markersize=5, color=self.ACCENT_CYAN) + ax.fill_between(range(len(times)), counts, alpha=0.2, color=self.PRIMARY_CYAN) + ax.set_xlabel('Time', fontsize=9, fontweight='bold') + ax.set_ylabel('Detections', fontsize=9, fontweight='bold') + ax.grid(True, alpha=0.3, linestyle='--') + ax.tick_params(labelsize=8) + + self.timeline_canvas.figure.autofmt_xdate(rotation=45, ha='right') + self.timeline_canvas.figure.tight_layout() + self.timeline_canvas.draw() + print("[DEBUG] Timeline chart drawn successfully", flush=True) + + except Exception as e: + print(f"[ERROR] Timeline chart error: {e}", flush=True) + import traceback + traceback.print_exc() + self._show_no_data(self.timeline_canvas) + + def _update_confidence_chart(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + data = self.api.get_model_health_metrics( + self.current_time_range, + sound_types=sound_filter + ) + + if not data: + self._show_no_data(self.confidence_canvas) + return + + times = [str(d["time_bucket"])[:16] for d in data] + avg_conf = [d["avg_confidence"] * 100 for d in data] + avg_proc = [d["avg_processing_ms"] for d in data] + + fig = self.confidence_canvas.figure + fig.clear() + + ax1 = fig.add_subplot(111) + ax1.set_title("Model Performance Trends", fontsize=10, fontweight="bold", color=self.PRIMARY_CYAN) + ax1.plot(times, avg_conf, color=self.ACCENT_CYAN, marker="o", linewidth=2, label="Avg Confidence %") + ax1.fill_between(range(len(avg_conf)), avg_conf, alpha=0.15, color=self.PRIMARY_CYAN) + ax1.set_ylabel("Confidence (%)", fontsize=9, fontweight="bold") + ax1.set_ylim(0, 100) + ax1.tick_params(axis='x', rotation=45, labelsize=8) + ax1.grid(True, alpha=0.3, linestyle="--") + + ax2 = ax1.twinx() + proc_color = self.CYAN_PALETTE[7] + ax2.plot(times, avg_proc, color=proc_color, marker="^", linestyle="--", linewidth=2, label="Avg Processing (ms)") + ax2.set_ylabel("Processing Time (ms)", fontsize=9, fontweight="bold", color=proc_color) + ax2.tick_params(axis='y', labelcolor=proc_color) + + lines, labels = ax1.get_legend_handles_labels() + lines2, labels2 = ax2.get_legend_handles_labels() + ax1.legend(lines + lines2, labels + labels2, loc="upper left", fontsize=8) + + fig.tight_layout() + self.confidence_canvas.draw() + + except Exception as e: + print(f"[SoundAnalyticsView] Model Health Monitor chart error: {e}", flush=True) + self._show_no_data(self.confidence_canvas) + + def _update_stats_boxes(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + stats = self.api.get_audio_stats( + self.current_time_range, + sound_types=sound_filter + ) + + if stats: + total = stats.get('total_files', 0) or 0 + self.stat_boxes['total_files']._value.setText(str(total)) + + unknown = stats.get('unknown_count', 0) or 0 + self.stat_boxes['unknown_count']._value.setText(str(unknown)) + + avg_conf = stats.get('avg_confidence') + if avg_conf is not None and avg_conf > 0: + self.stat_boxes['avg_confidence']._value.setText(f"{avg_conf:.1%}") + else: + self.stat_boxes['avg_confidence']._value.setText("--") + + avg_proc = stats.get('avg_processing_ms') + if avg_proc is not None and avg_proc > 0: + self.stat_boxes['avg_processing_ms']._value.setText(f"{avg_proc:.0f}ms") + else: + self.stat_boxes['avg_processing_ms']._value.setText("--") + else: + for key in self.stat_boxes: + self.stat_boxes[key]._value.setText("--") + except Exception as e: + print(f"[SoundAnalyticsView] Stats update error: {e}", flush=True) + + def _clear_canvas(self, canvas): + canvas.figure.clear() + + def _show_no_data(self, canvas): + ax = canvas.figure.add_subplot(111) + ax.text(0.5, 0.5, 'No Data Available', + ha='center', va='center', fontsize=14, fontweight='bold', + transform=ax.transAxes, color='#999') + ax.set_xlim(0, 1) + ax.set_ylim(0, 1) + ax.axis('off') + canvas.draw() + + def closeEvent(self, event): + self.refresh_timer.stop() + super().closeEvent(event) + + def _update_heatmap_chart(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + data = self.api.get_audio_heatmap( + self.current_time_range, + sound_types=sound_filter + ) + + print(f"[DEBUG] Heatmap data: {len(data) if data else 0} items", flush=True) + + if not data: + self._show_no_data(self.heatmap_canvas) + return + + heatmap_data = np.zeros((24, 7)) + + for row in data: + hour = int(row['hour_of_day']) + day = int(row['day_of_week']) + count = row['count'] + heatmap_data[hour, day] += count + + self.heatmap_canvas.figure.clear() + ax = self.heatmap_canvas.figure.add_subplot(111) + + im = ax.imshow(heatmap_data, cmap='GnBu', aspect='auto', interpolation='nearest') + + ax.set_xticks(range(7)) + ax.set_xticklabels(['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], fontsize=8) + ax.set_yticks(range(0, 24, 2)) + ax.set_yticklabels([f'{h:02d}:00' for h in range(0, 24, 2)], fontsize=7) + + ax.set_xlabel('Day of Week', fontsize=9, fontweight='bold') + ax.set_ylabel('Hour of Day', fontsize=9, fontweight='bold') + + cbar = self.heatmap_canvas.figure.colorbar(im, ax=ax, pad=0.02) + cbar.set_label('Detections', fontsize=8) + cbar.ax.tick_params(labelsize=7) + + for i in range(24): + for j in range(7): + if heatmap_data[i, j] > 0: + text_color = 'white' if heatmap_data[i, j] > heatmap_data.max() * 0.5 else 'black' + ax.text(j, i, int(heatmap_data[i, j]), + ha="center", va="center", color=text_color, fontsize=6, fontweight='bold') + + self.heatmap_canvas.figure.tight_layout() + self.heatmap_canvas.draw() + print("[DEBUG] Heatmap chart drawn successfully", flush=True) + + except Exception as e: + print(f"[ERROR] Heatmap chart error: {e}", flush=True) + import traceback + traceback.print_exc() + self._show_no_data(self.heatmap_canvas) + + def _update_correlation_chart(self): + try: + sound_filter = self.current_sound_types if self.current_sound_types else None + data = self.api.get_audio_correlations( + self.current_time_range, + sound_types=sound_filter + ) + + print(f"[DEBUG] Correlation data: {len(data) if data else 0} items", flush=True) + + if not data or len(data) < 1: + self._show_no_data(self.correlation_canvas) + return + + time_buckets = sorted(list(set(row['time_bucket'] for row in data))) + sound_types = sorted(list(set(row['sound_type'] for row in data))) + + if len(time_buckets) < 2 or len(sound_types) < 2: + self._show_no_data(self.correlation_canvas) + return + + n_times = len(time_buckets) + n_sounds = len(sound_types) + data_matrix = np.zeros((n_times, n_sounds)) + + time_idx = {t: i for i, t in enumerate(time_buckets)} + sound_idx = {s: i for i, s in enumerate(sound_types)} + + for row in data: + t_idx = time_idx[row['time_bucket']] + s_idx = sound_idx[row['sound_type']] + data_matrix[t_idx, s_idx] = row['detection_count'] + + corr_matrix = np.corrcoef(data_matrix.T) + corr_matrix = np.nan_to_num(corr_matrix, nan=0.0) + + self.correlation_canvas.figure.clear() + ax = self.correlation_canvas.figure.add_subplot(111) + + im = ax.imshow(corr_matrix, cmap='Blues', aspect='auto', vmin=-1, vmax=1) + + ax.set_xticks(range(len(sound_types))) + ax.set_yticks(range(len(sound_types))) + ax.set_xticklabels(sound_types, rotation=45, ha='right', fontsize=7) + ax.set_yticklabels(sound_types, fontsize=7) + + for i in range(len(sound_types)): + for j in range(len(sound_types)): + value = corr_matrix[i, j] + text_color = 'white' if value > 0.5 else 'black' + ax.text(j, i, f'{value:.2f}', + ha='center', va='center', + color=text_color, fontsize=6, fontweight='bold') + + cbar = self.correlation_canvas.figure.colorbar(im, ax=ax, fraction=0.046, pad=0.04) + cbar.set_label('Correlation Strength', rotation=270, labelpad=15, fontsize=8) + + ax.set_title('Sound Type Correlations\nDarker = Stronger Co-occurrence', + fontsize=9, fontweight='bold', pad=10) + + self.correlation_canvas.figure.tight_layout() + self.correlation_canvas.draw() + print("[DEBUG] Correlation chart drawn successfully", flush=True) + + except Exception as e: + print(f"[ERROR] Correlation chart error: {e}", flush=True) + import traceback + traceback.print_exc() + self._show_no_data(self.correlation_canvas) + +# ========================================================== +# Sound2 View - Displays Grafana dashboard +# ========================================================== +class Sound2View(QWidget): + def __init__(self, api: DashboardApi, parent=None): + super().__init__(parent) + self.api = api + self.setup_ui() + + def setup_ui(self): + layout = QVBoxLayout(self) + layout.setContentsMargins(0, 0, 0, 0) + + header = QHBoxLayout() + + title = QLabel("🌿 Ultrasonic Plant Predictions Dashboard") + title.setStyleSheet(""" + font-size: 18px; + font-weight: bold; + padding: 10px; + color: #2C3E50; + """) + header.addWidget(title) + + header.addStretch() + + refresh_btn = QPushButton("🔄 Refresh") + refresh_btn.setStyleSheet(""" + QPushButton { + background-color: #3498DB; + color: white; + border: none; + padding: 8px 16px; + border-radius: 4px; + font-weight: bold; + } + QPushButton:hover { + background-color: #2980B9; + } + """) + refresh_btn.clicked.connect(self.refresh_dashboard) + header.addWidget(refresh_btn) + + layout.addLayout(header) + + self.web_view = QWebEngineView() + + grafana_url = ( + "http://grafana:3000/d/ultrasonic-predictions/" + "ultrasonic-plant-predictions" + "?orgId=1&refresh=5s&kiosk=tv&theme=light" + ) + + self.web_view.setUrl(QUrl(grafana_url)) + layout.addWidget(self.web_view) + + self.status_label = QLabel("📊 Loading dashboard...") + self.status_label.setStyleSheet(""" + height: 24px; + padding: 5px; + color: #7F8C8D; + font-size: 12px; + """) + layout.addWidget(self.status_label) + + self.web_view.loadFinished.connect(self.on_load_finished) + + def refresh_dashboard(self): + self.status_label.setText("🔄 Refreshing dashboard...") + self.web_view.reload() + + def on_load_finished(self, success: bool): + if success: + self.status_label.setText("✓ Dashboard loaded successfully | Refreshes every 5s") + else: + self.status_label.setText( + "⚠ Failed to load dashboard. Please check Grafana server." + ) + + +# ========================================================== +# Main Sound View with Tabs +# ========================================================== +class SoundView(QWidget): + def __init__(self, api=None, parent=None): + super().__init__(parent) + self.api = api + + layout = QVBoxLayout(self) + layout.setContentsMargins(0, 0, 0, 0) + + self.tabs = QTabWidget() + self.tabs.setStyleSheet(""" + QTabWidget::pane { + border: 2px solid #d1d5da; + border-radius: 10px; + background: white; + } + QTabBar::tab { + background: #f6f8fa; + padding: 12px 24px; + border-radius: 8px 8px 0 0; + margin-right: 4px; + font-size: 14px; + font-weight: 500; + color: #586069; + } + QTabBar::tab:selected { + background-color: #4A90E2; + color: white; + } + QTabBar::tab:hover { background: #e1e4e8; } + """) + + self.map_tab = ImageMapView(api=self.api) + self.env_tab = RecordingsTab(recording_type="audio", api=self.api) + self.plant_tab = RecordingsTab(recording_type="ultrasound", api=self.api) + self.dashboard_tab = Sound2View(api=self.api) + self.analytics_tab = SoundAnalyticsView(api=self.api) + + self.tabs.addTab(self.map_tab, "🗺️ Interactive Map") + self.tabs.addTab(self.env_tab, "🎵 Environment Sounds") + self.tabs.addTab(self.plant_tab, "🌿 Plant Ultrasounds") + self.tabs.addTab(self.dashboard_tab, "📊 Ultrasonic Dashboard") + self.tabs.addTab(self.analytics_tab, "📈 Sound Analytics") + + layout.addWidget(self.tabs) diff --git a/README.md b/README.md new file mode 100644 index 000000000..06d285baf --- /dev/null +++ b/README.md @@ -0,0 +1,61 @@ +# 🌱 AgCloud -- Smart Cloud Agriculture Platform + +AgCloud is a smart cloud-based agriculture platform designed to +understand, monitor, and predict field conditions in real time. The +system integrates data from heterogeneous field sources and processes it +through a scalable, distributed data architecture to enable accurate, +data-driven decision making. + +## 🚜 System Overview + +The platform continuously collects data from a wide range of field +sources, including IoT sensors, soil and environmental measurements, +audio signals, cameras, drones, and agronomic and atmospheric data. + +The system unifies numeric, spatial, visual, and acoustic data into a +single, coherent view of the field. + +## 🔗 Data Ingestion & Streaming + +- MQTT is used as a lightweight, efficient, and reliable communication + protocol for ingesting data from edge devices. +- Apache Kafka serves as the backbone of the data layer, enabling + scalable, fault-tolerant, and distributed processing. + +## ⚙️ Data Processing Layer + +Data is consumed by: - Apache Flink for real-time stream processing - +Apache Airflow for scheduled and batch workflows + +Processing responsibilities include data cleaning, normalization, +enrichment, analytics, and predictive modeling. + +## 🗄️ Storage Layer + +Processed data is stored according to its characteristics: - PostgreSQL +(structured and time-series data) - Object Storage (images, video, +audio) - GIS-compatible storage (spatial data) - Vector Databases +(advanced analytics and embeddings) + +## 📊 Analytics & Visualization + +The platform enables anomaly detection, risk identification, and +long-term pattern analysis. Insights are exposed via a centralized API +and visualized through a unified dashboard with maps, metrics, alerts, +and forecasts. + +## 🐳 Running the Project + +### Prerequisites + +- Docker +- Docker Compose + +### Run the platform + +``` bash +docker compose up -d --build +``` + +This command builds and starts the entire system, including ingestion, +streaming, processing, storage, and API layers. diff --git a/RelDB/Dockerfile b/RelDB/Dockerfile index 10781dcc0..4c2f5bdba 100644 --- a/RelDB/Dockerfile +++ b/RelDB/Dockerfile @@ -38,6 +38,7 @@ COPY build_tables/02_event_logs_partition.sql /docker-entrypoint-initdb.d/02_eve COPY initdb/03_partitions.sql /docker-entrypoint-initdb.d/03_partitions.sql COPY build_tables/loader.sql /docker-entrypoint-initdb.d/04_loader.sql COPY initdb/04_cron.sql /docker-entrypoint-initdb.d/05_cron.sql +COPY build_tables/05_agcloud_audio_init.sql /docker-entrypoint-initdb.d/06_agcloud_audio_init.sql # ==== 7) Replication grants ==== RUN echo "ALTER ROLE missions_user WITH REPLICATION;" > /docker-entrypoint-initdb.d/00_grant_replication.sql diff --git a/RelDB/build_tables/05_agcloud_audio_init.sql b/RelDB/build_tables/05_agcloud_audio_init.sql new file mode 100644 index 000000000..d2b3afc83 --- /dev/null +++ b/RelDB/build_tables/05_agcloud_audio_init.sql @@ -0,0 +1,98 @@ +-- agcloud_audio initialization (schema + tables + indexes + 11-class view) + +BEGIN; + +-- 1) Schema +CREATE SCHEMA IF NOT EXISTS agcloud_audio; + +-- Use schema for subsequent CREATEs +SET search_path TO agcloud_audio, public; + +-- 2) runs: per-run metadata +CREATE TABLE IF NOT EXISTS runs ( + run_id TEXT PRIMARY KEY, + started_at TIMESTAMPTZ NOT NULL DEFAULT now(), + finished_at TIMESTAMPTZ, + + model_name TEXT, + checkpoint TEXT, + head_path TEXT, + labels_csv TEXT, + + window_sec DOUBLE PRECISION NOT NULL CHECK (window_sec > 0), + hop_sec DOUBLE PRECISION NOT NULL CHECK (hop_sec > 0), + pad_last BOOLEAN NOT NULL, + agg TEXT NOT NULL CHECK (agg IN ('mean','max')), + topk INTEGER NOT NULL CHECK (topk >= 1), + device TEXT NOT NULL, + + code_version TEXT, + notes TEXT +); + +-- 3) file_aggregates: final per-file outputs; references public.sounds_new_sounds_connections(id) +CREATE TABLE IF NOT EXISTS file_aggregates ( + run_id TEXT NOT NULL, + file_id BIGINT NOT NULL, + + -- Flexible multi-class head probabilities (label -> prob) + head_probs_json JSONB, + + -- Final decision with "unknown" fallback + head_pred_label TEXT, + head_pred_prob DOUBLE PRECISION CHECK (head_pred_prob IS NULL OR (head_pred_prob BETWEEN 0 AND 1)), + head_unknown_threshold DOUBLE PRECISION, + head_is_another BOOLEAN, + + -- Aggregation context + num_windows INTEGER CHECK (num_windows IS NULL OR num_windows >= 0), + agg_mode TEXT, + + -- Performance metric (ms) + processing_ms INTEGER CHECK (processing_ms IS NULL OR processing_ms >= 0), + + PRIMARY KEY (run_id, file_id), + FOREIGN KEY (run_id) REFERENCES runs(run_id) ON DELETE CASCADE, + FOREIGN KEY (file_id) REFERENCES public.sound_new_sounds_connections(id) ON DELETE CASCADE +); + +-- Helpful indexes +CREATE INDEX ix_agcloud_file_agg_run + ON file_aggregates(run_id); + +CREATE INDEX ix_agcloud_file_agg_pred_label + ON file_aggregates(head_pred_label); + +-- JSONB GIN index to enable key/containment queries on probabilities map +CREATE INDEX ix_agcloud_file_agg_probs_gin + ON file_aggregates USING GIN (head_probs_json); + +-- 4) Views +DROP VIEW IF EXISTS v_file_aggregates_probs10; +DROP VIEW IF EXISTS v_file_aggregates_probs11; + +-- 11-class columns view (current head taxonomy) +CREATE VIEW v_file_aggregates_probs11 AS +SELECT + fa.run_id, + fa.file_id, + (fa.head_probs_json->>'predatory_animals')::double precision AS head_p_predatory_animals, + (fa.head_probs_json->>'non_predatory_animals')::double precision AS head_p_non_predatory_animals, + (fa.head_probs_json->>'birds')::double precision AS head_p_birds, + (fa.head_probs_json->>'fire')::double precision AS head_p_fire, + (fa.head_probs_json->>'footsteps')::double precision AS head_p_footsteps, + (fa.head_probs_json->>'insects')::double precision AS head_p_insects, + (fa.head_probs_json->>'screaming')::double precision AS head_p_screaming, + (fa.head_probs_json->>'shotgun')::double precision AS head_p_shotgun, + (fa.head_probs_json->>'stormy_weather')::double precision AS head_p_stormy_weather, + (fa.head_probs_json->>'streaming_water')::double precision AS head_p_streaming_water, + (fa.head_probs_json->>'vehicle')::double precision AS head_p_vehicle, + fa.head_pred_label, + fa.head_pred_prob, + fa.head_unknown_threshold, + fa.head_is_another, + fa.num_windows, + fa.agg_mode +FROM file_aggregates fa; + +COMMIT; diff --git a/RelDB/build_tables/loader.sql b/RelDB/build_tables/loader.sql index c58dc99c6..aa5fc4eea 100644 --- a/RelDB/build_tables/loader.sql +++ b/RelDB/build_tables/loader.sql @@ -1,34 +1,54 @@ -- Extended synthetic data loader for schema_extended_v2.sql -- Insert devices -INSERT INTO devices (device_id, model, owner, active) VALUES - ('dev-a','drone-x','TeamA',true), - ('dev-b','drone-x','TeamA',true), - ('dev-c','rover-y','TeamB',true), - ('dev-d','rover-y','TeamB',true), - ('dev-e','sensor-z','TeamC',true), - ('dev-f','sensor-z','TeamC',true) +INSERT INTO devices (device_id, model, owner, active, location_lat, location_lon) VALUES + ('dev-a','drone-x','TeamA',true,NULL,NULL), + ('dev-b','drone-x','TeamA',true,NULL,NULL), + ('dev-c','rover-y','TeamB',true,NULL,NULL), + ('dev-d','rover-y','TeamB',true,NULL,NULL), + ('dev-e','sensor-z','TeamC',true,NULL,NULL), + ('dev-f','sensor-z','TeamC',true,NULL,NULL), + ('dev-g','ground-l','TeamD',true,NULL,NULL), + ('dev-h','ground-l','TeamD',true,NULL,NULL), + ('dev-i','ground-l','TeamD',true,NULL,NULL), + ('dev-j','ground-l','TeamD',true,NULL,NULL), + ('dev-k','ground-l','TeamD',true,NULL,NULL), + ('mic-1','sound-a','TeamD',true,NULL,NULL), + ('mic-2','sound-a','TeamD',true,NULL,NULL), + ('mic-33','sound-a','TeamD',true,NULL,NULL), + ('mic-u-2','sound-ul','TeamD',true,NULL,NULL) ON CONFLICT DO NOTHING; --- Insert synthetic sensors -INSERT INTO sensors ( - sensor_name, - sensor_type, - owner_name, - location_lat, - location_lon, - install_date, - status, - description, - last_maintenance -) -VALUES - ('SoilMoistureSensor_A1', 'moisture', 'TeamA', 32.051, 34.871, NOW() - INTERVAL '120 days', 'active', 'Soil probe at north field section A1', NOW() - INTERVAL '20 days'), - ('TempSensor_B2', 'temperature', 'TeamA', 32.057, 34.885, NOW() - INTERVAL '95 days', 'active', 'Temperature monitor - greenhouse B2', NOW() - INTERVAL '15 days'), - ('HumiditySensor_C1', 'humidity', 'TeamB', 31.982, 34.945, NOW() - INTERVAL '200 days', 'maintenance', 'Humidity node C1 (low battery)', NOW() - INTERVAL '3 days'), - ('NDVI_Camera_01', 'NDVI', 'TeamB', 32.015, 34.980, NOW() - INTERVAL '60 days', 'active', 'Multispectral NDVI drone-mounted camera', NOW() - INTERVAL '10 days'), - ('WeatherStation_Main', 'weather', 'TeamC', 32.000, 34.760, NOW() - INTERVAL '365 days', 'active', 'Main weather station at south field', NOW() - INTERVAL '30 days'), - ('SoilProbe_Edge', 'moisture', 'TeamC', 32.010, 34.910, NOW() - INTERVAL '40 days', 'inactive', 'Edge field soil probe - disconnected', NOW() - INTERVAL '60 days') -ON CONFLICT (sensor_name) DO NOTHING; + +INSERT INTO zones (name, geom) VALUES + ('Zone A', ST_GeomFromText('POLYGON((34.75 32.00, 34.90 32.00, 34.90 32.10, 34.75 32.10, 34.75 32.00))', 4326)), + ('Zone B', ST_GeomFromText('POLYGON((34.90 31.95, 35.05 31.95, 35.05 32.05, 34.90 32.05, 34.90 31.95))', 4326)) +ON CONFLICT DO NOTHING; + +-- Seed data for devices_sensor table +-- This file is automatically executed during database initialization + +INSERT INTO devices_sensor (id, plant_id, sensor_type, last_seen) VALUES + ('1', 101, 'temperature', NOW()), + ('2', 101, 'humidity', NOW()), + ('3', 101, 'soil_moisture', NOW()), + ('4', 102, 'co2', NOW()), + ('5', 102, 'light_intensity', NOW()), + ('6', 103, 'rainfall', NOW()), + ('7', 103, 'ph', NOW()), + ('8', 104, 'temperature', NOW()), + ('9', 104, 'humidity', NOW()), + ('10', 105, 'soil_moisture', NOW()), + ('11', 105, 'co2', NOW()), + ('12', 106, 'light_intensity', NOW()), + ('13', 106, 'wind_speed', NOW()), + ('14', 107, 'ph', NOW()), + ('15', 107, 'temperature', NOW()), + ('16', 107, 'ph', NOW()), + ('17', 107, 'temperature', NOW()) +ON CONFLICT (id) DO UPDATE SET + plant_id = EXCLUDED.plant_id, + sensor_type = EXCLUDED.sensor_type, + last_seen = NOW(); -- Insert some regions INSERT INTO regions (name, geom) @@ -46,6 +66,26 @@ VALUES ('COMM_LOSS','Communication lost') ON CONFLICT DO NOTHING; +-- Seed leaf disease types +INSERT INTO leaf_disease_types (name) +VALUES + ('pepper__bacterial_spot'), + ('pepper__healthy'), + ('potato__early_blight'), + ('potato__healthy'), + ('potato__late_blight'), + ('tomato__bacterial_spot'), + ('tomato__early_blight'), + ('tomato__healthy'), + ('tomato__late_blight'), + ('tomato__leaf_mold'), + ('tomato__mosaic_virus'), + ('tomato__septoria_leaf_spot'), + ('tomato__spider_mites'), + ('tomato__target_spot'), + ('tomato__yellowleaf_curl_virus') +ON CONFLICT DO NOTHING; + -- Insert 5 missions WITH params AS ( SELECT 34.75::double precision AS min_lon, 35.05 AS max_lon, @@ -142,7 +182,6 @@ SELECT CASE WHEN random()<0.3 THEN (100+g) ELSE -1 END FROM generate_series(1,100) g; - -- Insert 1000 random embeddings INSERT INTO embeddings (vec) SELECT ARRAY( @@ -151,3 +190,46 @@ SELECT ARRAY( ) FROM generate_series(1, 1000) ON CONFLICT DO NOTHING; + +-- === Seed task_thresholds === +INSERT INTO task_thresholds (task, label, threshold, updated_by) +VALUES + (CAST('ripeness' AS task_type_enum), '', 0.75, 'seed'), + (CAST('disease' AS task_type_enum), '', 0.60, 'seed'), + (CAST('size' AS task_type_enum), '', 0.55, 'seed'), + (CAST('color' AS task_type_enum), '', 0.65, 'seed'), + (CAST('quality' AS task_type_enum), '', 0.80, 'seed') +ON CONFLICT (task, label) +DO UPDATE SET + threshold = EXCLUDED.threshold, + updated_by = EXCLUDED.updated_by, + updated_at = NOW(); + +-- Seed sample leaf reports with random data +DO $$ +DECLARE + devices_arr text[] := ARRAY['dev-g', 'dev-h', 'dev-i', 'dev-j', 'dev-k']; + disease_ids int[]; + d text; + t int; + start_date timestamptz := '2025-10-25 00:00:00+00'::timestamptz; + end_date timestamptz := '2025-11-25 23:59:59+00'::timestamptz; + rand_ts timestamptz; + conf double precision; + sick_val boolean; +BEGIN + -- Get all disease type IDs + SELECT array_agg(id) INTO disease_ids FROM leaf_disease_types; + + -- Insert 1000 random reports + FOR i IN 1..1000 LOOP + d := devices_arr[ceil(random() * array_length(devices_arr,1))]; + t := disease_ids[ceil(random() * array_length(disease_ids,1))]; + rand_ts := start_date + (random() * (end_date - start_date)); + conf := round(random()::numeric, 2); + sick_val := (conf > 0.4); + + INSERT INTO leaf_reports(device_id, leaf_disease_type_id, ts, confidence, sick) + VALUES (d, t, rand_ts, conf, sick_val); + END LOOP; +END $$; \ No newline at end of file diff --git a/RelDB/build_tables/schema.sql b/RelDB/build_tables/schema.sql index df7db1a3f..b6464b643 100644 --- a/RelDB/build_tables/schema.sql +++ b/RelDB/build_tables/schema.sql @@ -11,7 +11,15 @@ CREATE TABLE IF NOT EXISTS devices ( device_id text PRIMARY KEY, model text, owner text, - active boolean DEFAULT true + active boolean DEFAULT true, + location_lat DOUBLE PRECISION, + location_lon DOUBLE PRECISION +); + +CREATE TABLE IF NOT EXISTS public.zones ( + id SERIAL PRIMARY KEY, + name VARCHAR(128) NOT NULL, + geom geometry(POLYGON, 4326) NOT NULL ); -- Predefined regions (optional: for missions crossing multiple regions) @@ -28,8 +36,23 @@ CREATE TABLE IF NOT EXISTS anomaly_types ( description text NOT NULL ); +--Types of leaf diseases +CREATE TABLE IF NOT EXISTS leaf_disease_types ( + id SERIAL PRIMARY KEY, + name TEXT UNIQUE NOT NULL +); -- === Core entities === +CREATE TABLE IF NOT EXISTS leaf_reports ( + id BIGSERIAL PRIMARY KEY, + device_id TEXT NOT NULL REFERENCES devices(device_id), + leaf_disease_type_id INT NOT NULL REFERENCES leaf_disease_types(id), + ts TIMESTAMPTZ NOT NULL, + confidence DOUBLE PRECISION CHECK (confidence >= 0 AND confidence <= 1), + sick BOOLEAN NOT NULL +); + + -- Missions table CREATE TABLE IF NOT EXISTS missions ( mission_id BIGSERIAL PRIMARY KEY, @@ -128,13 +151,13 @@ CREATE TABLE IF NOT EXISTS users ( ); CREATE TABLE IF NOT EXISTS clients ( - schedule_id BIGSERIAL PRIMARY KEY, - client_id BIGINT NOT NULL, - team VARCHAR(150), - cron_expr TEXT, - active_days TEXT, - time_window TEXT, - last_updated TIMESTAMPTZ NOT NULL DEFAULT now() + schedule_id BIGSERIAL PRIMARY KEY, + client_id BIGINT NOT NULL, + team VARCHAR(150), + cron_expr TEXT, + active_days TEXT, + time_window TEXT, + last_updated TIMESTAMPTZ NOT NULL DEFAULT now() ); -- CREATE TABLE IF NOT EXISTS ultrasonic_plant_predictions ( @@ -210,10 +233,62 @@ CREATE TABLE IF NOT EXISTS inference_logs ( image_url TEXT ); +-- Ripeness predictions table +CREATE TABLE IF NOT EXISTS ripeness_predictions ( + id BIGSERIAL PRIMARY KEY, + inference_log_id BIGINT NOT NULL REFERENCES inference_logs(id) ON DELETE CASCADE, + ts TIMESTAMPTZ NOT NULL DEFAULT NOW(), + ripeness_label TEXT NOT NULL CHECK (ripeness_label IN ('ripe', 'unripe', 'overripe')), + ripeness_score DOUBLE PRECISION NOT NULL, + model_name TEXT NOT NULL, + run_id UUID NOT NULL, + device_id TEXT REFERENCES devices(device_id), + UNIQUE (inference_log_id) +); + +-- Create indexes for ripeness_predictions +CREATE INDEX IF NOT EXISTS ix_ripeness_inflog ON ripeness_predictions(inference_log_id); +CREATE INDEX IF NOT EXISTS ix_ripeness_ts ON ripeness_predictions(ts); +CREATE INDEX IF NOT EXISTS ix_ripeness_device ON ripeness_predictions(device_id); +CREATE INDEX IF NOT EXISTS ix_ripeness_run ON ripeness_predictions(run_id); +CREATE INDEX IF NOT EXISTS ix_leaf_reports_ts_brin ON leaf_reports USING BRIN (ts); +CREATE INDEX IF NOT EXISTS ix_leaf_reports_device_ts ON leaf_reports (device_id, ts); +CREATE INDEX IF NOT EXISTS ix_leaf_reports_type_ts ON leaf_reports (leaf_disease_type_id, ts); + +-- Weekly ripeness rollups table +CREATE TABLE IF NOT EXISTS ripeness_weekly_rollups_ts ( + id BIGSERIAL PRIMARY KEY, + ts TIMESTAMPTZ NOT NULL DEFAULT NOW(), + window_start TIMESTAMPTZ NOT NULL, + window_end TIMESTAMPTZ NOT NULL, + fruit_type TEXT NOT NULL, + device_id TEXT REFERENCES devices(device_id), + run_id UUID NOT NULL, + cnt_total INTEGER NOT NULL, + cnt_ripe INTEGER NOT NULL, + cnt_unripe INTEGER NOT NULL, + cnt_overripe INTEGER NOT NULL, + pct_ripe DOUBLE PRECISION NOT NULL +); + +-- Create indexes for ripeness_weekly_rollups_ts +CREATE INDEX IF NOT EXISTS ix_rwrt_ts ON ripeness_weekly_rollups_ts(ts); +CREATE INDEX IF NOT EXISTS ix_rwrt_fruit_ts ON ripeness_weekly_rollups_ts(fruit_type, ts); +CREATE INDEX IF NOT EXISTS ix_rwrt_device ON ripeness_weekly_rollups_ts(device_id); +CREATE INDEX IF NOT EXISTS ix_rwrt_run ON ripeness_weekly_rollups_ts(run_id); + +-- Sensor event logs table. +CREATE TABLE IF NOT EXISTS devices_sensor ( + id TEXT UNIQUE NOT NULL, + plant_id INT, + sensor_type TEXT, + last_seen TIMESTAMPTZ NOT NULL DEFAULT now(), + PRIMARY KEY (id) +); -- Sensor event logs table. CREATE TABLE IF NOT EXISTS event_logs_sensors( id bigserial PRIMARY KEY, - device_id text NOT NULL REFERENCES devices(device_id), + device_id TEXT NOT NULL REFERENCES devices_sensor(id), issue_type text NOT NULL, severity text NOT NULL CHECK (severity IN ('info','warn','error','critical')), start_ts timestamptz NOT NULL DEFAULT now(), @@ -225,23 +300,427 @@ CREATE TABLE IF NOT EXISTS event_logs_sensors( -CREATE TABLE IF NOT EXISTS sensors ( +CREATE TABLE IF NOT EXISTS public.sensor_anomalies ( + id BIGSERIAL PRIMARY KEY, + idSensor INT NOT NULL, + plant_id INT NOT NULL, + sensor VARCHAR(64) NOT NULL, + ts TIMESTAMPTZ NOT NULL, + value DOUBLE PRECISION, + lat DOUBLE PRECISION, + lon DOUBLE PRECISION, + zone VARCHAR(128), + result JSONB NOT NULL, + inserted_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + + + +CREATE TABLE IF NOT EXISTS public.sensor_zone_stats ( + id BIGSERIAL PRIMARY KEY, + zone VARCHAR(128) NOT NULL, + window_start TIMESTAMPTZ NOT NULL, + window_end TIMESTAMPTZ NOT NULL, + count INT NOT NULL, + mean DOUBLE PRECISION, + median DOUBLE PRECISION, + min DOUBLE PRECISION, + max DOUBLE PRECISION, + std DOUBLE PRECISION, + anomalies INT, + inserted_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + + + +--- Alerts_leaves table + +CREATE TABLE IF NOT EXISTS public.alerts_leaves ( + id bigserial PRIMARY KEY, + entity_id text NOT NULL, + rule text NOT NULL, + window_start timestamptz NOT NULL, + window_end timestamptz NOT NULL, + score double precision NOT NULL, + first_seen timestamptz NOT NULL, + last_seen timestamptz NOT NULL, + status text NOT NULL CHECK (status IN ('OPEN','ACK','RESOLVED')), + meta_json jsonb +); + +CREATE INDEX IF NOT EXISTS ix_alerts_leaves_entity_rule ON public.alerts_leaves(entity_id, rule); +CREATE INDEX IF NOT EXISTS ix_alerts_leaves_status ON public.alerts_leaves(status); + + +--- === Soil moisture irrigation tables === + +CREATE TABLE IF NOT EXISTS soil_moisture_events ( id SERIAL PRIMARY KEY, - sensor_name TEXT UNIQUE NOT NULL, - sensor_type TEXT NOT NULL, - owner_name TEXT, - location_lat DOUBLE PRECISION, - location_lon DOUBLE PRECISION, - install_date TIMESTAMP DEFAULT NOW(), - status TEXT DEFAULT 'active', - description TEXT, - last_maintenance TIMESTAMP + device_id TEXT NOT NULL REFERENCES devices(device_id), + ts TIMESTAMPTZ NOT NULL DEFAULT NOW(), + dry_ratio REAL NOT NULL, + decision TEXT NOT NULL, + confidence REAL NOT NULL, + patch_count INT NOT NULL, + idempotency_key TEXT NOT NULL, + extra JSONB DEFAULT '{}'::jsonb +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_events_idem ON soil_moisture_events (idempotency_key); + +CREATE TABLE IF NOT EXISTS irrigation_schedule ( + device_id TEXT PRIMARY KEY REFERENCES devices(device_id), + + next_run_at TIMESTAMPTZ NOT NULL, + duration_min INT NOT NULL, + updated_by TEXT NOT NULL, + update_reason TEXT NOT NULL, + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); + +CREATE TABLE IF NOT EXISTS irrigation_schedule_audit ( + id SERIAL PRIMARY KEY, + device_id TEXT NOT NULL, + prev_next_run_at TIMESTAMPTZ, + prev_duration_min INT, + next_run_at TIMESTAMPTZ NOT NULL, + duration_min INT NOT NULL, + updated_by TEXT NOT NULL, + update_reason TEXT NOT NULL, + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); + +CREATE TABLE irrigation_policies ( + device_id TEXT NOT NULL, + prev_state TEXT, + dry_ratio_high REAL, + dry_ratio_low REAL, + min_patches INT, + duration_min INT, + updated_at TIMESTAMP DEFAULT NOW(), + PRIMARY KEY (device_id), + CONSTRAINT fk_device + FOREIGN KEY (device_id) REFERENCES devices(device_id) + ON DELETE CASCADE +); + + +CREATE TABLE IF NOT EXISTS alerts ( + + -- Required fields + alert_id TEXT PRIMARY KEY, + alert_type TEXT, + device_id TEXT, + started_at TIMESTAMPTZ, + + -- Optional / dynamic fields + ended_at TIMESTAMPTZ, + confidence DOUBLE PRECISION, + area TEXT, + lat DOUBLE PRECISION, + lon DOUBLE PRECISION, + severity INT DEFAULT 1, + image_url TEXT, + vod TEXT, + hls TEXT, + + -- Acknowledgment field + ack BOOLEAN DEFAULT FALSE, -- TRUE when the alert was acknowledged + + -- Flexible metadata for anything else + meta JSONB, + + -- System fields + created_at TIMESTAMPTZ DEFAULT now(), + updated_at TIMESTAMPTZ DEFAULT now() +); + +-- === Task thresholds (enum + table) === +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'task_type_enum') THEN + CREATE TYPE task_type_enum AS ENUM ( + 'ripeness', + 'disease', + 'size', + 'color', + 'quality' + ); + END IF; +END$$; + +CREATE TABLE IF NOT EXISTS task_thresholds ( + threshold_id SERIAL PRIMARY KEY, + task task_type_enum NOT NULL, + label TEXT NOT NULL DEFAULT '', + threshold NUMERIC(6,4) NOT NULL CHECK (threshold >= 0 AND threshold <= 1), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_by TEXT, + CONSTRAINT ux_task_thresholds_task_label UNIQUE (task, label) +); + +CREATE TABLE public.image_new_aerial_connections ( + id BIGSERIAL PRIMARY KEY, + file_name VARCHAR(255), + key TEXT, + linked_time TIMESTAMPTZ +); + +CREATE TABLE IF NOT EXISTS public.aerial_images_metadata ( + id SERIAL PRIMARY KEY, + + -- File and drone metadata + file_name TEXT NOT NULL, + drone_id TEXT NOT NULL, + capture_time TIMESTAMP WITH TIME ZONE NOT NULL, + + -- Raw JSON as received (latitude/longitude) + gis_origin JSONB NOT NULL, + + -- Geometry point auto-generated from JSON + geom_point geometry(Point, 4326) + GENERATED ALWAYS AS ( + ST_SetSRID( + ST_MakePoint( + (gis_origin->>'longitude')::double precision, + (gis_origin->>'latitude')::double precision + ), + 4326 + ) + ) STORED, + + -- Flight attributes + altitude_m DOUBLE PRECISION, + done BOOLEAN DEFAULT FALSE, + created_at TIMESTAMP DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS ix_aerial_geom_point_gist +ON public.aerial_images_metadata USING GIST (geom_point); + + +CREATE TABLE IF NOT EXISTS public.aerial_image_object_detections ( + id SERIAL PRIMARY KEY, + img_key TEXT NOT NULL, + label TEXT NOT NULL, + confidence DOUBLE PRECISION NOT NULL, + bbox_x1 DOUBLE PRECISION NOT NULL, + bbox_y1 DOUBLE PRECISION NOT NULL, + bbox_x2 DOUBLE PRECISION NOT NULL, + bbox_y2 DOUBLE PRECISION NOT NULL, + detected_at TIMESTAMP DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS idx_image_object_detections_key + ON public.aerial_image_object_detections (img_key); + + +CREATE TABLE IF NOT EXISTS public.aerial_image_anomaly_detections ( + id SERIAL PRIMARY KEY, + img_key TEXT NOT NULL, + label TEXT NOT NULL, + confidence DOUBLE PRECISION NOT NULL, + bbox_x1 DOUBLE PRECISION NOT NULL, + bbox_y1 DOUBLE PRECISION NOT NULL, + bbox_x2 DOUBLE PRECISION NOT NULL, + bbox_y2 DOUBLE PRECISION NOT NULL, + detected_at TIMESTAMP DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS idx_image_anomaly_detections_key + ON public.aerial_image_anomaly_detections (img_key); + + +CREATE TABLE IF NOT EXISTS public.aerial_images_complete_metadata ( + id SERIAL PRIMARY KEY, + file_name TEXT NOT NULL, + device_id TEXT NOT NULL, + gis_origin JSONB, + gis geometry(Point, 4326) + GENERATED ALWAYS AS ( + ST_SetSRID( + ST_MakePoint( + (gis_origin->>'longitude')::double precision, + (gis_origin->>'latitude')::double precision + ), + 4326 + ) + ) STORED, + img_key TEXT NOT NULL UNIQUE, + timestamp_utc TIMESTAMP WITH TIME ZONE, + created_at TIMESTAMP DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS idx_aerial_metadata_device_id + ON public.aerial_images_complete_metadata (device_id); + +CREATE INDEX IF NOT EXISTS idx_aerial_metadata_timestamp + ON public.aerial_images_complete_metadata (timestamp_utc); + +CREATE INDEX IF NOT EXISTS idx_aerial_metadata_gis + ON public.aerial_images_complete_metadata USING GIST (gis); + +CREATE TABLE fruit_detections ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + original_key TEXT NOT NULL, + cropped_key TEXT NOT NULL, + bucket TEXT NOT NULL, + device_id TEXT NOT NULL, + timestamp TIMESTAMPTZ NOT NULL, + x1 INT NOT NULL, + y1 INT NOT NULL, + x2 INT NOT NULL, + y2 INT NOT NULL, + latency_ms_model INT, + label TEXT, + created_at TIMESTAMPTZ DEFAULT now() +); + +CREATE INDEX idx_fruit_original_key ON fruit_detections(original_key); +CREATE INDEX idx_fruit_device_ts ON fruit_detections(device_id, timestamp); + +CREATE TABLE IF NOT EXISTS public.field_polygons ( + id SERIAL PRIMARY KEY, + gis geometry(Point, 4326) NOT NULL, + boundary geometry(Polygon, 4326) NOT NULL, + area_sq_m DOUBLE PRECISION GENERATED ALWAYS AS ( + ST_Area(geography(boundary)) + ) STORED, + created_at TIMESTAMP DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS idx_field_polygons_gis + ON public.field_polygons USING GIST (gis); + + +CREATE TABLE IF NOT EXISTS public.aerial_image_segmentation ( + id SERIAL PRIMARY KEY, + img_key TEXT NOT NULL, + mask_path TEXT, + other FLOAT DEFAULT 0, + bareland FLOAT DEFAULT 0, + rangeland FLOAT DEFAULT 0, + developed_space FLOAT DEFAULT 0, + road FLOAT DEFAULT 0, + tree FLOAT DEFAULT 0, + water FLOAT DEFAULT 0, + agriculture FLOAT DEFAULT 0, + building FLOAT DEFAULT 0, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +CREATE INDEX IF NOT EXISTS idx_segmentation_img_key + ON public.aerial_image_segmentation (img_key); + + +CREATE TABLE public.sound_new_sounds_connections ( + id BIGSERIAL PRIMARY KEY, + file_name VARCHAR(255), + key TEXT, + linked_time TIMESTAMPTZ +); + +CREATE TABLE public.sound_new_plants_connections ( + id BIGSERIAL PRIMARY KEY, + file_name VARCHAR(255), + key TEXT, + linked_time TIMESTAMPTZ +); + +CREATE INDEX IF NOT EXISTS ix_task_thresholds_task ON task_thresholds (task); +CREATE INDEX IF NOT EXISTS ix_task_thresholds_updated_at ON task_thresholds (updated_at); + + +CREATE TABLE IF NOT EXISTS public.sounds_metadata ( + id BIGSERIAL PRIMARY KEY, + file_name TEXT NOT NULL, + device_id TEXT NOT NULL REFERENCES public.devices(device_id), + capture_time TIMESTAMPTZ NOT NULL, + duration_sec DOUBLE PRECISION CHECK (duration_sec >= 0), + done BOOLEAN NOT NULL DEFAULT FALSE, + sample_rate_hz INTEGER CHECK (sample_rate_hz > 0), + channels SMALLINT CHECK (channels > 0), + content_type TEXT, + + gis_origin JSONB NOT NULL, + + geom_point geometry(Point, 4326) + GENERATED ALWAYS AS ( + ST_SetSRID( + ST_MakePoint( + (gis_origin->>'longitude')::double precision, + (gis_origin->>'latitude')::double precision + ), + 4326 + ) + ) STORED, + + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT ux_sounds_dev_time UNIQUE (device_id, capture_time) +); + +CREATE INDEX IF NOT EXISTS ix_sounds_meta_ts_brin + ON public.sounds_metadata USING BRIN (capture_time); +CREATE INDEX IF NOT EXISTS ix_sounds_meta_device_time + ON public.sounds_metadata (device_id, capture_time); +CREATE INDEX IF NOT EXISTS ix_sounds_meta_geom_point_gist + ON public.sounds_metadata USING GIST (geom_point); +CREATE INDEX IF NOT EXISTS ix_sounds_meta_file_name + ON public.sounds_metadata (file_name); +CREATE INDEX IF NOT EXISTS ix_sounds_meta_created_brin + ON public.sounds_metadata USING BRIN (created_at); + + +CREATE TABLE IF NOT EXISTS public.sounds_ultra_metadata ( + id BIGSERIAL PRIMARY KEY, + file_name TEXT NOT NULL, + device_id TEXT NOT NULL REFERENCES public.devices(device_id), + capture_time TIMESTAMPTZ NOT NULL, + duration_sec DOUBLE PRECISION CHECK (duration_sec >= 0), + done BOOLEAN NOT NULL DEFAULT FALSE, + sample_rate_hz INTEGER CHECK (sample_rate_hz > 0), + channels SMALLINT CHECK (channels > 0), + content_type TEXT, + + gis_origin JSONB NOT NULL, + + geom_point geometry(Point, 4326) + GENERATED ALWAYS AS ( + ST_SetSRID( + ST_MakePoint( + (gis_origin->>'longitude')::double precision, + (gis_origin->>'latitude')::double precision + ), + 4326 + ) + ) STORED, + + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT ux_ultra_sounds_dev_time UNIQUE (device_id, capture_time) ); -CREATE INDEX IF NOT EXISTS ix_sensors_name ON sensors (sensor_name); -CREATE INDEX IF NOT EXISTS ix_sensors_type ON sensors (sensor_type); -CREATE INDEX IF NOT EXISTS ix_sensors_status ON sensors (status); -CREATE INDEX IF NOT EXISTS ix_sensors_location ON sensors (location_lat, location_lon); + +CREATE INDEX IF NOT EXISTS ix_ultra_sounds_meta_ts_brin + ON public.sounds_ultra_metadata USING BRIN (capture_time); +CREATE INDEX IF NOT EXISTS ix_ultra_sounds_meta_device_time + ON public.sounds_ultra_metadata (device_id, capture_time); +CREATE INDEX IF NOT EXISTS ix_ultra_sounds_meta_geom_point_gist + ON public.sounds_ultra_metadata USING GIST (geom_point); +CREATE INDEX IF NOT EXISTS ix_ultra_sounds_meta_file_name + ON public.sounds_ultra_metadata (file_name); +CREATE INDEX IF NOT EXISTS ix_ultra_sounds_meta_created_brin + ON public.sounds_ultra_metadata USING BRIN (created_at); + + +CREATE TABLE public.image_new_securixxxxxxxxctions ( + id BIGSERIAL PRIMARY KEY, + file_name VARCHAR(255), + key TEXT, + linked_time TIMESTAMPTZ +); + + +-- === Indexes for performance optimization === -- Spatial CREATE INDEX IF NOT EXISTS ix_missions_area_geom_gist ON missions USING GIST (area_geom); @@ -283,3 +762,122 @@ CREATE INDEX IF NOT EXISTS ix_event_logs_sensors_device_start ON event_logs_sens CREATE INDEX IF NOT EXISTS ix_event_logs_sensors_start_brin ON event_logs_sensors USING BRIN (start_ts); CREATE INDEX IF NOT EXISTS ix_event_logs_sensors_details_gin ON event_logs_sensors USING GIN (details jsonb_path_ops); + + + + +-- CREATE INDEX IF NOT EXISTS ix_alerts_entity_rule ON public.alerts(entity_id, rule); +-- CREATE INDEX IF NOT EXISTS ix_alerts_status ON public.alerts(status); + +-- ============================================ +-- 🔹 SENSORS TABLES (zones, sensors, sensors_anomalies_modal) +-- ============================================ + +-- Zones table (for linking sensors to geographic areas) +CREATE TABLE IF NOT EXISTS public.zones ( + id SERIAL PRIMARY KEY, + name VARCHAR(128) NOT NULL, + geom geometry(POLYGON, 4326) NOT NULL +); + +-- Extended sensors table with all environmental metrics +CREATE TABLE IF NOT EXISTS public.sensors ( + sensor_id SERIAL PRIMARY KEY, + sid TEXT, + sensor_name TEXT NOT NULL, + sensor_type TEXT NOT NULL, + owner_name TEXT, + lat DOUBLE PRECISION, + lon DOUBLE PRECISION, + install_date TIMESTAMP DEFAULT NOW(), + status TEXT DEFAULT 'active', + description TEXT, + last_maintenance TIMESTAMP, + value DOUBLE PRECISION, + humidity DOUBLE PRECISION, + temperature DOUBLE PRECISION, + ph DOUBLE PRECISION, + rainfall DOUBLE PRECISION, + soil_moisture DOUBLE PRECISION, + co2_concentration DOUBLE PRECISION, + n DOUBLE PRECISION, + p DOUBLE PRECISION, + k DOUBLE PRECISION, + label TEXT, + timestamp TIMESTAMPTZ NOT NULL, + msg_type TEXT, + plant_id INT, + soil_type INT, + sunlight_exposure DOUBLE PRECISION, + wind_speed DOUBLE PRECISION, + organic_matter DOUBLE PRECISION, + irrigation_frequency DOUBLE PRECISION, + crop_density DOUBLE PRECISION, + pest_pressure DOUBLE PRECISION, + fertilizer_usage DOUBLE PRECISION, + growth_stage INT, + urban_area_proximity DOUBLE PRECISION, + water_source_type INT, + frost_risk DOUBLE PRECISION, + water_usage_efficiency DOUBLE PRECISION +); + +-- Sensors anomalies modal (aggregated anomaly detection model) +CREATE TABLE IF NOT EXISTS public.sensors_anomalies_modal ( + id BIGSERIAL PRIMARY KEY, + sensor_id INT NOT NULL REFERENCES sensors(sensor_id) ON DELETE CASCADE, + ts TIMESTAMPTZ NOT NULL, + anomaly REAL NOT NULL CHECK (anomaly >= 0), + inserted_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + +-- ============================================ +-- 🔹 INDEXES FOR SENSOR TABLES +-- ============================================ + +CREATE INDEX IF NOT EXISTS ix_sensors_anomalies_modal_sensor_ts + ON sensors_anomalies_modal (sensor_id, ts); + +CREATE INDEX IF NOT EXISTS ix_sensors_name ON sensors (sensor_name); +CREATE INDEX IF NOT EXISTS ix_sensors_type ON sensors (sensor_type); +CREATE INDEX IF NOT EXISTS ix_sensors_status ON sensors (status); +CREATE INDEX IF NOT EXISTS ix_sensors_location ON sensors (lat, lon); +CREATE TABLE IF NOT EXISTS sensor_embeddings ( + id BIGSERIAL PRIMARY KEY, + sensor_id BIGINT NOT NULL, + vec vector(5), + created_at TIMESTAMP DEFAULT NOW() +); +CREATE OR REPLACE FUNCTION generate_sensor_embedding() +RETURNS trigger AS $$ +DECLARE + name_len INT; + type_len INT; + status_score FLOAT; + vec vector(5); +BEGIN + name_len := COALESCE(LENGTH(NEW.sensor_name), 0); + type_len := COALESCE(LENGTH(NEW.sensor_type), 0); + status_score := CASE WHEN LOWER(COALESCE(NEW.status, '')) = 'active' THEN 1 ELSE 0 END; + + vec := ARRAY[ + COALESCE(NEW.lat, 0), + COALESCE(NEW.lon, 0), + name_len, + type_len, + status_score + ]::vector; + + DELETE FROM sensor_embeddings WHERE sensor_id = NEW.sensor_id; + + INSERT INTO sensor_embeddings(sensor_id, vec) + VALUES (NEW.sensor_id, vec); + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER trg_generate_embedding +AFTER INSERT OR UPDATE ON sensors +FOR EACH ROW +EXECUTE FUNCTION generate_sensor_embedding(); diff --git a/RelDB/docker-compose.yml b/RelDB/docker-compose.yml index 8b26401fd..e8ac85ae0 100644 --- a/RelDB/docker-compose.yml +++ b/RelDB/docker-compose.yml @@ -34,6 +34,39 @@ services: - airnet restart: unless-stopped + rover_ingest: + build: + context: .. + dockerfile: services/rover_ingest/Dockerfile + command: ["python","-m","services.rover_ingest.app"] + environment: + MINIO_ENDPOINT: "host.docker.internal:9000" + MINIO_BUCKET: "rover-images" + MINIO_ACCESS_KEY: "minioadmin" + MINIO_SECRET_KEY: "minioadmin" + PG_DSN: "dbname=missions_db user=missions_user host=db port=5432 password=pg123" + + depends_on: + db: + condition: service_healthy + + extra_hosts: + - "host.docker.internal:host-gateway" + + ports: + - "9109:9109" # Prometheus metrics + restart: unless-stopped + networks: + - airnet + + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:9109/metrics').read()"] + interval: 10s + timeout: 3s + retries: 3 + start_period: 20s + + postgres_exporter: image: quay.io/prometheuscommunity/postgres-exporter:v0.15.0 environment: diff --git a/RelDB/graphs/postgres-queries.yml b/RelDB/graphs/postgres-queries.yml index b2e34316a..85037af90 100644 --- a/RelDB/graphs/postgres-queries.yml +++ b/RelDB/graphs/postgres-queries.yml @@ -134,3 +134,504 @@ pg_database_size: - size_bytes: usage: GAUGE description: "Database size in bytes" + +# ============================================ +# LEAF DISEASES METRICS +# ============================================ + +# Total leaf reports +leaf_reports_total: + query: "SELECT COUNT(*)::float as total FROM public.leaf_reports" + master: true + metrics: + - total: + usage: "GAUGE" + description: "Total number of leaf disease reports" + +# Reports by disease type +leaf_reports_by_disease: + query: | + SELECT + COALESCE(ldt.name, 'Unknown') as disease_name, + lr.leaf_disease_type_id::text as disease_id, + COUNT(*)::float as count + FROM public.leaf_reports lr + LEFT JOIN public.leaf_disease_types ldt ON lr.leaf_disease_type_id = ldt.id + WHERE lr.sick = true + GROUP BY lr.leaf_disease_type_id, ldt.name + master: true + metrics: + - disease_name: + usage: "LABEL" + description: "Disease name" + - disease_id: + usage: "LABEL" + description: "Disease type ID" + - count: + usage: "GAUGE" + description: "Number of reports per disease" + +# Reports by device +leaf_reports_by_device: + query: | + SELECT + device_id::text as device_id, + COUNT(*)::float as total_reports, + SUM(CASE WHEN sick THEN 1 ELSE 0 END)::float as sick_reports + FROM public.leaf_reports + GROUP BY device_id + master: true + metrics: + - device_id: + usage: "LABEL" + description: "Device ID" + - total_reports: + usage: "GAUGE" + description: "Total reports per device" + - sick_reports: + usage: "GAUGE" + description: "Sick reports per device" + +# Daily disease progression (time series) +leaf_disease_daily_progression: + query: | + SELECT + COALESCE(ldt.name, 'Unknown') as disease_name, + lr.leaf_disease_type_id::text as disease_id, + TO_CHAR(DATE_TRUNC('day', lr.ts), 'YYYY-MM-DD') as report_date, + EXTRACT(EPOCH FROM DATE_TRUNC('day', lr.ts))::float as date_timestamp, + COUNT(*)::float as sick_count + FROM public.leaf_reports lr + LEFT JOIN public.leaf_disease_types ldt ON lr.leaf_disease_type_id = ldt.id + WHERE lr.sick = true + AND lr.ts > NOW() - INTERVAL '365 days' + GROUP BY lr.leaf_disease_type_id, ldt.name, DATE_TRUNC('day', lr.ts) + ORDER BY date_timestamp DESC + master: true + metrics: + - disease_name: + usage: "LABEL" + description: "Disease name" + - disease_id: + usage: "LABEL" + description: "Disease type ID" + - report_date: + usage: "LABEL" + description: "Report date (YYYY-MM-DD)" + - date_timestamp: + usage: "GAUGE" + description: "Date timestamp for X axis" + - sick_count: + usage: "GAUGE" + description: "Number of sick reports per day" + +# Hourly disease detection (last 7 days) +leaf_disease_hourly_detection: + query: | + SELECT + COALESCE(ldt.name, 'Unknown') AS disease_name, + lr.leaf_disease_type_id::text AS disease_id, + MAX(EXTRACT(EPOCH FROM DATE_TRUNC('hour', lr.ts)))::float AS hour_timestamp, + COUNT(*)::float AS count + FROM public.leaf_reports lr + LEFT JOIN public.leaf_disease_types ldt ON lr.leaf_disease_type_id = ldt.id + WHERE lr.sick = true + AND lr.ts > NOW() - INTERVAL '7 days' + GROUP BY lr.leaf_disease_type_id, ldt.name + ORDER BY hour_timestamp DESC + master: true + metrics: + - disease_name: + usage: "LABEL" + description: "Disease name" + - disease_id: + usage: "LABEL" + description: "Disease type ID" + - hour_timestamp: + usage: "GAUGE" + description: "Last detection hour (epoch)" + - count: + usage: "GAUGE" + description: "Detections count in last 7 days" + + +# Disease severity by device (percentage) +leaf_disease_severity_by_device: + query: | + SELECT + COALESCE(ldt.name, 'Unknown') as disease_name, + lr.leaf_disease_type_id::text as disease_id, + lr.device_id::text as device_id, + (SUM(CASE WHEN lr.sick THEN 1 ELSE 0 END)::float / COUNT(*)::float * 100) as sick_percentage + FROM public.leaf_reports lr + LEFT JOIN public.leaf_disease_types ldt ON lr.leaf_disease_type_id = ldt.id + WHERE lr.ts > NOW() - INTERVAL '30 days' + GROUP BY lr.leaf_disease_type_id, ldt.name, lr.device_id + HAVING COUNT(*) > 5 + master: true + metrics: + - disease_name: + usage: "LABEL" + description: "Disease name" + - disease_id: + usage: "LABEL" + description: "Disease type ID" + - device_id: + usage: "LABEL" + description: "Device ID" + - sick_percentage: + usage: "GAUGE" + description: "Percentage of sick reports (0-100)" + + +# ============================================ +# ULTRASONIC PLANT PREDICTIONS METRICS +# S3 Path format: s3://sound/plants/microphone-MIC-02/2025-11-13/1763018877231/MIC-U-01_20251113T073457Z.wav +# ============================================ + +ultrasonic_predictions_total: + query: "SELECT COUNT(*)::float as total FROM public.ultrasonic_plant_predictions" + master: true + metrics: + - total: + usage: "GAUGE" + description: "Total number of ultrasonic predictions" + +ultrasonic_predictions_by_class: + query: | + SELECT + CASE predicted_class + WHEN 'Healthy_Tomato' THEN 'Healthy_Plant' + WHEN 'Healthy_Tobacco' THEN 'Healthy_Plant' + + WHEN 'Drought_Tomato' THEN 'Drought_Plant' + WHEN 'Drought_Tobacco' THEN 'Drought_Plant' + + WHEN 'Pest_Tomato' THEN 'Pest_Plant' + WHEN 'Pest_Tobacco' THEN 'Pest_Plant' + + ELSE COALESCE(predicted_class, 'unknown') + END as predicted_class, + COUNT(*)::float as count + FROM public.ultrasonic_plant_predictions + GROUP BY 1 + master: true + metrics: + - predicted_class: + usage: "LABEL" + description: "Predicted class (Drought_Plant, Healthy_Plant, Pest_Plant, Control, etc.)" + - count: + usage: "GAUGE" + description: "Number of predictions per class" + +ultrasonic_predictions_by_watering: + query: | + SELECT + COALESCE(watering_status, 'unknown') as watering_status, + COUNT(*)::float as count + FROM public.ultrasonic_plant_predictions + GROUP BY watering_status + master: true + metrics: + - watering_status: + usage: "LABEL" + description: "Watering status (Yes, No, etc.)" + - count: + usage: "GAUGE" + description: "Number of predictions per watering status" + +ultrasonic_predictions_by_status: + query: | + SELECT + COALESCE(status, 'unknown') as status, + COUNT(*)::float as count + FROM public.ultrasonic_plant_predictions + GROUP BY status + master: true + metrics: + - status: + usage: "LABEL" + description: "Record status (Success, Error, etc.)" + - count: + usage: "GAUGE" + description: "Number of predictions per status" + +ultrasonic_predictions_avg_confidence: + query: | + SELECT + AVG(confidence)::float as avg_confidence + FROM public.ultrasonic_plant_predictions + WHERE confidence IS NOT NULL + AND TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) > NOW() - INTERVAL '7 days' + master: true + metrics: + - avg_confidence: + usage: "GAUGE" + description: "Average confidence score of predictions (Last 7 days)" + +ultrasonic_predictions_recent: + query: | + SELECT + COUNT(*)::float as recent_count + FROM ( + SELECT 1 + FROM public.ultrasonic_plant_predictions + ORDER BY prediction_time DESC + LIMIT 100 + ) sub + master: true + metrics: + - recent_count: + usage: "GAUGE" + description: "Count of recent predictions (last 100)" + +ultrasonic_confidence_by_sensor: + query: | + SELECT + SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_') as sensor_id, + AVG(confidence)::float as avg_confidence, + COUNT(*)::float as sample_count, + MIN(confidence)::float as min_confidence, + MAX(confidence)::float as max_confidence + FROM public.ultrasonic_plant_predictions + WHERE status = 'Success' + AND confidence IS NOT NULL + AND file ~ 'MIC-U-\d+_\d{8}T\d{6}Z\.wav$' + GROUP BY SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_') + ORDER BY avg_confidence DESC + master: true + metrics: + - sensor_id: + usage: "LABEL" + description: "Sensor ID extracted from file (e.g., MIC-U-01, MIC-U-02)" + - avg_confidence: + usage: "GAUGE" + description: "Average confidence level per sensor" + - sample_count: + usage: "GAUGE" + description: "Number of successful samples per sensor" + - min_confidence: + usage: "GAUGE" + description: "Minimum confidence per sensor" + - max_confidence: + usage: "GAUGE" + description: "Maximum confidence per sensor" + +ultrasonic_daily_stress_count: + query: | + SELECT + DATE_TRUNC('hour', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ) as event_time, + EXTRACT(EPOCH FROM DATE_TRUNC('hour', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ))::float as date_timestamp, + COUNT(*)::float as event_count + FROM public.ultrasonic_plant_predictions + WHERE predicted_class IN ('Drought_Tomato', 'Pest_Tomato') + AND status = 'Success' + AND TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) >= DATE_TRUNC('day', NOW()) + GROUP BY DATE_TRUNC('hour', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ) + ORDER BY date_timestamp DESC + master: true + metrics: + - event_time: + usage: "LABEL" + description: "Hour of stress event extracted from file name" + - date_timestamp: + usage: "GAUGE" + description: "Hour timestamp (Unix epoch)" + - event_count: + usage: "GAUGE" + description: "Number of stress events per hour (Today)" + +ultrasonic_success_rate_by_sensor: + query: | + SELECT + SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_') as sensor_id, + SUM(CASE WHEN status = 'Success' THEN 1.0 ELSE 0.0 END) / + NULLIF(COUNT(*), 0) * 100.0 as success_rate + FROM public.ultrasonic_plant_predictions + WHERE file ~ 'MIC-U-\d+_\d{8}T\d{6}Z\.wav$' + GROUP BY SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_') + master: true + metrics: + - sensor_id: + usage: "LABEL" + description: "Sensor ID" + - success_rate: + usage: "GAUGE" + description: "Success rate percentage per sensor" + +ultrasonic_class_distribution_healthy: + query: | + SELECT + COUNT(*) as healthy_count, + COUNT(*) * 100.0 / + NULLIF((SELECT COUNT(*) FROM public.ultrasonic_plant_predictions WHERE status = 'Success'), 0) + as healthy_percentage + FROM public.ultrasonic_plant_predictions + WHERE predicted_class IN ('Healthy_Tomato', 'Healthy_Tobacco', 'Control_Greenhouse', 'Control_Empty') AND status = 'Success' + master: true + metrics: + - healthy_count: + usage: "GAUGE" + description: "Count of healthy plant predictions" + - healthy_percentage: + usage: "GAUGE" + description: "Percentage of healthy plant predictions" + +ultrasonic_class_distribution_stress: + query: | + SELECT + COUNT(*) as stress_count, + COUNT(*) * 100.0 / + NULLIF((SELECT COUNT(*) FROM public.ultrasonic_plant_predictions WHERE status = 'Success'), 0) + as stress_percentage + FROM public.ultrasonic_plant_predictions + WHERE predicted_class IN ('Drought_Tomato', 'Pest_Tomato') AND status = 'Success' + master: true + metrics: + - stress_count: + usage: "GAUGE" + description: "Count of stress plant predictions" + - stress_percentage: + usage: "GAUGE" + description: "Percentage of stress plant predictions" + +ultrasonic_confidence_distribution: + query: | + SELECT + CASE + WHEN confidence >= 0.9 THEN '90-100% (High)' + WHEN confidence >= 0.75 THEN '75-90% (Good)' + WHEN confidence >= 0.6 THEN '60-75% (Medium)' + ELSE '< 60% (Low)' + END as confidence_range, + COUNT(*)::float as count + FROM public.ultrasonic_plant_predictions + WHERE status = 'Success' + GROUP BY confidence_range + ORDER BY confidence_range DESC + master: true + metrics: + - confidence_range: + usage: "LABEL" + description: "Confidence level range" + - count: + usage: "GAUGE" + description: "Number of predictions in confidence range" + +ultrasonic_sensor_activity_timeline: + query: | + SELECT + SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_') as sensor_id, + TO_CHAR(DATE_TRUNC('day', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ), 'YYYY-MM-DD') as activity_date, + COUNT(*)::float as daily_readings + FROM public.ultrasonic_plant_predictions + WHERE status = 'Success' + AND file ~ 'MIC-U-\d+_\d{8}T\d{6}Z\.wav$' + GROUP BY + SUBSTRING(REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') FROM '^(MIC-U-\d+)_'), + DATE_TRUNC('day', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ) + ORDER BY activity_date DESC, sensor_id + master: true + metrics: + - sensor_id: + usage: "LABEL" + description: "Sensor ID" + - activity_date: + usage: "LABEL" + description: "Activity date extracted from file name" + - daily_readings: + usage: "GAUGE" + description: "Daily reading count per sensor" + +ultrasonic_predictions_per_hour: + query: | + SELECT + EXTRACT(EPOCH FROM DATE_TRUNC('hour', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ))::float as hour_timestamp, + COUNT(*)::float as count + FROM public.ultrasonic_plant_predictions + WHERE TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) >= DATE_TRUNC('day', NOW()) + AND file ~ 'MIC-U-\d+_\d{8}T\d{6}Z\.wav$' + GROUP BY DATE_TRUNC('hour', + TO_TIMESTAMP( + SUBSTRING( + REGEXP_REPLACE(file, '^.*/([^/]+)$', '\1') + FROM 'MIC-U-\d+_(\d{8}T\d{6})Z' + ), + 'YYYYMMDD"T"HH24MISS' + ) + ) + ORDER BY hour_timestamp DESC + master: true + metrics: + - hour_timestamp: + usage: "LABEL" + description: "Hour timestamp (Unix epoch) extracted from file name" + - count: + usage: "GAUGE" + description: "Predictions count per hour (Today's Events)" diff --git a/RelDB/graphs/prometheus.yml b/RelDB/graphs/prometheus.yml index 67d79f26c..7ebb44c3c 100644 --- a/RelDB/graphs/prometheus.yml +++ b/RelDB/graphs/prometheus.yml @@ -14,3 +14,8 @@ scrape_configs: - job_name: 'postgres_exporter' static_configs: - targets: ['postgres_exporter:9187'] + + - job_name: 'rover_ingest' + scrape_interval: 10s + static_configs: + - targets: ['rover_ingest:9109'] diff --git a/RelDB/initdb/05_rover_images.sql b/RelDB/initdb/05_rover_images.sql new file mode 100644 index 000000000..93ca57da9 --- /dev/null +++ b/RelDB/initdb/05_rover_images.sql @@ -0,0 +1,39 @@ +-- Schema + table for rover still-image indexing + +CREATE SCHEMA IF NOT EXISTS rover AUTHORIZATION missions_user; + +CREATE TABLE IF NOT EXISTS rover.images ( + image_id text PRIMARY KEY, -- unique image identifier + device_id text NOT NULL, -- rover/camera id + captured_at timestamptz NOT NULL, -- UTC capture time + + lat double precision NOT NULL CHECK (lat >= -90 AND lat <= 90), + lon double precision NOT NULL CHECK (lon >= -180 AND lon <= 180), + + heading_deg double precision, -- [0,360) + pitch_deg double precision, + roll_deg double precision, + alt_m double precision, -- camera height (meters) + fov_deg double precision, + gps_accuracy_m double precision, + temp_c double precision, -- optional ambient temp + + s3_key text NOT NULL, -- object key in MinIO/S3 + mime_type text, + size_bytes bigint, + sha256 text, + exif_present boolean, + firmware text, + capture_seq bigint, + + meta_src text NOT NULL, -- 'manifest' | 'telemetry' | 'exif_fallback' + schema_ver int NOT NULL DEFAULT 1, + source_ts timestamptz, + trace_id text, + + ingested_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX IF NOT EXISTS idx_images_device_time ON rover.images (device_id, captured_at); +CREATE INDEX IF NOT EXISTS idx_images_captured_at ON rover.images (captured_at); +CREATE UNIQUE INDEX IF NOT EXISTS uq_images_sha256 ON rover.images (sha256) WHERE sha256 IS NOT NULL; diff --git a/airflow_bundle/leaf-pipeline/.gitattributes b/airflow_bundle/leaf-pipeline/.gitattributes new file mode 100644 index 000000000..ada57005e --- /dev/null +++ b/airflow_bundle/leaf-pipeline/.gitattributes @@ -0,0 +1,5 @@ +projects/leaf-counting/weights/*.pt filter=lfs diff=lfs merge=lfs -text +projects/leaf-counting/weights/*.pth filter=lfs diff=lfs merge=lfs -text +projects/leaf-counting/weights/*.safetensors filter=lfs diff=lfs merge=lfs -text + +projects/Detection_Jobs/**/models/* filter=lfs diff=lfs merge=lfs -text diff --git a/airflow_bundle/leaf-pipeline/.gitignore b/airflow_bundle/leaf-pipeline/.gitignore new file mode 100644 index 000000000..b5c271165 --- /dev/null +++ b/airflow_bundle/leaf-pipeline/.gitignore @@ -0,0 +1,90 @@ +# === OS / Editors === +.DS_Store +*.swp +*.swo +.idea/ +.vscode/ +*.code-workspace + +# === Python === +__pycache__/ +*.py[cod] +*.pyo +*.pyd +*.egg-info/ +.eggs/ +.build/ +build/ +dist/ +.mypy_cache/ +.pytest_cache/ +.coverage +.coverage.* +.cache/ +.ipynb_checkpoints/ + +# Virtual envs +.venv/ +venv/ +env/ + +# === Docker / Compose === +docker.env +.env +.env.* +.env.local +.envrc + +# === Airflow === +airflow/logs/ +airflow/airflow.db +airflow/airflow.db-journal +airflow/*.pid +airflow/*webserver*.log +airflow/*webserver*.out +airflow/*webserver*.err +airflow/*scheduler*.log +airflow/*scheduler*.out +airflow/*scheduler*.err +airflow/dags/*.bak.* +airflow/staging/ + +# === Projects: leaf-counting === +projects/leaf-counting/out_detect/ +projects/leaf-counting/out_crops/ +projects/leaf-counting/out_pwb/ +projects/leaf-counting/runs_local/ +projects/leaf-counting/weights/ +projects/leaf-counting/.venv/ +projects/leaf-counting/staging/ + +# === Projects: Detection_Jobs / disease-monitor === +projects/Detection_Jobs/**/__pycache__/ +projects/Detection_Jobs/**/.mypy_cache/ +projects/Detection_Jobs/**/.pytest_cache/ +projects/disease-monitor/**/__pycache__/ +projects/disease-monitor/**/.mypy_cache/ +projects/disease-monitor/**/.pytest_cache/ + +# === Secrets / Certs === +*.key +*.pem +*.crt +*.p12 +*credentials*.json +*service_account*.json +*.secrets.* +.secrets/ +secrets/ +projects/Detection_Jobs/.git.backup-*.tar.gz +airflow/dags/leaf-counting/runs_local/ +airflow/dags/leaf-counting/demo_images/ +airflow/dags/leaf-counting/out_*/ +projects/Detection_Jobs/**/models/ +projects/disease-monitor/disease-monitor/alerts.db +projects/**/.git.backup-*.tar.gz +.gitignore.bak* +airflow/dags/leaf-counting/ + + +dags_leaf_counting_backup.tgz \ No newline at end of file diff --git a/airflow_bundle/leaf-pipeline/Dockerfile b/airflow_bundle/leaf-pipeline/Dockerfile new file mode 100644 index 000000000..53af135cf --- /dev/null +++ b/airflow_bundle/leaf-pipeline/Dockerfile @@ -0,0 +1,42 @@ + +FROM mcr.microsoft.com/devcontainers/python:1-3.10-bullseye +# RUN apt-get update && apt-get install -y --no-install-recommends \ +# libgl1 libglib2.0-0 ffmpeg curl ca-certificates && \ +# rm -rf /var/lib/apt/lists/* +# RUN apt-get update && apt-get install -y --no-install-recommends \ +# libgl1 libglib2.0-0 ffmpeg curl ca-certificates \ +# util-linux procps \ +# && rm -rf /var/lib/apt/lists/* + +RUN apt-get update && apt-get install -y --no-install-recommends \ + libgl1 libglib2.0-0 ffmpeg curl ca-certificates \ + util-linux procps \ + && rm -rf /var/lib/apt/lists/* + +RUN python -m pip install --no-cache-dir --upgrade pip wheel setuptools + +ENV AIRFLOW_VERSION=2.9.3 +ENV PYTHON_VERSION=3.10 +ENV CONSTRAINT_URL=https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-${PYTHON_VERSION}.txt +RUN pip install --no-cache-dir "apache-airflow==${AIRFLOW_VERSION}" --constraint "${CONSTRAINT_URL}" + +RUN pip install --no-cache-dir \ + "apache-airflow-providers-docker" \ + --constraint "${CONSTRAINT_URL}" + + +# === PyTorch CPU wheels === +RUN pip install --no-cache-dir \ + --extra-index-url https://download.pytorch.org/whl/cpu \ + torch==2.3.1+cpu torchvision==0.18.1+cpu torchaudio==2.3.1+cpu + +# === YOLO=== +RUN pip install --no-cache-dir \ + numpy==1.26.4 opencv-python-headless==4.9.0.80 ultralytics==8.2.10 \ + onnx==1.16.1 onnxruntime==1.18.1 \ + boto3 minio awscli requests tqdm + +#root +RUN useradd -ms /bin/bash airflow +USER airflow +WORKDIR /opt/airflow diff --git a/airflow_bundle/leaf-pipeline/README b/airflow_bundle/leaf-pipeline/README new file mode 100644 index 000000000..2d7d28b57 --- /dev/null +++ b/airflow_bundle/leaf-pipeline/README @@ -0,0 +1,8 @@ +docker compose --profile images up -d --build + + +projects/leaf-counting/weights/ +https://drive.google.com/drive/folders/1RIp71J7kSLdyQ7UtCdS_piiPYG5hvKOD?usp=sharing + +projects/Detection_Jobs/Detection_Jobs/models/ +https://drive.google.com/drive/folders/1u3S8nryoGgjUC_5LKTdc-qvXZmOyJT7X?usp=sharing \ No newline at end of file diff --git a/airflow_bundle/leaf-pipeline/airflow/airflow.cfg b/airflow_bundle/leaf-pipeline/airflow/airflow.cfg new file mode 100644 index 000000000..8f1408c24 --- /dev/null +++ b/airflow_bundle/leaf-pipeline/airflow/airflow.cfg @@ -0,0 +1,2420 @@ +[core] +# The folder where your airflow pipelines live, most likely a +# subfolder in a code repository. This path must be absolute. +# +# Variable: AIRFLOW__CORE__DAGS_FOLDER +# +dags_folder = /opt/airflow/dags + +# Hostname by providing a path to a callable, which will resolve the hostname. +# The format is "package.function". +# +# For example, default value ``airflow.utils.net.getfqdn`` means that result from patched +# version of `socket.getfqdn()
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-freemarker-2.3.25-incubating.txt b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-freemarker-2.3.25-incubating.txt
deleted file mode 100644
index d64569567..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-freemarker-2.3.25-incubating.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-guava-20.0.txt b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-guava-20.0.txt
deleted file mode 100644
index d64569567..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-guava-20.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-org.eclipse.paho.client.mqttv3-1.2.0.txt b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-org.eclipse.paho.client.mqttv3-1.2.0.txt
deleted file mode 100644
index 79e486c3d..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-org.eclipse.paho.client.mqttv3-1.2.0.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-slf4j-1.7.25.txt b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-slf4j-1.7.25.txt
deleted file mode 100644
index 315bd4979..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/doc/licenses/LICENSE-slf4j-1.7.25.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2017 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/connect-avro-docker.properties b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/connect-avro-docker.properties
deleted file mode 100644
index 482880401..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/connect-avro-docker.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright [2018 - 2020] Confluent Inc.
-#
-
-# Sample configuration for a standalone Kafka Connect worker that uses Avro serialization and
-# integrates the the SchemaConfig Registry. This sample configuration assumes a local installation of
-# Confluent Platform with all services running on their default ports.
-# Bootstrap Kafka servers. If multiple servers are specified, they should be comma-separated.
-bootstrap.servers=kafka:9092
-# The converters specify the format of data in Kafka and how to translate it into Connect data.
-# Every Connect user will need to configure these based on the format they want their data in
-# when loaded from or stored into Kafka
-# key.converter=io.confluent.connect.avro.AvroConverter
-key.converter.schema.registry.url=http://schema-registry:8081
-# value.converter=io.confluent.connect.avro.AvroConverter
-value.converter.schema.registry.url=http://schema-registry:8081
-# The internal converter used for offsets and config data is configurable and must be specified,
-# but most users will always want to use the built-in default. Offset and config data is never
-# visible outside of Connect in this format.
-internal.key.converter=org.apache.kafka.connect.json.JsonConverter
-internal.value.converter=org.apache.kafka.connect.json.JsonConverter
-internal.key.converter.schemas.enable=false
-internal.value.converter.schemas.enable=false
-# Local storage file for offset data
-offset.storage.file.filename=/tmp/connect.offsets
-# Confuent Control Center Integration -- uncomment these lines to enable Kafka client interceptors
-# that will report audit data that can be displayed and analyzed in Confluent Control Center
-# producer.interceptor.classes=io.confluent.monitoring.clients.interceptor.MonitoringProducerInterceptor
-# consumer.interceptor.classes=io.confluent.monitoring.clients.interceptor.MonitoringConsumerInterceptor
-consumer.max.poll.records=100
-plugin.path=target/components/packages/
\ No newline at end of file
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-anonymous.properties b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-anonymous.properties
deleted file mode 100644
index caee1a9f2..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-anonymous.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright [2018 - 2020] Confluent Inc.
-#
-
-name=anonymous
-tasks.max=1
-connector.class=io.confluent.connect.mqtt.MqttSourceConnector
-mqtt.server.uri=tcp://127.0.0.1:32790
-mqtt.topics=foo
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-password.properties b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-password.properties
deleted file mode 100644
index 6e70fe86f..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/etc/source-password.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright [2018 - 2020] Confluent Inc.
-#
-
-name=anonymous
-tasks.max=1
-connector.class=io.confluent.connect.mqtt.MqttSourceConnector
-mqtt.server.uri=tcp://127.0.0.1:32792
-mqtt.topics=foo
-mqtt.username=test
-mqtt.password=test
\ No newline at end of file
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/checker-qual-3.33.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/checker-qual-3.33.0.jar
deleted file mode 100644
index 61761fdcb..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/checker-qual-3.33.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-licensing-new-7.5.8-18-ce.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-licensing-new-7.5.8-18-ce.jar
deleted file mode 100644
index 029b90421..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-licensing-new-7.5.8-18-ce.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-serializers-new-7.5.8-18-ce.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-serializers-new-7.5.8-18-ce.jar
deleted file mode 100644
index ace3404ee..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/confluent-serializers-new-7.5.8-18-ce.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-ak-non-public-0.24.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-ak-non-public-0.24.0.jar
deleted file mode 100644
index 77c66c22b..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-ak-non-public-0.24.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-licensing-extensions-0.9.35.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-licensing-extensions-0.9.35.jar
deleted file mode 100644
index 61f03838b..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-licensing-extensions-0.9.35.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-0.3.3.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-0.3.3.jar
deleted file mode 100644
index 4cc6f9c5b..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-0.3.3.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-1.1.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-1.1.0.jar
deleted file mode 100644
index 8ad2fa21c..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/connect-utils-1.1.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/error_prone_annotations-2.18.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/error_prone_annotations-2.18.0.jar
deleted file mode 100644
index e072fe029..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/error_prone_annotations-2.18.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/failureaccess-1.0.1.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/failureaccess-1.0.1.jar
deleted file mode 100644
index 9b56dc751..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/failureaccess-1.0.1.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/freemarker-2.3.31.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/freemarker-2.3.31.jar
deleted file mode 100644
index 8fb169b21..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/freemarker-2.3.31.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/gson-2.9.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/gson-2.9.0.jar
deleted file mode 100644
index fb62e0565..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/gson-2.9.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/guava-32.1.1-jre.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/guava-32.1.1-jre.jar
deleted file mode 100644
index 8f2b3f5d4..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/guava-32.1.1-jre.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/j2objc-annotations-2.8.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/j2objc-annotations-2.8.jar
deleted file mode 100644
index 3595c4f9b..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/j2objc-annotations-2.8.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jose4j-0.9.5.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jose4j-0.9.5.jar
deleted file mode 100644
index ee3b65c10..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jose4j-0.9.5.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jsr305-3.0.2.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jsr305-3.0.2.jar
deleted file mode 100644
index 59222d9ca..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/jsr305-3.0.2.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/kafka-connect-mqtt-1.7.6.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/kafka-connect-mqtt-1.7.6.jar
deleted file mode 100644
index 427eca9c2..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/kafka-connect-mqtt-1.7.6.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
deleted file mode 100644
index 45832c052..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-api-2.25.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-api-2.25.0.jar
deleted file mode 100644
index 848f393a4..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-api-2.25.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-core-2.25.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-core-2.25.0.jar
deleted file mode 100644
index 8184432ba..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-core-2.25.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-slf4j2-impl-2.25.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-slf4j2-impl-2.25.0.jar
deleted file mode 100644
index 1a398dce0..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/log4j-slf4j2-impl-2.25.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/metrics-core-2.2.0.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/metrics-core-2.2.0.jar
deleted file mode 100644
index 0f6d1cb0e..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/metrics-core-2.2.0.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/org.eclipse.paho.client.mqttv3-1.2.5.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/org.eclipse.paho.client.mqttv3-1.2.5.jar
deleted file mode 100644
index 66f1278e4..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/org.eclipse.paho.client.mqttv3-1.2.5.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-3.25.5.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-3.25.5.jar
deleted file mode 100644
index d76648859..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-3.25.5.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-util-3.25.5.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-util-3.25.5.jar
deleted file mode 100644
index 5f97266a4..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/protobuf-java-util-3.25.5.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/slf4j-api-1.7.36.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/slf4j-api-1.7.36.jar
deleted file mode 100644
index 7d3ce68d2..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/slf4j-api-1.7.36.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/value-2.8.2.jar b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/value-2.8.2.jar
deleted file mode 100644
index 6f4cec3c5..000000000
Binary files a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/lib/value-2.8.2.jar and /dev/null differ
diff --git a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/manifest.json b/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/manifest.json
deleted file mode 100644
index 31b258b82..000000000
--- a/mqtt_and_kafka/connect/plugins/confluentinc-kafka-connect-mqtt-1.7.6/manifest.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "name" : "kafka-connect-mqtt",
- "version" : "1.7.6",
- "title" : "Kafka Connect MQTT",
- "description" : "A Kafka Connect plugin for sending and receiving data from a Mqtt broker.",
- "owner" : {
- "username" : "confluentinc",
- "name" : "Confluent, Inc."
- },
- "support" : {
- "summary" : "This connector is a Confluent Commercial Connector and supported by Confluent. The Apache License
Version 2.0, January 2004
-http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files.
-"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that -is included in or attached to the work (an example is provided in the -Appendix below).
-"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as -a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof.
-"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution."
-"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the -terms and conditions of this License, each Contributor hereby grants to You -a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, publicly -display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms -and conditions of this License, each Contributor hereby grants to You a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, use, -offer to sell, sell, import, and otherwise transfer the Work, where such -license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by -combination of their Contribution(s) with the Work to which such -Contribution(s) was submitted. If You institute patent litigation against -any entity (including a cross-claim or counterclaim in a lawsuit) alleging -that the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the -date such litigation is filed.
-4. Redistribution. You may reproduce and -distribute copies of the Work or Derivative Works thereof in any medium, -with or without modifications, and in Source or Object form, provided that -You meet the following conditions:
--
-
- You must give any other recipients of the Work or Derivative Works a -copy of this License; and - -
- You must cause any modified files to carry prominent notices stating -that You changed the files; and - -
- You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and - -
- If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding
-those notices that do not pertain to any part of the Derivative Works, in
-at least one of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or documentation,
-if provided along with the Derivative Works; or, within a display generated
-by the Derivative Works, if and wherever such third-party notices normally
-appear. The contents of the NOTICE file are for informational purposes only
-and do not modify the License. You may add Your own attribution notices
-within Derivative Works that You distribute, alongside or as an addendum to
-the NOTICE text from the Work, provided that such additional attribution
-notices cannot be construed as modifying the License.
-
-
-You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. -
-
-
5. Submission of Contributions. Unless You -explicitly state otherwise, any Contribution intentionally submitted for -inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the -terms of any separate license agreement you may have executed with Licensor -regarding such Contributions.
-6. Trademarks. This License does not grant -permission to use the trade names, trademarks, service marks, or product -names of the Licensor, except as required for reasonable and customary use -in describing the origin of the Work and reproducing the content of the -NOTICE file.
-7. Disclaimer of Warranty. Unless required by -applicable law or agreed to in writing, Licensor provides the Work (and -each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, -without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You -are solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise -of permissions under this License.
-8. Limitation of Liability. In no event and -under no legal theory, whether in tort (including negligence), contract, or -otherwise, unless required by applicable law (such as deliberate and -grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a result -of this License or out of the use or inability to use the Work (including -but not limited to damages for loss of goodwill, work stoppage, computer -failure or malfunction, or any and all other commercial damages or losses), -even if such Contributor has been advised of the possibility of such -damages.
-9. Accepting Warranty or Additional Liability. -While redistributing the Work or Derivative Works thereof, You may choose -to offer, and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this License. -However, in accepting such obligations, You may act only on Your own behalf -and on Your sole responsibility, not on behalf of any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor -harmless for any liability incurred by, or claims asserted against, such -Contributor by reason of your accepting any such warranty or additional -liability.
-END OF TERMS AND CONDITIONS
-APPENDIX: How to apply the Apache License to your work¶
-To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included -on the same "printed page" as the copyright notice for easier -identification within third-party archives.
-Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -
Your Notifications
Add New Notification
-
+
diff --git a/services/sounds/API-development/src/window-client/package.json b/services/API-notifications/src/window-client/package.json
similarity index 100%
rename from services/sounds/API-development/src/window-client/package.json
rename to services/API-notifications/src/window-client/package.json
diff --git a/services/sounds/API-development/src/window-client/script.js b/services/API-notifications/src/window-client/script.js
similarity index 99%
rename from services/sounds/API-development/src/window-client/script.js
rename to services/API-notifications/src/window-client/script.js
index 8bfdac577..66fc45b59 100644
--- a/services/sounds/API-development/src/window-client/script.js
+++ b/services/API-notifications/src/window-client/script.js
@@ -462,4 +462,4 @@ if (typeof window !== 'undefined') {
window.openNotificationPopup = () => {
document.getElementById("popupOverlay").style.display = "flex";
};
-}
\ No newline at end of file
+}
diff --git a/services/sounds/API-development/src/window-client/styles.css b/services/API-notifications/src/window-client/styles.css
similarity index 100%
rename from services/sounds/API-development/src/window-client/styles.css
rename to services/API-notifications/src/window-client/styles.css
diff --git a/services/API-notifications/tests/__init__.py b/services/API-notifications/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/services/sounds/API-development/tests/notification-manager.test.js b/services/API-notifications/tests/notification-manager.test.js
similarity index 100%
rename from services/sounds/API-development/tests/notification-manager.test.js
rename to services/API-notifications/tests/notification-manager.test.js
diff --git a/services/sounds/API-development/tests/test_app.py b/services/API-notifications/tests/test_app.py
similarity index 100%
rename from services/sounds/API-development/tests/test_app.py
rename to services/API-notifications/tests/test_app.py
diff --git a/services/Cross-Sensor System-Level Anomalies/.github/CODEOWNERS b/services/Cross-Sensor System-Level Anomalies/.github/CODEOWNERS
new file mode 100644
index 000000000..3371c6fe8
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @KamaTechOrg @SaraShimon @hadasaGIT @tamarmar
diff --git a/services/Cross-Sensor System-Level Anomalies/.gitignore b/services/Cross-Sensor System-Level Anomalies/.gitignore
new file mode 100644
index 000000000..80522fd97
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/.gitignore
@@ -0,0 +1,47 @@
+# Python
+__pycache__/
+*.py[cod]
+*.pyo
+*.pyd
+*.so
+
+# Virtual envs
+.venv/
+env/
+venv/
+
+# IDE
+.vscode/
+.idea/
+
+# Outputs & plots
+out/
+*.png
+*.svg
+
+# Data files :
+*.csv
+*.parquet
+*.feather
+
+# Allow specific data files
+!data/
+!data/Crop_recommendationV2.csv
+
+
+private_*.py
+local_*.py
+scratch_*.ipynb
+
+# files
+analyze_dataset.py
+anomalies.py
+check_25_consistency.py
+diff_anomalies.py
+export_anomalies.py
+
+# Ignore model artifacts
+*.pkl
+*.joblib
+models/*.pkl
+models/*.joblib
\ No newline at end of file
diff --git a/services/Cross-Sensor System-Level Anomalies/Dockerfile.flink b/services/Cross-Sensor System-Level Anomalies/Dockerfile.flink
new file mode 100644
index 000000000..f599dbce7
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/Dockerfile.flink
@@ -0,0 +1,68 @@
+# Dockerfile.flink
+FROM flink:1.19.3-scala_2.12-java11
+
+USER root
+
+
+
+COPY certs/*.crt /app/certs/
+RUN if [ -d ./certs ] && [ "$(ls ./certs/*.crt 2>/dev/null)" ]; then \
+ echo "Configuring NetFree certificates..."; \
+ cp ./certs/*.crt /usr/local/share/ca-certificates/; \
+ update-ca-certificates; \
+ fi
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+ENV PIP_CERT=/etc/ssl/certs/ca-certificates.crt
+
+RUN apt-get update && apt-get install -y python3 python3-venv python3-pip
+RUN curl -fSL https://repo1.maven.org/maven2/org/apache/kafka/kafka-clients/3.7.0/kafka-clients-3.7.0.jar \
+ -o /opt/flink/lib/kafka-clients-3.7.0.jar
+
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:${PATH}"
+
+
+RUN printf "[global]\ntrusted-host = pypi.org\n files.pythonhosted.org\ncert = /etc/ssl/certs/ca-certificates.crt\n" > /etc/pip.conf
+RUN python -m pip install --no-cache-dir --upgrade pip setuptools wheel
+
+RUN apt-get update && apt-get install -y \
+ build-essential \
+ gfortran \
+ libatlas-base-dev \
+ && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ netcat-openbsd \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN pip install --no-cache-dir --prefer-binary \
+ apache-flink \
+ pandas \
+ scikit-learn \
+ joblib
+
+
+
+RUN curl -fSL \
+ https://repo1.maven.org/maven2/org/apache/flink/flink-connector-kafka/3.2.0-1.19/flink-connector-kafka-3.2.0-1.19.jar \
+ -o /opt/flink/lib/flink-connector-kafka-3.2.0-1.19.jar
+
+COPY conf/flink-conf.yaml /opt/flink/conf/flink-conf.yaml
+WORKDIR /opt/app
+COPY flink_job.py /opt/app/flink_job.py
+COPY models/iforest_pca_artifacts.joblib /opt/models/iforest_pca_artifacts.joblib
+COPY models/residuals_artifacts.joblib /opt/models/residuals_artifacts.joblib
+
+
+ENV ART_IFOREST_PCA=/opt/models/iforest_pca_artifacts.joblib \
+ ART_RESIDUALS=/opt/models/residuals_artifacts.joblib \
+ KAFKA_BROKERS=kafka-single:9092 \
+ IN_TOPIC=sensors \
+ OUT_TOPIC=sensors_anomalies_modal \
+ PYTHONPATH=/opt/app \
+ PYFLINK_CLIENT_EXECUTABLE=/opt/venv/bin/python \
+ PYFLINK_PYTHON=/opt/venv/bin/python
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/services/Cross-Sensor System-Level Anomalies/README.md b/services/Cross-Sensor System-Level Anomalies/README.md
new file mode 100644
index 000000000..e12181bc4
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/README.md
@@ -0,0 +1,137 @@
+# Cross-Sensor System-Level Anomalies
+
+# Model Artifacts
+
+This folder stores the model artifacts required for anomaly detection.
+
+The binary model files (**.pkl** / **.joblib**) are **not stored in the Git repository**, as they are large binary files that should not be tracked by Git.
+
+Instead, you can download all required model files from Google Drive:
+
+🔗 **Google Drive folder (all model artifacts):**
+https://drive.google.com/drive/folders/1QKRW5jTv3K-NmQLjMjfKqwgVu6JwrZsf?usp=drive_link
+
+## How to use
+
+1. Download all four model files from the Drive link.
+2. Place them inside this `models/` directory.
+3. The application will load them from here during runtime.
+
+## Notes
+
+- Do **not** upload model files back into Git.
+- To prevent accidental uploads, ensure `.gitignore` includes:
+
+
+## Overview
+
+Unsupervised anomaly detection for agricultural sensor data using three complementary methods:
+
+1. Isolation Forest (tree-based outlier model)
+2. PCA Reconstruction Error (distance-from-low-rank structure)
+3. Residual-per-Feature (OOF) with a robust HuberRegressor
+
+We combine them into a hybrid decision:
+
+* UNION (sensitive, higher recall)
+* INTERSECTION (strict, higher precision)
+* Majority (2-of-3) — good balance for high-confidence alerts.
+
+Now fully integrated with Apache Flink streaming, consuming sensor JSON data from Kafka topics and producing anomaly alerts in real-time.
+
+## Project Layout
+
+docker-compose.yml # Build & run Flink + Kafka + job
+flink_job.py # Flink job wrapping IF + PCA + Residual pipeline
+detect_iforest_pca.py # Stage 1: IF + PCA + basic plots, intermediate CSV (used in batch mode)
+detect_residuals_and_hybrid.py # Stage 2: Residual OOF + Hybrid + 2-of-3 + hybrid plot (used in batch mode)
+tests/ # Pytest-based tests (synthetic data fixtures included)
+data/Crop_recommendationV2.csv # Dataset (kept in repo)
+out/ # Outputs (ignored by git)
+Dockerfile # Build & run both stages
+requirements.txt # Python dependencies
+README.txt # This file
+
+## Why these models?
+
+* Isolation Forest: robust to high-dimensional mixed features; detects "few and different."
+* PCA Recon Error: catches samples that don't fit global low-rank structure; complementary to IF.
+* Residual-per-Feature (OOF): per-target predictive errors using KFold with no data leakage; highlights physically inconsistent sensor relationships (e.g., high soil moisture with very low rainfall).
+
+## No-Leakage Residuals (critical)
+
+Residuals are computed Out-Of-Fold:
+
+* For each fold, we fit imputer + scaler + HuberRegressor on train only, then score the validation split.
+* This prevents information leakage and over-optimistic errors.
+
+## Streaming with Kafka & Flink
+
+1. Start Kafka with Docker Compose:
+
+ ```bash
+ docker compose -f docker-compose.yml up -d
+ ```
+
+2. Build and start Flink + job environment:
+
+ ```bash
+ docker compose up -d
+ ```
+
+3. Open Flink Web UI at [http://localhost:8084/](http://localhost:8084/) to monitor jobs.
+
+4. Submit the Flink job:
+
+ ```bash
+ docker compose exec jobmanager flink run -py /opt/app/flink_job.py
+ ```
+
+5. Open two terminals for Kafka:
+
+ * Producer (send JSON sensor data):
+
+ ```bash
+ docker exec -i kafka kafka-console-producer.sh --bootstrap-server localhost:9092 --topic sensors
+ ```
+ * Consumer (receive anomaly results):
+
+ ```bash
+ docker exec -it kafka kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic sensors_anomalies_modal --from-beginning
+ ```
+
+6. Example JSON input to producer:
+
+```json
+{"sid": "normal-01", "timestamp": 1690010100, "temperature": 24, "humidity": 55, "rainfall": 12, "soil_moisture": 45}
+{"sid": "anomaly-01", "timestamp": 1690010150, "temperature": 100, "humidity": 0, "rainfall": 9999, "soil_moisture": 1000}
+```
+
+Consumer will output whether the sample is flagged as an anomaly or not.
+
+## Outputs
+
+out/dataset_with_iforest_pca.csv # IF + PCA features/flags
+out/pca_iforest_anomalies.png # PCA scatter with IF anomalies
+out/dataset_hybrid_iforest_pca_residual.csv # Final hybrid CSV with residual scores & flags
+out/pca_hybrid_union.png # PCA scatter colored by hybrid union
+out/top10_residual_rows.csv # Top-10 by residual_general_score (always created)
+
+## Interpreting Results
+
+* 'anomaly_union' is sensitive and best for broad monitoring.
+* 'anomaly_2of3' is stricter and good as "high-confidence" alerting.
+* Tune sensitivity via:
+
+ * IsolationForest 'contamination'
+ * PCA reconstruction error quantile
+ * Residuals quantile (RES_Q)
+* Choose thresholds to match your alert budget (~1–3% for 2-of-3 recommended).
+
+## Notes
+
+* Plots are saved headless (matplotlib Agg backend).
+* The residual targets default to: soil_moisture, rainfall, temperature, humidity.
+* top10_residual_rows.csv is always written (even if fewer than 10 rows exist).
+* Streaming mode fully supports real-time detection via Flink and Kafka.
+* Ensure Kafka is running before starting Flink jobs to avoid connectivity errors.
diff --git a/services/Cross-Sensor System-Level Anomalies/check_models.py b/services/Cross-Sensor System-Level Anomalies/check_models.py
new file mode 100644
index 000000000..db534a8cf
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/check_models.py
@@ -0,0 +1,19 @@
+import joblib
+
+print("=== iforest_pca_artifacts.joblib ===")
+try:
+ artifact_ifpca = joblib.load("models/iforest_pca_artifacts.joblib")
+ print("Model version:", artifact_ifpca.get("model_version"))
+ print("PCA threshold:", artifact_ifpca.get("pca_thr"))
+ print("Features:", artifact_ifpca.get("feature_cols", [])[:5], "...")
+except Exception as e:
+ print("Error loading iforest_pca_artifacts.joblib:", e)
+
+print("\n=== residuals_artifacts.joblib ===")
+try:
+ artifact_resid = joblib.load("models/residuals_artifacts.joblib")
+ print("Model version:", artifact_resid.get("model_version"))
+ print("Residual threshold:", artifact_resid.get("resid_thr"))
+ print("Targets:", list(artifact_resid.get("resid_models", {}).keys()))
+except Exception as e:
+ print("Error loading residuals_artifacts.joblib:", e)
diff --git a/services/Cross-Sensor System-Level Anomalies/conf/flink-conf.yaml b/services/Cross-Sensor System-Level Anomalies/conf/flink-conf.yaml
new file mode 100644
index 000000000..18cf61e32
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/conf/flink-conf.yaml
@@ -0,0 +1,15 @@
+blob.server.port: 6124
+taskmanager.memory.process.size: 4096m
+taskmanager.bind-host: 0.0.0.0
+jobmanager.execution.failover-strategy: region
+python.fn-execution.memory.managed: false
+taskmanager.memory.task.off-heap.size: 512m
+taskmanager.memory.jvm-metaspace.size: 256m
+jobmanager.rpc.address: crosssensor-flink-jobmanager
+jobmanager.memory.process.size: 2048m
+jobmanager.rpc.port: 6123
+query.server.port: 6125
+jobmanager.bind-host: 0.0.0.0
+taskmanager.memory.framework.off-heap.size: 256m
+parallelism.default: 4
+taskmanager.numberOfTaskSlots: 4
diff --git a/services/Cross-Sensor System-Level Anomalies/convert_model.py b/services/Cross-Sensor System-Level Anomalies/convert_model.py
new file mode 100644
index 000000000..2cf8e5be4
--- /dev/null
+++ b/services/Cross-Sensor System-Level Anomalies/convert_model.py
@@ -0,0 +1,28 @@
+import joblib
+import sys
+from pathlib import Path
+
+def main():
+ if len(sys.argv) < 2:
+ print("Usage: python convert_model.py