diff --git a/Cargo.lock b/Cargo.lock index 6969b37d..507b6e42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] @@ -839,7 +839,7 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "elide" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-codec", @@ -875,7 +875,7 @@ dependencies = [ [[package]] name = "elide-codec" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "bytes", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "elide-context" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-core", @@ -910,7 +910,7 @@ dependencies = [ [[package]] name = "elide-core" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "bytes", @@ -928,7 +928,7 @@ dependencies = [ [[package]] name = "elide-detection" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-core", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "elide-lingua" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-core", @@ -952,7 +952,7 @@ dependencies = [ [[package]] name = "elide-llm" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "derive_builder", @@ -972,7 +972,7 @@ dependencies = [ [[package]] name = "elide-ner" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "derive_builder", @@ -986,7 +986,7 @@ dependencies = [ [[package]] name = "elide-ocr" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-core", @@ -996,7 +996,7 @@ dependencies = [ [[package]] name = "elide-orchestration" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "bytes", "elide-codec", @@ -1010,7 +1010,7 @@ dependencies = [ [[package]] name = "elide-pattern" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "aho-corasick", "async-trait", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "elide-redaction" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "bytes", @@ -1045,7 +1045,7 @@ dependencies = [ [[package]] name = "elide-stt" version = "0.1.0" -source = "git+https://github.com/nvisycom/elide?branch=main#5bc8557ff10c0d9a28413a11a932981582f16314" +source = "git+https://github.com/nvisycom/elide?branch=main#b0fbfbade1f51610ec31e8a200a6fc1abc3ac76e" dependencies = [ "async-trait", "elide-core", diff --git a/crates/nvisy-engine/src/analyzer/audio.rs b/crates/nvisy-engine/src/analyzer/audio.rs index 67e2cc8b..584812c9 100644 --- a/crates/nvisy-engine/src/analyzer/audio.rs +++ b/crates/nvisy-engine/src/analyzer/audio.rs @@ -16,18 +16,22 @@ //! [`AnalyzerParams`]: nvisy_schema::plan::AnalyzerParams use elide::detection::Analyzer; +use elide_core::Error; use elide_core::modality::audio::Audio; -use elide_core::{Error, ErrorKind}; -#[cfg(feature = "test-utils")] -use elide_stt::{MockBackend as MockSttBackend, SttEnricher}; use nvisy_core::ner::NerConfig; -use nvisy_schema::plan::{AnalyzerParams, SttBackendParams, SttEnricherParams}; +use nvisy_schema::plan::AnalyzerParams; -use super::common::{attach_dedup, attach_pattern}; -use super::ner::attach_ner_lineup; +use super::PatternGuardrails; +use super::enricher::attach_stt; +use super::layer::attach_dedup; +use super::recognizer::{attach_ner_lineup, attach_pattern}; /// Compile `spec` into an audio-modality [`Analyzer`]. -pub(super) fn compile(spec: &AnalyzerParams, ner: &NerConfig) -> Result, Error> { +pub(super) fn compile( + spec: &AnalyzerParams, + ner: &NerConfig, + guardrails: &PatternGuardrails, +) -> Result, Error> { let mut analyzer = Analyzer::