impr (hql+core+cli+mcp): cleaning up cli, adding mcp aggregation methods, v from id/type (#438)

## Description
<!-- Provide a brief description of the changes in this PR -->

## Related Issues
<!-- Link to any related issues using #issue_number -->

Closes #433 #436 #435 

## Checklist when merging to main
<!-- Mark items with "x" when completed -->

- [ ] No compiler warnings (if applicable)
- [ ] Code is formatted with `rustfmt`
- [ ] No useless or dead code (if applicable)
- [ ] Code is easy to understand
- [ ] Doc comments are used for all functions, enums, structs, and
fields (where appropriate)
- [ ] All tests pass
- [ ] Performance has not regressed (assuming change was not to fix a
bug)
- [ ] Version number has been updated in `helix-cli/Cargo.toml` and
`helixdb/Cargo.toml`

## Additional Notes
<!-- Add any additional information that would be helpful for reviewers
-->

Author: xav-db

.gitignore

@@ -24,4 +24,4 @@ other_data/
 !examples/rag_demo/**
 test-store/
 helixdb-cfg/
-
+/test/

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "helix-cli"
-version = "1.0.136"
+version = "1.0.137"
 edition = "2024"
 
 [dependencies]

helix-cli/Cargo.toml

@@ -65,16 +65,15 @@ pub const DEFAULT_SCHEMA: &str = r#"// Start building your schema here.
 //
 // N::User {
 //     Name: String,
-//     Label: String,
-//     Age: Integer,
+//     Age: I32,
 //     IsAdmin: Boolean,
 // }
 //
 // E::Knows {
 //     From: User,
 //     To: User,
 //     Properties: {
-//         Since: Integer,
+//         Since: Date DEFAULT NOW,
 //     }
 // }
 //
@@ -93,7 +92,7 @@ pub const DEFAULT_QUERIES: &str = r#"// Start writing your queries here.
 //         RETURN {variable}
 //
 // Example:
-//     QUERY GetUserFriends(user_id: String) =>
+//     QUERY GetUserFriends(user_id: ID) =>
 //         friends <- N<User>(user_id)::Out<Knows>
 //         RETURN friends
 //
@@ -488,27 +487,34 @@ fn parse_content(content: &Content) -> Result<Source, String> {
 
 /// Runs the static analyzer on the parsed source to catch errors and generate diagnostics if any.
 /// Otherwise returns the generated source object which is an IR used to transpile the queries to rust.
-fn analyze_source(source: Source) -> Result<GeneratedSource, String> {
-    if source.schema.is_empty() {
+fn analyze_source(content: &Content) -> Result<GeneratedSource, String> {
+    if content.source.schema.is_empty() {
         return Err("No schema definitions provided".to_string());
     }
 
-    let (diagnostics, source) = analyze(&source);
+    let (diagnostics, analyzed_source) = analyze(&content.source);
     if !diagnostics.is_empty() {
         for diag in diagnostics {
             let filepath = diag.filepath.clone().unwrap_or("queries.hx".to_string());
-            println!("{}", diag.render(&source.src, &filepath));
+
+            // Find the correct file content for this diagnostic
+            let file_content = content.files.iter()
+                .find(|f| f.name == filepath)
+                .map(|f| &f.content)
+                .unwrap_or(&analyzed_source.src);
+
+            println!("{}", diag.render(file_content, &filepath));
         }
         return Err("compilation failed!".to_string());
     }
 
-    Ok(source)
+    Ok(analyzed_source)
 }
 
 pub fn generate(files: &[DirEntry], path: &str) -> Result<(Content, GeneratedSource), String> {
     let mut content = generate_content(files)?;
     content.source = parse_content(&content)?;
-    let mut analyzed_source = analyze_source(content.source.clone())?;
+    let mut analyzed_source = analyze_source(&content)?;
     analyzed_source.config = read_config(path)?;
     Ok((content, analyzed_source))
 }

helix-cli/src/utils.rs

@@ -10,7 +10,7 @@ use helix_db::helix_gateway::{
     router::router::{HandlerFn, HandlerSubmission},
 };
 use std::{collections::HashMap, sync::Arc};
-use tracing::{Level, info};
+use tracing::{info, Level};
 use tracing_subscriber::util::SubscriberInitExt;
 
 mod queries;

helix-container/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "helix-db"
-version = "1.0.136"
+version = "1.0.137"
 edition = "2024"
 description = "HelixDB is a powerful, open-source, graph-vector database built in Rust for intelligent data storage for RAG and AI."
 license = "AGPL-3.0"
@@ -27,6 +27,8 @@ flume = { version = "0.11.1", default-features = false, features = ["async", "se
 itertools = "0.14.0"
 tempfile = "3.20.0"
 paste = "1.0.15"
+rayon = "1.11.0"
+mimalloc = "0.1.48"
 
 # compiler dependencies
 pest = { version = "2.7", optional = true }

helix-db/Cargo.toml

@@ -62,7 +62,7 @@ get_stmt            = { identifier ~ "<-" ~ evaluates_to_anything }
 traversal           = { (start_node | start_edge | search_vector | start_vector) ~ step* ~ last_step? }
 id_traversal        = { identifier ~ ((step+ ~ last_step?) | last_step) }
 anonymous_traversal = { "_"  ~ ((step+ ~ last_step?) | last_step)? }
-step                = { "::" ~ (graph_step | order_by | where_step | closure_step | object_step | exclude_field | count | ID | range_step | AddE) }
+step                = { "::" ~ (graph_step | order_by| aggregate | group_by | where_step | closure_step | object_step | exclude_field | count | ID | range_step | AddE) }
 last_step           = { "::" ~ (bool_operations | update | first) }
 // change this for loop to be able to take traversals etc in the future. 
 for_loop            = { "FOR" ~ for_argument ~ "IN" ~ identifier ~ "{" ~ query_body ~ "}" }
@@ -92,6 +92,7 @@ evaluates_to_anything = {
   | search_vector
   | bm25_search
   | string_literal
+  | array_literal
   | float
   | integer
   | boolean
@@ -195,6 +196,9 @@ update_field = { identifier ~ ":" ~ (evaluates_to_anything | anonymous_traversal
 update       = { "UPDATE" ~ "(" ~ "{" ~ update_field ~ ("," ~ update_field)* ~ "}" ~ ")" }
 drop = { "DROP" ~ evaluates_to_anything }
 first = { "FIRST" }
+aggregate = { "AGGREGATE_BY" ~ "(" ~ (identifier ~ ("," ~ identifier)*) ~ ")" }
+group_by = { "GROUP_BY" ~ "(" ~ (identifier ~ ("," ~ identifier)*) ~ ")" }
+
 
 // ---------------------------------------------------------------------
 // Vector steps

helix-db/src/grammar.pest

@@ -109,6 +109,44 @@ impl HBM25Config {
             b: 0.75,
         })
     }
+
+    pub fn new_temp(graph_env: &Env, wtxn: &mut RwTxn, uuid: &str) -> Result<HBM25Config, GraphError> {
+        let inverted_index_db: Database<Bytes, Bytes> = graph_env
+            .database_options()
+            .types::<Bytes, Bytes>()
+            .flags(heed3::DatabaseFlags::DUP_SORT)
+            .name(format!("{DB_BM25_INVERTED_INDEX}_{uuid}").as_str())
+            .create(wtxn)?;
+
+        let doc_lengths_db: Database<U128<heed3::byteorder::BE>, U32<heed3::byteorder::BE>> =
+            graph_env
+            .database_options()
+            .types::<U128<heed3::byteorder::BE>, U32<heed3::byteorder::BE>>()
+            .name(format!("{DB_BM25_DOC_LENGTHS}_{uuid}").as_str())
+            .create(wtxn)?;
+
+        let term_frequencies_db: Database<Bytes, U32<heed3::byteorder::BE>> = graph_env
+            .database_options()
+            .types::<Bytes, U32<heed3::byteorder::BE>>()
+            .name(format!("{DB_BM25_TERM_FREQUENCIES}_{uuid}").as_str())
+            .create(wtxn)?;
+
+        let metadata_db: Database<Bytes, Bytes> = graph_env
+            .database_options()
+            .types::<Bytes, Bytes>()
+            .name(format!("{DB_BM25_METADATA}_{uuid}").as_str())
+            .create(wtxn)?;
+
+        Ok(HBM25Config {
+            graph_env: graph_env.clone(),
+            inverted_index_db,
+            doc_lengths_db,
+            term_frequencies_db,
+            metadata_db,
+            k1: 1.2,
+            b: 0.75,
+        })
+    }
 }
 
 impl BM25 for HBM25Config {

helix-db/src/helix_engine/bm25/bm25.rs

@@ -13,7 +13,7 @@ use crate::{
                     n_from_id::NFromIdAdapter,
                     n_from_type::NFromTypeAdapter,
                 },
-                util::{filter_ref::FilterRefAdapter, range::RangeAdapter},
+                util::{count::CountAdapter, filter_ref::FilterRefAdapter, range::RangeAdapter},
             },
             traversal_value::Traversable,
         },

helix-db/src/helix_engine/tests/traversal_tests/count_tests.rs

@@ -6,4 +6,5 @@ pub mod e_from_type;
 pub mod n_from_id;
 pub mod n_from_index;
 pub mod n_from_type;
-pub mod v_from_id;
+pub mod v_from_id;
+pub mod v_from_type;