Skip to content

Commit 4818c92

Browse files
authored
Merge pull request #76 from vectorlessflow/dev
Dev
2 parents 7d46441 + bc52a4b commit 4818c92

88 files changed

Lines changed: 2895 additions & 3632 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ futures = "0.3"
2020
# Serialization
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
23-
toml = "0.8"
2423

2524
# Error handling
2625
thiserror = "2"
@@ -36,7 +35,7 @@ uuid = { version = "1.10", features = ["v4", "serde"] }
3635
chrono = { version = "0.4", default-features = false, features = ["serde", "clock"] }
3736

3837
# Logging
39-
tracing = "0.1"
38+
tracing = { version = "0.1", features = ["attributes"] }
4039

4140
# Rate limiting
4241
governor = "0.6"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ vectorless = "0.1"
3737
```
3838

3939
```rust
40-
use vectorless::client::{EngineBuilder, IndexContext, QueryContext};
40+
use vectorless::{EngineBuilder, IndexContext, QueryContext};
4141

4242
#[tokio::main]
4343
async fn main() -> vectorless::Result<()> {

docs/docs/examples/batch-indexing.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ asyncio.run(main())
4747
## Rust
4848

4949
```rust
50-
use vectorless::client::{Engine, EngineBuilder, IndexContext};
50+
use vectorless::{Engine, EngineBuilder, IndexContext};
5151

5252
#[tokio::main]
5353
async fn main() -> vectorless::Result<()> {

docs/docs/examples/quick-query.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ asyncio.run(main())
4848
## Rust
4949

5050
```rust
51-
use vectorless::client::{Engine, EngineBuilder, IndexContext, QueryContext};
51+
use vectorless::{Engine, EngineBuilder, IndexContext, QueryContext};
5252
use vectorless::StrategyPreference;
5353

5454
#[tokio::main]

docs/docs/features/synonym-expansion.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ opts = IndexOptions(enable_synonym_expansion=False)
4646
The synonym expansion is controlled via `ReasoningIndexConfig`:
4747

4848
```rust
49-
use vectorless::document::ReasoningIndexConfig;
49+
use vectorless::ReasoningIndexConfig;
5050

5151
let config = ReasoningIndexConfig::default()
5252
.with_synonym_expansion(true);

docs/docs/indexing/incremental.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ result = await engine.index(ctx)
3232
### Rust
3333

3434
```rust
35-
use vectorless::client::{IndexContext, IndexMode};
35+
use vectorless::{IndexContext, IndexMode};
3636

3737
let ctx = IndexContext::from_path("./report.pdf")
3838
.with_mode(IndexMode::Incremental);

docs/docs/sdk/rust.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ vectorless = "0.1"
1616
## Engine
1717

1818
```rust
19-
use vectorless::client::{Engine, EngineBuilder};
19+
use vectorless::{Engine, EngineBuilder};
2020

2121
let engine = EngineBuilder::new()
2222
.with_key("sk-...")
@@ -29,7 +29,7 @@ let engine = EngineBuilder::new()
2929
## Indexing
3030

3131
```rust
32-
use vectorless::client::{IndexContext, IndexOptions, IndexMode};
32+
use vectorless::{IndexContext, IndexOptions, IndexMode};
3333

3434
// From a file
3535
let result = engine.index(IndexContext::from_path("./report.pdf")).await?;
@@ -51,7 +51,7 @@ let result = engine.index(
5151
## Querying
5252

5353
```rust
54-
use vectorless::client::QueryContext;
54+
use vectorless::QueryContext;
5555
use vectorless::StrategyPreference;
5656

5757
let result = engine.query(

docs/src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async def main():
107107
108108
asyncio.run(main())`;
109109

110-
const RUST_CODE = `use vectorless::client::{EngineBuilder, IndexContext, QueryContext};
110+
const RUST_CODE = `use vectorless::{EngineBuilder, IndexContext, QueryContext};
111111
112112
#[tokio::main]
113113
async fn main() -> vectorless::Result<()> {

python/src/config.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,21 @@ impl PyConfig {
5555
///
5656
/// Default: 10
5757
fn set_max_concurrent_requests(&mut self, max: usize) {
58-
self.inner.concurrency.max_concurrent_requests = max;
58+
self.inner.llm.throttle.max_concurrent_requests = max;
5959
}
6060

6161
/// Set the rate limit (requests per minute).
6262
///
6363
/// Default: 500
6464
fn set_requests_per_minute(&mut self, rpm: usize) {
65-
self.inner.concurrency.requests_per_minute = rpm;
65+
self.inner.llm.throttle.requests_per_minute = rpm;
6666
}
6767

6868
/// Set the maximum iterations for retrieval search.
6969
fn set_max_iterations(&mut self, max: usize) {
7070
self.inner.retrieval.search.max_iterations = max;
7171
}
7272

73-
/// Set the retrieval temperature.
74-
///
75-
/// Default: 0.0
76-
fn set_temperature(&mut self, temp: f32) {
77-
self.inner.retrieval.temperature = temp;
78-
}
79-
8073
/// Enable or disable metrics collection.
8174
///
8275
/// Default: True

python/src/context.rs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
use pyo3::prelude::*;
77

8-
use ::vectorless::client::{DocumentFormat, IndexContext, IndexMode, IndexOptions, QueryContext};
8+
use ::vectorless::{DocumentFormat, IndexContext, IndexMode, IndexOptions, QueryContext};
99

1010
use super::error::VectorlessError;
1111

@@ -31,7 +31,6 @@ fn parse_format(format: &str) -> PyResult<DocumentFormat> {
3131
/// mode: Indexing mode - "default", "force", or "incremental".
3232
/// generate_summaries: Whether to generate summaries. Default: True.
3333
/// generate_description: Whether to generate document description. Default: False.
34-
/// include_text: Whether to include node text in the tree. Default: True.
3534
/// generate_ids: Whether to generate node IDs. Default: True.
3635
/// enable_synonym_expansion: Whether to expand keywords with LLM-generated
3736
/// synonyms during indexing. Improves recall for differently-worded queries.
@@ -45,12 +44,11 @@ pub struct PyIndexOptions {
4544
#[pymethods]
4645
impl PyIndexOptions {
4746
#[new]
48-
#[pyo3(signature = (mode="default", generate_summaries=true, generate_description=false, include_text=true, generate_ids=true, enable_synonym_expansion=false))]
47+
#[pyo3(signature = (mode="default", generate_summaries=true, generate_description=false, generate_ids=true, enable_synonym_expansion=false))]
4948
fn new(
5049
mode: &str,
5150
generate_summaries: bool,
5251
generate_description: bool,
53-
include_text: bool,
5452
generate_ids: bool,
5553
enable_synonym_expansion: bool,
5654
) -> PyResult<Self> {
@@ -71,23 +69,21 @@ impl PyIndexOptions {
7169
}
7270
opts.generate_summaries = generate_summaries;
7371
opts.generate_description = generate_description;
74-
opts.include_text = include_text;
7572
opts.generate_ids = generate_ids;
7673
opts.enable_synonym_expansion = enable_synonym_expansion;
7774
Ok(Self { inner: opts })
7875
}
7976

8077
fn __repr__(&self) -> String {
8178
format!(
82-
"IndexOptions(mode='{}', generate_summaries={}, generate_description={}, include_text={}, generate_ids={}, enable_synonym_expansion={})",
79+
"IndexOptions(mode='{}', generate_summaries={}, generate_description={}, generate_ids={}, enable_synonym_expansion={})",
8380
match self.inner.mode {
8481
IndexMode::Default => "default",
8582
IndexMode::Force => "force",
8683
IndexMode::Incremental => "incremental",
8784
},
8885
self.inner.generate_summaries,
8986
self.inner.generate_description,
90-
self.inner.include_text,
9187
self.inner.generate_ids,
9288
self.inner.enable_synonym_expansion,
9389
)
@@ -270,18 +266,6 @@ impl PyQueryContext {
270266
Self { inner: ctx }
271267
}
272268

273-
/// Set whether to include the reasoning chain.
274-
fn with_include_reasoning(&self, include: bool) -> Self {
275-
let ctx = self.inner.clone().with_include_reasoning(include);
276-
Self { inner: ctx }
277-
}
278-
279-
/// Set the maximum tree traversal depth.
280-
fn with_depth_limit(&self, depth: usize) -> Self {
281-
let ctx = self.inner.clone().with_depth_limit(depth);
282-
Self { inner: ctx }
283-
}
284-
285269
fn __repr__(&self) -> String {
286270
"QueryContext(...)".to_string()
287271
}

0 commit comments

Comments
 (0)