DataTreehouse · dali99 · Oct 25, 2024 · Oct 12, 2024 · dali99 · Oct 25, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,8 @@ opcua = {version="0.12.0", features = ["vendored-openssl"]}
 url = "2.5.2"
 uuid = {version = "1.10.0", features = ["fast-rng", "v4"]}
 
+axum = "0.7.7"
+
 [patch.crates-io]
 oxrdf = { git = 'https://github.com/magbak/oxigraph.git', rev = "b13df973ed2785de2ac41066ca4b62d88d3f5d40"}
 oxttl = { git = 'https://github.com/magbak/oxigraph.git', rev = "b13df973ed2785de2ac41066ca4b62d88d3f5d40"}

diff --git a/lib/chrontext/Cargo.toml b/lib/chrontext/Cargo.toml
@@ -33,6 +33,9 @@ async-trait.workspace = true
 oxigraph.workspace = true
 filesize.workspace = true
 uuid.workspace = true
+axum.workspace = true
+tokio.workspace = true
+serde.workspace = true
 
 [features]
 opcua = ["virtualization/opcua"]
diff --git a/lib/chrontext/src/lib.rs b/lib/chrontext/src/lib.rs
@@ -11,3 +11,4 @@ pub mod rewriting;
 pub mod sparql_database;
 mod sparql_result_to_polars;
 pub mod splitter;
+pub mod web;
diff --git a/lib/chrontext/src/web.rs b/lib/chrontext/src/web.rs
@@ -0,0 +1,61 @@
+use std::sync::Arc;
+
+use axum::response::Html;
+use axum::Form;
+use axum::{self, Router};
+use axum::{extract::State, routing::get};
+
+use oxigraph::sparql::{results::QueryResultsFormat, QueryResults, QuerySolutionIter};
+use oxrdf::Variable;
+use serde::Deserialize;
+
+use crate::sparql_database::SparqlQueryable;
+
+#[derive(Clone)]
+struct AppState {
+    sparql_engine: Arc<(dyn SparqlQueryable)>,
+}
+
+pub async fn launch_web(sparql_engine: Arc<(dyn SparqlQueryable)>, address: &str) {
+    let state = AppState { sparql_engine };
+
+    let app: Router = Router::new()
+        .route("/", get(|| async { "Hello, World!" }))
+        .route("/query", get(get_query).post(post_query))
+        .with_state(state);
+
+    let listener = tokio::net::TcpListener::bind(address).await.unwrap();
+    axum::serve(listener, app).await.unwrap();
+}
+
+async fn get_query() -> Html<&'static str> {
+    Html(include_str!("web/sparql.html"))
+}
+
+#[derive(Deserialize, Debug)]
+struct SparqlQuery {
+    query: String,
+}
+
+async fn post_query(State(state): State<AppState>, Form(form): Form<SparqlQuery>) -> String {
+    let sparql_engine = state.sparql_engine;
+
+    let query = spargebra::Query::parse(&form.query, None).unwrap();
+
+    let query_result: QueryResults = match sparql_engine.execute(&query).await {
+        Ok(v) => {
+            let variables: Arc<[Variable]> = v.first().unwrap().variables().into();
+            let iter = v
+                .into_iter()
+                .map(|qs| Ok(qs.values().iter().map(|t| t.clone()).collect()));
+            let qsi = QuerySolutionIter::new(variables, iter);
+            qsi.into()
+        }
+        Err(_) => todo!(),
+    };
+
+    let mut results = Vec::new();
+    query_result.write(&mut results, QueryResultsFormat::Json);
+
+    String::from_utf8_lossy(&results).into()
+}
diff --git a/lib/chrontext/src/web/sparql.html b/lib/chrontext/src/web/sparql.html
@@ -0,0 +1,24 @@
+<!--
+  From https://github.com/oxigraph/oxigraph/blob/22d956823f6257b7840f2116858e1431393cdf84/cli/templates/query.html
+  Licensed under Apache 2.0 or MIT
+  Vincent Emonet
+  Thomas Tanon
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Chrontext - Query</title>
+    <link href="https://unpkg.com/@zazuko/yasgui@4/build/yasgui.min.css" rel="stylesheet" type="text/css" />
+    <script src="https://unpkg.com/@zazuko/yasgui@4/build/yasgui.min.js"></script>
+    <link rel="icon" type="image/svg+xml" href="/logo.svg">
+</head>
+<body>
+<div id="yasgui"></div>
+<script>
+    const url = new URL(window.location.href.endsWith('/') ? window.location.href.slice(0, -1) : window.location.href);
+    new Yasgui(document.getElementById("yasgui"), {
+        requestConfig: { endpoint: url.origin + "/query" }
+    });
+</script>
+</body>
diff --git a/lib/flight/src/server.rs b/lib/flight/src/server.rs
@@ -17,8 +17,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::net::AddrParseError;
 use futures::stream::BoxStream;
