kreuzberg 4.0.0.pre.rc.6 → 4.0.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitignore +0 -6
- data/.rubocop.yaml +534 -1
- data/Gemfile +2 -1
- data/Gemfile.lock +11 -11
- data/README.md +5 -10
- data/examples/async_patterns.rb +0 -1
- data/ext/kreuzberg_rb/extconf.rb +0 -10
- data/ext/kreuzberg_rb/native/Cargo.toml +15 -23
- data/ext/kreuzberg_rb/native/build.rs +2 -0
- data/ext/kreuzberg_rb/native/include/ieeefp.h +1 -1
- data/ext/kreuzberg_rb/native/include/msvc_compat/strings.h +1 -1
- data/ext/kreuzberg_rb/native/include/strings.h +2 -2
- data/ext/kreuzberg_rb/native/include/unistd.h +1 -1
- data/ext/kreuzberg_rb/native/src/lib.rs +16 -75
- data/kreuzberg.gemspec +14 -57
- data/lib/kreuzberg/cache_api.rb +0 -1
- data/lib/kreuzberg/cli.rb +2 -2
- data/lib/kreuzberg/config.rb +2 -9
- data/lib/kreuzberg/errors.rb +7 -75
- data/lib/kreuzberg/extraction_api.rb +0 -1
- data/lib/kreuzberg/setup_lib_path.rb +0 -1
- data/lib/kreuzberg/version.rb +1 -1
- data/lib/kreuzberg.rb +0 -21
- data/pkg/kreuzberg-4.0.0.rc1.gem +0 -0
- data/sig/kreuzberg.rbs +3 -55
- data/spec/binding/cli_proxy_spec.rb +4 -2
- data/spec/binding/cli_spec.rb +11 -12
- data/spec/examples.txt +104 -0
- data/spec/fixtures/config.yaml +1 -0
- data/spec/spec_helper.rb +1 -1
- data/vendor/kreuzberg/Cargo.toml +42 -112
- data/vendor/kreuzberg/README.md +2 -2
- data/vendor/kreuzberg/build.rs +4 -18
- data/vendor/kreuzberg/src/bin/profile_extract.rs +455 -0
- data/vendor/kreuzberg/src/cache/mod.rs +3 -27
- data/vendor/kreuzberg/src/core/batch_mode.rs +0 -60
- data/vendor/kreuzberg/src/core/extractor.rs +81 -202
- data/vendor/kreuzberg/src/core/io.rs +2 -4
- data/vendor/kreuzberg/src/core/mime.rs +12 -2
- data/vendor/kreuzberg/src/core/mod.rs +1 -4
- data/vendor/kreuzberg/src/core/pipeline.rs +33 -111
- data/vendor/kreuzberg/src/embeddings.rs +16 -125
- data/vendor/kreuzberg/src/error.rs +1 -1
- data/vendor/kreuzberg/src/extraction/docx.rs +1 -1
- data/vendor/kreuzberg/src/extraction/image.rs +13 -13
- data/vendor/kreuzberg/src/extraction/libreoffice.rs +1 -0
- data/vendor/kreuzberg/src/extraction/mod.rs +5 -9
- data/vendor/kreuzberg/src/extraction/office_metadata/mod.rs +0 -2
- data/vendor/kreuzberg/src/extraction/pandoc/batch.rs +275 -0
- data/vendor/kreuzberg/src/extraction/pandoc/mime_types.rs +178 -0
- data/vendor/kreuzberg/src/extraction/pandoc/mod.rs +491 -0
- data/vendor/kreuzberg/src/extraction/pandoc/server.rs +496 -0
- data/vendor/kreuzberg/src/extraction/pandoc/subprocess.rs +1188 -0
- data/vendor/kreuzberg/src/extraction/pandoc/version.rs +162 -0
- data/vendor/kreuzberg/src/extractors/archive.rs +0 -21
- data/vendor/kreuzberg/src/extractors/docx.rs +128 -16
- data/vendor/kreuzberg/src/extractors/email.rs +0 -14
- data/vendor/kreuzberg/src/extractors/excel.rs +20 -19
- data/vendor/kreuzberg/src/extractors/html.rs +154 -137
- data/vendor/kreuzberg/src/extractors/image.rs +4 -7
- data/vendor/kreuzberg/src/extractors/mod.rs +9 -106
- data/vendor/kreuzberg/src/extractors/pandoc.rs +201 -0
- data/vendor/kreuzberg/src/extractors/pdf.rs +15 -12
- data/vendor/kreuzberg/src/extractors/pptx.rs +3 -17
- data/vendor/kreuzberg/src/extractors/structured.rs +0 -14
- data/vendor/kreuzberg/src/extractors/text.rs +5 -23
- data/vendor/kreuzberg/src/extractors/xml.rs +0 -7
- data/vendor/kreuzberg/src/keywords/rake.rs +1 -0
- data/vendor/kreuzberg/src/lib.rs +1 -4
- data/vendor/kreuzberg/src/mcp/mod.rs +1 -1
- data/vendor/kreuzberg/src/mcp/server.rs +3 -5
- data/vendor/kreuzberg/src/ocr/processor.rs +2 -18
- data/vendor/kreuzberg/src/pdf/error.rs +1 -1
- data/vendor/kreuzberg/src/pdf/table.rs +44 -17
- data/vendor/kreuzberg/src/pdf/text.rs +3 -0
- data/vendor/kreuzberg/src/plugins/extractor.rs +5 -8
- data/vendor/kreuzberg/src/plugins/ocr.rs +11 -2
- data/vendor/kreuzberg/src/plugins/processor.rs +1 -2
- data/vendor/kreuzberg/src/plugins/registry.rs +0 -13
- data/vendor/kreuzberg/src/plugins/validator.rs +8 -9
- data/vendor/kreuzberg/src/stopwords/mod.rs +2 -2
- data/vendor/kreuzberg/src/types.rs +12 -42
- data/vendor/kreuzberg/tests/batch_orchestration.rs +5 -19
- data/vendor/kreuzberg/tests/batch_processing.rs +3 -15
- data/vendor/kreuzberg/tests/chunking_offset_demo.rs +92 -0
- data/vendor/kreuzberg/tests/concurrency_stress.rs +1 -17
- data/vendor/kreuzberg/tests/config_features.rs +0 -18
- data/vendor/kreuzberg/tests/config_loading_tests.rs +39 -15
- data/vendor/kreuzberg/tests/core_integration.rs +7 -24
- data/vendor/kreuzberg/tests/csv_integration.rs +81 -71
- data/vendor/kreuzberg/tests/docx_metadata_extraction_test.rs +25 -23
- data/vendor/kreuzberg/tests/pandoc_integration.rs +503 -0
- data/vendor/kreuzberg/tests/pipeline_integration.rs +1 -0
- data/vendor/kreuzberg/tests/plugin_postprocessor_test.rs +1 -0
- data/vendor/kreuzberg/tests/registry_integration_tests.rs +22 -1
- data/vendor/kreuzberg/tests/security_validation.rs +1 -12
- metadata +25 -90
- data/.rubocop.yml +0 -538
- data/ext/kreuzberg_rb/native/Cargo.lock +0 -6535
- data/lib/kreuzberg/error_context.rb +0 -32
- data/vendor/kreuzberg/benches/otel_overhead.rs +0 -48
- data/vendor/kreuzberg/src/extraction/markdown.rs +0 -213
- data/vendor/kreuzberg/src/extraction/office_metadata/odt_properties.rs +0 -287
- data/vendor/kreuzberg/src/extractors/bibtex.rs +0 -469
- data/vendor/kreuzberg/src/extractors/docbook.rs +0 -502
- data/vendor/kreuzberg/src/extractors/epub.rs +0 -707
- data/vendor/kreuzberg/src/extractors/fictionbook.rs +0 -491
- data/vendor/kreuzberg/src/extractors/fictionbook.rs.backup2 +0 -738
- data/vendor/kreuzberg/src/extractors/jats.rs +0 -1051
- data/vendor/kreuzberg/src/extractors/jupyter.rs +0 -367
- data/vendor/kreuzberg/src/extractors/latex.rs +0 -652
- data/vendor/kreuzberg/src/extractors/markdown.rs +0 -700
- data/vendor/kreuzberg/src/extractors/odt.rs +0 -628
- data/vendor/kreuzberg/src/extractors/opml.rs +0 -634
- data/vendor/kreuzberg/src/extractors/orgmode.rs +0 -528
- data/vendor/kreuzberg/src/extractors/rst.rs +0 -576
- data/vendor/kreuzberg/src/extractors/rtf.rs +0 -810
- data/vendor/kreuzberg/src/extractors/security.rs +0 -484
- data/vendor/kreuzberg/src/extractors/security_tests.rs +0 -367
- data/vendor/kreuzberg/src/extractors/typst.rs +0 -650
- data/vendor/kreuzberg/src/panic_context.rs +0 -154
- data/vendor/kreuzberg/tests/api_extract_multipart.rs +0 -52
- data/vendor/kreuzberg/tests/bibtex_parity_test.rs +0 -421
- data/vendor/kreuzberg/tests/docbook_extractor_tests.rs +0 -498
- data/vendor/kreuzberg/tests/docx_vs_pandoc_comparison.rs +0 -370
- data/vendor/kreuzberg/tests/epub_native_extractor_tests.rs +0 -275
- data/vendor/kreuzberg/tests/fictionbook_extractor_tests.rs +0 -228
- data/vendor/kreuzberg/tests/html_table_test.rs +0 -551
- data/vendor/kreuzberg/tests/instrumentation_test.rs +0 -139
- data/vendor/kreuzberg/tests/jats_extractor_tests.rs +0 -639
- data/vendor/kreuzberg/tests/jupyter_extractor_tests.rs +0 -704
- data/vendor/kreuzberg/tests/latex_extractor_tests.rs +0 -496
- data/vendor/kreuzberg/tests/markdown_extractor_tests.rs +0 -490
- data/vendor/kreuzberg/tests/odt_extractor_tests.rs +0 -695
- data/vendor/kreuzberg/tests/opml_extractor_tests.rs +0 -616
- data/vendor/kreuzberg/tests/orgmode_extractor_tests.rs +0 -822
- data/vendor/kreuzberg/tests/rst_extractor_tests.rs +0 -692
- data/vendor/kreuzberg/tests/rtf_extractor_tests.rs +0 -776
- data/vendor/kreuzberg/tests/typst_behavioral_tests.rs +0 -1259
- data/vendor/kreuzberg/tests/typst_extractor_tests.rs +0 -647
- data/vendor/rb-sys/.cargo-ok +0 -1
- data/vendor/rb-sys/.cargo_vcs_info.json +0 -6
- data/vendor/rb-sys/Cargo.lock +0 -393
- data/vendor/rb-sys/Cargo.toml +0 -70
- data/vendor/rb-sys/Cargo.toml.orig +0 -57
- data/vendor/rb-sys/LICENSE-APACHE +0 -190
- data/vendor/rb-sys/LICENSE-MIT +0 -21
- data/vendor/rb-sys/bin/release.sh +0 -21
- data/vendor/rb-sys/build/features.rs +0 -108
- data/vendor/rb-sys/build/main.rs +0 -246
- data/vendor/rb-sys/build/stable_api_config.rs +0 -153
- data/vendor/rb-sys/build/version.rs +0 -48
- data/vendor/rb-sys/readme.md +0 -36
- data/vendor/rb-sys/src/bindings.rs +0 -21
- data/vendor/rb-sys/src/hidden.rs +0 -11
- data/vendor/rb-sys/src/lib.rs +0 -34
- data/vendor/rb-sys/src/macros.rs +0 -371
- data/vendor/rb-sys/src/memory.rs +0 -53
- data/vendor/rb-sys/src/ruby_abi_version.rs +0 -38
- data/vendor/rb-sys/src/special_consts.rs +0 -31
- data/vendor/rb-sys/src/stable_api/compiled.c +0 -179
- data/vendor/rb-sys/src/stable_api/compiled.rs +0 -257
- data/vendor/rb-sys/src/stable_api/ruby_2_6.rs +0 -316
- data/vendor/rb-sys/src/stable_api/ruby_2_7.rs +0 -316
- data/vendor/rb-sys/src/stable_api/ruby_3_0.rs +0 -324
- data/vendor/rb-sys/src/stable_api/ruby_3_1.rs +0 -317
- data/vendor/rb-sys/src/stable_api/ruby_3_2.rs +0 -315
- data/vendor/rb-sys/src/stable_api/ruby_3_3.rs +0 -326
- data/vendor/rb-sys/src/stable_api/ruby_3_4.rs +0 -327
- data/vendor/rb-sys/src/stable_api.rs +0 -261
- data/vendor/rb-sys/src/symbol.rs +0 -31
- data/vendor/rb-sys/src/tracking_allocator.rs +0 -332
- data/vendor/rb-sys/src/utils.rs +0 -89
- data/vendor/rb-sys/src/value_type.rs +0 -7
|
@@ -0,0 +1,275 @@
|
|
|
1
|
+
//! Batch extraction with automatic pandoc-server mode optimization
|
|
2
|
+
//!
|
|
3
|
+
//! This module provides intelligent batch processing for Pandoc extractions with automatic
|
|
4
|
+
//! server mode optimization. The `BatchExtractor` automatically detects if pandoc-server is
|
|
5
|
+
//! available and uses it when beneficial for performance.
|
|
6
|
+
//!
|
|
7
|
+
//! # Server Mode Detection
|
|
8
|
+
//!
|
|
9
|
+
//! The extractor checks for pandoc-server availability in two ways:
|
|
10
|
+
//! 1. Direct binary check: Looks for `pandoc-server` in PATH
|
|
11
|
+
//! 2. Version detection: Checks if pandoc 3.8+ is installed (supports server mode)
|
|
12
|
+
//!
|
|
13
|
+
//! # Optimization Heuristic
|
|
14
|
+
//!
|
|
15
|
+
//! - **>3 files**: Uses server mode (amortizes ~100-200ms startup overhead)
|
|
16
|
+
//! - **≤3 files**: Uses subprocess mode (avoids server startup cost)
|
|
17
|
+
//! - **Server unavailable**: Always uses subprocess mode (graceful fallback)
|
|
18
|
+
//!
|
|
19
|
+
//! # Example Usage
|
|
20
|
+
//!
|
|
21
|
+
//! ```no_run
|
|
22
|
+
//! use kreuzberg::extraction::pandoc::BatchExtractor;
|
|
23
|
+
//! use std::path::Path;
|
|
24
|
+
//!
|
|
25
|
+
//! #[tokio::main]
|
|
26
|
+
//! async fn main() -> kreuzberg::Result<()> {
|
|
27
|
+
//! // Create extractor (auto-detects server availability)
|
|
28
|
+
//! let extractor = BatchExtractor::new().await;
|
|
29
|
+
//!
|
|
30
|
+
//! // Extract multiple files
|
|
31
|
+
//! let paths = vec![
|
|
32
|
+
//! Path::new("doc1.docx"),
|
|
33
|
+
//! Path::new("doc2.docx"),
|
|
34
|
+
//! Path::new("doc3.docx"),
|
|
35
|
+
//! Path::new("doc4.docx"),
|
|
36
|
+
//! ];
|
|
37
|
+
//! let formats = vec!["docx", "docx", "docx", "docx"];
|
|
38
|
+
//!
|
|
39
|
+
//! let results = extractor.extract_files(&paths, &formats).await?;
|
|
40
|
+
//!
|
|
41
|
+
//! // Process results
|
|
42
|
+
//! for (i, result) in results.iter().enumerate() {
|
|
43
|
+
//! match result {
|
|
44
|
+
//! Ok(extraction) => println!("File {}: {} chars", i, extraction.content.len()),
|
|
45
|
+
//! Err(e) => eprintln!("File {}: Error: {}", i, e),
|
|
46
|
+
//! }
|
|
47
|
+
//! }
|
|
48
|
+
//!
|
|
49
|
+
//! // Cleanup (optional, happens automatically on drop)
|
|
50
|
+
//! extractor.shutdown().await?;
|
|
51
|
+
//!
|
|
52
|
+
//! Ok(())
|
|
53
|
+
//! }
|
|
54
|
+
//! ```
|
|
55
|
+
//!
|
|
56
|
+
//! # Logging
|
|
57
|
+
//!
|
|
58
|
+
//! Enable tracing to see server mode detection and usage:
|
|
59
|
+
//!
|
|
60
|
+
//! ```bash
|
|
61
|
+
//! RUST_LOG=kreuzberg=debug cargo run
|
|
62
|
+
//! ```
|
|
63
|
+
//!
|
|
64
|
+
//! Expected logs:
|
|
65
|
+
//! - `DEBUG`: Server detection results, file counts
|
|
66
|
+
//! - `INFO`: Server startup confirmation
|
|
67
|
+
//! - `WARN`: Server failures with troubleshooting guidance
|
|
68
|
+
|
|
69
|
+
use crate::error::{KreuzbergError, Result};
|
|
70
|
+
use crate::types::PandocExtractionResult;
|
|
71
|
+
use serde_json::Value;
|
|
72
|
+
use std::path::Path;
|
|
73
|
+
use std::sync::Arc;
|
|
74
|
+
use tokio::sync::Mutex;
|
|
75
|
+
|
|
76
|
+
use super::server::PandocServer;
|
|
77
|
+
use super::subprocess;
|
|
78
|
+
|
|
79
|
+
/// Batch extractor with automatic server mode optimization
|
|
80
|
+
///
|
|
81
|
+
/// Automatically detects pandoc-server availability and uses it when beneficial for
|
|
82
|
+
/// performance (>3 files). Falls back to subprocess mode gracefully.
|
|
83
|
+
///
|
|
84
|
+
/// # Performance
|
|
85
|
+
///
|
|
86
|
+
/// - **Server mode**: ~100-200ms savings per file (startup overhead eliminated)
|
|
87
|
+
/// - **Subprocess mode**: Lightweight, suitable for small batches
|
|
88
|
+
///
|
|
89
|
+
/// # Thread Safety
|
|
90
|
+
///
|
|
91
|
+
/// This struct is safe to use across multiple async tasks. The server instance is
|
|
92
|
+
/// protected by an Arc<Mutex> and can be safely shared.
|
|
93
|
+
pub struct BatchExtractor {
|
|
94
|
+
server: Arc<Mutex<Option<PandocServer>>>,
|
|
95
|
+
use_server: bool,
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
impl BatchExtractor {
|
|
99
|
+
/// Create a new batch extractor
|
|
100
|
+
///
|
|
101
|
+
/// Automatically detects if pandoc-server is available and uses it if beneficial
|
|
102
|
+
pub async fn new() -> Self {
|
|
103
|
+
let use_server = PandocServer::is_server_available().await;
|
|
104
|
+
|
|
105
|
+
if use_server {
|
|
106
|
+
tracing::info!("Pandoc server mode available - will use for batch processing");
|
|
107
|
+
} else {
|
|
108
|
+
tracing::debug!("Pandoc server mode not available - using subprocess mode");
|
|
109
|
+
tracing::debug!("To enable server mode:");
|
|
110
|
+
tracing::debug!(" 1. Install pandoc 3.8+ (current version may be older)");
|
|
111
|
+
tracing::debug!(" 2. OR create symlink: ln -s $(which pandoc) /usr/local/bin/pandoc-server");
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
Self {
|
|
115
|
+
server: Arc::new(Mutex::new(None)),
|
|
116
|
+
use_server,
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/// Extract multiple files using optimal strategy
|
|
121
|
+
///
|
|
122
|
+
/// Automatically starts server if available and beneficial (>3 files)
|
|
123
|
+
pub async fn extract_files(
|
|
124
|
+
&self,
|
|
125
|
+
paths: &[&Path],
|
|
126
|
+
formats: &[&str],
|
|
127
|
+
) -> Result<Vec<Result<PandocExtractionResult>>> {
|
|
128
|
+
if paths.is_empty() {
|
|
129
|
+
return Ok(vec![]);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
if self.use_server && paths.len() > 3 {
|
|
133
|
+
self.extract_with_server(paths, formats).await
|
|
134
|
+
} else {
|
|
135
|
+
self.extract_with_subprocess(paths, formats).await
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/// Extract using server mode (warm instance)
|
|
140
|
+
async fn extract_with_server(
|
|
141
|
+
&self,
|
|
142
|
+
paths: &[&Path],
|
|
143
|
+
formats: &[&str],
|
|
144
|
+
) -> Result<Vec<Result<PandocExtractionResult>>> {
|
|
145
|
+
let mut server_lock = self.server.lock().await;
|
|
146
|
+
|
|
147
|
+
if server_lock.is_none() {
|
|
148
|
+
match PandocServer::new(None, None).await {
|
|
149
|
+
Ok(server) => {
|
|
150
|
+
if let Err(e) = server.start().await {
|
|
151
|
+
tracing::warn!("Failed to start pandoc-server: {}", e);
|
|
152
|
+
tracing::warn!("Falling back to subprocess mode");
|
|
153
|
+
tracing::warn!("To fix:");
|
|
154
|
+
tracing::warn!(" 1. Ensure pandoc 3.8+ is installed: pandoc --version");
|
|
155
|
+
tracing::warn!(" 2. Create symlink: ln -s $(which pandoc) /usr/local/bin/pandoc-server");
|
|
156
|
+
drop(server_lock);
|
|
157
|
+
return self.extract_with_subprocess(paths, formats).await;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
tracing::info!("Started pandoc-server for batch processing ({} files)", paths.len());
|
|
161
|
+
*server_lock = Some(server);
|
|
162
|
+
}
|
|
163
|
+
Err(e) => {
|
|
164
|
+
tracing::warn!("Failed to create pandoc-server: {}", e);
|
|
165
|
+
tracing::warn!("Falling back to subprocess mode");
|
|
166
|
+
drop(server_lock);
|
|
167
|
+
return self.extract_with_subprocess(paths, formats).await;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
} else {
|
|
171
|
+
tracing::debug!("Reusing warm pandoc-server instance for {} files", paths.len());
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
let server = server_lock.as_ref().unwrap();
|
|
175
|
+
let mut results = Vec::with_capacity(paths.len());
|
|
176
|
+
|
|
177
|
+
for (i, (path, format)) in paths.iter().zip(formats.iter()).enumerate() {
|
|
178
|
+
tracing::debug!("Extracting file {}/{} via server: {:?}", i + 1, paths.len(), path);
|
|
179
|
+
|
|
180
|
+
let content = match tokio::fs::read(path).await {
|
|
181
|
+
Ok(c) => c,
|
|
182
|
+
Err(e) => {
|
|
183
|
+
results.push(Err(KreuzbergError::Io(e)));
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
186
|
+
};
|
|
187
|
+
|
|
188
|
+
let result = match server.convert(&String::from_utf8_lossy(&content), format, "json").await {
|
|
189
|
+
Ok(json_output) => match serde_json::from_str::<Value>(&json_output) {
|
|
190
|
+
Ok(json_data) => {
|
|
191
|
+
let content = subprocess::extract_content_from_json(&json_data)?;
|
|
192
|
+
let metadata = subprocess::extract_metadata_from_json(&json_data)?;
|
|
193
|
+
|
|
194
|
+
Ok(PandocExtractionResult { content, metadata })
|
|
195
|
+
}
|
|
196
|
+
Err(e) => Err(KreuzbergError::parsing(format!(
|
|
197
|
+
"Failed to parse JSON from server: {}",
|
|
198
|
+
e
|
|
199
|
+
))),
|
|
200
|
+
},
|
|
201
|
+
Err(e) => Err(e),
|
|
202
|
+
};
|
|
203
|
+
|
|
204
|
+
results.push(result);
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
Ok(results)
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/// Extract using subprocess mode
|
|
211
|
+
async fn extract_with_subprocess(
|
|
212
|
+
&self,
|
|
213
|
+
paths: &[&Path],
|
|
214
|
+
formats: &[&str],
|
|
215
|
+
) -> Result<Vec<Result<PandocExtractionResult>>> {
|
|
216
|
+
tracing::debug!("Extracting {} files via subprocess mode", paths.len());
|
|
217
|
+
|
|
218
|
+
let mut results = Vec::with_capacity(paths.len());
|
|
219
|
+
|
|
220
|
+
for (path, format) in paths.iter().zip(formats.iter()) {
|
|
221
|
+
let result = subprocess::extract_with_pandoc(path, format)
|
|
222
|
+
.await
|
|
223
|
+
.map(|(content, metadata)| PandocExtractionResult { content, metadata });
|
|
224
|
+
results.push(result);
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
Ok(results)
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
/// Stop the server if running
|
|
231
|
+
pub async fn shutdown(&self) -> Result<()> {
|
|
232
|
+
let mut server_lock = self.server.lock().await;
|
|
233
|
+
if let Some(server) = server_lock.take() {
|
|
234
|
+
tracing::info!("Shutting down pandoc-server");
|
|
235
|
+
server.stop().await?;
|
|
236
|
+
}
|
|
237
|
+
Ok(())
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
impl Drop for BatchExtractor {
|
|
242
|
+
fn drop(&mut self) {
|
|
243
|
+
if let Some(server) = self.server.try_lock().ok().and_then(|mut s| s.take()) {
|
|
244
|
+
tokio::spawn(async move {
|
|
245
|
+
let _ = server.stop().await;
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
#[cfg(test)]
|
|
252
|
+
mod tests {
|
|
253
|
+
use super::*;
|
|
254
|
+
|
|
255
|
+
#[tokio::test]
|
|
256
|
+
async fn test_batch_extractor_creation() {
|
|
257
|
+
let extractor = BatchExtractor::new().await;
|
|
258
|
+
assert!(extractor.server.lock().await.is_none());
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
#[tokio::test]
|
|
262
|
+
async fn test_empty_batch() {
|
|
263
|
+
let extractor = BatchExtractor::new().await;
|
|
264
|
+
let results = extractor.extract_files(&[], &[]).await;
|
|
265
|
+
assert!(results.is_ok());
|
|
266
|
+
assert!(results.unwrap().is_empty());
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
#[tokio::test]
|
|
270
|
+
async fn test_shutdown() {
|
|
271
|
+
let extractor = BatchExtractor::new().await;
|
|
272
|
+
let result = extractor.shutdown().await;
|
|
273
|
+
assert!(result.is_ok());
|
|
274
|
+
}
|
|
275
|
+
}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
use crate::error::{KreuzbergError, Result};
|
|
2
|
+
use std::collections::HashMap;
|
|
3
|
+
|
|
4
|
+
/// MIME type to Pandoc format mapping
|
|
5
|
+
pub fn get_pandoc_format_from_mime(mime_type: &str) -> Result<String> {
|
|
6
|
+
let mappings = get_mime_to_pandoc_mapping();
|
|
7
|
+
|
|
8
|
+
if let Some(format) = mappings.get(mime_type) {
|
|
9
|
+
return Ok(format.to_string());
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
if mime_type == "text/markdown" {
|
|
13
|
+
return Ok("markdown".to_string());
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
for (key, value) in &mappings {
|
|
17
|
+
if mime_type.starts_with(key) {
|
|
18
|
+
return Ok(value.to_string());
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
Err(KreuzbergError::validation(format!(
|
|
23
|
+
"Unsupported MIME type: {}",
|
|
24
|
+
mime_type
|
|
25
|
+
)))
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/// MIME type to file extension mapping
|
|
29
|
+
pub fn get_extension_from_mime(mime_type: &str) -> Result<String> {
|
|
30
|
+
let mappings = get_mime_to_extension_mapping();
|
|
31
|
+
|
|
32
|
+
mappings
|
|
33
|
+
.get(mime_type)
|
|
34
|
+
.map(|s| s.to_string())
|
|
35
|
+
.ok_or_else(|| KreuzbergError::validation(format!("No file extension mapping for MIME type: {}", mime_type)))
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
fn get_mime_to_pandoc_mapping() -> HashMap<&'static str, &'static str> {
|
|
39
|
+
HashMap::from([
|
|
40
|
+
("application/csl+json", "csljson"),
|
|
41
|
+
("application/docbook+xml", "docbook"),
|
|
42
|
+
("application/epub+zip", "epub"),
|
|
43
|
+
("application/rtf", "rtf"),
|
|
44
|
+
("application/vnd.oasis.opendocument.text", "odt"),
|
|
45
|
+
(
|
|
46
|
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
|
|
47
|
+
"docx",
|
|
48
|
+
),
|
|
49
|
+
("application/x-biblatex", "biblatex"),
|
|
50
|
+
("application/x-bibtex", "bibtex"),
|
|
51
|
+
("application/x-endnote+xml", "endnotexml"),
|
|
52
|
+
("application/x-fictionbook+xml", "fb2"),
|
|
53
|
+
("application/x-ipynb+json", "ipynb"),
|
|
54
|
+
("application/x-jats+xml", "jats"),
|
|
55
|
+
("application/x-latex", "latex"),
|
|
56
|
+
("application/x-opml+xml", "opml"),
|
|
57
|
+
("application/x-research-info-systems", "ris"),
|
|
58
|
+
("application/x-typst", "typst"),
|
|
59
|
+
("text/csv", "csv"),
|
|
60
|
+
("text/tab-separated-values", "tsv"),
|
|
61
|
+
("text/troff", "man"),
|
|
62
|
+
("text/x-commonmark", "commonmark"),
|
|
63
|
+
("text/x-dokuwiki", "dokuwiki"),
|
|
64
|
+
("text/x-gfm", "gfm"),
|
|
65
|
+
("text/x-markdown", "markdown"),
|
|
66
|
+
("text/x-markdown-extra", "markdown_phpextra"),
|
|
67
|
+
("text/x-mdoc", "mdoc"),
|
|
68
|
+
("text/x-multimarkdown", "markdown_mmd"),
|
|
69
|
+
("text/x-org", "org"),
|
|
70
|
+
("text/x-pod", "pod"),
|
|
71
|
+
("text/x-rst", "rst"),
|
|
72
|
+
])
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
fn get_mime_to_extension_mapping() -> HashMap<&'static str, &'static str> {
|
|
76
|
+
HashMap::from([
|
|
77
|
+
("application/csl+json", "json"),
|
|
78
|
+
("application/docbook+xml", "xml"),
|
|
79
|
+
("application/epub+zip", "epub"),
|
|
80
|
+
("application/rtf", "rtf"),
|
|
81
|
+
("application/vnd.oasis.opendocument.text", "odt"),
|
|
82
|
+
(
|
|
83
|
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
|
|
84
|
+
"docx",
|
|
85
|
+
),
|
|
86
|
+
("application/x-biblatex", "bib"),
|
|
87
|
+
("application/x-bibtex", "bib"),
|
|
88
|
+
("application/x-endnote+xml", "xml"),
|
|
89
|
+
("application/x-fictionbook+xml", "fb2"),
|
|
90
|
+
("application/x-ipynb+json", "ipynb"),
|
|
91
|
+
("application/x-jats+xml", "xml"),
|
|
92
|
+
("application/x-latex", "tex"),
|
|
93
|
+
("application/x-opml+xml", "opml"),
|
|
94
|
+
("application/x-research-info-systems", "ris"),
|
|
95
|
+
("application/x-typst", "typst"),
|
|
96
|
+
("text/csv", "csv"),
|
|
97
|
+
("text/tab-separated-values", "tsv"),
|
|
98
|
+
("text/troff", "1"),
|
|
99
|
+
("text/x-commonmark", "md"),
|
|
100
|
+
("text/x-dokuwiki", "wiki"),
|
|
101
|
+
("text/x-gfm", "md"),
|
|
102
|
+
("text/x-markdown", "md"),
|
|
103
|
+
("text/x-markdown-extra", "md"),
|
|
104
|
+
("text/x-mdoc", "md"),
|
|
105
|
+
("text/x-multimarkdown", "md"),
|
|
106
|
+
("text/x-org", "org"),
|
|
107
|
+
("text/x-pod", "pod"),
|
|
108
|
+
("text/x-rst", "rst"),
|
|
109
|
+
])
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
#[cfg(test)]
|
|
113
|
+
mod tests {
|
|
114
|
+
use super::*;
|
|
115
|
+
|
|
116
|
+
#[test]
|
|
117
|
+
fn test_get_pandoc_format_from_mime_docx() {
|
|
118
|
+
let format =
|
|
119
|
+
get_pandoc_format_from_mime("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
|
|
120
|
+
.unwrap();
|
|
121
|
+
assert_eq!(format, "docx");
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
#[test]
|
|
125
|
+
fn test_get_pandoc_format_from_mime_markdown() {
|
|
126
|
+
let format = get_pandoc_format_from_mime("text/markdown").unwrap();
|
|
127
|
+
assert_eq!(format, "markdown");
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
#[test]
|
|
131
|
+
fn test_get_pandoc_format_from_mime_gfm() {
|
|
132
|
+
let format = get_pandoc_format_from_mime("text/x-gfm").unwrap();
|
|
133
|
+
assert_eq!(format, "gfm");
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
#[test]
|
|
137
|
+
fn test_get_pandoc_format_from_mime_rst() {
|
|
138
|
+
let format = get_pandoc_format_from_mime("text/x-rst").unwrap();
|
|
139
|
+
assert_eq!(format, "rst");
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
#[test]
|
|
143
|
+
fn test_get_pandoc_format_from_mime_latex() {
|
|
144
|
+
let format = get_pandoc_format_from_mime("application/x-latex").unwrap();
|
|
145
|
+
assert_eq!(format, "latex");
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
#[test]
|
|
149
|
+
fn test_get_pandoc_format_from_mime_invalid() {
|
|
150
|
+
let result = get_pandoc_format_from_mime("application/invalid");
|
|
151
|
+
assert!(result.is_err());
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
#[test]
|
|
155
|
+
fn test_get_extension_from_mime_docx() {
|
|
156
|
+
let ext =
|
|
157
|
+
get_extension_from_mime("application/vnd.openxmlformats-officedocument.wordprocessingml.document").unwrap();
|
|
158
|
+
assert_eq!(ext, "docx");
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
#[test]
|
|
162
|
+
fn test_get_extension_from_mime_md() {
|
|
163
|
+
let ext = get_extension_from_mime("text/x-markdown").unwrap();
|
|
164
|
+
assert_eq!(ext, "md");
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
#[test]
|
|
168
|
+
fn test_get_extension_from_mime_tex() {
|
|
169
|
+
let ext = get_extension_from_mime("application/x-latex").unwrap();
|
|
170
|
+
assert_eq!(ext, "tex");
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
#[test]
|
|
174
|
+
fn test_get_extension_from_mime_invalid() {
|
|
175
|
+
let result = get_extension_from_mime("application/invalid");
|
|
176
|
+
assert!(result.is_err());
|
|
177
|
+
}
|
|
178
|
+
}
|