Bump maplib dep

Author: magbak

.cargo/config.toml

@@ -1,2 +1,2 @@
 [build]
-jobs = 4
+jobs = 8

Cargo.lock

@@ -25,6 +25,7 @@ templates = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb4
 
 sparesults = { version = "0.2.3" }
 oxrdf = { version = "0.2.2" }
+oxrdfio = { version = "0.1.5" }
 
 polars = "0.45.1"
 tonic = "0.12.3"
@@ -33,7 +34,7 @@ arrow-flight = "53.1.0"
 futures = "0.3.31"
 bincode = "1.3.3"
 log = "0.4.21"
-pyo3 = "0.22.6"
+pyo3 = { version="0.22.6", features = ["abi3-py39"] }
 reqwest = "0.12.5"
 env_logger = "0.11.3"
 thiserror = "1.0.58"
@@ -44,17 +45,12 @@ filesize = "0.2.0"
 serde = "1.0.203"
 serde_json = "1.0.117"
 secrecy = "=0.10.3"
-backoff = "0.4.0"
-gcp-bigquery-client = "0.24.1"
+gcp-bigquery-client = "0.25.1"
 rayon = "1.10.0"
 opcua = {version="0.12.0", features = ["vendored-openssl"]}
 url = "2.5.2"
 uuid = {version = "1.10.0", features = ["fast-rng", "v4"]}
 rustls = "0.23.18"
-#Fixing dependabot issues
-hashbrown = "0.15.2"
-
-
 
 [patch.crates-io]
 polars = { git = 'https://github.com/pola-rs/polars', rev="841c387d99d7024037556c4ef79d96bf2caac397" }

Cargo.toml

@@ -246,6 +246,9 @@ fn table_cell_to_any<'a>(
         FieldType::Json => {
             todo!()
         }
+        FieldType::Interval => {
+            todo!()
+        }
     }
 }
 

lib/bigquery-polars/src/querying.rs

@@ -8,7 +8,9 @@ use crate::constants::GROUPING_COL;
 use crate::preparing::graph_patterns::GPPrepReturn;
 use crate::preparing::grouping_col_type;
 use oxrdf::Variable;
-use polars::prelude::{col, DataFrameJoinOps, IntoLazy, JoinArgs, JoinType, PlSmallStr, Series, UniqueKeepStrategy};
+use polars::prelude::{
+    col, DataFrameJoinOps, IntoLazy, JoinArgs, JoinType, PlSmallStr, Series, UniqueKeepStrategy,
+};
 use query_processing::find_query_variables::find_all_used_variables_in_aggregate_expression;
 use representation::solution_mapping::SolutionMappings;
 use spargebra::algebra::{AggregateExpression, GraphPattern};
@@ -112,7 +114,7 @@ impl TimeseriesQueryPrepper {
                 by_names.as_slice(),
                 by_names.as_slice(),
                 JoinArgs::new(JoinType::Inner),
-                None
+                None,
             )
             .unwrap()
             .lazy();

lib/chrontext/src/preparing/graph_patterns/group_pattern.rs

@@ -44,7 +44,7 @@ pub(crate) fn create_static_query_dataframe(
                     Term::Literal(l) => (
                         l.datatype().as_str(),
                         rdf_literal_to_polars_literal_value(l),
-                    )
+                    ),
                 }
             } else {
                 (MULTI_NONE_DT, LiteralValue::Null)

lib/chrontext/src/sparql_result_to_polars.rs

@@ -1,6 +1,6 @@
 [package]
 name = "py_chrontext"
-version = "0.9.12"
+version = "0.9.13"
 edition = "2021"
 
 [dependencies]
@@ -22,6 +22,7 @@ tokio.workspace = true
 log.workspace = true
 env_logger.workspace = true
 spargebra.workspace = true
+oxrdfio.workspace = true
 secrecy.workspace = true
 
 [lib]
@@ -59,4 +60,4 @@ jemallocator = { version = "0.5.4", features = ["disable_initial_exec_tls"] }
 opcua = ["chrontext/opcua", "virtualization/opcua"]
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("gil-refs", "rdf-star"))'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("gil-refs", "rdf-star"))'] }

py_chrontext/Cargo.toml

