Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
133 changes: 49 additions & 84 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ hypr-calendar-google = { path = "crates/calendar-google", package = "calendar-go
hypr-calendar-interface = { path = "crates/calendar-interface", package = "calendar-interface" }
hypr-calendar-outlook = { path = "crates/calendar-outlook", package = "calendar-outlook" }
hypr-chunker = { path = "crates/chunker", package = "chunker" }
hypr-clova = { path = "crates/clova", package = "clova" }
hypr-data = { path = "crates/data", package = "data" }
hypr-db-admin = { path = "crates/db-admin", package = "db-admin" }
hypr-db-core = { path = "crates/db-core", package = "db-core" }
Expand All @@ -50,14 +51,18 @@ hypr-notification2 = { path = "crates/notification2", package = "notification2"
hypr-notion = { path = "crates/notion", package = "notion" }
hypr-onnx = { path = "crates/onnx", package = "onnx" }
hypr-openai = { path = "crates/openai", package = "openai" }
hypr-pyannote = { path = "crates/pyannote", package = "pyannote" }
hypr-pyannote-cloud = { path = "crates/pyannote-cloud", package = "pyannote-cloud" }
hypr-pyannote-local = { path = "crates/pyannote-local", package = "pyannote-local" }
hypr-rtzr = { path = "crates/rtzr", package = "rtzr" }
hypr-s3 = { path = "crates/s3", package = "s3" }
hypr-slack = { path = "crates/slack", package = "slack" }
hypr-stt = { path = "crates/stt", package = "stt", features = ["realtime", "recorded"] }
hypr-template = { path = "crates/template", package = "template" }
hypr-turso = { path = "crates/turso", package = "turso" }
hypr-vad = { path = "crates/vad", package = "vad" }
hypr-whisper = { path = "crates/whisper", package = "whisper" }
hypr-whisper-cloud = { path = "crates/whisper-cloud", package = "whisper-cloud" }
hypr-whisper-local = { path = "crates/whisper-local", package = "whisper-local" }
hypr-ws = { path = "crates/ws", package = "ws" }
hypr-ws-utils = { path = "crates/ws-utils", package = "ws-utils" }

Expand Down
11 changes: 1 addition & 10 deletions apps/app/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,19 @@ dotenv = { workspace = true }
hypr-auth-interface = { workspace = true }
hypr-listener-interface = { workspace = true }

futures-util = { workspace = true }
hypr-analytics = { workspace = true }
hypr-buffer = { workspace = true }
hypr-calendar-google = { workspace = true }
hypr-calendar-interface = { workspace = true }
hypr-calendar-outlook = { workspace = true }
hypr-db-admin = { workspace = true }
hypr-db-core = { workspace = true }
hypr-db-user = { workspace = true }
hypr-nango = { workspace = true }
hypr-notion = { workspace = true }
hypr-openai = { workspace = true }
hypr-s3 = { workspace = true }
hypr-slack = { workspace = true }
hypr-stt = { workspace = true, features = ["realtime", "recorded"] }
hypr-turso = { workspace = true }
hypr-ws-utils = { workspace = true }

async-stream = { workspace = true }
futures-core = { workspace = true }
futures-util = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

axum = { workspace = true, features = ["ws"] }
Expand All @@ -47,10 +40,8 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
anyhow = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true }
codes-iso-639 = { workspace = true }
dotenv = { workspace = true }
thiserror = { workspace = true }
url = { workspace = true }
uuid = { workspace = true }

serde = { workspace = true, features = ["derive"] }
Expand Down
22 changes: 22 additions & 0 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,25 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
tokio-stream = { workspace = true }

hound = { workspace = true }

[features]
macos-default = ["llm-metal", "stt-metal", "stt-coreml"]
windows-default = ["llm-vulkan", "llm-native", "stt-vulkan", "stt-openblas", "stt-directml"]

llm-metal = ["tauri-plugin-local-llm/metal"]
llm-cuda = ["tauri-plugin-local-llm/cuda"]
llm-vulkan = ["tauri-plugin-local-llm/vulkan"]
llm-native = ["tauri-plugin-local-llm/native"]

stt-coreml = ["tauri-plugin-local-stt/coreml"]
stt-directml = ["tauri-plugin-local-stt/directml"]
stt-cuda = ["tauri-plugin-local-stt/cuda"]
stt-hipblas = ["tauri-plugin-local-stt/hipblas"]
stt-openblas = ["tauri-plugin-local-stt/openblas"]
stt-metal = ["tauri-plugin-local-stt/metal"]
stt-vulkan = ["tauri-plugin-local-stt/vulkan"]
stt-openmp = ["tauri-plugin-local-stt/openmp"]

metal = ["llm-metal", "stt-metal"]
cuda = ["llm-cuda", "stt-cuda"]
vulkan = ["llm-vulkan", "stt-vulkan"]
12 changes: 12 additions & 0 deletions apps/desktop/src-tauri/build.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
fn main() {
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();

match target_os.as_str() {
"macos" => {
println!("cargo:rustc-cfg=feature=\"macos-default\"");
}
"windows" => {
println!("cargo:rustc-cfg=feature=\"windows-default\"");
}
_ => {}
}

tauri_build::build()
}
1 change: 1 addition & 0 deletions apps/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ pub async fn main() {
.plugin(tauri_plugin_auth::init())
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_task::init())
.plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_machine_uid::init())
.plugin(tauri_plugin_analytics::init())
Expand Down
1 change: 0 additions & 1 deletion crates/chunker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ futures-util = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
tracing = { workspace = true }
1 change: 0 additions & 1 deletion crates/clova/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

