feat(kubegraph): begin implementation of basic simulation gateway

crates/kubegraph/api/Cargo.toml

@@ -20,8 +20,9 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["full"]
-full = ["connector-full", "df-full"]
+default = ["minimal"]
+minimal = ["connector-simulation", "df-polars", "function-dummy"]
+full = ["connector-full", "df-full", "function-full"]
 
 # Connectors
 connector-full = ["connector-prometheus", "connector-simulation"]

crates/kubegraph/api/src/connector.rs → crates/kubegraph/api/src/connector/mod.rs

@@ -1,10 +1,11 @@
-use std::{
-    path::PathBuf,
-    time::{Duration, Instant},
-};
+#[cfg(feature = "connector-prometheus")]
+pub mod prometheus;
+#[cfg(feature = "connector-simulation")]
+pub mod simulation;
+
+use std::time::{Duration, Instant};
 
 use anyhow::Result;
-use ark_core_k8s::data::Url;
 use async_trait::async_trait;
 use kube::CustomResource;
 use schemars::JsonSchema;
@@ -16,14 +17,14 @@ use crate::db::NetworkGraphDB;
 
 #[async_trait]
 pub trait NetworkConnectors {
-    async fn add_connector(&self, namespace: String, name: String, spec: NetworkConnectorSpec);
+    async fn add_connector(&self, object: NetworkConnectorCrd);
 
     async fn delete_connector(&self, namespace: String, name: String);
 
     async fn get_connectors(
         &self,
         r#type: NetworkConnectorSourceRef,
-    ) -> Option<Vec<NetworkConnectorSpec>>;
+    ) -> Option<Vec<NetworkConnectorCrd>>;
 }
 
 #[async_trait]
@@ -64,6 +65,7 @@ pub trait NetworkConnector {
     kind = "NetworkConnector",
     root = "NetworkConnectorCrd",
     shortname = "nc",
+    namespaced,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
@@ -78,11 +80,12 @@ pub trait NetworkConnector {
     }"#
 )]
 #[serde(rename_all = "camelCase")]
+#[non_exhaustive]
 pub enum NetworkConnectorSpec {
     #[cfg(feature = "connector-prometheus")]
-    Prometheus(NetworkConnectorPrometheusSpec),
+    Prometheus(self::prometheus::NetworkConnectorPrometheusSpec),
     #[cfg(feature = "connector-simulation")]
-    Simulation(NetworkConnectorSimulationSpec),
+    Simulation(self::simulation::NetworkConnectorSimulationSpec),
 }
 
 impl NetworkConnectorSpec {
@@ -119,6 +122,7 @@ impl PartialEq<NetworkConnectorSourceRef> for NetworkConnectorSpec {
     Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
 )]
 #[serde(rename_all = "camelCase")]
+#[non_exhaustive]
 pub enum NetworkConnectorSourceRef {
     #[cfg(feature = "connector-prometheus")]
     Prometheus,
@@ -136,28 +140,3 @@ impl NetworkConnectorSourceRef {
         }
     }
 }
-
-#[cfg(feature = "connector-prometheus")]
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
-)]
-#[serde(rename_all = "camelCase")]
-pub struct NetworkConnectorPrometheusSpec {
-    pub template: crate::query::NetworkQuery,
-    pub url: Url,
-}
-
-impl NetworkConnectorPrometheusSpec {
-    pub const fn name(&self) -> &'static str {
-        self.template.name()
-    }
-}
-
-#[cfg(feature = "connector-simulation")]
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
-)]
-#[serde(rename_all = "camelCase")]
-pub struct NetworkConnectorSimulationSpec {
-    pub path: PathBuf,
-}

crates/kubegraph/api/src/connector/prometheus.rs

