+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
index 8e9e14e1c..c77ded97d 100644
--- a/GUI/src/vast/views/fruits_view.py
+++ b/GUI/src/vast/views/fruits_view.py
@@ -1,60 +1,118 @@
# views/fruits_view.py
from __future__ import annotations
from typing import Optional, Tuple, Dict, List
-from PyQt6.QtCore import Qt, pyqtSignal # type: ignore
-from PyQt6.QtWidgets import ( # type: ignore
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtWidgets import (
QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QComboBox,
QTableWidget, QTableWidgetItem, QAbstractItemView, QDoubleSpinBox,
- QMessageBox, QHeaderView,
+ QMessageBox, QHeaderView, QDialog, QLineEdit, QFrame
)
from dashboard_api import DashboardApi
-class FruitsView(QWidget):
- """
- Thresholds editor per ( task, label).
- Replaces the previous 'client thresholds' view.
- """
- thresholdsSaved = pyqtSignal(dict) # {( task, label): threshold}
+# ---------- thresholds ----------
+class ThresholdsEditorDialog(QDialog):
+ thresholdsSaved = pyqtSignal(dict) # {(task,label): threshold}
- def __init__(self, api: DashboardApi, parent=None):
+ 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); }
+""")
- # --- Layout scaffolding ---
root = QVBoxLayout(self)
- root.setSpacing(10)
+ root.setSpacing(12)
+ # Title
title = QLabel("Fruits — Task Thresholds (per task/label)")
- title.setStyleSheet("font-size: 18px; font-weight: 600;")
+ title.setObjectName("title")
root.addWidget(title)
- # Action buttons
- btns = QHBoxLayout()
- self.btn_add = QPushButton("Add row")
- self.btn_delete = QPushButton("Delete selected")
- self.btn_save = QPushButton("Save all")
- btns.addWidget(self.btn_add)
- btns.addWidget(self.btn_delete)
- btns.addStretch(1)
- btns.addWidget(self.btn_save)
- root.addLayout(btns)
-
- # Table: 4 columns
-
- # 0: Task (editable text)
- # 1: Label (editable text, optional; empty string means default bucket)
- # 2: Threshold (0..1) as spinbox
- # 3: Updated By (editable text, optional)
+ # 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"
+ "Task", "Label (optional)", "Threshold (0..1)", "Updated By"
])
- self.tbl.horizontalHeader().setStretchLastSection(True)
- self.tbl.horizontalHeader().setSectionResizeMode(
- QHeaderView.ResizeMode.Interactive
- )
+ 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(
@@ -62,21 +120,39 @@ def __init__(self, api: DashboardApi, parent=None):
| QAbstractItemView.EditTrigger.SelectedClicked
| QAbstractItemView.EditTrigger.EditKeyPressed
)
- root.addWidget(self.tbl)
+
+ self.tbl.verticalHeader().setDefaultSectionSize(36)
+
+ root.addWidget(self.tbl, 1)
- # Status line
+ # Status + Close
+ bottom = QHBoxLayout()
self.lbl_status = QLabel("Add rows and click Save.")
- self.lbl_status.setStyleSheet("color:#555;")
- root.addWidget(self.lbl_status)
+ 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 an empty demo row
+ # 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,
@@ -88,59 +164,51 @@ def add_row(
r = self.tbl.rowCount()
self.tbl.insertRow(r)
-
- # Task
+ # Task (combobox)
cmb = QComboBox(self.tbl)
- TASK_OPTIONS = ["ripeness", "disease", "size", "color"]
- cmb.addItems(TASK_OPTIONS)
- if task in TASK_OPTIONS:
+ cmb.addItems(self.TASK_OPTIONS)
+ if task in self.TASK_OPTIONS:
cmb.setCurrentText(task)
- else:
- cmb.setCurrentIndex(0)
self.tbl.setCellWidget(r, 0, cmb)
- # Label (optional)
+
+ # Label (editable)
self._set_text_cell(r, 1, label)
- # Threshold spinbox
+ # 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)
+ 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.lbl_status.setText("No row selected.")
+ self._set_status("No row selected.", "warn")
return
for m in sel:
self.tbl.removeRow(m.row())
- self.lbl_status.setText("Row deleted.")
+ self._set_status("Row deleted.", "ok")
# -------- Helpers --------
def _set_text_cell(self, row: int, col: int, text: str):
item = QTableWidgetItem(text or "")
- # Editable text item
item.setFlags(item.flags() | Qt.ItemFlag.ItemIsEditable)
self.tbl.setItem(row, col, item)
- def _read_row(self, r: int) -> Tuple[ str, str, float, str]:
-
+ def _read_row(self, r: int) -> Tuple[str, str, float, str]:
# Task
cmb = self.tbl.cellWidget(r, 0)
- if isinstance(cmb, QComboBox):
- task = cmb.currentText()
- else:
- task = ""
-
+ task = cmb.currentText() if isinstance(cmb, QComboBox) else ""
- # Label (optional; empty string is allowed)
+ # Label (optional)
label_item = self.tbl.item(r, 1)
label = (label_item.text().strip() if label_item else "")
@@ -152,56 +220,79 @@ def _read_row(self, r: int) -> Tuple[ str, str, float, str]:
updated_item = self.tbl.item(r, 3)
updated_by = (updated_item.text().strip() if updated_item else "")
- return task, label, threshold, updated_by
+ return task, label, threshold, updated_by
- def _validate(self) -> Tuple[bool, str]:
+ 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 still enforced using the triple)
+ - Label: optional (dedup by (task,label))
- Threshold: 0..1
- - No duplicate (mission_id, task, label)
+ - 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:
- return False, f"Row {r+1}: Task is empty."
+ bad_rows.append(r)
+ return False, f"Row {r+1}: Task is empty.", bad_rows
if not (0.0 <= thr <= 1.0):
- return False, f"Row {r+1}: Threshold must be between 0 and 1."
+ 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:
- return False, (
- f"Row {r+1}: Duplicate ( task, label) = "
- f"( {t}, {l or '∅'})."
- )
+ 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 False, "No rows to save.", []
- return True, ""
+ return True, "", []
# -------- Save --------
def save_all(self):
- ok, msg = self._validate()
+ 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.lbl_status.setStyleSheet("color:#b00020;")
- self.lbl_status.setText(msg)
+ self._set_status(msg, "err")
return
- # Build mapping: {( task, label): threshold}
- mapping: Dict[Tuple[ str, str], float] = {}
- updated_by_for_row: Dict[Tuple[ str, str], str] = {}
-
+ # Build mapping: {(task,label): threshold}
+ mapping: Dict[Tuple[str, str], float] = {}
for r in range(self.tbl.rowCount()):
- t, l, thr, updated_by = self._read_row(r)
- key = ( t, l or "")
+ t, l, thr, _ = self._read_row(r)
+ key = (t, l or "")
mapping[key] = thr
- updated_by_for_row[key] = updated_by or "gui"
# Disable buttons during save
self.btn_save.setEnabled(False)
@@ -231,13 +322,6 @@ def _normalize_fail_list(fail_raw):
return pairs
try:
- # Flatten mapping into the API’s expected structure
- # API helper that we assume exists (as agreed earlier):
- # bulk_set_task_thresholds_labeled(mapping, updated_by="gui")
- # If your API expects a list of dicts, it should convert internally.
- # To respect per-row updated_by, we send the majority value,
- # and rely on server-side to accept it. Alternatively, expose a
- # dedicated bulk that accepts per-row updated_by list.
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", []))
@@ -247,25 +331,69 @@ def _normalize_fail_list(fail_raw):
succeeded = len(ok_keys) if ok_keys else (total - failed)
if failed == 0:
- self.lbl_status.setStyleSheet("color:#0a7d00;")
- self.lbl_status.setText(f"Saved {succeeded}/{total} thresholds ✓")
+ self._set_status(f"Saved {succeeded}/{total} thresholds ✓", "ok")
QMessageBox.information(self, "Saved", f"All {total} thresholds saved successfully.")
- # Emit a normalized dict for listeners
self.thresholdsSaved.emit({k: v for k, v in mapping.items()})
else:
- self.lbl_status.setStyleSheet("color:#cc7a00;")
- # Show first 10 failures neatly
lines = "\n".join(f"- {k}: {reason}" for k, reason in fail_pairs[:10])
more = "" if failed <= 10 else f"\n(+{failed-10} more...)"
- self.lbl_status.setText(f"Partial save: {succeeded}/{total} saved, {failed} failed.")
+ 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)
+
+ 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..09db68187
--- /dev/null
+++ b/GUI/src/vast/views/ground_view.py
@@ -0,0 +1,589 @@
+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", "")
+
+# ----------------------------
+# 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/GUI/src/vast/views/security/events_history_page.py b/GUI/src/vast/views/security/events_history_page.py
new file mode 100644
index 000000000..f6ec017fb
--- /dev/null
+++ b/GUI/src/vast/views/security/events_history_page.py
@@ -0,0 +1,516 @@
+from PyQt6 import QtWidgets, QtGui, QtCore
+import os, sys, vlc
+from datetime import datetime
+
+
+class EventsHistoryPage(QtWidgets.QWidget):
+ """AgGuard Security Events History — visual-only severity bar with sorting and fixed filters (with debug prints)."""
+
+ def __init__(self, api, parent=None):
+ super().__init__(parent)
+ self.api = api
+ self.setContentsMargins(24, 24, 24, 24)
+
+ print("[INIT] EventsHistoryPage initialized")
+
+ # ───────────── GLOBAL STYLE ─────────────
+ self.setStyleSheet("""
+ QWidget {
+ background-color: #f9fafb;
+ font-family: 'Segoe UI', 'DejaVu Sans', Arial, sans-serif;
+ color: #111827;
+ font-size: 14px;
+ }
+ QHeaderView::section {
+ background-color: #f3f4f6;
+ color: #111827;
+ font-weight: 600;
+ border: none;
+ padding: 8px;
+ border-bottom: 1px solid #e5e7eb;
+ }
+ QTableWidget {
+ gridline-color: #e5e7eb;
+ background-color: #ffffff;
+ border: 1px solid #d1d5db;
+ border-radius: 10px;
+ selection-background-color: #bbf7d0;
+ selection-color: #065f46;
+ font-size: 13px;
+ }
+ QTableWidget::item { padding: 10px; }
+ QScrollBar:vertical {
+ background: transparent;
+ width: 10px;
+ margin: 2px;
+ }
+ QScrollBar::handle:vertical {
+ background: #9ca3af;
+ border-radius: 5px;
+ min-height: 20px;
+ }
+ QScrollBar::handle:vertical:hover { background: #6b7280; }
+ 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;
+ }
+ QComboBox:focus, QDateEdit:focus {
+ border: 1px solid #10b981;
+ background-color: #ffffff;
+ }
+ QComboBox QAbstractItemView {
+ border: none;
+ background-color: #ffffff;
+ padding: 6px 4px;
+ outline: none;
+ font-size: 14px;
+ selection-background-color: #10b981;
+ selection-color: white;
+ }
+ QPushButton {
+ border: none;
+ border-radius: 6px;
+ font-weight: 500;
+ padding: 6px 12px;
+ }
+ QPushButton#reload_btn {
+ background-color: #10b981;
+ color: white;
+ font-weight: 600;
+ }
+ QPushButton#reload_btn:hover { background-color: #059669; }
+ QPushButton#clear_btn {
+ background-color: #f3f4f6;
+ color: #374151;
+ border: 1px solid #d1d5db;
+ }
+ QPushButton#clear_btn:hover { background-color: #e5e7eb; }
+ QPushButton.view_btn {
+ background-color: #10b981;
+ color: white;
+ padding: 6px 16px;
+ font-weight: 700;
+ font-size: 13px;
+ }
+ QPushButton.view_btn:hover { background-color: #059669; }
+ """)
+
+ # ───────────── CONSTANTS ─────────────
+ self.media_proxy_base = os.getenv("MEDIA_PROXY_BASE", "http://media-proxy:8080").rstrip("/")
+ self.proxy_local_base = "http://127.0.0.1:19100"
+ self.all_rows = []
+
+ main_layout = QtWidgets.QVBoxLayout(self)
+ main_layout.setSpacing(18)
+
+ # ───────────── HEADER ─────────────
+ header = QtWidgets.QHBoxLayout()
+ title = QtWidgets.QLabel("🧾 Security Events History")
+ title.setStyleSheet("font-size:22px;font-weight:700;color:#0f172a;")
+ header.addWidget(title)
+ header.addStretch(1)
+
+ reload_btn = QtWidgets.QPushButton("Reload")
+ reload_btn.setObjectName("reload_btn")
+ reload_btn.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+ reload_btn.clicked.connect(self.load_from_api)
+ header.addWidget(reload_btn)
+ main_layout.addLayout(header)
+
+ # ───────────── TOOLBAR ─────────────
+ toolbar = QtWidgets.QFrame()
+ toolbar.setStyleSheet("""
+ QFrame {
+ background-color: #ffffff;
+ border: 1px solid #d1d5db;
+ border-radius: 14px;
+ padding: 10px 14px;
+ }
+ """)
+ tl = QtWidgets.QHBoxLayout(toolbar)
+ tl.setContentsMargins(8, 6, 8, 6)
+ tl.setSpacing(8)
+
+ self.device_filter = QtWidgets.QComboBox()
+ self.device_filter.addItem("All Devices")
+ self.device_filter.currentIndexChanged.connect(self.apply_filters)
+
+ self.anomaly_filter = QtWidgets.QComboBox()
+ self.anomaly_filter.addItem("All Anomalies")
+ self.anomaly_filter.currentIndexChanged.connect(self.apply_filters)
+
+ self.severity_slider = QtWidgets.QSlider(QtCore.Qt.Orientation.Horizontal)
+ self.severity_slider.setRange(0, 6)
+ self.severity_slider.setFixedWidth(110)
+ self._update_slider_style(0)
+ self.severity_slider.valueChanged.connect(self._update_slider_style)
+ self.severity_slider.valueChanged.connect(self.apply_filters)
+
+ self.from_date = QtWidgets.QDateEdit(QtCore.QDate.currentDate().addMonths(-1))
+ self.from_date.setDisplayFormat("yyyy-MM-dd")
+ self.from_date.setCalendarPopup(True)
+ self.from_date.dateChanged.connect(self.apply_filters)
+
+ self.to_date = QtWidgets.QDateEdit(QtCore.QDate.currentDate())
+ self.to_date.setDisplayFormat("yyyy-MM-dd")
+ self.to_date.setCalendarPopup(True)
+ self.to_date.dateChanged.connect(self.apply_filters)
+
+ self.sort_combo = QtWidgets.QComboBox()
+ self.sort_combo.addItems([
+ "No Sorting",
+ "Severity (High → Low)",
+ "Severity (Low → High)",
+ "Start Time (Newest)",
+ "Start Time (Oldest)",
+ "End Time (Newest)",
+ "End Time (Oldest)",
+ "Anomaly (A → Z)",
+ "Anomaly (Z → A)"
+ ])
+ self.sort_combo.currentIndexChanged.connect(self.apply_filters)
+
+ clear_btn = QtWidgets.QPushButton("Clear")
+ clear_btn.setObjectName("clear_btn")
+ clear_btn.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+ clear_btn.clicked.connect(self.clear_filters)
+
+ for w in [
+ self.device_filter, self.anomaly_filter,
+ self.severity_slider, self.from_date, self.to_date,
+ self.sort_combo
+ ]:
+ tl.addWidget(w)
+ tl.addStretch(1)
+ tl.addWidget(clear_btn)
+ main_layout.addWidget(toolbar)
+
+ # ───────────── TABLE ─────────────
+ self.table = QtWidgets.QTableWidget()
+ self.table.setColumnCount(8)
+ self.table.setHorizontalHeaderLabels([
+ "ID", "Device", "Anomaly", "Start Time",
+ "End Time", "Duration (s)", "Severity", "View"
+ ])
+ self.table.verticalHeader().setVisible(False)
+ self.table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+ self.table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+ self.table.horizontalHeader().setStretchLastSection(True)
+ self.table.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
+ self.table.verticalHeader().setDefaultSectionSize(48)
+ main_layout.addWidget(self.table, 1)
+
+ QtCore.QTimer.singleShot(300, self.load_from_api)
+
+ # ───────────── SLIDER STYLE ─────────────
+ def _update_slider_style(self, value):
+ percent = value / 6 if value else 0
+ self.severity_slider.setStyleSheet(f"""
+ QSlider::groove:horizontal {{
+ border: 1px solid #d1d5db;
+ height: 6px;
+ border-radius: 3px;
+ background: qlineargradient(
+ x1:0, y1:0, x2:1, y2:0,
+ stop:0 #10b981,
+ stop:{percent} #10b981,
+ stop:{percent} white,
+ stop:1 white
+ );
+ }}
+ QSlider::handle:horizontal {{
+ width: 16px;
+ height: 16px;
+ background: #10b981;
+ border-radius: 8px;
+ margin: -5px 0;
+ border: 1px solid #10b981;
+ }}
+ """)
+
+ # ───────────── LOGIC ─────────────
+ def _safe_int(self, val):
+ try:
+ return int(val)
+ except Exception:
+ return 0
+
+ def _parse_time(self, t):
+ try:
+ if not t:
+ return None
+ dt = datetime.fromisoformat(t.replace("Z", "+00:00"))
+ return dt.replace(tzinfo=None)
+ except Exception:
+ return None
+
+ def _fmt_time(self, t):
+ return t.replace("T", " ").split(".")[0] if t else "-"
+
+ def load_from_api(self):
+ print("[API] Fetching alerts from:", f"{self.api.base}/api/tables/alerts")
+ try:
+ url = f"{self.api.base}/api/tables/alerts"
+ resp = self.api.http.get(url, timeout=8)
+ resp.raise_for_status()
+ data = resp.json()
+
+ # Expect structure: {"rows": [...], "count": N}
+ if isinstance(data, dict) and "rows" in data:
+ rows = data["rows"]
+ count = data.get("count", len(rows))
+ print(f"[API] Loaded {count} total alerts.")
+ else:
+ rows = data if isinstance(data, list) else []
+ print(f"[API][WARN] Unexpected format, using raw list of {len(rows)} items.")
+
+ # ───── Filter only relevant alert types ─────
+ allowed_types = {"climbing_fence", "masked_person", "intruding_animal"}
+ filtered = [r for r in rows if (r.get("alert_type") or "").strip() in allowed_types]
+
+ print(f"[API] Filtered {len(filtered)} / {len(rows)} alerts matching allowed types {allowed_types}.")
+
+ self.all_rows = filtered
+
+ except Exception as e:
+ print("[API][ERROR]", e)
+ QtWidgets.QMessageBox.warning(self, "Error", f"Failed to fetch alerts:\n{e}")
+ return
+
+ # Update the table and filters
+ self.populate_table(self.all_rows)
+ self.populate_filters()
+
+
+
+ def populate_filters(self):
+ devices = sorted({it.get("device_id") or "-" for it in self.all_rows})
+ anomalies = sorted({it.get("anomaly") or "-" for it in self.all_rows})
+ print(f"[FILTERS] Available devices={devices}")
+ print(f"[FILTERS] Available anomalies={anomalies}")
+
+ # devices
+ self.device_filter.blockSignals(True)
+ self.device_filter.clear()
+ self.device_filter.addItem("All Devices", None)
+ for d in devices:
+ self.device_filter.addItem(d, d)
+ self.device_filter.blockSignals(False)
+
+ # anomalies (friendly display)
+ self.anomaly_filter.blockSignals(True)
+ self.anomaly_filter.clear()
+ self.anomaly_filter.addItem("All Anomalies", None)
+ for a in anomalies:
+ label = a.replace("_", " ").title() if a and a != "-" else a
+ self.anomaly_filter.addItem(label, a)
+ self.anomaly_filter.blockSignals(False)
+
+ print("[FILTERS] Filters populated.")
+
+ def apply_filters(self):
+ if not self.all_rows:
+ print("[FILTER] No rows loaded yet.")
+ return
+
+ device = self.device_filter.currentData()
+ anomaly = self.anomaly_filter.currentData()
+ min_sev = self._safe_int(self.severity_slider.value())
+ from_dt = datetime.combine(self.from_date.date().toPyDate(), datetime.min.time())
+ to_dt = datetime.combine(self.to_date.date().toPyDate(), datetime.max.time())
+
+ print(f"\n[FILTER] Applying filters:")
+ print(f" device={device}, anomaly={anomaly}, min_sev={min_sev},")
+ print(f" from={from_dt}, to={to_dt}")
+ print(f" total rows={len(self.all_rows)}")
+
+ filtered = []
+ for idx, it in enumerate(self.all_rows):
+ dev = it.get("device_id") or "-"
+ anom = it.get("anomaly") or "-"
+ sev = self._safe_int(it.get("severity"))
+ started = self._parse_time(it.get("started_at"))
+
+ include = True
+ reasons = []
+
+ # Device filter
+ if device and dev != device:
+ include = False
+ reasons.append(f"device mismatch ({dev} ≠ {device})")
+
+ # Anomaly filter
+ if anomaly and anom != anomaly:
+ include = False
+ reasons.append(f"anomaly mismatch ({anom} ≠ {anomaly})")
+
+ # Severity filter
+ if sev < min_sev:
+ include = False
+ reasons.append(f"severity too low ({sev} < {min_sev})")
+
+ # Date filter
+ if started:
+ if not (from_dt <= started <= to_dt):
+ include = False
+ reasons.append(f"date {started} out of range [{from_dt}, {to_dt}]")
+ else:
+ reasons.append("no start date parsed")
+
+ if include:
+ filtered.append(it)
+ else:
+ print(f"[FILTER][X] Row {idx} excluded — {', '.join(reasons)}")
+
+ print(f"[FILTER] {len(filtered)} / {len(self.all_rows)} rows matched filters.\n")
+
+ # Sorting
+ i = self.sort_combo.currentIndex()
+ keymap = {
+ 1: lambda x: self._safe_int(x.get("severity")),
+ 2: lambda x: self._safe_int(x.get("severity")),
+ 3: lambda x: self._parse_time(x.get("started_at")) or datetime.min,
+ 4: lambda x: self._parse_time(x.get("started_at")) or datetime.min,
+ 5: lambda x: self._parse_time(x.get("ended_at")) or datetime.min,
+ 6: lambda x: self._parse_time(x.get("ended_at")) or datetime.min,
+ 7: lambda x: (x.get("anomaly") or "").lower(),
+ 8: lambda x: (x.get("anomaly") or "").lower(),
+ }
+
+ if i in keymap:
+ reverse = i in (1, 3, 5, 8)
+ print(f"[SORT] Sorting index={i}, reverse={reverse}")
+ filtered.sort(key=keymap[i], reverse=reverse)
+ else:
+ print("[SORT] No sorting applied.")
+
+ self.populate_table(filtered)
+
+
+ def clear_filters(self):
+ print("[FILTER] Clearing filters to defaults.")
+ self.device_filter.setCurrentIndex(0)
+ self.anomaly_filter.setCurrentIndex(0)
+ self.sort_combo.setCurrentIndex(0)
+ self.severity_slider.setValue(0)
+ self.from_date.setDate(QtCore.QDate.currentDate().addMonths(-1))
+ self.to_date.setDate(QtCore.QDate.currentDate())
+ self.apply_filters()
+
+ def _severity_color(self, sev: int) -> str:
+ """Return green intensity from white (low) to dark green (high)."""
+ sev = max(1, min(sev, 9))
+ # interpolate white (#ffffff) → dark green (#059669)
+ def lerp_color(c1, c2, t):
+ c1, c2 = [int(c1[i:i+2], 16) for i in (1, 3, 5)], [int(c2[i:i+2], 16) for i in (1, 3, 5)]
+ mix = [round(c1[j] + (c2[j]-c1[j])*t) for j in range(3)]
+ return f"#{mix[0]:02x}{mix[1]:02x}{mix[2]:02x}"
+ return lerp_color("#ffffff", "#059669", sev / 9)
+
+ def _severity_label(self, sev: int) -> str:
+ if sev <= 3:
+ return f"Low ({sev})"
+ elif sev <= 6:
+ return f"Medium ({sev})"
+ else:
+ return f"Critical ({sev})"
+
+
+
+ def populate_table(self, rows):
+ print(f"[TABLE] Populating table with {len(rows)} alerts.")
+ self.table.setRowCount(len(rows))
+
+ for r, it in enumerate(rows):
+ sid = (str(it.get("alert_id") or "")[:8] + "...") if it.get("alert_id") else "-"
+ self.table.setItem(r, 0, QtWidgets.QTableWidgetItem(sid))
+ self.table.setItem(r, 1, QtWidgets.QTableWidgetItem(it.get("device_id") or "-"))
+ self.table.setItem(r, 2, QtWidgets.QTableWidgetItem(it.get("alert_type") or "-"))
+ self.table.setItem(r, 3, QtWidgets.QTableWidgetItem(self._fmt_time(it.get("started_at"))))
+ self.table.setItem(r, 4, QtWidgets.QTableWidgetItem(self._fmt_time(it.get("ended_at"))))
+ self.table.setItem(r, 5, QtWidgets.QTableWidgetItem(f"{it.get('confidence') or 0:.2f}"))
+
+ # ACK Checkbox indicator
+ ack_value = it.get("ack", False)
+ ack_label = QtWidgets.QLabel("✅" if ack_value else "❌")
+ ack_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+ self.table.setCellWidget(r, 6, ack_label)
+
+ # Centered “View” button for vod
+ btn = QtWidgets.QPushButton("View")
+ btn.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+ btn.setFixedHeight(26)
+ btn.setFixedWidth(65)
+ btn.setStyleSheet("""
+ QPushButton {
+ background-color: #10b981;
+ color: white;
+ border-radius: 6px;
+ font-size: 12px;
+ font-weight: 600;
+ padding: 3px 6px;
+ }
+ QPushButton:hover {
+ background-color: #059669;
+ }
+ """)
+ btn.clicked.connect(lambda _, info=it: self._open_video_player(info))
+
+ btn_container = QtWidgets.QWidget()
+ btn_layout = QtWidgets.QHBoxLayout(btn_container)
+ btn_layout.setContentsMargins(0, 0, 0, 0)
+ btn_layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+ btn_layout.addWidget(btn)
+ self.table.setCellWidget(r, 7, btn_container)
+
+ print("[TABLE] Done populating alerts table.")
+
+
+
+
+
+
+
+
+
+
+
+
+ def _open_video_player(self, info):
+ print(f"[VIDEO] Opening video player for alert={info.get('alert_id')}")
+ url = info.get("vod")
+ if not url:
+ QtWidgets.QMessageBox.warning(self, "No Video", "This alert has no VOD URL.")
+ return
+ self._show_vlc_popup(url)
+
+
+ def _show_vlc_popup(self, url):
+ print(f"[VIDEO] Playing URL: {url}")
+ popup = QtWidgets.QDialog(self)
+ popup.setWindowTitle("Incident Video Playback")
+ popup.setMinimumSize(640, 400)
+ vbox = QtWidgets.QVBoxLayout(popup)
+ player = QtWidgets.QFrame()
+ player.setStyleSheet("background:black;border-radius:8px;")
+ vbox.addWidget(player, 1)
+ inst = vlc.Instance(["--quiet", "--no-video-title-show"])
+ mp = inst.media_player_new()
+ mp.set_media(inst.media_new(url))
+ popup.show()
+ if sys.platform.startswith("win"):
+ mp.set_hwnd(int(player.winId()))
+ else:
+ mp.set_xwindow(int(player.winId()))
+ mp.play()
+ print("[VIDEO] Playback started.")
diff --git a/GUI/src/vast/views/security/incident_player_vlc.py b/GUI/src/vast/views/security/incident_player_vlc.py
new file mode 100644
index 000000000..52bda9b11
--- /dev/null
+++ b/GUI/src/vast/views/security/incident_player_vlc.py
@@ -0,0 +1,1947 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+AgGuard Incident Player — PyQt6 + python-vlc with a tiny DVR proxy.
+
+What’s new in this build:
+- Dynamic live lag: on any segment 404/410, the proxy temporarily hides more
+ tail segments in /live.m3u8 so VLC never requests unavailable parts.
+ (Decay back to normal once stable.)
+- No DVR freeze on resolve (removed items disappear; playback stops/advances).
+- No-cache headers on HLS endpoints.
+"""
+
+from __future__ import annotations
+import sys, os, asyncio, threading, time, re, json
+from dataclasses import dataclass
+from typing import Optional, List, Tuple
+from urllib.parse import urljoin, urlparse, urlunparse
+
+from PyQt6 import QtCore, QtWidgets, QtGui
+from PyQt6.QtCore import Qt, QUrl, QTimer
+from PyQt6.QtWebSockets import QWebSocket
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest
+import vlc # python-vlc
+from aiohttp import web, ClientSession
+from vast.views.security.events_history_page import EventsHistoryPage
+
+
+
+
+# ──────────────────────────────────────────────────────────────────────────────
+# Config
+# ──────────────────────────────────────────────────────────────────────────────
+class Config:
+ MEDIA_BASE = os.getenv("MEDIA_BASE", "http://media-proxy:8080")
+ INCIDENT = os.getenv("INCIDENT", "placeholder")
+ TOKEN = os.getenv("MEDIA_TOKEN", "CHANGE_ME")
+ BIND = os.getenv("BIND", "127.0.0.1")
+ PORT = int(os.getenv("PORT", "19100"))
+
+ # Poll upstream playlist ~2–4x per segment (1.0s segments -> 300ms is good)
+ REFRESH_MS = int(os.getenv("REFRESH_MS", "20000"))
+
+ # Show this many segments in the live window…
+ LIVE_EDGE_SEGMENTS = int(os.getenv("LIVE_EDGE_SEGMENTS", "3"))
+ # …but hide the freshest N (stay behind live edge to avoid stalls)
+ LIVE_LAG_SEGMENTS = int(os.getenv("LIVE_LAG_SEGMENTS", "1"))
+
+ # VLC network caching (ms)
+ NETWORK_CACHING = int(os.getenv("NETWORK_CACHING", "320"))
+
+ ALERTS_WS = os.getenv("ALERTS_WS", "ws://host.docker.internal:8010/ws/alerts")
+ ALERTS_SNAPSHOT_HTTP = os.getenv("ALERTS_SNAPSHOT_HTTP", "")
+
+# ──────────────────────────────────────────────────────────────────────────────
+# Upstream fetcher + DVR state
+# ──────────────────────────────────────────────────────────────────────────────
+@dataclass
+class Segment:
+ uri: str
+ duration: float
+ abs_url: str # absolute URL to fetch
+
+class DvrState:
+ def __init__(self, upstream_index_url: str, auth_token: str = "", refresh_ms: int = 800):
+ self.upstream_index_url = upstream_index_url
+ self.auth_token = auth_token
+ self.refresh_ms = refresh_ms
+ self.init_url: Optional[str] = None
+ self.target_duration: float = 1.0
+ self.version: int = 6
+ self.segments: List[Segment] = []
+ self._last_playlist_text: Optional[str] = None
+ self._stop = False
+ self._ready_evt = threading.Event()
+ self._lock = threading.Lock()
+
+ @staticmethod
+ def _absolutize(base: str, maybe_rel: str) -> str:
+ return urljoin(base, maybe_rel)
+
+ async def _fetch_text(self, session: ClientSession, url: str) -> Tuple[int, str]:
+ headers = {}
+ if self.auth_token:
+ headers["Authorization"] = f"Bearer {self.auth_token}"
+ async with session.get(url, headers=headers, timeout=10) as resp:
+ txt = await resp.text()
+ status = resp.status
+ if status == 200 and txt.lstrip().startswith("#EXTM3U"):
+ print(f"[DVR] fetched playlist {status}, {len(txt)} bytes")
+ else:
+ print(f"[DVR] upstream status={status}, body[:120]={txt[:120]!r}")
+ return status, txt
+
+ def stop(self):
+ self._stop = True
+ self._ready_evt.set()
+
+ async def run(self):
+ async with ClientSession() as session:
+ base = self.upstream_index_url
+ base_dir = base.rsplit("/", 1)[0] + "/"
+ while not self._stop:
+ try:
+ status, text = await self._fetch_text(session, base)
+
+ # Hard-stop conditions: upstream removed/closed
+ if status in (404, 410):
+ print(f"[DVR] upstream gone (HTTP {status}); stop polling")
+ self.stop()
+ break
+
+ # Always parse; de-dupe by URL prevents dupes
+ if text.lstrip().startswith("#EXTM3U"):
+ self._parse_and_update(text, base_dir)
+ self._last_playlist_text = text
+ self._ready_evt.set()
+ else:
+ if text != self._last_playlist_text:
+ self._last_playlist_text = text
+ print("[DVR] NOTE: got non-HLS body; will retry.")
+ except Exception as e:
+ print(f"[DVR] fetch error: {e!r}")
+ await asyncio.sleep(self.refresh_ms / 1000.0)
+
+ def _parse_and_update(self, playlist_text: str, base_dir: str):
+ lines = [l.strip() for l in playlist_text.splitlines() if l.strip()]
+
+ target_from_tag: Optional[float] = None
+ max_seen_extinf = 0.0
+ for l in lines:
+ if l.startswith('#EXT-X-TARGETDURATION:'):
+ try:
+ target_from_tag = float(l.split(':', 1)[1])
+ except Exception:
+ pass
+ elif l.startswith('#EXT-X-VERSION:'):
+ try:
+ self.version = int(l.split(':', 1)[1])
+ except Exception:
+ pass
+ elif l.startswith('#EXT-X-MAP:'):
+ m = re.search(r'URI="([^"]+)"', l)
+ if m:
+ self.init_url = self._absolutize(base_dir, m.group(1))
+ elif l.startswith('#EXTINF:'):
+ try:
+ d = float(l.split(':', 1)[1].split(',')[0])
+ max_seen_extinf = max(max_seen_extinf, d)
+ except Exception:
+ pass
+
+ new_segments: List[Segment] = []
+ i = 0
+ while i < len(lines):
+ l = lines[i]
+ if l.startswith('#EXTINF:'):
+ try:
+ dur = float(l.split(':', 1)[1].split(',')[0])
+ except Exception:
+ dur = self.target_duration or 1.0
+ j = i + 1
+ while j < len(lines) and lines[j].startswith('#'):
+ j += 1
+ if j < len(lines):
+ uri = lines[j]
+ absu = self._absolutize(base_dir, uri)
+ new_segments.append(Segment(uri=uri, duration=dur, abs_url=absu))
+ i = j + 1
+ continue
+ i += 1
+
+ if target_from_tag is None or target_from_tag <= 0:
+ self.target_duration = max(1.0, max_seen_extinf or self.target_duration or 1.0)
+ else:
+ self.target_duration = target_from_tag
+
+ added = 0
+ with self._lock:
+ seen_urls = {s.abs_url for s in self.segments}
+ for s in new_segments:
+ if s.abs_url not in seen_urls:
+ self.segments.append(s)
+ seen_urls.add(s.abs_url)
+ added += 1
+ if added:
+ print(f"[DVR] +{added} segments (total={len(self.segments)})")
+
+ def render_dvr_vod_playlist(self, *, endlist: bool = False) -> Tuple[str, float]:
+ with self._lock:
+ segs = list(self.segments)
+ init_url = self.init_url
+ target = int(max(1.0, self.target_duration))
+ version = self.version
+
+ total = sum(s.duration for s in segs)
+
+ out: List[str] = []
+ out.append('#EXTM3U')
+ out.append(f'#EXT-X-VERSION:{version}')
+ out.append('#EXT-X-PLAYLIST-TYPE:EVENT')
+ out.append('#EXT-X-INDEPENDENT-SEGMENTS')
+ out.append(f'#EXT-X-TARGETDURATION:{target}')
+ out.append(f'#EXT-X-MEDIA-SEQUENCE:0')
+
+ if init_url:
+ out.append(f'#EXT-X-MAP:URI="/seg?u={init_url}"')
+
+ for s in segs:
+ out.append(f'#EXTINF:{s.duration:.3f},')
+ out.append(f'/seg?u={s.abs_url}')
+
+ if endlist:
+ out.append('#EXT-X-ENDLIST')
+
+ return "\n".join(out) + "\n", float(total)
+
+# ──────────────────────────────────────────────────────────────────────────────
+# Aiohttp proxy app
+# ──────────────────────────────────────────────────────────────────────────────
+import socket
+
+def is_port_in_use(port=19090, host="127.0.0.1"):
+ with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+ return s.connect_ex((host, port)) == 0
+
+class ProxyServer:
+ def __init__(self, media_base: str, camera: Optional[str], incident: Optional[str],
+ token: str, refresh_ms: int, bind: str, port: int):
+ self.media_base = media_base.rstrip('/')
+ self.camera = camera
+ self.incident = incident
+ self.token = token
+ self.refresh_ms = refresh_ms
+ self.bind = bind
+ self.port = port
+
+ self.upstream_index: Optional[str] = None
+ self.dvr: Optional[DvrState] = None
+ self.resolved: bool = False
+
+ # Dynamic lag control
+ self._last_seg_404_ts: float = 0.0 # monotonic timestamp of last 404/410
+ self._extra_lag_floor: int = 0 # can be bumped to 1–2 and decays over time
+
+ self._app = web.Application()
+ self._app.router.add_get('/dvr.m3u8', self.handle_dvr)
+ self._app.router.add_get('/live.m3u8', self.handle_live)
+ self._app.router.add_get('/seg', self.handle_seg)
+ self._app.router.add_get('/', self.handle_root)
+ self._app.router.add_get('/dvr_seek.m3u8', self.handle_dvr_seek)
+ self._app.router.add_get("/vod", self.handle_vod)
+
+
+ # DEBUG routes
+ self._app.router.add_get('/debug/upstream', self.handle_debug_upstream)
+ self._app.router.add_get('/debug/dvr', self.handle_debug_dvr)
+ self._app.router.add_get('/debug/state', self.handle_debug_state)
+
+ self._runner: Optional[web.AppRunner] = None
+ self._thread: Optional[threading.Thread] = None
+ self._loop: Optional[asyncio.AbstractEventLoop] = None
+
+ # no-cache headers helper
+ def _nocache_headers(self) -> dict:
+ return {
+ "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
+ "Pragma": "no-cache",
+ "Expires": "0",
+ }
+
+ # quick helper so UI knows totals
+ def get_durations_ms(self) -> Tuple[int, int]:
+ if not self.dvr:
+ return (0, 0)
+ with self.dvr._lock:
+ segs = list(self.dvr.segments)
+ total_ms = int(sum(s.duration for s in segs) * 1000)
+ edge = max(1, int(getattr(Config, "LIVE_EDGE_SEGMENTS", 3)))
+ lag = max(0, int(getattr(Config, "LIVE_LAG_SEGMENTS", 0)))
+ # Apply dynamic lag here too so UI stays coherent with playlist
+ lag += self._current_extra_lag()
+ keep = min(len(segs), max(1, edge + lag))
+ last = segs[-keep:] if keep <= len(segs) else segs
+ live_win_ms = int(sum(s.duration for s in last) * 1000)
+ return (total_ms, live_win_ms)
+ async def handle_vod(self, request):
+ vod_url = request.query.get("u")
+ if not vod_url:
+ raise web.HTTPBadRequest(text="missing u")
+
+ if not vod_url.startswith(("http://", "https://")):
+ vod_url = f"http://{vod_url.lstrip('/')}"
+
+ headers = {}
+ if self.token:
+ headers["Authorization"] = f"Bearer {self.token}"
+
+ range_hdr = request.headers.get("Range")
+ if range_hdr:
+ headers["Range"] = range_hdr
+
+ try:
+ async with ClientSession() as session:
+ async with session.get(vod_url, headers=headers, timeout=None) as resp:
+ response_headers = {
+ "Content-Type": resp.headers.get("Content-Type", "video/mp4"),
+ "Accept-Ranges": resp.headers.get("Accept-Ranges", "bytes"),
+ **self._nocache_headers(),
+ }
+ if "Content-Length" in resp.headers:
+ response_headers["Content-Length"] = resp.headers["Content-Length"]
+ if "Content-Range" in resp.headers:
+ response_headers["Content-Range"] = resp.headers["Content-Range"]
+
+ print(f"[HTTP] vod {resp.status} -> {vod_url} "
+ f"({resp.headers.get('Content-Length', '?')} bytes, range={range_hdr})")
+
+ proxy_resp = web.StreamResponse(status=resp.status, headers=response_headers)
+ await proxy_resp.prepare(request)
+
+ try:
+ async for chunk in resp.content.iter_chunked(8192):
+ await proxy_resp.write(chunk)
+ await proxy_resp.write_eof()
+ except (asyncio.CancelledError, ConnectionResetError, ClientConnectionError, ClientPayloadError) as e:
+ # ✅ harmless — VLC moved to another range
+ print(f"[HTTP] client disconnected early ({type(e).__name__}) — OK")
+ except Exception as e:
+ print(f"[HTTP] stream write error: {type(e).__name__}: {e}")
+ finally:
+ await proxy_resp.write_eof()
+
+ return proxy_resp
+
+ except Exception as e:
+ print(f"[HTTP] vod fetch error: {e!r} <- {vod_url}")
+ return web.Response(
+ text=f"vod fetch error: {type(e).__name__}: {e}",
+ content_type="text/plain",
+ status=502,
+ headers=self._nocache_headers(),
+ )
+
+
+ # Dynamic lag amount based on recent 404s
+ def _current_extra_lag(self) -> int:
+ now = time.monotonic()
+ extra = 0
+ if self._last_seg_404_ts > 0:
+ dt = now - self._last_seg_404_ts
+ # immediately after a 404, be conservative with +2;
+ # after 10s, ease to +1; after 30s, back to +0
+ if dt < 10:
+ extra = 2
+ elif dt < 30:
+ extra = 1
+ else:
+ extra = 0
+ # floor in case we had repeated issues and want to hold higher lag briefly
+ extra = max(extra, self._extra_lag_floor)
+ # decay the floor gently
+ if self._extra_lag_floor and (now - self._last_seg_404_ts) > 20:
+ self._extra_lag_floor = max(0, self._extra_lag_floor - 1)
+ return extra
+
+ def _bump_extra_lag(self, floor_to: int):
+ self._last_seg_404_ts = time.monotonic()
+ self._extra_lag_floor = max(self._extra_lag_floor, floor_to)
+ print(f"[LIVE] segment 404/410 observed → increasing effective lag (floor={self._extra_lag_floor})")
+
+ # DEBUG HANDLERS
+ async def handle_debug_upstream(self, _request: web.Request):
+ if not self.upstream_index:
+ return web.Response(text="(no upstream_index yet)\n", content_type="text/plain")
+ headers = {}
+ if self.token:
+ headers['Authorization'] = f'Bearer {self.token}'
+ try:
+ async with ClientSession() as session:
+ async with session.get(self.upstream_index, headers=headers, timeout=10) as resp:
+ body = await resp.text()
+ out = [
+ f"URL: {self.upstream_index}",
+ f"HTTP {resp.status}",
+ "",
+ body
+ ]
+ print(f"[HTTP] debug_upstream {resp.status}")
+ return web.Response(text="\n".join(out), content_type='text/plain', status=resp.status, headers=self._nocache_headers())
+ except Exception as e:
+ return web.Response(text=f"fetch error: {type(e).__name__}: {e}\n", content_type="text/plain", status=500, headers=self._nocache_headers())
+
+ async def handle_debug_dvr(self, _request: web.Request):
+ if not self.dvr:
+ return web.Response(text="(no DVR yet)\n", content_type="text/plain", headers=self._nocache_headers())
+ m3u8, total = self.dvr.render_dvr_vod_playlist(endlist=self.resolved)
+ hdr = f"# segment_count={len(self.dvr.segments)} total_duration_seconds={total:.3f} resolved={self.resolved}\n"
+ print(f"[HTTP] debug_dvr segments={len(self.dvr.segments)} total_s={total:.3f} endlist={self.resolved}")
+ return web.Response(text=hdr + m3u8, content_type="text/plain", headers=self._nocache_headers())
+
+ async def handle_debug_state(self, _request: web.Request):
+ info = {
+ "camera": self.camera,
+ "incident": self.incident,
+ "upstream_index": self.upstream_index,
+ "have_dvr": bool(self.dvr),
+ "segment_count": len(self.dvr.segments) if self.dvr else 0,
+ "target_duration": getattr(self.dvr, "target_duration", None) if self.dvr else None,
+ "have_init": bool(getattr(self.dvr, "init_url", None)) if self.dvr else False,
+ "resolved": self.resolved,
+ "extra_lag": self._current_extra_lag(),
+ }
+ print(f"[HTTP] state: {info}")
+ return web.json_response(info, headers=self._nocache_headers())
+
+ # URL helpers
+ def _rewrite_to_media_base(self, any_hls_url: str) -> str:
+ if not any_hls_url:
+ return any_hls_url
+ mb = urlparse(self.media_base)
+ if any_hls_url.startswith('/') and not any_hls_url.startswith('//'):
+ return f"{mb.scheme}://{mb.netloc}{any_hls_url}"
+ u = urlparse(any_hls_url)
+ if not u.scheme or not u.netloc:
+ return f"{mb.scheme}://{mb.netloc}/{any_hls_url.lstrip('/')}"
+ return urlunparse(u._replace(scheme=mb.scheme, netloc=mb.netloc))
+
+ def _normalize_live_playlist(self, upstream_text: str, upstream_index_url: str) -> str:
+ base_dir = upstream_index_url.rsplit("/", 1)[0] + "/"
+ lines = [l.strip() for l in upstream_text.splitlines() if l.strip()]
+
+ version = 6
+ media_seq = 0
+
+ segments = []
+ init_map_abs = None
+ max_extinf = 1.0
+
+ i = 0
+ while i < len(lines):
+ l = lines[i]
+ if l.startswith("#EXT-X-VERSION:"):
+ try: version = int(l.split(":", 1)[1])
+ except: pass
+ elif l.startswith("#EXT-X-MEDIA-SEQUENCE:"):
+ try: media_seq = int(l.split(":", 1)[1])
+ except: media_seq = 0
+ elif l.startswith("#EXT-X-MAP:"):
+ m = re.search(r'URI="([^"]+)"', l)
+ if m:
+ init_map_abs = urljoin(base_dir, m.group(1))
+ elif l.startswith("#EXTINF:"):
+ try:
+ dur = float(l.split(':', 1)[1].split(',')[0])
+ except Exception:
+ dur = 1.0
+ max_extinf = max(max_extinf, dur)
+ attached = []
+ j = i + 1
+ while j < len(lines) and lines[j].startswith("#"):
+ attached.append(lines[j]); j += 1
+ if j < len(lines):
+ uri = lines[j]
+ segments.append((dur, attached, uri))
+ i = j
+ else:
+ i = j
+ i += 1
+ continue
+ i += 1
+
+ base_edge = max(1, int(getattr(Config, "LIVE_EDGE_SEGMENTS", 3)))
+ base_lag = max(0, int(getattr(Config, "LIVE_LAG_SEGMENTS", 0)))
+ # Add dynamic lag derived from recent 404s
+ effective_lag = base_lag + self._current_extra_lag()
+
+ total = len(segments)
+ keep = min(total, max(1, base_edge + effective_lag))
+ start_index = max(0, total - keep)
+ end_index = max(0, total - effective_lag)
+ trimmed = segments[start_index:end_index]
+ new_media_seq = media_seq + start_index
+
+ out = [
+ "#EXTM3U",
+ f"#EXT-X-VERSION:{version}",
+ "#EXT-X-PLAYLIST-TYPE:LIVE",
+ f"#EXT-X-TARGETDURATION:{int(max(1, round(max_extinf + 0.0001)))}",
+ "#EXT-X-INDEPENDENT-SEGMENTS",
+ f"#EXT-X-MEDIA-SEQUENCE:{new_media_seq}",
+ ]
+
+ if init_map_abs:
+ out.append(f'#EXT-X-MAP:URI="/seg?u={init_map_abs}"')
+
+ for dur, attached_tags, uri in trimmed:
+ out.append(f"#EXTINF:{dur:.3f},")
+ for t in attached_tags:
+ out.append(t)
+ seg_abs = urljoin(base_dir, uri)
+ out.append(f'/seg?u={seg_abs}')
+
+ print(f"[LIVE] served {len(trimmed)} segs (edge={base_edge}, lag={effective_lag}, seq={new_media_seq})")
+ return "\n".join(out) + "\n"
+
+ # Source switching
+ def switch_source(self, *, camera: Optional[str] = None,
+ incident: Optional[str] = None,
+ upstream_hls: Optional[str] = None):
+ if camera:
+ self.camera = camera
+ if incident:
+ self.incident = incident
+
+ self.resolved = False
+ self._last_seg_404_ts = 0.0
+ self._extra_lag_floor = 0
+
+ if upstream_hls:
+ self.upstream_index = self._rewrite_to_media_base(upstream_hls)
+ else:
+ if not (self.camera and self.incident):
+ return
+ self.upstream_index = f"{self.media_base}/hls/{self.camera}/{self.incident}/index.m3u8"
+
+ print(f"[SRC] switch to upstream={self.upstream_index}")
+
+ if self.dvr:
+ try:
+ self.dvr.stop()
+ except Exception:
+ pass
+ self.dvr = DvrState(self.upstream_index, auth_token=self.token, refresh_ms=self.refresh_ms)
+
+ if self._loop and self._loop.is_running():
+ def _start():
+ print("[SRC] starting DVR loop")
+ self._loop.create_task(self.dvr.run())
+ self._loop.call_soon_threadsafe(_start)
+
+ def mark_resolved(self):
+ if self.resolved:
+ return
+ self.resolved = True
+ if self.dvr:
+ try:
+ self.dvr.stop()
+ except Exception:
+ pass
+ self.upstream_index = None
+ print("[SRC] incident resolved; upstream disabled; no DVR freeze")
+
+ # HTTP handlers
+ async def handle_root(self, _request: web.Request):
+ return web.Response(text='OK', content_type='text/plain', headers=self._nocache_headers())
+
+ async def handle_dvr(self, _request: web.Request):
+ # No DVR freeze behavior
+ return web.Response(text="#EXTM3U\n#EXT-X-ENDLIST\n", content_type='application/vnd.apple.mpegurl', status=410, headers=self._nocache_headers())
+
+ async def handle_live(self, _request: web.Request):
+ if self.resolved or not self.upstream_index:
+ return web.Response(text="#EXTM3U\n#EXT-X-ENDLIST\n", content_type='application/vnd.apple.mpegurl', status=410, headers=self._nocache_headers())
+
+ headers = {}
+ if self.token:
+ headers['Authorization'] = f'Bearer {self.token}'
+ try:
+ async with ClientSession() as session:
+ async with session.get(self.upstream_index, headers=headers, timeout=10) as resp:
+ text = await resp.text()
+ if resp.status >= 400:
+ print(f"[HTTP] live.m3u8 upstream {resp.status}")
+ if resp.status in (404, 410):
+ self.mark_resolved()
+ return web.Response(text="#EXTM3U\n#EXT-X-ENDLIST\n", content_type='application/vnd.apple.mpegurl', status=410, headers=self._nocache_headers())
+ return web.Response(text=f"# upstream {resp.status}\n{text}", content_type='text/plain', status=resp.status, headers=self._nocache_headers())
+ except Exception as e:
+ print(f"[HTTP] live.m3u8 fetch error: {e!r}")
+ return web.Response(text=f"# fetch error: {type(e).__name__}: {e}\n", content_type='text/plain', status=502, headers=self._nocache_headers())
+
+ text = self._normalize_live_playlist(text, self.upstream_index)
+ return web.Response(text=text, content_type='application/vnd.apple.mpegurl', headers=self._nocache_headers())
+
+ async def handle_seg(self, request: web.Request):
+ url = request.query.get('u')
+ if not url:
+ raise web.HTTPBadRequest(text='missing u')
+ headers = {}
+ if self.token:
+ headers['Authorization'] = f'Bearer {self.token}'
+ try:
+ async with ClientSession() as session:
+ async with session.get(url, headers=headers, timeout=20) as resp:
+ body = await resp.read()
+ ctype = resp.headers.get('Content-Type', 'application/octet-stream')
+ status = resp.status
+ print(f"[HTTP] seg {status} {ctype} {len(body)} bytes <- {url}")
+ # On 404/410, bump lag so subsequent /live.m3u8 hides fresher segs
+ if status in (404, 410):
+ self._bump_extra_lag(floor_to=2)
+ return web.Response(body=body, content_type=ctype, status=status, headers=self._nocache_headers())
+ except Exception as e:
+ print(f"[HTTP] seg fetch error: {e!r} <- {url}")
+ return web.Response(text=f"segment fetch error: {type(e).__name__}: {e}", content_type="text/plain", status=502, headers=self._nocache_headers())
+
+ async def handle_dvr_seek(self, request: web.Request):
+ if self.resolved or not self.dvr:
+ return web.Response(text="#EXTM3U\n#EXT-X-ENDLIST\n",
+ content_type='application/vnd.apple.mpegurl',
+ status=410,
+ headers=self._nocache_headers())
+
+ t_ms_str = request.query.get('t', '0')
+ try:
+ t_ms = max(0, int(float(t_ms_str)))
+ except Exception:
+ t_ms = 0
+
+ with self.dvr._lock:
+ segs = list(self.dvr.segments)
+ init_url = self.dvr.init_url
+ version = self.dvr.version
+ target = int(max(1.0, self.dvr.target_duration))
+
+ # Compute which segment contains t_ms and how far into it we need to start.
+ acc_ms = 0.0
+ start_idx = 0
+ intra_ms = 0.0
+ for i, s in enumerate(segs):
+ next_acc = acc_ms + s.duration * 1000.0
+ if next_acc > t_ms:
+ start_idx = i
+ intra_ms = max(0.0, t_ms - acc_ms)
+ break
+ acc_ms = next_acc
+ else:
+ # Past the end → start at the last segment, no intra offset
+ start_idx = max(0, len(segs) - 1)
+ intra_ms = 0.0
+
+ trimmed = segs[start_idx:]
+ media_seq = start_idx
+
+ out = []
+ out.append('#EXTM3U')
+ out.append(f'#EXT-X-VERSION:{version}')
+ out.append('#EXT-X-PLAYLIST-TYPE:EVENT')
+ out.append('#EXT-X-INDEPENDENT-SEGMENTS')
+ out.append(f'#EXT-X-TARGETDURATION:{max(1, target)}')
+ out.append(f'#EXT-X-MEDIA-SEQUENCE:{media_seq}')
+
+ # PRECISE intra-segment start (many players honor this; helps VLC too)
+ # Start "intra_ms" seconds *into* the first segment of this playlist.
+ out.append(f'#EXT-X-START:TIME-OFFSET={intra_ms/1000.0:.3f},PRECISE=YES')
+
+ if init_url:
+ out.append(f'#EXT-X-MAP:URI="/seg?u={init_url}"')
+
+ for s in trimmed:
+ out.append(f'#EXTINF:{s.duration:.3f},')
+ out.append(f'/seg?u={s.abs_url}')
+
+ body = "\n".join(out) + "\n"
+ print(f"[HTTP] dvr_seek.m3u8 t={t_ms}ms -> start_idx={start_idx} intra={int(intra_ms)}ms segs={len(trimmed)} resolved={self.resolved}")
+ # Optional debug header — handy to confirm behavior in logs/curl:
+ headers = self._nocache_headers() | {"X-Start-Offset-Ms": str(int(intra_ms))}
+ return web.Response(text=body,
+ content_type='application/vnd.apple.mpegurl',
+ headers=headers)
+
+ # Lifecycle
+ def start(self):
+ def _run_loop():
+ loop = asyncio.new_event_loop()
+ self._loop = loop
+ asyncio.set_event_loop(loop)
+ self._runner = web.AppRunner(self._app)
+ loop.run_until_complete(self._runner.setup())
+ site = web.TCPSite(self._runner, self.bind, self.port)
+ loop.run_until_complete(site.start())
+ print(f"[HTTP] proxy listening on http://{self.bind}:{self.port}")
+ try:
+ loop.run_forever()
+ finally:
+ loop.run_until_complete(self._runner.cleanup())
+ loop.stop()
+ if is_port_in_use(19090):
+ print("[INFO] DVR proxy already running on port 19090, reusing it.")
+ else:
+ self._thread = threading.Thread(target=_run_loop, daemon=True)
+ self._thread.start()
+
+ def stop(self):
+ if self.dvr:
+ self.dvr.stop()
+
+# ──────────────────────────────────────────────────────────────────────────────
+# LEFT PANE + UI — unchanged except: no DVR freeze on resolve
+# ──────────────────────────────────────────────────────────────────────────────
+class AlertsModel(QtCore.QAbstractListModel):
+ def __init__(self):
+ super().__init__()
+ self._items: list[dict] = []
+
+ def rowCount(self, parent=None):
+ return len(self._items)
+
+ def data(self, idx, role):
+ if not idx.isValid():
+ return None
+ if role == QtCore.Qt.ItemDataRole.DisplayRole:
+ a = self._items[idx.row()]
+ status = (a.get("status") or "firing").lower()
+ return f'[{status}] {a.get("camera")} {a.get("anomaly")} ({a.get("incident_id")})'
+ return None
+
+ def is_empty(self) -> bool:
+ return len(self._items) == 0
+
+ def set_alerts(self, items: list[dict]):
+ self.beginResetModel()
+ self._items = list(items or [])
+ self.endResetModel()
+
+ def add_alerts(self, items):
+ if not items:
+ return
+ start = len(self._items)
+ self.beginInsertRows(QtCore.QModelIndex(), start, start + len(items) - 1)
+ self._items.extend(items)
+ self.endInsertRows()
+
+ def get(self, row: int):
+ return self._items[row]
+
+ def _key(self, it: dict) -> tuple[str, str]:
+ return (str(it.get("camera") or ""), str(it.get("incident_id") or ""))
+
+ def as_dict(self) -> dict[tuple[str, str], dict]:
+ return { self._key(it): it for it in self._items }
+
+ def replace_with(self, merged: dict[tuple[str,str], dict]):
+ self.set_alerts(list(merged.values()))
+
+ def remove_by_key(self, camera: str, incident_id: str):
+ k = (str(camera or ""), str(incident_id or ""))
+ for i, it in enumerate(self._items):
+ if (str(it.get("camera") or ""), str(it.get("incident_id") or "")) == k:
+ self.beginRemoveRows(QtCore.QModelIndex(), i, i)
+ self._items.pop(i)
+ self.endRemoveRows()
+ return True
+ return False
+
+class AlertItemDelegate(QtWidgets.QStyledItemDelegate):
+ def paint(self, painter: QtGui.QPainter, option: QtWidgets.QStyleOptionViewItem, index: QtCore.QModelIndex):
+ model: AlertsModel = index.model() # type: ignore
+ a = model.get(index.row())
+ r = option.rect
+ painter.save()
+
+ if option.state & QtWidgets.QStyle.StateFlag.State_Selected:
+ painter.fillRect(r, QtGui.QColor("#eef8ff"))
+ elif option.state & QtWidgets.QStyle.StateFlag.State_MouseOver:
+ painter.fillRect(r, QtGui.QColor("#f6fafc"))
+
+ status = (a.get("status") or "firing").lower()
+ color = {"firing": "#16a34a", "resolved": "#94a3b8", "warning": "#f59e0b"}.get(status, "#16a34a")
+ chip = QtCore.QRect(r.left() + 10, r.center().y() - 5, 10, 10)
+ painter.setBrush(QtGui.QColor(color))
+ painter.setPen(QtCore.Qt.PenStyle.NoPen)
+ painter.drawEllipse(chip)
+
+ x = chip.right() + 10
+ cam = str(a.get("camera") or "")
+ anom = str(a.get("anomaly") or "")
+ inc = str(a.get("incident_id") or "")[:8]
+
+ title_font = QtGui.QFont(option.font); title_font.setPointSizeF(option.font.pointSizeF() + 1); title_font.setBold(True)
+ sub_font = QtGui.QFont(option.font); sub_font.setPointSizeF(option.font.pointSizeF() - 1)
+
+ painter.setPen(QtGui.QColor("#111827"))
+ painter.setFont(title_font)
+ painter.drawText(QtCore.QRect(x, r.top() + 4, r.width() - 20, 18),
+ QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter,
+ f"{cam} • {anom}")
+
+ painter.setPen(QtGui.QColor("#6b7280"))
+ painter.setFont(sub_font)
+ painter.drawText(QtCore.QRect(x, r.top() + 22, r.width() - 20, 16),
+ QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter,
+ f"Incident: {inc}… • Status: {status}")
+
+ painter.restore()
+
+ def sizeHint(self, option: QtWidgets.QStyleOptionViewItem, _index: QtCore.QModelIndex) -> QtCore.QSize:
+ return QtCore.QSize(220, 42)
+
+LEFT_LIST_QSS = """
+QListView {
+ padding: 6px;
+ background: #ffffff;
+ border: 1px solid #e5e7eb;
+ border-radius: 12px;
+}
+QListView::item { padding: 4px 8px; }
+QListView::item:selected { background: #eef8ff; border-radius: 8px; }
+QScrollBar:vertical { background: transparent; width: 10px; margin: 8px 2px 8px 2px; border-radius: 5px; }
+QScrollBar::handle:vertical { background: #cbd5e1; min-height: 32px; border-radius: 5px; }
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }
+#LeftHeader { color: #6b7280; font-weight: 600; letter-spacing: 0.4px; margin: 0 6px 6px 6px; }
+"""
+
+class SeekSlider(QtWidgets.QSlider):
+ hovered = QtCore.pyqtSignal(int)
+ clickedTo = QtCore.pyqtSignal(int)
+ draggedTo = QtCore.pyqtSignal(int)
+
+ def __init__(self, orientation, parent=None):
+ super().__init__(orientation, parent)
+ self._press_x: Optional[float] = None
+ self._moved: bool = False
+ self._CLICK_EPS = 4.0
+ self._EDGE_SNAP_PX = 8 # ← new: snap zone near the ends
+
+ def mousePressEvent(self, ev: QtGui.QMouseEvent):
+ if ev.button() == Qt.MouseButton.LeftButton:
+ self._press_x = float(ev.position().x())
+ self._moved = False
+ self.setSliderDown(True)
+ ev.accept()
+ return
+ super().mousePressEvent(ev)
+
+ def mouseMoveEvent(self, ev: QtGui.QMouseEvent):
+ x = float(ev.position().x())
+ if self._press_x is not None and abs(x - self._press_x) > self._CLICK_EPS:
+ self._moved = True
+ val = self._value_for_x(x)
+ self.hovered.emit(val)
+ if self._moved:
+ self.setValue(val)
+ super().mouseMoveEvent(ev)
+
+ def mouseReleaseEvent(self, ev: QtGui.QMouseEvent):
+ if ev.button() == Qt.MouseButton.LeftButton and self._press_x is not None:
+ x = float(ev.position().x())
+ val = self._value_for_x(x)
+ self.setSliderDown(False)
+ self.setValue(val)
+ if self._moved:
+ self.draggedTo.emit(val)
+ else:
+ self.clickedTo.emit(val)
+ self._press_x = None
+ ev.accept()
+ return
+ super().mouseReleaseEvent(ev)
+
+ def _value_for_x(self, x: float) -> int:
+ opt = QtWidgets.QStyleOptionSlider()
+ self.initStyleOption(opt)
+ groove = self.style().subControlRect(
+ QtWidgets.QStyle.ComplexControl.CC_Slider,
+ opt,
+ QtWidgets.QStyle.SubControl.SC_SliderGroove,
+ self
+ )
+ if groove.width() <= 0:
+ return self.value()
+
+ # NEW: snap to exact min/max if you're near the ends
+ if x <= groove.left() + self._EDGE_SNAP_PX:
+ return self.minimum()
+ if x >= groove.right() - self._EDGE_SNAP_PX:
+ return self.maximum()
+
+ ratio = max(0.0, min(1.0, (x - groove.left()) / groove.width()))
+ return int(self.minimum() + ratio * (self.maximum() - self.minimum()))
+
+
+class VideoSurface(QtWidgets.QStackedWidget):
+ def __init__(self, vlc_widget: QtWidgets.QWidget, parent=None):
+ super().__init__(parent)
+ self.vlcw = vlc_widget
+ self.loading = QtWidgets.QLabel("Loading…")
+ self.loading.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.loading.setStyleSheet("color:#b9c0c7; font-size:18px;")
+ self.addWidget(self.vlcw)
+ self.addWidget(self.loading)
+ self.setCurrentIndex(1)
+
+ def show_loading(self, on: bool):
+ self.setCurrentIndex(1 if on else 0)
+
+class VlcWidget(QtWidgets.QFrame):
+ positionChanged = QtCore.pyqtSignal(float)
+ timeChanged = QtCore.pyqtSignal(int)
+
+ def __init__(self, instance: vlc.Instance, parent=None):
+ super().__init__(parent)
+ self.instance = instance
+ self.mediaplayer = self.instance.media_player_new()
+ self.setMinimumSize(640, 360)
+ self._timer = QtCore.QTimer(self)
+ self._timer.setInterval(200)
+ self._timer.timeout.connect(self._on_tick)
+ self._timer.start()
+
+ def _on_tick(self):
+ if self.mediaplayer:
+ try:
+ pos = self.mediaplayer.get_position()
+ t = self.mediaplayer.get_time()
+ if pos >= 0:
+ self.positionChanged.emit(pos)
+ if t >= 0:
+ self.timeChanged.emit(t)
+ except Exception:
+ pass
+
+ def set_media(self, mrl: str, options: Optional[List[str]] = None):
+ print(f"[VLC] set_media {mrl} opts={options or []}")
+ media = self.instance.media_new(mrl)
+ for opt in (options or []):
+ media.add_option(opt)
+ self.mediaplayer.set_media(media)
+
+ def play(self):
+ if sys.platform.startswith('linux'):
+ self.mediaplayer.set_xwindow(int(self.winId()))
+ elif sys.platform.startswith('win'):
+ self.mediaplayer.set_hwnd(int(self.winId()))
+ else:
+ self.mediaplayer.set_nsobject(int(self.winId()))
+ print("[VLC] play()")
+ self.mediaplayer.play()
+
+ def pause(self):
+ print("[VLC] pause()")
+ self.mediaplayer.pause()
+
+ def set_position(self, pos01: float):
+ p = max(0.0, min(1.0, float(pos01)))
+ print(f"[VLC] set_position {p:.3f}")
+ self.mediaplayer.set_position(p)
+
+ def set_time_ms(self, t_ms: int):
+ t = int(max(0, t_ms))
+ print(f"[VLC] set_time {t}ms")
+ self.mediaplayer.set_time(t)
+
+class IncidentPlayerVLC(QtWidgets.QWidget):
+ def __init__(self, api,alert_service, parent=None):
+ super().__init__(parent)
+ self.api = api
+ self.alert_service = alert_service
+ self.cfg = Config()
+ self.proxy = ProxyServer(
+ media_base=self.cfg.MEDIA_BASE,
+ camera=None,
+ incident=self.cfg.INCIDENT,
+ token=self.cfg.TOKEN,
+ refresh_ms=self.cfg.REFRESH_MS,
+ bind=self.cfg.BIND,
+ port=self.cfg.PORT,
+ )
+ self.proxy.start()
+ self.setWindowTitle("AgGuard — Live Incidents")
+
+ self.setMinimumSize(1100, 620)
+ self.resize(1180, 680)
+ self.setContentsMargins(6, 6, 6, 6)
+
+ THEME_QSS = """
+ QWidget { background:#fafbfc; color:#1f2937; font-size:13px; }
+ QGroupBox { background:#ffffff; border:1px solid #e5e7eb; border-radius:10px; margin-top:14px; }
+ QGroupBox::title { subcontrol-origin: margin; left: 12px; top:-6px; padding:0 4px; color:#0f172a; font-weight:600; }
+ QPushButton { border-radius:10px; padding:7px 12px; background:#10b981; color:white; font-weight:600; border:0; }
+ QPushButton:hover { background:#0ea371; }
+ QLabel#timeLabel { color:#6b7280; font-weight:600; }
+ QLabel#liveBadge { background:#10b981; color:white; padding:3px 8px; border-radius:12px; font-weight:700; }
+ QLabel#liveBadge.off { background:#9ca3af; }
+ QSlider::groove:horizontal { height:8px; background:#e7f6ef; border-radius:4px; }
+ QSlider::handle:horizontal { background:#10b981; width:14px; height:14px; margin:-3px 0; border-radius:7px; }
+ """ + LEFT_LIST_QSS
+ self.setStyleSheet(THEME_QSS)
+
+ os.environ.setdefault("VDPAU_DRIVER", "")
+ os.environ.setdefault("LIBVA_DRIVER_NAME", "")
+ vlc_opts = [
+ f'--network-caching={max(200, int(self.cfg.NETWORK_CACHING))}',
+ '--live-caching=300',
+ '--file-caching=300',
+ '--no-video-title-show',
+ '--quiet',
+ '--aout=dummy',
+ '--avcodec-hw=none',
+ '--drop-late-frames',
+ '--skip-frames',
+ '--clock-jitter=0',
+ ]
+ self.vlc_instance = vlc.Instance(*vlc_opts)
+ self.vlcw = VlcWidget(self.vlc_instance)
+ self.videoSurface = VideoSurface(self.vlcw)
+ self.videoSurface.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding,
+ QtWidgets.QSizePolicy.Policy.Expanding)
+
+ # Controls
+ self.btnLive = QtWidgets.QPushButton('Go Live')
+ self.btnLive.setObjectName("btnLive")
+
+ self.timeLeft = QtWidgets.QLabel('00:00')
+ self.timeLeft.setObjectName("timeLabel")
+ self.slider = SeekSlider(QtCore.Qt.Orientation.Horizontal)
+ self.slider.setRange(0, 0)
+ self.liveBadge = QtWidgets.QLabel('LIVE')
+ self.liveBadge.setObjectName("liveBadge")
+
+ # LEFT PANE
+ leftContainer = QtWidgets.QGroupBox("Alerts")
+ leftContainer.setSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed,
+ QtWidgets.QSizePolicy.Policy.Expanding)
+ leftContainer.setMinimumWidth(300)
+ leftContainer.setMaximumWidth(340)
+
+ leftLayout = QtWidgets.QVBoxLayout(leftContainer)
+ leftLayout.setContentsMargins(10, 10, 10, 10)
+ leftLayout.setSpacing(8)
+
+ self.alertList = QtWidgets.QListView()
+ self.alertList.setMouseTracking(True)
+ self.alertList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
+ self.alertList.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectItems)
+ self.alertList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollMode.ScrollPerPixel)
+ self.alertList.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+ self.alertList.setUniformItemSizes(True)
+ self.alertList.setSpacing(4)
+ self.alertList.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+
+ self.alertModel = AlertsModel()
+ self.alertList.setModel(self.alertModel)
+ self.alertList.setItemDelegate(AlertItemDelegate(self.alertList))
+ leftLayout.addWidget(self.alertList)
+
+ # Details inside player pane
+ self.detailGroup = QtWidgets.QGroupBox("Details")
+ self.detailGroup.setSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred,
+ QtWidgets.QSizePolicy.Policy.Fixed)
+ grid = QtWidgets.QGridLayout(self.detailGroup)
+ grid.setContentsMargins(12, 8, 12, 12)
+ grid.setHorizontalSpacing(24)
+ grid.setVerticalSpacing(6)
+
+ labels = ["Camera:", "Anomaly:", "Incident ID:", "Status:", "Start Time:"]
+ self.lblVals = []
+ for i, title in enumerate(labels):
+ k = QtWidgets.QLabel(title)
+ v = QtWidgets.QLabel("–")
+ v.setStyleSheet("color:#6b7280;")
+ grid.addWidget(k, i, 0, 1, 1)
+ grid.addWidget(v, i, 1, 1, 1)
+ self.lblVals.append(v)
+ self.detailGroup.setMaximumHeight(160)
+
+ # Right stack
+ self.rightStack = QtWidgets.QStackedWidget()
+ self.rightStack.setContentsMargins(0, 0, 0, 0)
+
+ self.emptyPane = QtWidgets.QWidget()
+ ep_layout = QtWidgets.QVBoxLayout(self.emptyPane)
+ ep_layout.setContentsMargins(10, 10, 10, 10)
+ ep_layout.setSpacing(0)
+
+ noTitle = QtWidgets.QLabel("No alerts")
+ noTitle.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ noTitle.setStyleSheet("font-size:22px; font-weight:800; color:#111827;")
+
+ noSub = QtWidgets.QLabel("Alerts will appear here.")
+ noSub.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ noSub.setWordWrap(True)
+ noSub.setStyleSheet("color:#6b7280;")
+
+ ep_layout.addStretch(1)
+ ep_layout.addWidget(noTitle)
+ ep_layout.addWidget(noSub)
+ ep_layout.addStretch(3)
+
+ self.playerPane = QtWidgets.QGroupBox("")
+ rightLayout = QtWidgets.QVBoxLayout(self.playerPane)
+ rightLayout.setContentsMargins(10, 10, 10, 10)
+ rightLayout.setSpacing(10)
+
+ titleRow = QtWidgets.QHBoxLayout()
+ titleRow.setContentsMargins(0, 0, 0, 0)
+ titleRow.setSpacing(10)
+ title = QtWidgets.QLabel("AgGuard — Security Alerts")
+ title.setStyleSheet("font-size:20px; font-weight:800; color:#111827;")
+ dotLive = QtWidgets.QLabel("• LIVE")
+ dotLive.setStyleSheet("color:#10b981; font-weight:700;")
+ titleRow.addWidget(title)
+ titleRow.addStretch(1)
+ titleRow.addWidget(dotLive)
+
+ ctrls = QtWidgets.QHBoxLayout()
+ ctrls.setContentsMargins(0, 0, 0, 0)
+ ctrls.setSpacing(10)
+ ctrls.addWidget(self.btnLive)
+ ctrls.addSpacing(10)
+ ctrls.addWidget(self.timeLeft)
+ ctrls.addSpacing(8)
+ ctrls.addWidget(self.slider, 1)
+ ctrls.addSpacing(8)
+ ctrls.addWidget(self.liveBadge)
+
+ rightLayout.addLayout(titleRow, 0)
+ rightLayout.addWidget(self.videoSurface, 1)
+ rightLayout.addLayout(ctrls, 0)
+ rightLayout.addWidget(self.detailGroup, 0)
+
+
+ self.rightStack.addWidget(self.emptyPane)
+ self.rightStack.addWidget(self.playerPane)
+ self.rightStack.setCurrentIndex(0)
+
+ splitter = QtWidgets.QSplitter(Qt.Orientation.Horizontal)
+ splitter.setChildrenCollapsible(False)
+ splitter.setHandleWidth(6)
+ splitter.addWidget(leftContainer)
+ splitter.addWidget(self.rightStack)
+ splitter.setStretchFactor(0, 0)
+ splitter.setStretchFactor(1, 1)
+ splitter.setSizes([320, 900])
+
+ outer = QtWidgets.QVBoxLayout(self)
+ outer.setContentsMargins(6, 6, 6, 6)
+ outer.setSpacing(6)
+ # outer.addWidget(splitter)
+ # --- Navigation bar ---
+ navBar = QtWidgets.QHBoxLayout()
+ navBar.setContentsMargins(6, 6, 6, 6)
+ navBar.setSpacing(8)
+
+ btnLiveView = QtWidgets.QPushButton("Live Incidents")
+ btnLiveView.setCheckable(True)
+ btnLiveView.setChecked(True)
+ btnHistory = QtWidgets.QPushButton("Events History")
+ btnHistory.setCheckable(True)
+
+ btnStyle = """
+ QPushButton {
+ background:#e5e7eb; border:none; border-radius:8px;
+ padding:6px 12px; font-weight:600;
+ }
+ QPushButton:checked { background:#10b981; color:white; }
+ """
+ btnLiveView.setStyleSheet(btnStyle)
+ btnHistory.setStyleSheet(btnStyle)
+
+ navBar.addWidget(btnLiveView)
+ navBar.addWidget(btnHistory)
+ navBar.addStretch(1)
+
+ # --- Main content stack ---
+ self.stack = QtWidgets.QStackedWidget()
+ self.livePage = QtWidgets.QWidget()
+ self.liveLayout = QtWidgets.QVBoxLayout(self.livePage)
+ self.liveLayout.setContentsMargins(0, 0, 0, 0)
+ self.liveLayout.addWidget(splitter)
+
+ self.historyPage = EventsHistoryPage(api=self.api)
+
+ self.stack.addWidget(self.livePage)
+ self.stack.addWidget(self.historyPage)
+
+ # --- Combine all together ---
+ outer.addLayout(navBar)
+ outer.addWidget(self.stack)
+
+ # --- Navigation logic ---
+ btnLiveView.clicked.connect(lambda: self._switch_page(0, btnLiveView, btnHistory))
+ btnHistory.clicked.connect(lambda: self._switch_page(1, btnHistory, btnLiveView))
+
+
+ # State
+ self.mode_live = False
+ self.dvr_duration_ms = 0
+ self._dragging = False
+ self.current_camera: Optional[str] = None
+ self.current_incident: Optional[str] = None
+ self.current_status: str = "firing"
+
+ self._last_abs_t_ms: int = 0
+ self._playlist_offset_ms: int = 0
+
+ self._ui_freeze_deadline: float = 0.0
+ self._seek_guard_deadline: float = 0.0
+
+ self._live_sync = QTimer(self)
+ self._live_sync.setInterval(800)
+ self._live_sync.timeout.connect(self._maybe_sync_live_timeline)
+
+ #new
+ self._dvr_growth = QTimer(self)
+ self._dvr_growth.setInterval(1200)
+ self._dvr_growth.timeout.connect(self._maybe_grow_dvr_range_only)
+
+ # --- Subscribe to alert service ---
+ self.alert_service.alertsUpdated.connect(self._on_alerts_updated)
+ self.alert_service.alertAdded.connect(self._on_alert_added)
+ self.alert_service.alertRemoved.connect(self._on_alert_removed)
+
+ # Trigger initial load
+ if not self.alert_service.alerts:
+ print("[IncidentPlayer] No cached alerts yet — calling load_initial()")
+ self.alert_service.load_initial()
+ else:
+ print("[IncidentPlayer] Using cached alerts:", len(self.alert_service.alerts))
+ self._on_alerts_updated(self.alert_service.alerts)
+ # WebSocket + snapshot
+ # self.ws: Optional[QWebSocket] = None
+ # self.ws_url: Optional[QUrl] = QUrl(self.cfg.ALERTS_WS) if self.cfg.ALERTS_WS else None
+ # self._ws_backoff_sec = 1
+ # self._ws_ping = QTimer(self)
+ # self._ws_ping.setInterval(15000)
+ # self._ws_ping.timeout.connect(self._ws_send_ping)
+ # self._got_initial_snapshot = False
+ # self._snapshot_resends = 0
+ # self._snapshot_retry_timer = QTimer(self)
+ # self._snapshot_retry_timer.setInterval(1200)
+ # self._snapshot_retry_timer.timeout.connect(self._on_snapshot_retry_tick)
+ # self.net = QNetworkAccessManager(self)
+ # self.net.finished.connect(self._on_http_finished)
+ # self._awaiting_http_snapshot = False
+
+ # if self.ws_url:
+ # self._ws_connect()
+
+ # Connections
+ self.btnLive.clicked.connect(self._go_live)
+ self.slider.hovered.connect(self._on_slider_hover)
+ self.slider.clickedTo.connect(self._on_slider_clicked)
+ self.slider.draggedTo.connect(self._on_slider_drag_released)
+ self.vlcw.positionChanged.connect(self._on_vlc_pos)
+ self.vlcw.timeChanged.connect(self._on_vlc_time)
+ self.alertList.clicked.connect(self._on_pick_alert_from_list)
+
+ self._show_player(False)
+ self._set_idle()
+
+ def _on_alerts_updated(self, alerts: list):
+ """Called when AlertService emits full list (on initial load)."""
+ print(f"[AlertService] Full update: {len(alerts)} alerts")
+ print("[DEBUG] alerts from AlertService:", alerts)
+ self._apply_firing_list(alerts)
+
+ def _on_alert_added(self, alert: dict):
+ """Called when a new alert arrives in real-time."""
+ print(f"[AlertService] New alert added: {alert.get('alert_id')}")
+ self._merge_firing_deltas([alert])
+
+ def _on_alert_removed(self, alert_id: str):
+ """Called when an alert is resolved/removed."""
+ print(f"[AlertService] Alert removed: {alert_id}")
+ self.alertModel.set_alerts([
+ a for a in self.alertModel._items if a.get("alert_id") != alert_id
+ ])
+ self._update_right_pane_visibility()
+
+
+ def _fetch_active_alerts_from_db(self):
+ """Fetch current active alerts directly from the DB API."""
+ try:
+ print("[DB] Fetching active alerts from dashboard API...")
+ url = f"{self.api.base}/api/tables/alerts"
+ resp = self.api.http.get(url, timeout=10)
+ if resp.status_code != 200:
+ print(f"[DB] Failed to fetch alerts: {resp.status_code}")
+ return []
+
+ data = resp.json()
+ alerts = data.get("rows", data) if isinstance(data, dict) else data
+ print(f"[DB] Loaded {len(alerts)} active alerts from DB.")
+ return alerts
+ except Exception as e:
+ print(f"[DB] Error fetching alerts: {e}")
+ return []
+
+
+ # ───── NO-ALERTS helpers ─────
+ def _show_player(self, on: bool):
+ self.rightStack.setCurrentIndex(1 if on else 0)
+ print(f"[UI] right pane -> {'PLAYER' if on else 'NO-ALERTS'}")
+
+ def _update_right_pane_visibility(self):
+ have_any = not self.alertModel.is_empty()
+ print("_update_right_pane_visibility called have any",have_any)
+ if not have_any:
+ try:
+ self.vlcw.mediaplayer.stop()
+ except Exception:
+ pass
+ self._set_idle()
+ self._show_player(False)
+ else:
+ self._show_player(True)
+
+ def _switch_page(self, index: int, active_btn: QtWidgets.QPushButton, inactive_btn: QtWidgets.QPushButton):
+ self.stack.setCurrentIndex(index)
+ active_btn.setChecked(True)
+ inactive_btn.setChecked(False)
+ print(f"[UI] switched to page index={index}")
+
+
+ # ───── alerts helpers ─────
+ def _key(self, it: dict) -> tuple[str, str]:
+ return (str(it.get('camera') or ''), str(it.get('incident_id') or ''))
+
+ # def _normalize_alert(self, it: dict) -> dict:
+ # if not isinstance(it, dict):
+ # return {}
+
+ # labels = it.get("labels", {}) or {}
+ # ann = it.get("annotations", {}) or {}
+
+ # # Normalize field names
+ # flat = {
+ # "camera": labels.get("device") or ann.get("device") or "unknown",
+ # "incident_id": labels.get("alert_id") or ann.get("alert_id"),
+ # "anomaly": labels.get("alertname") or ann.get("category") or "unknown",
+ # "hls": ann.get("hls"),
+ # "vod": ann.get("vod"),
+ # "image_url": ann.get("image_url"),
+ # "lat": ann.get("lat"),
+ # "lon": ann.get("lon"),
+ # "severity": ann.get("severity"),
+ # "summary": ann.get("summary"),
+ # "recommendation": ann.get("recommendation"),
+ # "category": ann.get("category"),
+ # "startsAt": it.get("startsAt"),
+ # "endsAt": it.get("endsAt"),
+ # }
+
+ # # Status inference (Alertmanager has endsAt → resolved)
+ # ends_at = it.get("endsAt")
+ # flat["status"] = "resolved" if ends_at else "firing"
+
+ # return flat
+ def _normalize_alert(self, it: dict) -> dict:
+ return {
+ "camera": it.get("device_id") or it.get("camera"),
+ "incident_id": it.get("alert_id") or it.get("incident_id"),
+ "anomaly": it.get("alert_type") or it.get("anomaly"),
+ "hls": it.get("hls"),
+ "vod": it.get("vod"),
+ "image_url": it.get("image_url"),
+ "summary": it.get("summary"),
+ "severity": it.get("severity"),
+ "started_at": it.get("started_at") or it.get("startsAt"),
+ "ended_at": it.get("ended_at") or it.get("endsAt"),
+ "status": "firing" if not (it.get("ended_at") or it.get("endsAt")) else "resolved",
+ }
+
+
+
+
+ ##new
+ def _maybe_grow_dvr_range_only(self):
+ # Only expand the slider max while paused/seeked (DVR mode). Never move the thumb.
+ if self.mode_live:
+ self._dvr_growth.stop()
+ return
+ if self.proxy.dvr and not self.proxy.resolved:
+ _, total = self.proxy.dvr.render_dvr_vod_playlist()
+ new_max = int(total * 1000)
+ if new_max > self.dvr_duration_ms:
+ self.dvr_duration_ms = new_max
+ self.slider.setRange(0, self.dvr_duration_ms)
+
+
+ def _apply_firing_list(self, firing: list[dict]):
+ firing = [self._normalize_alert(it) for it in (firing or []) if it]
+ print("[DEBUG] normalized firing list:", firing)
+ firing = [it for it in firing if (it.get("status") or "firing").lower() == "firing"]
+
+ sel = self.alertList.selectionModel().currentIndex() if self.alertList.selectionModel() else QtCore.QModelIndex()
+ selected_inc = selected_cam = None
+ if sel.isValid():
+ try:
+ cur = self.alertModel.get(sel.row())
+ selected_inc = cur.get('incident_id')
+ selected_cam = cur.get('camera')
+ except Exception:
+ pass
+
+ self.alertModel.set_alerts(firing)
+ self._update_right_pane_visibility()
+
+ if selected_inc is not None:
+ for row, it in enumerate(firing):
+ if it.get('incident_id') == selected_inc and it.get('camera') == selected_cam:
+ idx = self.alertModel.index(row, 0)
+ self.alertList.selectionModel().select(idx, QtCore.QItemSelectionModel.SelectionFlag.ClearAndSelect)
+ self.alertList.setCurrentIndex(idx)
+ break
+
+ cur_cam = self.current_camera
+ cur_inc = self.current_incident or self.cfg.INCIDENT
+ still_there = any(
+ it.get('camera') == cur_cam and it.get('incident_id') == cur_inc
+ for it in firing
+ ) if (cur_cam and cur_inc) else False
+
+ if (cur_cam and cur_inc) and not still_there:
+ if self.current_camera and self.current_incident:
+ self.alertModel.remove_by_key(self.current_camera, self.current_incident)
+ self.current_status = "resolved"
+ self.proxy.mark_resolved()
+ try:
+ self.vlcw.mediaplayer.stop()
+ except Exception:
+ pass
+
+ if firing:
+ self._show_player(True)
+ self._play_alert(firing[0])
+ else:
+ self._set_idle()
+ self._show_player(False)
+ return
+
+ if firing and not still_there:
+ self._show_player(True)
+ self._play_alert(firing[0])
+
+ def _merge_firing_deltas(self, deltas: list[dict]):
+ current = self.alertModel.as_dict()
+ changed = False
+
+ for raw in (deltas or []):
+ it = self._normalize_alert(raw)
+ print("[DEBUG] normalized:", it)
+ k = self._key(it)
+
+ if it.get('status') == 'firing':
+ if current.get(k) != it:
+ current[k] = it
+ changed = True
+ else:
+ if k in current:
+ current.pop(k, None)
+ changed = True
+
+ if (self.current_camera, self.current_incident) == k and it.get('status') != 'firing':
+ self.current_status = "resolved"
+ self.proxy.mark_resolved()
+ if self.current_camera and self.current_incident:
+ self.alertModel.remove_by_key(self.current_camera, self.current_incident)
+ try:
+ self.vlcw.mediaplayer.stop()
+ except Exception:
+ pass
+
+ if not changed:
+ return
+
+ sel = self.alertList.selectionModel().currentIndex() if self.alertList.selectionModel() else QtCore.QModelIndex()
+ selected_key = None
+ if sel.isValid():
+ try:
+ cur = self.alertModel.get(sel.row())
+ selected_key = self._key(cur)
+ except Exception:
+ pass
+
+ self.alertModel.replace_with(current)
+ self._update_right_pane_visibility()
+
+ if selected_key:
+ items = list(current.values())
+ for row, it in enumerate(items):
+ if self._key(it) == selected_key:
+ idx = self.alertModel.index(row, 0)
+ self.alertList.selectionModel().select(idx, QtCore.QItemSelectionModel.SelectionFlag.ClearAndSelect)
+ self.alertList.setCurrentIndex(idx)
+ break
+
+ cur_cam = self.current_camera
+ cur_inc = self.current_incident or self.cfg.INCIDENT
+ has_current = (cur_cam and cur_inc and (cur_cam, cur_inc) in current)
+ if not has_current:
+ items = list(current.values())
+ if items:
+ self._show_player(True)
+ self._play_alert(items[0])
+ else:
+ try: self.vlcw.mediaplayer.stop()
+ except Exception: pass
+ self._set_idle()
+ self._show_player(False)
+
+ # ───── helpers ─────
+ def _freeze_ui(self, seconds: float = 0.8):
+ self._ui_freeze_deadline = time.monotonic() + max(0.1, seconds)
+
+ def _maybe_sync_live_timeline(self):
+ if not self.mode_live:
+ self._live_sync.stop()
+ return
+
+ total_ms, live_win_ms = self.proxy.get_durations_ms()
+ if total_ms <= 0 or live_win_ms <= 0:
+ return
+
+ target_offset = max(0, total_ms - live_win_ms)
+ t_rel = self.vlcw.mediaplayer.get_time()
+ if t_rel < 0:
+ t_rel = 0
+ abs_t = min(target_offset + t_rel, total_ms)
+
+ changed = (self.dvr_duration_ms != total_ms) or (abs(self._playlist_offset_ms - target_offset) > 250)
+ if changed:
+ self.dvr_duration_ms = total_ms
+ self._playlist_offset_ms = target_offset
+
+ self.slider.setRange(0, total_ms)
+ self.slider.blockSignals(True)
+ self.slider.setValue(abs_t)
+ self.slider.blockSignals(False)
+
+ self._last_abs_t_ms = abs_t
+ self._update_time_label(abs_t)
+
+ # WebSocket & snapshot (same as before) …
+ def _ws_connect(self):
+ if not self.ws_url:
+ print("[WS] ALERTS_WS not set; skipping alerts websocket.")
+ return
+ if self.ws:
+ try:
+ self.ws.abort()
+ except Exception:
+ pass
+ self.ws = QWebSocket()
+ self.ws.connected.connect(self._on_ws_connected)
+ self.ws.textMessageReceived.connect(self._on_ws_msg)
+ self.ws.disconnected.connect(self._on_ws_disconnected)
+ self.ws.errorOccurred.connect(self._on_ws_error)
+ print(f"[WS] connecting to {self.ws_url.toString()}")
+ self.ws.open(self.ws_url)
+
+ def _send_ws_snapshot_request(self):
+ try:
+ if self.ws and self.ws.isValid():
+ self.ws.sendTextMessage('{"type":"get_snapshot"}')
+ self.ws.sendTextMessage('{"type":"snapshot_request"}')
+ except Exception:
+ pass
+
+ def _on_ws_connected(self):
+ print("[WS] connected")
+ self._ws_backoff_sec = 1
+ self._ws_ping.start()
+
+ # Instead of waiting for a snapshot message, immediately fetch from DB
+ alerts = self._fetch_active_alerts_from_db()
+ if alerts:
+ print(f"[WS] Initial load: {len(alerts)} alerts fetched from DB")
+ self._apply_firing_list(alerts)
+ else:
+ print("[WS] No active alerts found in DB")
+
+ # Continue listening for WebSocket deltas
+ self._got_initial_snapshot = True
+ self._snapshot_retry_timer.stop()
+
+
+ def _on_snapshot_retry_tick(self):
+ if self._got_initial_snapshot:
+ self._snapshot_retry_timer.stop()
+ return
+ if self._snapshot_resends < 3:
+ print(f"[WS] requesting snapshot again (attempt {self._snapshot_resends+2}/4)")
+ self._send_ws_snapshot_request()
+ self._snapshot_resends += 1
+ if self.cfg.ALERTS_SNAPSHOT_HTTP and not self._awaiting_http_snapshot:
+ self._request_http_snapshot()
+ if self._snapshot_resends >= 3 and not self.cfg.ALERTS_SNAPSHOT_HTTP:
+ self._snapshot_retry_timer.stop()
+
+ def _request_http_snapshot(self):
+ try:
+ url = QUrl(self.cfg.ALERTS_SNAPSHOT_HTTP)
+ if not url.isValid() or url.isEmpty():
+ return
+ req = QNetworkRequest(url)
+ if self.cfg.TOKEN and self.cfg.TOKEN != "CHANGE_ME":
+ req.setRawHeader(b"Authorization", f"Bearer {self.cfg.TOKEN}".encode("utf-8"))
+ self._awaiting_http_snapshot = True
+ print(f"[HTTP] requesting snapshot from {url.toString()}")
+ self.net.get(req)
+ except Exception as e:
+ print(f"[HTTP] snapshot request error: {e!r}")
+
+ def _on_http_finished(self, reply):
+ try:
+ if not self._awaiting_http_snapshot:
+ reply.deleteLater()
+ return
+ self._awaiting_http_snapshot = False
+ data = bytes(reply.readAll())
+ try:
+ payload = json.loads(data.decode("utf-8"))
+ except Exception:
+ payload = []
+ if isinstance(payload, dict):
+ items = payload.get("items") or payload.get("alerts") or payload.get("data") or []
+ elif isinstance(payload, list):
+ items = payload
+ else:
+ items = []
+ firing = [it for it in items if (it or {}).get("status", "").lower() == "firing"]
+ print(f"[HTTP] snapshot received: {len(firing)} firing")
+ self._apply_firing_list(firing)
+ self._got_initial_snapshot = True
+ self._snapshot_retry_timer.stop()
+ finally:
+ reply.deleteLater()
+
+ def _on_ws_disconnected(self):
+ print("[WS] disconnected")
+ self._ws_ping.stop()
+ self._schedule_ws_reconnect()
+
+ def _on_ws_error(self, err):
+ print(f"[WS] error: {self.ws.errorString()}")
+ if not self._ws_ping.isActive():
+ self._schedule_ws_reconnect()
+
+ def _ws_send_ping(self):
+ try:
+ if self.ws and self.ws.isValid():
+ self.ws.sendTextMessage('{"type":"ping"}')
+ except Exception:
+ pass
+
+ def _schedule_ws_reconnect(self):
+ delay = min(self._ws_backoff_sec, 30)
+ print(f"[WS] reconnecting in {delay}s...")
+ QtCore.QTimer.singleShot(int(delay * 1000), self._ws_connect)
+ self._ws_backoff_sec = min(self._ws_backoff_sec * 2, 30)
+
+ def _on_ws_msg(self, text: str):
+ print("=" * 80)
+ print("[WS] RAW MESSAGE:", text[:600].replace("\n", " "))
+
+ # Try to parse JSON
+ try:
+ msg = json.loads(text)
+ except Exception as e:
+ print(f"[WS] non-JSON message ({type(e).__name__}):", text[:120])
+ return
+
+ t = (msg.get("type") or "").lower()
+ items = msg.get("items") or msg.get("alerts") or msg.get("data") or []
+ print(f"[WS] Type='{t}' | items={len(items)}")
+
+ # Log short summary of each alert item
+ for i, it in enumerate(items):
+ print(f" [{i}] camera={it.get('camera')} "
+ f"incident={it.get('incident_id')} "
+ f"status={it.get('status')} "
+ f"endsAt={it.get('endsAt')} "
+ f"summary={it.get('summary')}")
+
+ # Normalize alerts
+ norm = [self._normalize_alert(it) for it in (items or []) if it]
+ print(f"[WS] After normalize → {[it.get('status') for it in norm]}")
+
+ # Infer missing statuses
+ for it in norm:
+ st = (it.get("status") or "").lower()
+ if not st:
+ it["status"] = "resolved" if it.get("endsAt") else "firing"
+
+ # Compute "currently firing" view
+ firing_now = [it for it in norm if (it.get("status") or "firing").lower() == "firing"]
+ print(f"[WS] Firing after filter: {len(firing_now)} / {len(norm)} → "
+ f"{[it.get('status') for it in firing_now]}")
+
+ # Decide what to do based on type
+ if t == 'am_alerts':
+ print("[WS] Handling am_alerts as delta update (can include resolved)")
+ self._merge_firing_deltas(norm)
+ return
+
+ if t in ('snapshot', 'update', 'delta', 'patch'):
+ print(f"[WS] Handling message type '{t}' as full state replace")
+ self._apply_firing_list(firing_now)
+ if t == 'snapshot':
+ self._got_initial_snapshot = True
+ self._snapshot_retry_timer.stop()
+ return
+
+
+ # Fallback for unknown message types
+ if isinstance(items, list):
+ print(f"[WS] Unknown type '{t}' → applying default rule ({len(firing_now)} firing)")
+ self._apply_firing_list(firing_now)
+
+
+
+ # List click → play
+ def _on_pick_alert_from_list(self, idx: QtCore.QModelIndex):
+ if not idx.isValid():
+ return
+ it = self.alertModel.get(idx.row())
+ print(f"[UI] picked alert: {it}")
+ self._show_player(True)
+ self._play_alert(it)
+
+ def _play_alert(self, it: dict):
+ cam = it.get('camera')
+ inc = it.get('incident_id') or self.cfg.INCIDENT
+ hls_url = it.get('hls') or None
+
+ self.current_camera = cam
+ self.current_incident = inc
+ self.current_status = (it.get('status') or 'firing').lower()
+
+ self.proxy.switch_source(camera=cam, incident=inc, upstream_hls=hls_url)
+ self.setWindowTitle("AgGuard — Live Incidents")
+ self._update_details(it)
+ self.videoSurface.show_loading(True)
+
+ QtCore.QTimer.singleShot(150, self._go_live)
+
+ def _update_details(self, it: dict):
+ vals = [
+ it.get('camera') or '–',
+ it.get('anomaly') or '–',
+ it.get('incident_id') or '–',
+ (it.get('status') or self.current_status or '–'),
+ it.get('startsAt') or '–',
+ ]
+ for lbl, v in zip(self.lblVals, vals):
+ lbl.setText(v)
+
+ # ───── slider / playback helpers ─────
+ def _fmt(self, ms: int) -> str:
+ s = max(0, ms // 1000)
+ h, s = divmod(s, 3600)
+ m, s = divmod(s, 60)
+ if h:
+ return f"{h:d}:{m:02d}:{s:02d}"
+ return f"{m:d}:{s:02d}"
+
+ def _set_live_badge(self, live: bool):
+ if live:
+ self.liveBadge.setText("LIVE")
+ self.liveBadge.setStyleSheet("background:#10b981; color:white; padding:3px 8px; border-radius:12px; font-weight:700;")
+ else:
+ self.liveBadge.setText("DVR")
+ self.liveBadge.setStyleSheet("background:#9ca3af; color:white; padding:3px 8px; border-radius:12px; font-weight:700;")
+
+ def _set_idle(self):
+ self.mode_live = False
+ self._set_live_badge(False)
+ self.dvr_duration_ms = 0
+ self._last_abs_t_ms = 0
+ self._playlist_offset_ms = 0
+ self.timeLeft.setText("00:00")
+ self.videoSurface.show_loading(True)
+ for v in self.lblVals:
+ v.setText("–")
+ print("[MODE] IDLE")
+
+ def _go_live(self):
+ # resume live sync; stop DVR growth
+ if not self._live_sync.isActive():
+ self._live_sync.start()
+ self._dvr_growth.stop()
+
+ if self.current_status == "resolved":
+ print("[MODE] resolved; not going live")
+ self._set_idle()
+ return
+
+ if not self.proxy.upstream_index:
+ return
+
+ total_ms, live_win_ms = self.proxy.get_durations_ms()
+ self.dvr_duration_ms = max(self.dvr_duration_ms, total_ms)
+ self._playlist_offset_ms = max(0, total_ms - live_win_ms)
+
+ self.mode_live = True
+ self._set_live_badge(True)
+ self.videoSurface.show_loading(True)
+
+ self._freeze_ui(1.0)
+ self._update_time_label(self.dvr_duration_ms)
+
+ live_url = f"http://{self.cfg.BIND}:{self.cfg.PORT}/live.m3u8"
+
+ try:
+ self.vlcw.mediaplayer.stop()
+ except Exception:
+ pass
+
+ live_edge_total = max(2, int(self.cfg.LIVE_EDGE_SEGMENTS) + int(self.cfg.LIVE_LAG_SEGMENTS))
+ self.vlcw.set_media(
+ live_url,
+ options=[
+ "--demux=hls",
+ ":no-audio",
+ ":http-reconnect=true",
+ ":hls-keep-live-session",
+ f":hls-live-edge={min(3, max(2, live_edge_total))}",
+ ":hls-segment-threads=2",
+ f":network-caching={max(200, int(self.cfg.NETWORK_CACHING))}",
+ ],
+ )
+ self.vlcw.play()
+ self._live_sync.start()
+
+ self.slider.setEnabled(True)
+ self.slider.setRange(0, self.dvr_duration_ms)
+ self.slider.blockSignals(True)
+ self.slider.setValue(self.dvr_duration_ms)
+ self.slider.blockSignals(False)
+
+ QtCore.QTimer.singleShot(300, lambda: self.videoSurface.show_loading(False))
+ print(f"[MODE] LIVE offset={self._playlist_offset_ms}ms total={self.dvr_duration_ms}ms")
+
+ def _load_dvr(self):
+ print("[DVR] _load_dvr called but DVR freeze is disabled.")
+ self._set_idle()
+
+ def _on_slider_clicked(self, value: int):
+ print(f"[SEEK] click -> {value}ms (mode_live={self.mode_live})")
+ self._freeze_ui(0.8)
+ if self.mode_live:
+ self.mode_live = False
+ self._set_live_badge(False)
+ self._seek_via_playlist(value)
+
+ def _on_slider_drag_released(self, value: int):
+ print(f"[SEEK] drag-release -> {value}ms (mode_live={self.mode_live})")
+ self._freeze_ui(0.8)
+ if self.mode_live:
+ self.mode_live = False
+ self._set_live_badge(False)
+ self._seek_via_playlist(value)
+
+ def _seek_via_playlist(self, t_ms: int):
+ # kill live sync right away so it cannot pull the thumb toward live
+ self._live_sync.stop()
+ if not self._dvr_growth.isActive():
+ self._dvr_growth.start()
+
+ if self.current_status == "resolved" or not self.proxy.dvr:
+ print("[SEEK] ignored (no DVR while resolved)")
+ return
+
+ t_ms = max(0, min(int(t_ms), max(0, self.dvr_duration_ms)))
+ seek_url = f"http://{self.cfg.BIND}:{self.cfg.PORT}/dvr_seek.m3u8?t={t_ms}"
+ print(f"[SEEK] switching media to seek playlist: {seek_url}")
+ try:
+ self.vlcw.mediaplayer.stop()
+ except Exception:
+ pass
+
+ self._playlist_offset_ms = t_ms
+
+ if self.slider.maximum() < max(self.dvr_duration_ms, t_ms):
+ self.slider.setRange(0, max(self.dvr_duration_ms, t_ms))
+
+ self.vlcw.set_media(seek_url, options=["--demux=hls", ":no-audio"])
+ self.vlcw.play()
+ self.mode_live = False
+ self._set_live_badge(False)
+
+ self._update_time_label(t_ms)
+ self.slider.blockSignals(True)
+ self.slider.setValue(t_ms)
+ self.slider.blockSignals(False)
+
+ self._last_abs_t_ms = t_ms
+ self._seek_guard_deadline = time.monotonic() + 2.0
+
+ QTimer.singleShot(700, lambda: setattr(self, "_ui_freeze_deadline", 0.0))
+
+ def _on_slider_hover(self, value: int):
+ if self.dvr_duration_ms > 0:
+ self._update_time_label(int(value))
+
+ def _on_vlc_pos(self, _pos01: float):
+ pass
+
+ def _on_vlc_time(self, t_ms: int):
+ if t_ms < 0:
+ return
+ if time.monotonic() < self._ui_freeze_deadline:
+ return
+
+ absolute_ms = self._playlist_offset_ms + t_ms
+
+ now = time.monotonic()
+ if absolute_ms < self._last_abs_t_ms:
+ if now < self._seek_guard_deadline:
+ self._last_abs_t_ms = absolute_ms
+ else:
+ absolute_ms = self._last_abs_t_ms
+ else:
+ self._last_abs_t_ms = absolute_ms
+
+ self._update_time_label(absolute_ms)
+
+ if self.dvr_duration_ms > 0:
+ self.slider.blockSignals(True)
+ self.slider.setValue(min(absolute_ms, self.dvr_duration_ms))
+ self.slider.blockSignals(False)
+
+ if self.proxy.dvr and not self.proxy.resolved and (int(time.time()) % 2 == 0):
+ _, total = self.proxy.dvr.render_dvr_vod_playlist()
+ new_dur = int(total * 1000)
+ if new_dur > self.dvr_duration_ms:
+ self.dvr_duration_ms = new_dur
+ self.slider.setRange(0, self.dvr_duration_ms)
+
+ def _update_time_label(self, t_ms: int):
+ s = max(0, t_ms // 1000)
+ h, s = divmod(s, 3600)
+ m, s = divmod(s, 60)
+ txt = f"{h:d}:{m:02d}:{s:02d}" if h else f"{m:d}:{s:02d}"
+ self.timeLeft.setText(txt)
+
+ def closeEvent(self, event: QtGui.QCloseEvent):
+ try:
+ self.proxy.stop()
+ except Exception:
+ pass
+ super().closeEvent(event)
+
+
diff --git a/GUI/src/vast/views/sensorDetailsTab.py b/GUI/src/vast/views/sensorDetailsTab.py
new file mode 100644
index 000000000..9d78abe0a
--- /dev/null
+++ b/GUI/src/vast/views/sensorDetailsTab.py
@@ -0,0 +1,228 @@
+import traceback
+import plotly.graph_objects as go
+from PyQt6.QtWidgets import (
+ QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QComboBox
+)
+from PyQt6.QtWebEngineWidgets import QWebEngineView
+from PyQt6.QtCore import QTimer
+
+
+class SensorDetailsTab(QWidget):
+ """Sensor Details Tab – compact, clean, and fully in English."""
+
+ def __init__(self, api, parent=None):
+ super().__init__(parent)
+ self.api = api
+ self.sensor_id = None
+ self.sensor_names = []
+
+ main_layout = QVBoxLayout(self)
+ main_layout.setContentsMargins(10, 10, 10, 10)
+ main_layout.setSpacing(6)
+
+ # --- Sensor selection area ---
+ self.input_layout = QHBoxLayout()
+ self.label = QLabel("Select sensor:")
+ self.label.setStyleSheet("font-weight:600;font-size:12px;")
+
+ self.sensor_dropdown = QComboBox()
+ self.sensor_dropdown.setStyleSheet("""
+ QComboBox {
+ padding:4px 8px;
+ border:1px solid #cbd5e1;
+ border-radius:4px;
+ font-size:12px;
+ background:white;
+ min-width:150px;
+ }
+ QComboBox:hover { border:1px solid #2563eb; }
+ """)
+
+ self.load_button = QPushButton("Show Data")
+ self.load_button.setStyleSheet("""
+ QPushButton {
+ background:#2563eb;
+ color:white;
+ border:none;
+ border-radius:4px;
+ padding:4px 10px;
+ font-size:12px;
+ font-weight:600;
+ }
+ QPushButton:hover { background:#1d4ed8; }
+ """)
+ self.load_button.clicked.connect(self._on_load_clicked)
+
+ self.input_layout.addWidget(self.label)
+ self.input_layout.addWidget(self.sensor_dropdown)
+ self.input_layout.addWidget(self.load_button)
+ main_layout.addLayout(self.input_layout)
+
+ # --- Web view area ---
+ self.web = QWebEngineView()
+ main_layout.addWidget(self.web)
+
+ # --- Auto-refresh timer ---
+ self.timer = QTimer(self)
+ self.timer.timeout.connect(self.refresh_data)
+ self.timer.start(15000)
+
+ # Load available sensors list
+ self._load_sensor_list()
+ self.web.setHtml("
+
+
+ Please select a sensor to view details
") + + # -------------------------------------------------------- + def _load_sensor_list(self): + """Load sensor names from the API.""" + try: + r = self.api.http.get(f"{self.api.base}/api/tables/sensors") + data = r.json().get("rows", []) + self.sensor_names = [s["sensor_name"] for s in data if "sensor_name" in s] + self.sensor_dropdown.clear() + self.sensor_dropdown.addItem("-- Select Sensor --") + for name in self.sensor_names: + self.sensor_dropdown.addItem(name) + except Exception as e: + print(f"[SensorDetailsTab] Failed to load sensors list: {e}") + + # -------------------------------------------------------- + def _on_load_clicked(self): + """Triggered when user clicks 'Show Data'.""" + selected = self.sensor_dropdown.currentText().strip() + if not selected or selected == "-- Select Sensor --": + self.web.setHtml("Please select a sensor from the list
") + return + self.load_sensor(selected) + + # -------------------------------------------------------- + def load_sensor(self, sensor_id: str): + """Called when a sensor is selected manually or from the map.""" + self.sensor_id = sensor_id + self.refresh_data() + + # -------------------------------------------------------- + def refresh_data(self): + """Fetch data from API and refresh the dashboard.""" + if not self.sensor_id: + return + try: + # Sensors + r_sensor = self.api.http.get(f"{self.api.base}/api/tables/sensors?sensor_name={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") + logs = r_logs.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") + modal = r_modal.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") + anoms = r_anoms.json().get("rows", []) + + # Active alert + active_alert = next((a for a in logs if a.get("end_ts") is None), None) + + chart_html = self._build_plot(anoms) + page_html = self._build_html(sensor_data, logs, 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): + """Build the Plotly chart.""" + 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):
+ """Generate the full HTML layout."""
+ 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 |
|---|
" + f"Type: {sensor.get('sensor_type')}
" + f"Current Issue: {sensor.get('Issue')}
" + f"Severity: {sensor.get('Severity')}
") + title.setWordWrap(True) + layout.addWidget(title) + + 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; + }} + """) + card_layout = QFormLayout(card) + start_time = a.get("start_ts", "")[:19] if a.get("start_ts") else "" + end_time = a.get("end_ts") + end_display = end_time[:19] if end_time else "[ACTIVE]" + card_layout.addRow("Start Time:", QLabel(start_time)) + card_layout.addRow("End Time:", QLabel(end_display)) + card_layout.addRow("Issue:", QLabel(a.get("issue_type", ""))) + card_layout.addRow("Severity:", QLabel(a.get("severity", ""))) + details = a.get("details", {}) + if details: + for key, val in details.items(): + card_layout.addRow(f"{key.title()}:", QLabel(str(val))) + body_layout.addWidget(card) + else: + body_layout.addWidget(QLabel("No previous alerts or anomalies.")) + + 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): + """Unified sensors view merging anomalies + alerts""" + 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) + main_layout.setContentsMargins(20, 20, 20, 20) + main_layout.setSpacing(10) + + # ---------- Header ---------- + 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) + + self.refresh_btn = QPushButton("⟳ Refresh") + self.refresh_btn.clicked.connect(self.load_sensors) + self.refresh_btn.setStyleSheet(""" + QPushButton { + background-color: #0078D7; + color: white; + border-radius: 6px; + padding: 6px 12px; + font-weight: 600; + } + QPushButton:hover { background-color: #005FA3; } + """) + header.addWidget(self.refresh_btn) + main_layout.addLayout(header) + + # ---------- Scroll with cards ---------- + 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): + self.refresh_btn.setEnabled(False) + self.refresh_btn.setText("⟳ Loading...") + try: - data = self.api.http.get(f"{self.api.base}/api/files").json() + res_sensors = self.api.http.get(f"{self.api.base}/api/tables/sensors", timeout=10).json() + res_anoms = self.api.http.get(f"{self.api.base}/api/tables/sensors_anomalies_modal", timeout=10).json() + res_logs = self.api.http.get(f"{self.api.base}/api/tables/event_logs_sensors", timeout=10).json() + sensors = res_sensors.get("rows", []) + anomalies = res_anoms.get("rows", []) + alerts = res_logs.get("rows", []) except Exception as e: - print(f"[SensorsView] API error: {e}") - data = [] + traceback.print_exc() + self.refresh_btn.setEnabled(True) + self.refresh_btn.setText("↻ Refresh") + return + + # map anomalies by sensor + 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 (event_logs_sensors) + alerts_by_sensor = {} + for alert in alerts: + dev_id = alert.get("device_id") + if not dev_id: + continue + if alert.get("end_ts"): + continue # closed alert + alerts_by_sensor.setdefault(dev_id, []).append(alert) + + merged = [] + for s in sensors: + sid = s.get("sensor_name") + s_type = s.get("sensor_type", "Unknown") - if not data: - self.table.setRowCount(0) - self.table.setColumnCount(1) - self.table.setHorizontalHeaderLabels(["No data"]) + alerts_for_s = alerts_by_sensor.get(sid, []) + active_alerts = [a for a in alerts_for_s if not a.get("end_ts")] + + # determine severity from alerts + if active_alerts: + latest_alert = sorted(active_alerts, key=lambda x: x.get("start_ts", ""), reverse=True)[0] + sev_alert = latest_alert.get("severity", "info").lower() + issue_alert = latest_alert.get("issue_type", "alert") + else: + sev_alert = "info" + issue_alert = None + + # determine severity from anomalies + anom = anomaly_latest.get(sid) + if anom and anom.get("anomaly", 0) > 0: + sev_anom = "error" # you can adjust mapping of numeric to severity + issue_anom = "Anomaly detected" + else: + sev_anom = "info" + issue_anom = None + + # pick the most severe + 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({ + "issue_type": "anomaly_modal", + "severity": sev_anom, + "start_ts": anom.get("ts"), + "details": {"anomaly": anom.get("anomaly")} + }) + + merged.append({ + "sensor_name": sid, + "sensor_type": s_type, + "Issue": issue_final, + "Severity": sev_final, + "All Alerts": all_alerts + }) + + self.all_sensors = merged + self._apply_filters() + self.refresh_btn.setEnabled(True) + self.refresh_btn.setText("↻ Refresh") + + # ---------------------------- + 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: + no_data = QLabel("No sensors found matching your criteria") + no_data.setAlignment(Qt.AlignmentFlag.AlignCenter) + no_data.setStyleSheet("color:#666; font-size:16px; padding:40px;") + self.grid.addWidget(no_data, 0, 0, 1, 3) return - keys = list(data[0].keys()) - self.table.setColumnCount(len(keys)) - self.table.setHorizontalHeaderLabels(keys) - self.table.setRowCount(len(data)) + cols = 3 + for idx, s in enumerate(sensors): + card = SensorCard(s, self._show_alert_history) + r, c = divmod(idx, cols) + self.grid.addWidget(card, r, c, Qt.AlignmentFlag.AlignTop) + + # ---------------------------- + def _apply_filters(self): + text = self.search_box.text().strip().lower() + sev_filter = self.filter_box.currentText().lower() + filtered = [] + + for s in self.all_sensors: + sid = str(s.get("sensor_name", "")).lower() + stype = str(s.get("sensor_type", "")).lower() + sev = s.get("Severity", "").lower() + + if text and text not in sid and text not in stype: + continue + if sev_filter != "all" and sev_filter 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/RelDB/build_tables/loader.sql b/RelDB/build_tables/loader.sql index a15bbe3d3..15b5f1435 100644 --- a/RelDB/build_tables/loader.sql +++ b/RelDB/build_tables/loader.sql @@ -9,26 +9,7 @@ INSERT INTO devices (device_id, model, owner, active) VALUES ('dev-e','sensor-z','TeamC',true), ('dev-f','sensor-z','TeamC',true) 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 some regions INSERT INTO regions (name, geom) @@ -46,6 +27,11 @@ VALUES ('COMM_LOSS','Communication lost') ON CONFLICT DO NOTHING; +-- Seed leaf disease types +INSERT INTO leaf_disease_types (name) +VALUES ('Blight'), ('Mildew'), ('Rust') +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 +128,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( @@ -165,3 +150,13 @@ DO UPDATE SET threshold = EXCLUDED.threshold, updated_by = EXCLUDED.updated_by, updated_at = NOW(); + +-- Seed sample leaf reports +INSERT INTO leaf_reports (device_id, leaf_disease_type_id, ts, confidence, sick) +SELECT d.device_id, t.id, now() - ((g % 2000) || ' seconds')::interval, + (random()*0.5 + 0.5)::double precision, -- 0.5..1.0 + (random() < 0.5) +FROM devices d, leaf_disease_types t, generate_series(1,20) g +LIMIT 30; + + diff --git a/RelDB/build_tables/schema.sql b/RelDB/build_tables/schema.sql index ade97f4a0..adfb954a4 100644 --- a/RelDB/build_tables/schema.sql +++ b/RelDB/build_tables/schema.sql @@ -11,7 +11,9 @@ 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 ); -- Predefined regions (optional: for missions crossing multiple regions) @@ -28,8 +30,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 +145,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,6 +227,50 @@ 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 event_logs_sensors( id bigserial PRIMARY KEY, @@ -266,28 +327,11 @@ CREATE TABLE IF NOT EXISTS public.sensor_zone_stats ( anomalies INT, inserted_at TIMESTAMPTZ NOT NULL DEFAULT now() ); - ---- Alerts table - -CREATE TABLE IF NOT EXISTS public.alerts ( - 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 -); - - --- === Soil moisture irrigation tables === CREATE TABLE IF NOT EXISTS soil_moisture_events ( id SERIAL PRIMARY KEY, - zone_id TEXT NOT NULL, + device_id TEXT NOT NULL REFERENCES devices(device_id), ts TIMESTAMPTZ NOT NULL DEFAULT NOW(), dry_ratio REAL NOT NULL, decision TEXT NOT NULL, @@ -300,7 +344,8 @@ CREATE TABLE IF NOT EXISTS soil_moisture_events ( CREATE UNIQUE INDEX IF NOT EXISTS idx_events_idem ON soil_moisture_events (idempotency_key); CREATE TABLE IF NOT EXISTS irrigation_schedule ( - zone_id TEXT PRIMARY KEY, + 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, @@ -310,7 +355,7 @@ CREATE TABLE IF NOT EXISTS irrigation_schedule ( CREATE TABLE IF NOT EXISTS irrigation_schedule_audit ( id SERIAL PRIMARY KEY, - zone_id TEXT NOT NULL, + device_id TEXT NOT NULL, prev_next_run_at TIMESTAMPTZ, prev_duration_min INT, next_run_at TIMESTAMPTZ NOT NULL, @@ -320,6 +365,52 @@ CREATE TABLE IF NOT EXISTS irrigation_schedule_audit ( 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 @@ -344,6 +435,155 @@ CREATE TABLE IF NOT EXISTS task_thresholds ( 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 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); @@ -412,5 +652,250 @@ CREATE INDEX IF NOT EXISTS ix_event_logs_sensors_start_brin ON event_logs_sens 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); + + +/* =========================== + ADDED: Incidents schema v1 + =========================== */ + +-- ========================= +-- Incidents: one event row +-- ========================= +-- anomaly_type_id int REFERENCES anomaly_types(anomaly_type_id) ON DELETE SET NULL, +CREATE TABLE IF NOT EXISTS incidents ( -- [ADDED] + incident_id uuid PRIMARY KEY, -- [ADDED] + mission_id bigint REFERENCES missions(mission_id) ON DELETE SET NULL, -- [ADDED] + device_id text REFERENCES devices(device_id) ON DELETE SET NULL, -- [ADDED] + anomaly text, -- [ADDED] + started_at timestamptz NOT NULL, -- [ADDED] + ended_at timestamptz, -- [ADDED] + duration_sec double precision, -- [ADDED] + frame_start int, -- [ADDED] + frame_end int, -- [ADDED] + -- [ADDED] + -- NEW: aggregate severity (mean tracks/frame over the incident) -- [ADDED] + severity real, -- [ADDED] + -- [ADDED] + -- image-space ROI; keep flexible -- [ADDED] + roi_pixels jsonb, -- [ADDED] + -- optional map footprint (camera frustum, area of interest, etc.) -- [ADDED] + footprint geometry(Polygon,4326), -- [ADDED] + -- [ADDED] + -- canonical media for playback (referencing your existing files table) -- [ADDED] + clip_file_id bigint REFERENCES files(file_id) ON DELETE SET NULL, -- [ADDED] + poster_file_id bigint REFERENCES files(file_id) ON DELETE SET NULL, -- [ADDED] + -- [ADDED] + -- optional pre-baked UI timeline (array of {frame,ts,box,conf,url,...}) -- [ADDED] + frames_manifest jsonb, -- [ADDED] + is_real boolean, + ack boolean DEFAULT false, -- [ADDED] + meta jsonb DEFAULT '{}'::jsonb -- [ADDED] +); -- [ADDED] + +-- Helpful indexes -- [ADDED] +CREATE INDEX IF NOT EXISTS ix_incidents_device_time ON incidents (device_id, started_at DESC); -- [ADDED] +CREATE INDEX IF NOT EXISTS ix_incidents_mission_time ON incidents (mission_id, started_at DESC); -- [ADDED] + +-- ========================================== +-- Per-frame timeline: one row per frame +-- Store ALL detections (bbox + conf + track_id) in JSONB +-- ========================================== +DROP TABLE IF EXISTS incident_frames CASCADE; -- [ADDED] + +CREATE TABLE incident_frames ( -- [ADDED] + incident_id uuid NOT NULL REFERENCES incidents(incident_id) ON DELETE CASCADE, -- [ADDED] + frame_idx int NOT NULL, -- [ADDED] + ts timestamptz NOT NULL, -- [ADDED] + -- [ADDED] + -- List of detection objects: -- [ADDED] + -- [{"x1":int,"y1":int,"x2":int,"y2":int,"conf":float|null,"track_id":int|null}, ...] -- [ADDED] + detections jsonb NOT NULL DEFAULT '[]'::jsonb, -- [ADDED] + -- [ADDED] + cls_name text, -- [ADDED] + cls_id text, -- [ADDED] + -- [ADDED] + -- Annotated (or raw) frame stored in files -- [ADDED] + file_id bigint REFERENCES files(file_id) ON DELETE SET NULL, -- [ADDED] + -- [ADDED] + meta jsonb DEFAULT '{}'::jsonb, -- [ADDED] + PRIMARY KEY (incident_id, frame_idx) -- [ADDED] +); -- [ADDED] + +-- Useful indexes -- [ADDED] +CREATE INDEX IF NOT EXISTS ix_incident_frames_ts -- [ADDED] + ON incident_frames (incident_id, ts); -- [ADDED] + +-- JSONB GIN index for detection queries (by bbox/conf/track_id) -- [ADDED] +CREATE INDEX IF NOT EXISTS ix_incident_frames_detections_gin -- [ADDED] + ON incident_frames USING GIN (detections jsonb_path_ops); -- [ADDED] + +-- (Optional) denormalized count for quick metrics -- [ADDED] +ALTER TABLE incident_frames -- [ADDED] + ADD COLUMN IF NOT EXISTS num_tracks int -- [ADDED] + GENERATED ALWAYS AS (jsonb_array_length(detections)) STORED; -- [ADDED] + +-- 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); + +-- ============================================ +-- 🔹 MISSING TABLES AND INDEXES FROM FIRST SCHEMA +-- ============================================ + +-- Devices sensor mapping +CREATE TABLE IF NOT EXISTS devices_sensor ( + id TEXT UNIQUE NOT NULL, + plant_id INT NOT NULL, + sensor_type TEXT NOT NULL, + PRIMARY KEY (plant_id, id) +); + +-- 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 +DROP TABLE IF EXISTS public.sensors CASCADE; +CREATE TABLE IF NOT EXISTS public.sensors ( + 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, + 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 +); + +-- Sensor anomalies table with full structure and JSONB result +DROP TABLE IF EXISTS public.sensor_anomalies CASCADE; +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() +); + +-- Sensors anomalies modal (aggregated anomaly detection model) +CREATE TABLE IF NOT EXISTS public.sensors_anomalies_modal ( + id BIGSERIAL PRIMARY KEY, + sensor_id TEXT NOT NULL REFERENCES sensors(sensor_name) ON DELETE CASCADE, + ts TIMESTAMPTZ NOT NULL, + anomaly REAL NOT NULL CHECK (anomaly >= 0), + inserted_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + +-- Updated event_logs_sensors referencing devices_sensor +DROP TABLE IF EXISTS event_logs_sensors CASCADE; +CREATE TABLE IF NOT EXISTS event_logs_sensors( + id bigserial PRIMARY KEY, + 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(), + end_ts timestamptz NULL, + details jsonb NOT NULL DEFAULT '{}'::jsonb, + CONSTRAINT event_logs_sensors_end_after_start + CHECK (end_ts IS NULL OR end_ts >= start_ts) +); + +-- Sensor zone statistics (for per-region summaries) +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() +); + +-- ============================================ +-- 🔹 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_sensor_anomalies_ts_brin + ON public.sensor_anomalies USING BRIN (ts); + +CREATE INDEX IF NOT EXISTS ix_sensor_anomalies_zone + ON public.sensor_anomalies (zone); + +CREATE INDEX IF NOT EXISTS ix_sensor_anomalies_sensor + ON public.sensor_anomalies (sensor); + +CREATE INDEX IF NOT EXISTS ix_sensor_zone_stats_zone_window + ON public.sensor_zone_stats (zone, window_start, window_end); + +CREATE INDEX IF NOT EXISTS ix_sensor_zone_stats_anomalies + ON public.sensor_zone_stats (anomalies); + +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); + + +--- 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); + 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..fa3f26096 --- /dev/null +++ b/airflow_bundle/leaf-pipeline/.gitignore @@ -0,0 +1,89 @@ +# === 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/.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..7d2cd8bd5 --- /dev/null +++ b/airflow_bundle/leaf-pipeline/README @@ -0,0 +1 @@ +docker compose --profile images up -d --build \ 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. -