Skip to content
Open
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
37 changes: 32 additions & 5 deletions Cargo.lock

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

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ members = [
"raphtory-core",
"raphtory-storage",
"raphtory-api-macros",
"raphtory-test-utils",
"raphtory-itertools",
"clam-core",
"clam-core/snb",
"raphtory-itertools"
]
, "raphtory-test-utils"]
default-members = ["raphtory"]
exclude = ["optd"]
resolver = "2"
Expand Down Expand Up @@ -62,6 +63,7 @@ opt-level = 1 # much smaller files
db4-graph = { version = "0.18.0", path = "db4-graph", default-features = false }
db4-storage = { version = "0.18.0", path = "db4-storage" }
raphtory = { version = "0.18.0", path = "raphtory", default-features = false }
raphtory-test-utils = { version = "0.18.0", path = "raphtory-test-utils", default-features = false }
raphtory-api = { version = "0.18.0", path = "raphtory-api", default-features = false }
raphtory-api-macros = { version = "0.18.0", path = "raphtory-api-macros", default-features = false }
raphtory-core = { version = "0.18.0", path = "raphtory-core", default-features = false }
Expand All @@ -73,7 +75,7 @@ optd-core = { version = "0.18.0", path = "optd/optd/core" }
async-graphql = { version = "7.2.1", features = ["dynamic-schema"] }
bincode = { version = "2", features = ["serde"] }
async-graphql-poem = "7.2.1"
dynamic-graphql = { git = "https://github.com/miratepuffin/dynamic-graphql", branch = "add-arg-descriptions" }
dynamic-graphql = "0.10.2"
derive_more = "2.1.1"
tikv-jemallocator = "0.6.1"
reqwest = { version = "0.12.28", default-features = false, features = [
Expand Down
1 change: 0 additions & 1 deletion raphtory-api/src/core/entities/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,6 @@ impl From<LayerId> for LayerIds {
mod tests {
use crate::core::entities::{LayerId, EID, MAX_EID};
use proptest::{prop_assert, prop_assert_eq, proptest};
use std::char::MAX;

#[test]
fn test_elid_layer() {
Expand Down
1 change: 1 addition & 0 deletions raphtory-benchmark/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
name = "raphtory-benchmark"
publish = false
version.workspace = true
edition = "2021"

Expand Down
4 changes: 1 addition & 3 deletions raphtory-graphql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@ zip = { workspace = true }
clap = { workspace = true }
rust-embed = { workspace = true }



[dev-dependencies]
parking_lot = { workspace = true }
tempfile = { workspace = true }
pretty_assertions = { workspace = true }
raphtory = { workspace = true, features = ["test-utils"] }
raphtory-test-utils = { workspace = true }
arrow-array = { workspace = true }

[features]
Expand Down
39 changes: 39 additions & 0 deletions raphtory-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[package]
name = "raphtory-test-utils"
publish = false
version.workspace = true
documentation.workspace = true
repository.workspace = true
license.workspace = true
readme.workspace = true
homepage.workspace = true
keywords.workspace = true
authors.workspace = true
rust-version.workspace = true
edition.workspace = true

[dependencies]
raphtory-api.workspace = true
raphtory = {workspace = true, features = ["io"]}
ahash.workspace = true
proptest.workspace = true
proptest-derive.workspace = true
serde.workspace = true
serde_json.workspace = true
itertools.workspace = true
storage.workspace = true
raphtory-storage.workspace = true
rand.workspace = true
rayon.workspace = true
bigdecimal.workspace = true
chrono.workspace = true

[dev-dependencies]
tempfile.workspace = true
arrow.workspace = true
parquet.workspace = true
tracing.workspace = true
zip.workspace = true

[features]
search = ["raphtory/search"]
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
use crate::{
use raphtory::{
db::api::view::{filter_ops::Filter, StaticGraphViewOps},
prelude::{EdgeViewOps, Graph, GraphViewOps, NodeViewOps},
};
use std::ops::Range;

#[cfg(feature = "search")]
pub use crate::db::api::view::SearchableGraphOps;
#[cfg(feature = "search")]
use crate::prelude::IndexMutationOps;
use crate::{
use raphtory::prelude::{IndexMutationOps, SearchableGraphOps};
use raphtory::{
db::{
api::view::filter_ops::{EdgeSelect, NodeSelect},
graph::views::{
Expand Down Expand Up @@ -378,7 +376,7 @@ pub fn assert_search_edges_results(
#[track_caller]
fn assert_results(
init_graph: impl FnOnce(Graph) -> Graph,
pre_transform: impl Fn(&Graph) -> (),
pre_transform: impl Fn(&Graph),
transform: impl GraphTransformer,
expected: &[&str],
variants: Vec<TestGraphVariants>,
Expand Down
2 changes: 2 additions & 0 deletions raphtory-test-utils/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pub mod assertions;
pub mod test_utils;
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
use crate::{
db::{
api::storage::storage::Storage,
graph::{edge::EdgeView, node::NodeView},
},
prelude::*,
};
use ahash::HashSet;
use bigdecimal::BigDecimal;
use chrono::{DateTime, NaiveDateTime, Utc};
use itertools::Itertools;
use proptest::{arbitrary::any, prelude::*};
use proptest_derive::Arbitrary;
use rand::seq::SliceRandom;
use raphtory::{
db::{
api::storage::storage::Storage,
graph::{edge::EdgeView, node::NodeView},
},
prelude::*,
};
use raphtory_api::core::{
entities::properties::prop::{PropType, DECIMAL_MAX},
storage::{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use raphtory::{
pagerank::unweighted_page_rank,
},
prelude::*,
test_storage,
};
use raphtory_test_utils::test_storage;

#[test]
fn test_betweenness_centrality() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ use raphtory::{
louvain::louvain,
modularity::{ComID, ModularityFunction, ModularityUnDir, Partition},
},
core::entities::VID,
logging::global_info_logger,
prelude::*,
test_storage,
};
use raphtory_core::entities::VID;
use raphtory_test_utils::test_storage;
use std::collections::{HashMap, HashSet};
use tracing::info;

Expand Down Expand Up @@ -134,7 +134,6 @@ proptest! {
}
}

#[cfg(feature = "io")]
#[test]
fn lfr_test() {
use raphtory::io::csv_loader::CsvLoader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use raphtory::{
view::internal::GraphView,
},
prelude::*,
test_storage,
};
use raphtory_test_utils::test_storage;
use serde::{Deserialize, Serialize};
use std::{
collections::{BTreeSet, HashMap},
Expand Down Expand Up @@ -270,8 +270,8 @@ mod in_component_test {
},
},
prelude::*,
test_storage,
};
use raphtory_test_utils::test_storage;
use std::collections::HashMap;

fn check_node(graph: &Graph, node_id: u64, mut correct: Vec<(u64, usize)>) {
Expand Down Expand Up @@ -540,8 +540,8 @@ mod components_test {
},
},
prelude::*,
test_storage,
};
use raphtory_test_utils::test_storage;
use std::collections::HashMap;

fn check_node(graph: &Graph, node_id: u64, mut correct: Vec<(u64, usize)>) {
Expand Down Expand Up @@ -803,8 +803,8 @@ mod strongly_connected_components_tests {
use raphtory::{
algorithms::components::strongly_connected_components,
prelude::{AdditionOps, Graph, NodeStateGroupBy, NodeStateOps, NodeViewOps, NO_PROPS},
test_storage,
};
use raphtory_test_utils::test_storage;
use std::collections::HashSet;

#[test]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#[cfg(test)]
mod k_core_test {
use raphtory::{algorithms::cores::k_core::k_core_set, prelude::*, test_storage};
use raphtory::{algorithms::cores::k_core::k_core_set, prelude::*};
use raphtory_test_utils::test_storage;
use std::collections::HashSet;

#[test]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#[cfg(test)]
mod fast_rp_test {

use raphtory::{
algorithms::embeddings::fast_rp::fast_rp, db::api::mutation::AdditionOps, prelude::*,
test_storage,
};
use raphtory_test_utils::test_storage;
use std::collections::HashMap;

#[test]
Expand Down
Loading
Loading