Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renable use all monitor #1359

Closed
wants to merge 4 commits into from
Closed

Renable use all monitor #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c35988
v0
louis030195 Feb 14, 2025
ea3b6b4
remove restart interval
louis030195 Feb 14, 2025
33d2745
fix: remove use all monitor
louis030195 Feb 14, 2025
a05438e
v0
louis030195 Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions screenpipe-app-tauri/components/recording-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ export function RecordingSettings() {

{!settings.disableVision && (
<>
<div className="flex items-center justify-between mb-4">
{/* <div className="flex items-center justify-between mb-4">
<div className="space-y-1">
<h4 className="font-medium">use all monitors</h4>
<p className="text-sm text-muted-foreground">
Expand All @@ -752,7 +752,7 @@ export function RecordingSettings() {
handleSettingsChange({ useAllMonitors: checked })
}
/>
</div>
</div> */}

<div className="flex flex-col space-y-6">
<div className="flex flex-col space-y-2">
Expand Down Expand Up @@ -1372,7 +1372,7 @@ export function RecordingSettings() {

<div className="space-y-8 py-4">
<div className="space-y-6">
<div className="flex flex-col space-y-2">
{/* <div className="flex flex-col space-y-2">
<Label
htmlFor="restartInterval"
className="flex items-center space-x-2"
Expand Down Expand Up @@ -1413,7 +1413,7 @@ export function RecordingSettings() {
{settings.restartInterval || 0} min
</span>
</div>
</div>
</div> */}

<div className="flex items-center justify-between">
<div className="space-y-1">
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/lib/hooks/use-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const DEFAULT_SETTINGS: Settings = {
monitorIds: ["default"],
audioDevices: ["default"],
usePiiRemoval: false,
restartInterval: 120,
restartInterval: 0,
port: 3030,
dataDir: "default",
disableAudio: false,
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 33 additions & 33 deletions screenpipe-app-tauri/src-tauri/src/sidecar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,39 +520,39 @@ impl SidecarManager {
// Spawn the sidecar
let child = spawn_sidecar(app)?;
self.child = Some(child);
self.last_restart = Instant::now();
info!("last restart: {:?}", self.last_restart);

// kill previous task if any
if let Some(task) = self.restart_task.take() {
task.abort();
}

let restart_interval = self.restart_interval.clone();
info!("restart_interval: {:?}", restart_interval);
// Add this function outside the SidecarManager impl
async fn check_and_restart_sidecar(app_handle: &tauri::AppHandle) -> Result<(), String> {
let state = app_handle.state::<SidecarState>();
let mut manager = state.0.lock().await;
if let Some(manager) = manager.as_mut() {
manager.check_and_restart(app_handle).await
} else {
Ok(())
}
}

// In the spawn method
let app_handle = app.app_handle().clone();
self.restart_task = Some(tauri::async_runtime::spawn(async move {
loop {
let interval = *restart_interval.lock().await;
info!("interval: {}", interval.as_secs());
if let Err(e) = check_and_restart_sidecar(&app_handle).await {
error!("Failed to check and restart sidecar: {}", e);
}
sleep(Duration::from_secs(60)).await;
}
}));
// self.last_restart = Instant::now();
// info!("last restart: {:?}", self.last_restart);

// // kill previous task if any
// if let Some(task) = self.restart_task.take() {
// task.abort();
// }

// let restart_interval = self.restart_interval.clone();
// info!("restart_interval: {:?}", restart_interval);
// // Add this function outside the SidecarManager impl
// async fn check_and_restart_sidecar(app_handle: &tauri::AppHandle) -> Result<(), String> {
// let state = app_handle.state::<SidecarState>();
// let mut manager = state.0.lock().await;
// if let Some(manager) = manager.as_mut() {
// manager.check_and_restart(app_handle).await
// } else {
// Ok(())
// }
// }

// // In the spawn method
// let app_handle = app.app_handle().clone();
// self.restart_task = Some(tauri::async_runtime::spawn(async move {
// loop {
// let interval = *restart_interval.lock().await;
// info!("interval: {}", interval.as_secs());
// if let Err(e) = check_and_restart_sidecar(&app_handle).await {
// error!("Failed to check and restart sidecar: {}", e);
// }
// sleep(Duration::from_secs(60)).await;
// }
// }));

Ok(())
}
Expand Down
10 changes: 4 additions & 6 deletions screenpipe-audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,26 +62,24 @@ webrtc-vad = "0.4.0"
reqwest = { workspace = true }

screenpipe-core = { path = "../screenpipe-core" }
screenpipe-events = { path = "../screenpipe-events" }

# crossbeam
crossbeam = { workspace = true }
dashmap = { workspace = true }

# Directories
dirs = "5.0.1"

lazy_static = "1.4.0"
lazy_static = { version = "1.4.0" }
realfft = "3.4.0"
regex = "1.11.0"
ndarray = "0.16"
ort = "=2.0.0-rc.6"
knf-rs = { git = "https://github.com/Neptune650/knf-rs.git", branch = "main" }
knf-rs = { git = "https://github.com/Neptune650/knf-rs.git" }
ort-sys = "=2.0.0-rc.8"
futures = "0.3.31"
deepgram = { git = "https://github.com/EzraEllette/deepgram-rust-sdk.git" }
deepgram = "0.6.4"
bytes = { version = "1.9.0", features = ["serde"] }
lru = "0.13.0"
num-traits = "0.2.19"

[target.'cfg(target_os = "windows")'.dependencies]
ort = { version = "=2.0.0-rc.6", features = [
Expand Down
9 changes: 4 additions & 5 deletions screenpipe-audio/benches/record_and_transcribe_benchmark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
use screenpipe_audio::vad_engine::VadSensitivity;
use screenpipe_audio::{
create_whisper_channel, default_input_device, record_and_transcribe, AudioInput, AudioStream,
AudioTranscriptionEngine,
create_whisper_channel, default_input_device, record_and_transcribe, AudioDevice, AudioInput,
AudioStream, AudioTranscriptionEngine,
};
use screenpipe_core::{AudioDevice, DeviceManager};
use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::Arc;
Expand All @@ -19,14 +18,14 @@ async fn setup_test() -> (
let audio_device = default_input_device().unwrap(); // TODO feed voice in automatically somehow
let output_path = PathBuf::from("/tmp/test_audio.mp4");
// let (whisper_sender, _) = mpsc::unbounded_channel();
let (whisper_sender, _) = create_whisper_channel(
let (whisper_sender, _, _) = create_whisper_channel(
Arc::new(AudioTranscriptionEngine::WhisperDistilLargeV3),
screenpipe_audio::VadEngineEnum::Silero,
None,
&output_path,
VadSensitivity::High,
vec![],
Arc::new(DeviceManager::default()),
None,
)
.await
.unwrap();
Expand Down
9 changes: 5 additions & 4 deletions screenpipe-audio/examples/stt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use screenpipe_audio::{AudioInput, AudioTranscriptionEngine};
use screenpipe_core::Language;
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::Mutex as StdMutex;
use strsim::levenshtein;
use tokio::sync::Mutex;
use tracing::debug;
Expand Down Expand Up @@ -91,23 +90,24 @@ async fn main() {
};

let mut segments = prepare_segments(
audio_input.data,
&audio_input.data,
vad_engine.clone(),
&segmentation_model_path,
Arc::new(StdMutex::new(embedding_manager)),
embedding_manager,
embedding_extractor,
&audio_input.device.to_string(),
)
.await
.unwrap();
let mut whisper_model_guard = whisper_model.lock().await;

let mut transcription = String::new();
while let Some(segment) = segments.recv().await {
let transcript = stt(
&segment.samples,
audio_input.sample_rate,
&audio_input.device.to_string(),
whisper_model.clone(),
&mut whisper_model_guard,
Arc::new(AudioTranscriptionEngine::WhisperLargeV3Turbo),
None,
vec![Language::English],
Expand All @@ -117,6 +117,7 @@ async fn main() {

transcription.push_str(&transcript);
}
drop(whisper_model_guard);

let distance = levenshtein(expected_transcription, &transcription.to_lowercase());
let accuracy = 1.0 - (distance as f64 / expected_transcription.len() as f64);
Expand Down
Loading
Loading