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
20 changes: 2 additions & 18 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ resolver = "2"
members = [
"crates/weaver-core",
"crates/weaver-interface",
"crates/weaver-inference",
"crates/weaver-database",
"crates/weaver-demo",
"crates/weaver-trace",
"crates/weaver-analysis",
"crates/weaver-embedding",
"crates/weaver-spu",
]

Expand All @@ -23,8 +21,10 @@ license = "Apache-2.0"
weaver-core = { path = "crates/weaver-core" }
weaver-trace = { path = "crates/weaver-trace" }
weaver-analysis = { path = "crates/weaver-analysis" }
weaver-embedding = { path = "crates/weaver-embedding" }
weaver-inference = { path = "crates/weaver-inference" }
# `weaver-embedding` and `weaver-inference` were deprecated re-export
# shells removed in PR-0.5.E. Their content folded into `weaver-spu`
# (encoder + decoder runtime) and `weaver-core` (Embedder trait).
# Workspace member count contracted from 9 → 7 per spec §6.
# `default-features = false` at the workspace level so consumers can
# explicitly opt out of weaver-spu's default feature set without
# tripping cargo's "can't override workspace defaults" rule. Today
Expand Down
12 changes: 6 additions & 6 deletions crates/weaver-core/src/embedder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! lives:
//!
//! - **Pre-Phase-1 cutover**: gRPC client to the Python `weaver-embedder.service`
//! in `weaver-embedding::grpc_client::EmbeddingClient`.
//! in `weaver_spu::encoder::grpc_client_legacy::EmbeddingClient`.
//! - **Post-Phase-1 cutover**: in-process candle backend
//! `weaver-spu::encoder::client::EmbedderClient`.
//!
Expand Down Expand Up @@ -39,7 +39,7 @@
//! `Box<dyn std::error::Error>` payload, so this crate doesn't need a
//! tonic dep just to express gRPC failures. Backend impls map their
//! concrete transport errors into the abstract `Transport` variant via
//! `From` impls (see `weaver-embedding::grpc_client`).
//! `From` impls (see `weaver_spu::encoder::grpc_client_legacy`).

use async_trait::async_trait;

Expand Down Expand Up @@ -107,7 +107,7 @@ pub struct LateChunkResult {
///
/// Variants are deliberately abstract over transport so this crate
/// doesn't pick up a tonic dep just to express gRPC errors. Backend
/// implementations (e.g., the gRPC client in `weaver-embedding`) map
/// implementations (e.g., the gRPC client in `weaver_spu::encoder::grpc_client_legacy`) map
/// their concrete transport errors into [`Self::Transport`] via `From`
/// impls and the message preserves the upstream error's `Display`.
#[derive(Debug, thiserror::Error)]
Expand All @@ -130,12 +130,12 @@ pub enum EmbeddingError {
}

// gRPC-transport `From` impls. These live here (not in
// `weaver-embedding`) because Rust's orphan rule requires foreign-on-
// `weaver_spu::encoder::grpc_client_legacy`) because Rust's orphan rule requires foreign-on-
// foreign impls to be in the trait's crate. The cost is one tonic dep
// in `weaver-core`; the alternative (explicit `.map_err` at every `?`
// site in the gRPC client) is a larger maintenance burden than the
// dep. Removed in PR-3.A along with the gRPC client itself, when the
// last consumer (weaver-embedding) goes away.
// last consumer (`weaver_spu::encoder::grpc_client_legacy`) goes away in PR-3.A.
impl From<tonic::transport::Error> for EmbeddingError {
fn from(e: tonic::transport::Error) -> Self {
EmbeddingError::Transport(Box::new(e))
Expand All @@ -151,7 +151,7 @@ impl From<tonic::Status> for EmbeddingError {
/// Backend-agnostic embedding service.
///
/// Implementations:
/// - `weaver_embedding::grpc_client::EmbeddingClient` — Python service over
/// - `weaver_spu::encoder::grpc_client_legacy::EmbeddingClient` — Python service over
/// Unix socket / TCP gRPC (pre-Phase-1 cutover).
/// - `weaver_spu::encoder::client::EmbedderClient` — Rust in-process
Comment thread
coderabbitai[bot] marked this conversation as resolved.
/// candle backend (post-Phase-1 cutover).
Expand Down
2 changes: 1 addition & 1 deletion crates/weaver-database/src/chunking/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//! belongs alongside the rest of the embedding pipeline. Consumers
//! that need `LateChunkConfig` / `LateChunkResult` /
//! `late_chunk_embeddings` import from
//! `weaver_embedding::late_chunk::*` instead.
//! `weaver_spu::encoder::late_chunk::*` instead.

mod strategies;

Expand Down
2 changes: 1 addition & 1 deletion crates/weaver-database/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub mod graph;
// `weaver-embedding::grpc_client` per
// `embedder-oxidization-Spec.md` §5.1 (issue #166 / sprint
// Block A.5). External consumers import from
// `weaver_embedding::grpc_client` and `weaver_embedding::proto::embedding`.
// `weaver_spu::encoder::grpc_client_legacy` and `weaver_spu::proto::embedding`.
// `weaver-database`'s `proto` module continues to generate
// embedding-service types for backward compat with internal
// proto-validation tests; a future cleanup PR removes the
Expand Down
5 changes: 4 additions & 1 deletion crates/weaver-demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ license.workspace = true
[dependencies]
weaver-core = { workspace = true }
weaver-database = { workspace = true }
weaver-embedding = { workspace = true }
# `weaver-embedding` removed in PR-0.5.E. Demo uses the relocated
# encoder types via `weaver-spu` directly + the relocated `Embedder`
# trait via `weaver-core::embedder`.
weaver-spu = { workspace = true }
weaver-trace = { workspace = true }
weaver-analysis = { workspace = true }
async-trait = { workspace = true }
Expand Down
Loading