futures-util = { workspace = true }
tokio = { workspace = true }

prost = { workspace = true }
tonic = { workspace = true, features = ["channel", "tls-native-roots"] }
Expand Down
2 changes: 0 additions & 2 deletions crates/db-script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ edition = "2021"
[dependencies]
hypr-listener-interface = { workspace = true }
libsql = { workspace = true }

serde = { workspace = true }
serde_json = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 0 additions & 2 deletions crates/db-user/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ schemars = { workspace = true, features = ["chrono"] }
specta = { workspace = true, features = ["derive", "chrono", "serde_json"] }

chrono = { workspace = true, features = ["serde"] }
codes-iso-639 = { workspace = true }
indoc = { workspace = true }
thiserror = { workspace = true }
uuid = { workspace = true, features = ["v4", "serde"] }
20 changes: 10 additions & 10 deletions crates/llama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,20 @@ name = "llama"
version = "0.1.0"
edition = "2021"

# https://github.com/utilityai/llama-cpp-rs/blob/update-llama-cpp-2025-05-28/llama-cpp-2/Cargo.toml
[features]
default = []
metal = ["llama-cpp-2/metal"]
cuda = ["llama-cpp-2/cuda"]
vulkan = ["llama-cpp-2/vulkan"]
native = ["llama-cpp-2/native"]
openmp = ["llama-cpp-2/openmp"]

[dependencies]
hypr-gguf = { workspace = true }

encoding_rs = "0.8.35"
gbnf-validator = { workspace = true }
llama-cpp-2 = { git = "https://github.com/utilityai/llama-cpp-rs", default-features = false, branch = "update-llama-cpp-2025-05-28" }

async-openai = { workspace = true }
futures-util = { workspace = true }
Expand All @@ -18,15 +27,6 @@ tracing = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

[target.'cfg(not(target_os = "macos"))'.dependencies]
llama-cpp-2 = { git = "https://github.com/utilityai/llama-cpp-rs", default-features = false, features = ["openmp"], branch = "update-llama-cpp-2025-05-28" }

[target.'cfg(all(target_os = "macos", target_arch = "aarch64"))'.dependencies]
llama-cpp-2 = { git = "https://github.com/utilityai/llama-cpp-rs", features = ["openmp", "metal"], branch = "update-llama-cpp-2025-05-28" }

[target.'cfg(all(target_os = "macos", target_arch = "x86_64"))'.dependencies]
llama-cpp-2 = { git = "https://github.com/utilityai/llama-cpp-rs", features = ["native"], branch = "update-llama-cpp-2025-05-28" }

[dev-dependencies]
hypr-buffer = { workspace = true }
hypr-data = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/llama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ impl Llama {
}