@@ -0,0 +1,20 @@
+use ark_core_k8s::data::Url;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::query::NetworkQuery;
+
+#[derive(
+    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
+#[serde(rename_all = "camelCase")]
+pub struct NetworkConnectorPrometheusSpec {
+    pub template: NetworkQuery,
+    pub url: Url,
+}
+
+impl NetworkConnectorPrometheusSpec {
+    pub const fn name(&self) -> &'static str {
+        self.template.name()
+    }
+}

crates/kubegraph/api/src/connector/simulation.rs

@@ -0,0 +1,31 @@
+use std::path::PathBuf;
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::graph::NetworkGraphMetadata;
+
+#[derive(
+    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
+#[serde(rename_all = "camelCase")]
+pub struct NetworkConnectorSimulationSpec {
+    #[serde(default)]
+    pub metadata: NetworkGraphMetadata,
+    pub path: PathBuf,
+
+    #[serde(default = "NetworkConnectorSimulationSpec::default_key_edges")]
+    pub key_edges: String,
+    #[serde(default = "NetworkConnectorSimulationSpec::default_key_nodes")]
+    pub key_nodes: String,
+}
+
+impl NetworkConnectorSimulationSpec {
+    fn default_key_edges() -> String {
+        "edges.csv".into()
+    }
+
+    fn default_key_nodes() -> String {
+        "nodes.csv".into()
+    }
+}

crates/kubegraph/api/src/frame/mod.rs

@@ -9,8 +9,9 @@ use pl::lazy::dsl;
 
 use crate::{
     function::FunctionMetadata,
+    graph::NetworkGraphMetadata,
     ops::{And, Eq, Ge, Gt, Le, Lt, Ne, Or},
-    problem::{ProblemMetadata, ProblemSpec},
+    problem::ProblemSpec,
     vm::{Feature, Number},
 };
 
@@ -51,17 +52,17 @@ impl LazyFrame {
         #[allow(unused_variables)]
         let ProblemSpec {
             metadata:
-                ProblemMetadata {
+                NetworkGraphMetadata {
+                    capacity,
                     flow: _,
                     function: _,
                     name,
                     sink,
                     src,
-                    verbose: _,
+                    supply: _,
+                    unit_cost: _,
                 },
-            capacity,
-            supply: _,
-            unit_cost: _,
+            verbose: _,
         } = problem;
 
         #[cfg(feature = "df-polars")]
@@ -85,7 +86,7 @@ impl LazyFrame {
             Self::Polars(nodes) => Ok(Self::Polars(
                 select_polars_edge_side(&nodes, name, src)
                     .cross_join(select_polars_edge_side(&nodes, name, sink))
-                    .with_column(dsl::lit(ProblemMetadata::MAX_CAPACITY).alias(capacity.as_ref())),
+                    .with_column(dsl::lit(ProblemSpec::MAX_CAPACITY).alias(capacity.as_ref())),
             )),
         }
     }

crates/kubegraph/api/src/function/dummy.rs

@@ -0,0 +1,11 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(
+    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
+#[serde(rename_all = "camelCase")]
+pub struct NetworkFunctionDummySpec<Filter = String, Script = String> {
+    pub filter: Filter,
+    pub script: Script,
+}

crates/kubegraph/api/src/function.rs → crates/kubegraph/api/src/function/mod.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "function-dummy")]
+pub mod dummy;
+
 use kube::CustomResource;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -9,6 +12,7 @@ use serde::{Deserialize, Serialize};
     kind = "NetworkFunction",
     root = "NetworkFunctionCrd",
     shortname = "nf",
+    namespaced,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
@@ -23,17 +27,12 @@ use serde::{Deserialize, Serialize};
     }"#
 )]
 #[serde(rename_all = "camelCase")]
+#[non_exhaustive]
 pub enum NetworkFunctionSpec {
     #[cfg(feature = "function-dummy")]
-    Dummy(NetworkFunctionDummySpec),
+    Dummy(self::dummy::NetworkFunctionDummySpec),
 }
 
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
-)]
-#[serde(rename_all = "camelCase")]
-pub struct NetworkFunctionDummySpec {}
-
 #[derive(
     Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
 )]