Merge pull request #492 from Oxen-AI/fix/data-frame-response

Fix/data frame export

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "Oxen"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 license-file = "LICENSE"
 description = "Oxen is a fast, unstructured data version control, to help version large machine learning datasets written in Rust."

src/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oxen-cli"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 
 [dependencies]

src/lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "liboxen"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 license-file = "LICENSE"
 description = "Oxen is a fast, unstructured data version control, to help version datasets, written in Rust."

src/lib/src/core/df/sql.rs

@@ -1,5 +1,6 @@
 use std::path::{Path, PathBuf};
 
+use crate::core::df::tabular;
 use crate::model::LocalRepository;
 use crate::opts::DFOpts;
 use crate::repositories;
@@ -30,7 +31,11 @@ pub fn query_df_from_repo(
 
     let db_path = repositories::workspaces::data_frames::duckdb_path(&workspace, path);
     let mut conn = df_db::get_connection(db_path)?;
-    query_df(&mut conn, sql, Some(opts))
+    let df = query_df(&mut conn, sql, Some(opts))?;
+
+    // If we are doing this from the CLI, we don't want to export the hidden Oxen columns
+    let df = tabular::strip_excluded_cols(df)?;
+    Ok(df)
 }
 
 pub fn query_df(

src/server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oxen-server"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 
 [dependencies]