pub fn new(model_path: impl AsRef<std::path::Path>) -> Result<Self, crate::Error> {
send_logs_to_tracing(LogOptions::default().with_logs_enabled(false));
let show_logs = if cfg!(debug_assertions) { true } else { false };
send_logs_to_tracing(LogOptions::default().with_logs_enabled(show_logs));

let fmt = model_path.gguf_chat_format()?.unwrap();
let tpl = LlamaChatTemplate::new(fmt.as_ref()).unwrap();
Expand Down
7 changes: 6 additions & 1 deletion crates/onnx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name = "onnx"
version = "0.1.0"
edition = "2021"

[features]
default = []
coreml = ["ort/coreml"]
directml = ["ort/directml"]

[dependencies]
ndarray = "0.16"
ort = "=2.0.0-rc.9"
ort = { version = "=2.0.0-rc.9" }
18 changes: 18 additions & 0 deletions crates/pyannote-cloud/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[package]
name = "pyannote-cloud"
version = "0.1.0"
edition = "2021"

[dependencies]
reqwest = { workspace = true, features = ["json"] }
url = { workspace = true }

serde = { workspace = true, features = ["derive"] }
specta = { workspace = true, features = ["derive"] }

[dev-dependencies]
hypr-data = { workspace = true }

reqwest = { workspace = true, features = ["json"] }
rodio = { workspace = true }
tokio = { workspace = true, features = ["rt", "macros"] }
File renamed without changes.
16 changes: 7 additions & 9 deletions crates/pyannote/Cargo.toml → crates/pyannote-local/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
[package]
name = "pyannote"
name = "pyannote-local"
version = "0.1.0"
edition = "2021"

[features]
default = []
cloud = ["dep:reqwest", "dep:url"]
local = ["dep:hypr-onnx", "dep:knf-rs", "dep:simsimd", "dep:dasp"]
coreml = ["hypr-onnx/coreml"]
directml = ["hypr-onnx/directml"]

[dependencies]
reqwest = { workspace = true, features = ["json"], optional = true }
url = { workspace = true, optional = true }
hypr-onnx = { workspace = true }

dasp = { workspace = true, optional = true }
hypr-onnx = { workspace = true, optional = true }
knf-rs = { git = "https://github.com/thewh1teagle/pyannote-rs", rev = "d97bd3b", package = "knf-rs", optional = true }
simsimd = { version = "6", optional = true }
dasp = { workspace = true }
knf-rs = { git = "https://github.com/thewh1teagle/pyannote-rs", rev = "d97bd3b", package = "knf-rs" }
simsimd = { version = "6" }

anyhow = { workspace = true }
thiserror = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use dasp::sample::{FromSample, Sample, ToSample};
use simsimd::SpatialSimilarity;
use dasp::sample::ToSample;

use hypr_onnx::{
ndarray::{self, Array2},
Expand Down Expand Up @@ -40,7 +39,7 @@ impl EmbeddingExtractor {
Ok(embeddings)
}

pub fn cluster(&self, n_clusters: usize, embeddings: &[f32]) -> Vec<usize> {
pub fn cluster(&self, _n_clusters: usize, embeddings: &[f32]) -> Vec<usize> {
let assignments = vec![0; embeddings.len()];
assignments
}
Expand All @@ -50,6 +49,8 @@ impl EmbeddingExtractor {
mod tests {
use super::*;

use dasp::sample::{FromSample, Sample};

fn get_audio<T: FromSample<i16>>(path: &str) -> Vec<T> {
let base = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
let p = base.join("src/local/data").join(path);
Expand Down
File renamed without changes.
5 changes: 0 additions & 5 deletions crates/pyannote/src/lib.rs

This file was deleted.

13 changes: 0 additions & 13 deletions crates/rtzr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,5 @@ generate = []
tonic-build = { workspace = true }

[dependencies]
anyhow = { workspace = true }
thiserror = { workspace = true }

bytes = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

futures-util = { workspace = true }
tokio = { workspace = true }

prost = { workspace = true }
tonic = { workspace = true, features = ["channel", "tls-native-roots"] }

reqwest = { workspace = true, features = ["multipart", "stream", "json"] }
url = { workspace = true }
17 changes: 5 additions & 12 deletions crates/stt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,31 @@ version = "0.1.0"
edition = "2021"

[features]
default = ["realtime", "recorded", "local"]
default = ["realtime", "recorded"]
realtime = []
recorded = []
local = []

[dependencies]
hypr-audio-utils = { workspace = true }
hypr-clova = { path = "../clova", package = "clova" }
hypr-db-user = { workspace = true }
hypr-clova = { workspace = true }
hypr-language = { workspace = true, features = ["deepgram", "whisper"] }
hypr-listener-interface = { workspace = true }
hypr-rtzr = { path = "../rtzr", package = "rtzr" }
hypr-whisper = { workspace = true, features = ["cloud"] }
hypr-whisper-cloud = { workspace = true }

deepgram = { workspace = true, default-features = false, features = ["listen"] }

anyhow = { workspace = true }
thiserror = { workspace = true }

bytes = { workspace = true }
codes-iso-639 = { workspace = true }

serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
specta = { workspace = true, features = ["derive"] }

futures-util = { workspace = true }
tokio = { workspace = true }

[dev-dependencies]
hypr-audio = { path = "../audio", package = "audio" }
hypr-data = { path = "../data", package = "data" }
hypr-audio = { workspace = true }
hypr-data = { workspace = true }

async-stream = { workspace = true }
hound = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/stt/src/realtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl ClientBuilder {
pub enum MultiClient {
Clova(hypr_clova::realtime::Client),
Deepgram(DeepgramClient),
Whisper(hypr_whisper::cloud::WhisperClient),
Whisper(hypr_whisper_cloud::WhisperClient),
}

#[derive(Debug, Clone)]
Expand All @@ -80,7 +80,7 @@ impl Client {
MultiClient::Clova(clova)
}
hypr_language::ISO639::De => {
let whisper = hypr_whisper::cloud::WhisperClient::builder()
let whisper = hypr_whisper_cloud::WhisperClient::builder()
.api_base(std::env::var("WHISPER_API_BASE").unwrap())
.api_key(std::env::var("WHISPER_API_KEY").unwrap())
.language(language.try_into().unwrap())
Expand Down
2 changes: 1 addition & 1 deletion crates/stt/src/realtime/whisper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use bytes::Bytes;
use futures_util::{Stream, StreamExt};
use std::error::Error;

use hypr_whisper::cloud::WhisperClient;
use hypr_whisper_cloud::WhisperClient;

use super::RealtimeSpeechToText;
use hypr_listener_interface::{ListenOutputChunk, Word};
Expand Down
1 change: 0 additions & 1 deletion crates/turso/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2021"
cached = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
url = { workspace = true }

Expand Down
1 change: 0 additions & 1 deletion crates/vad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ edition = "2021"
[dependencies]
serde = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }

ndarray = "0.16"
ort = "=2.0.0-rc.9"
Expand Down
Loading
Loading