Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

POST on front end and pass searcher

Rory Clear7dc9c1184cce
diff --git a/clearcam.py b/clearcam.py
index b6e096c..bb3d81f 100644
--- a/clearcam.py
+++ b/clearcam.py
@@ -766,9 +766,9 @@ def run_clip(return_q, clip, searcher, im, top_k, cam_name, selected_dir):
class HLSRequestHandler(BaseHTTPRequestHandler):
def __init__(self, *args, **kwargs):
self.clip = kwargs.pop('clip_instance', None)
+ self.searcher = kwargs.pop('searcher_instance', None)
self.base_dir = CAMERA_BASE_DIR
self.show_dets = None
- self.searcher = None
super().__init__(*args, **kwargs)
def send_results(self, results):
@@ -1133,9 +1133,7 @@ class HLSRequestHandler(BaseHTTPRequestHandler):
if subdir.is_dir()
})
- if (image_text or similar_img) and use_clip:
- self.searcher = CLIPSearch()
- self.searcher._load_all_embeddings()
+ if (image_text or similar_img) and use_clip: self.searcher._load_all_embeddings()
if similar_img and use_clip:
return_q = multiprocessing.Queue()
@@ -1448,11 +1446,13 @@ class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
self.cleanup_thread = None
self.max_gb = 256
self.clip = CachedCLIPSearch() if use_clip else None
+ self.searcher = CLIPSearch() if use_clip else None
self.clip_stop_event = threading.Event()
self.clip_thread = None
self._setup_cleanup_and_clip_thread()
- def finish_request(self, request, client_address): self.RequestHandlerClass(request, client_address, self, clip_instance=self.clip)
+ def finish_request(self, request, client_address):
+ self.RequestHandlerClass(request, client_address, self, clip_instance=self.clip, searcher_instance=self.searcher)
def _setup_cleanup_and_clip_thread(self):
if self.cleanup_thread is None or not self.cleanup_thread.is_alive():
@@ -1626,4 +1626,4 @@ if __name__ == "__main__":
if rtsp_url:
hls_streamer.stop()
cam.release()
- server.shutdown()
\ No newline at end of file
+ server.shutdown()
diff --git a/mainview.html b/mainview.html
index 2963565..b78d94f 100644
--- a/mainview.html
+++ b/mainview.html
@@ -2872,23 +2872,31 @@
let previousEventImages = null;
async function loadEventImages() {
try {
- let url = `/event_thumbs?folder=${currentEventDateFilter}`;
- if (currentEventCameraFilter) {
- url += `&cam=${encodeURIComponent(currentEventCameraFilter)}`;
- }
- if (alertsOnlyFilter) {
- url += `&name_contains=_notif`;
- }
+ const payload = {
+ folder: currentEventDateFilter || null,
+ cam: currentEventCameraFilter || null,
+ name_contains: alertsOnlyFilter ? "_notif" : null,
+ image_text: null,
+ similar_img: null,
+ };
+
if (currentSimilarImage) {
- url += `&similar_img=/${encodeURIComponent(currentSimilarImage)}`;
- currentSimilarImage = null;
+ payload.similar_img = `/${currentSimilarImage}`;
+ currentSimilarImage = null;
} else if (currentImageSearchText) {
- url += `&image_text=${encodeURIComponent(currentImageSearchText)}`;
+ payload.image_text = currentImageSearchText;
}
-
- const res = await fetch(url);
+
+ const res = await fetch("/event_thumbs", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(payload)
+ });
+
const data = await res.json();
-
+
if (data.images && data.images.length > 0 && !currentImageSearchText) {
data.images.sort((a, b) => {
if (a.folder !== b.folder) {
@@ -2897,39 +2905,41 @@
return b.timestamp - a.timestamp;
});
}
-
+
if (JSON.stringify(data) === JSON.stringify(previousEventImages)) {
return;
}
previousEventImages = data;
-
+
const container = document.getElementById("eventImagesContainer");
-
+
if (data.images && data.images.length > 0) {
let html = '';
data.images.forEach(img => {
const timeStr = secondsToTimeString(img.timestamp);
- const dateTime = `${img.folder} ${secondsToTimeString(img.timestamp)}`;
html += `
<div class="event-image-item">
- <img src="${img.url}" alt="Event" loading="lazy" onclick="viewImage('${img.url}')">
+ <img src="${img.url}" alt="Event" loading="lazy"
+ onclick="viewImage('${img.url}')">
<div class="event-image-info">
- <strong>${img.cam_name || 'Camera'}</strong>
- <br>
+ <strong>${img.cam_name || 'Camera'}</strong><br>
<small>${img.folder} ${timeStr}</small>
</div>
<div class="event-image-actions">
- <button title="Search Similar" onclick="searchWithImage('${img.url}')">
+ <button title="Search Similar"
+ onclick="searchWithImage('${img.url}')">
<span class="icon">
<svg><use href="#icon-magnify"></use></svg>
</span>
</button>
- <button title="Play" onclick="playVideoAtTime('${img.cam_name}', ${img.timestamp}, '${img.folder}')">
+ <button title="Play"
+ onclick="playVideoAtTime('${img.cam_name}', ${img.timestamp}, '${img.folder}')">
<span class="icon">
<svg><use href="#icon-play"></use></svg>
</span>
</button>
- <button title="Play All" onclick="playAllCamerasAtTime(${img.timestamp}, '${img.folder}')">
+ <button title="Play All"
+ onclick="playAllCamerasAtTime(${img.timestamp}, '${img.folder}')">
<span class="icon">
<svg><use href="#icon-play-all"></use></svg>
</span>
@@ -2940,18 +2950,22 @@
});
container.innerHTML = html;
} else {
- container.innerHTML = '<p style="text-align:center; color:#666; width:100%;">No events detected yet.</p>';
+ container.innerHTML =
+ '<p style="text-align:center; color:#666; width:100%;">No events detected yet.</p>';
}
+
} catch (err) {
console.error("Failed to load event images:", err);
- const container = document.getElementById("eventImagesContainer");
- container.innerHTML = '<p style="text-align:center; color:red; width:100%;">Error loading events.</p>';
+ document.getElementById("eventImagesContainer").innerHTML =
+ '<p style="text-align:center; color:red; width:100%;">Error loading events.</p>';
+
} finally {
const searchButton = document.getElementById('searchButton');
const searchText = document.getElementById('searchText');
const searchSpinner = document.getElementById('searchSpinner');
- const magnifyButtons = document.querySelectorAll('.event-image-actions button[title="Search Similar"]');
-
+ const magnifyButtons =
+ document.querySelectorAll('.event-image-actions button[title="Search Similar"]');
+
searchText.textContent = 'Search';
searchSpinner.style.display = 'none';
searchButton.disabled = false;
@@ -2959,6 +2973,7 @@
}
}
+
let currentSimilarImage = null;
function searchWithImage(imageUrl) {
const searchButton = document.getElementById('searchButton');