@@ -40,6 +40,7 @@ use chrontext::engine::{Engine, EngineConfig};
 use flight::client::ChrontextFlightClient;
 use flight::server::ChrontextFlightServer;
 use log::{debug, info};
+use oxrdfio::RdfFormat;
 use postgres::catalog::{Catalog, DataProduct};
 use postgres::server::{start_server, Config};
 use pydf_io::to_python::{df_to_py_df, fix_cats_and_multicolumns};
@@ -149,7 +150,7 @@ impl PyEngine {
     #[cfg(not(feature = "opcua"))]
     #[new]
     #[pyo3(signature = (resources, virtualized_python_database=None, virtualized_bigquery_database=None, sparql_endpoint=None, sparql_embedded_oxigraph=None))]
-    pub fn new(
+    pub fn new<'py>(
         resources: HashMap<String, PyTemplate>,
         virtualized_python_database: Option<VirtualizedPythonDatabase>,
         virtualized_bigquery_database: Option<PyVirtualizedBigQueryDatabase>,
@@ -187,14 +188,19 @@ impl PyEngine {
                 #[cfg(not(feature = "opcua"))]
                 panic!("Should never happen");
             };
-            let sparql_endpoint = self.sparql_endpoint.clone();
+            let sparql_endpoint = if let Some(endpoint) = &self.sparql_endpoint {
+                Some(endpoint.clone())
+            } else {
+                None
+            };
 
-            let sparql_oxigraph_config =
-                self.sparql_embedded_oxigraph
-                    .as_ref()
-                    .map(|store| EmbeddedOxigraph {
-                        store: store.clone(),
-                    });
+            let sparql_oxigraph_config = if let Some(store) = &self.sparql_embedded_oxigraph {
+                Some(EmbeddedOxigraph {
+                    store: store.clone(),
+                })
+            } else {
+                None
+            };
 
             let mut virtualization_map = HashMap::new();
             for (k, v) in &self.resources {
@@ -212,7 +218,7 @@ impl PyEngine {
             };
 
             self.engine =
-                Some(Engine::from_config(config).map_err(PyChrontextError::ChrontextError)?);
+                Some(Engine::from_config(config).map_err(|x| PyChrontextError::ChrontextError(x))?);
         }
         Ok(())
     }
@@ -236,7 +242,7 @@ impl PyEngine {
                 .build()
                 .unwrap()
                 .block_on(self.engine.as_mut().unwrap().query(sparql))
-                .map_err(PyChrontextError::ChrontextError)
+                .map_err(|err| PyChrontextError::ChrontextError(err))
         })?;
 
         (df, datatypes) =
@@ -283,7 +289,7 @@ impl PyEngine {
                 .build()
                 .unwrap()
                 .block_on(flight_server.serve(address))
-                .map_err(PyChrontextError::FlightServerError)?;
+                .map_err(|x| PyChrontextError::FlightServerError(x))?;
             Ok(())
         })
     }
@@ -333,7 +339,7 @@ impl PyFlightClient {
                 .build()
                 .unwrap()
                 .block_on(client.query(&sparql, &self.metadata))
-                .map_err(PyChrontextError::FlightClientError)?;
+                .map_err(|x| PyChrontextError::FlightClientError(x))?;
             Ok(sm)
         });
         match res {
@@ -361,6 +367,15 @@ impl PyFlightClient {
     }
 }
 
+fn resolve_format(format: &str) -> RdfFormat {
+    match format.to_lowercase().as_str() {
+        "ntriples" => RdfFormat::NTriples,
+        "turtle" => RdfFormat::Turtle,
+        "rdf/xml" | "xml" | "rdfxml" => RdfFormat::RdfXml,
+        _ => unimplemented!("Unknown format {}", format),
+    }
+}
+
 #[pyclass(name = "VirtualizedBigQueryDatabase")]
 #[derive(Clone)]
 pub struct PyVirtualizedBigQueryDatabase {
@@ -455,7 +470,7 @@ impl PyDataProduct {
             rdf_node_types,
         };
         rdp.init()
-            .map_err(PyChrontextError::DataProductQueryParseError)?;
+            .map_err(|x| PyChrontextError::DataProductQueryParseError(x))?;
         Ok(rdp)
     }
 }