+use std::net::AddrParseError;
 use std::pin::Pin;
 use std::sync::Arc;
 use tonic::{Code, Request, Response, Status, Streaming};
@@ -33,11 +33,11 @@ use bincode::deserialize;
 use bincode::serialize;
 use chrontext::engine::Engine;
 use futures::{stream, Stream};
+use log::info;
 use polars::io::SerWriter;
 use polars::prelude::{IpcCompression, IpcStreamWriter};
 use thiserror::*;
 use tonic::transport::Server;
-use log::info;
 
 #[derive(Error, Debug)]
 pub enum ChrontextFlightServerError {
@@ -104,7 +104,9 @@ impl FlightService for ChrontextFlightService {
         info!("Got do_get request: {:?}", request);
         let query_string: String = deserialize(request.get_ref().ticket.as_ref()).unwrap();
         let (mut df, map, _context) = self
-            .engine.as_ref().unwrap()
+            .engine
+            .as_ref()
+            .unwrap()
             .clone()
             .query(&query_string)
             .await
@@ -170,7 +172,9 @@ impl ChrontextFlightServer {
 
     pub async fn serve(self, addr: &str) -> Result<(), ChrontextFlightServerError> {
         info!("Starting server on {}", addr);
-        let addr = addr.parse().map_err(|x|ChrontextFlightServerError::AddrParseError(x))?;
+        let addr = addr
+            .parse()
+            .map_err(|x| ChrontextFlightServerError::AddrParseError(x))?;
         let svc = FlightServiceServer::new(self.chrontext_flight_service.clone());
 
         Server::builder()
@@ -181,4 +185,4 @@ impl ChrontextFlightServer {
         info!("Shutdown server");
         Ok(())
     }
-}
+}
diff --git a/py_chrontext/src/errors.rs b/py_chrontext/src/errors.rs
@@ -1,11 +1,10 @@
 use chrontext::errors::ChrontextError as RustChrontextError;
+use flight::client::ChrontextFlightClientError;
+use flight::server::ChrontextFlightServerError;
 use oxrdf::IriParseError;
 use pyo3::{create_exception, exceptions::PyException, prelude::*};
 use spargebra::SparqlSyntaxError;
 use thiserror::Error;
-use flight::client::ChrontextFlightClientError;
-use flight::server::ChrontextFlightServerError;
-
 
 #[derive(Error, Debug)]
 pub enum PyChrontextError {
@@ -49,12 +48,8 @@ impl std::convert::From<PyChrontextError> for PyErr {
             PyChrontextError::MultipleVirtualizedDatabasesError => {
                 MultipleVirtualizedDatabasesError::new_err("")
             }
-            PyChrontextError::FlightClientError(x) => {
-                FlightClientError::new_err(x.to_string())
-            }
-            PyChrontextError::FlightServerError(x) => {
-                FlightServerError::new_err(x.to_string())
-            }
+            PyChrontextError::FlightClientError(x) => FlightClientError::new_err(x.to_string()),
+            PyChrontextError::FlightServerError(x) => FlightServerError::new_err(x.to_string()),
         }
     }
 }