Refactoring WIP

Author: Dig-Doug

Cargo.toml

@@ -60,7 +60,6 @@ tower-http = { version = "0.6", features = ["fs", "trace", "cors"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 utoipa = { version = "5", features = ["axum_extras", "chrono", "uuid"] }
-utoipa-swagger-ui = { version = "9", features = ["axum"] }
 uuid = { version = "1.11", features = ["v4", "v7", "serde", "js"] }
 utoipa-axum = { version = "0.2" }
 pulldown-cmark = "0.12"

crates/observation-tools-server/Cargo.toml

@@ -41,7 +41,6 @@ tracing-subscriber.workspace = true
 tracing.workspace = true
 utoipa.workspace = true
 utoipa-axum.workspace = true
-utoipa-swagger-ui.workspace = true
 uuid.workspace = true
 pulldown-cmark.workspace = true
 ammonia.workspace = true

crates/observation-tools-server/src/api/observations/create.rs

@@ -4,7 +4,6 @@ use crate::api::types::CreateObservationsResponse;
 use crate::api::AppError;
 use crate::storage::BlobStorage;
 use crate::storage::MetadataStorage;
-use crate::storage::ObservationWithPayloads;
 use crate::storage::PayloadData;
 use crate::storage::StoredPayload;
 use axum::extract::Multipart;
@@ -107,8 +106,9 @@ pub async fn create_observations(
     })
     .unwrap_or_default();
 
-  // Build ObservationWithPayloads for each observation by collecting all matching payloads
-  let mut observations_with_payloads = Vec::with_capacity(observations.len());
+  // Collect payloads per observation
+  let mut payloads_per_obs: Vec<(observation_tools_shared::ObservationId, Vec<StoredPayload>)> =
+    Vec::with_capacity(observations.len());
 
   for obs in &observations {
     let obs_id_str = obs.id.to_string();
@@ -165,10 +165,7 @@ pub async fn create_observations(
       )));
     }
 
-    observations_with_payloads.push(ObservationWithPayloads {
-      observation: obs.clone(),
-      payloads: obs_payloads,
-    });
+    payloads_per_obs.push((obs.id, obs_payloads));
   }
 
   // Warn about any orphaned payloads
@@ -179,13 +176,16 @@ pub async fn create_observations(
     );
   }
 
-  metadata
-    .store_observations(observations_with_payloads)
-    .await?;
+  let obs_count = observations.len();
+  metadata.store_observations(observations).await?;
+
+  for (obs_id, obs_payloads) in &payloads_per_obs {
+    metadata.store_payloads(obs_id, obs_payloads).await?;
+  }
 
   tracing::info!(
     execution_id = %execution_id,
-    count = observations.len(),
+    count = obs_count,
     "Observations created successfully"
   );
 

crates/observation-tools-server/src/api/observations/get.rs

@@ -2,7 +2,6 @@
 
 use crate::api::AppError;
 use crate::storage::MetadataStorage;
-use crate::storage::ObservationWithPayloads;
 use crate::storage::PayloadData;
 use crate::storage::StoredPayload;
 use axum::extract::Path;
@@ -39,11 +38,10 @@ pub struct GetPayload {
 }
 
 impl GetObservation {
-  pub fn new(obs: ObservationWithPayloads) -> GetObservation {
-    let exec_id = obs.observation.execution_id;
-    let obs_id = obs.observation.id;
-    let payloads = obs
-      .payloads
+  pub fn new(observation: Observation, stored_payloads: Vec<StoredPayload>) -> GetObservation {
+    let exec_id = observation.execution_id;
+    let obs_id = observation.id;
+    let payloads = stored_payloads
       .into_iter()
       .map(|p| {
         let id = p.id.clone();
@@ -60,7 +58,7 @@ impl GetObservation {
       })
       .collect();
     GetObservation {
-      observation: obs.observation,
+      observation,
       payloads,
     }
   }
@@ -148,7 +146,8 @@ pub async fn get_observation(
   let _execution_id = ExecutionId::parse(&execution_id)?;
   let observation_id = ObservationId::parse(&observation_id)?;
   let observation = metadata.get_observation(observation_id).await?;
+  let payloads = metadata.get_all_payloads(observation_id).await?;
   Ok(Json(GetObservationResponse {
-    observation: GetObservation::new(observation),
+    observation: GetObservation::new(observation, payloads),
   }))
 }

crates/observation-tools-server/src/api/observations/get_blob.rs

@@ -39,11 +39,10 @@ pub async fn get_observation_blob(
 ) -> Result<impl IntoResponse, AppError> {
   let observation_id = ObservationId::parse(&observation_id)?;
   let payload_id = PayloadId::from(payload_id);
-  let observation = metadata.get_observation(observation_id).await?;
+  let payloads = metadata.get_all_payloads(observation_id).await?;
 
   // Find the payload in the manifest
-  let payload = observation
-    .payloads
+  let payload = payloads
     .iter()
     .find(|p| p.id == payload_id)
     .ok_or_else(|| {
@@ -97,10 +96,10 @@ pub async fn get_observation_blob_legacy(
   Path((_execution_id, observation_id)): Path<(String, String)>,
 ) -> Result<impl IntoResponse, AppError> {
   let observation_id = ObservationId::parse(&observation_id)?;
-  let observation = metadata.get_observation(observation_id).await?;
+  let payloads = metadata.get_all_payloads(observation_id).await?;
 
   // Use the first payload
-  let payload = observation.payloads.first().ok_or_else(|| {
+  let payload = payloads.first().ok_or_else(|| {
     StorageError::NotFound(format!(
       "No payloads found for observation {}",
       observation_id

crates/observation-tools-server/src/api/observations/list.rs

@@ -50,14 +50,14 @@ pub async fn list_observations(
 ) -> Result<Json<ListObservationsResponse>, AppError> {
   let execution_id = ExecutionId::parse(&execution_id)?;
   let page = metadata
-    .get_observations(execution_id, query.page_token)
+    .get_observations(execution_id, query.page_token, None)
     .await?;
   let has_next_page = page.pagination.next_page_token.is_some();
   Ok(Json(ListObservationsResponse {
     observations: page
       .observations
       .into_iter()
-      .map(GetObservation::new)
+      .map(|obs| GetObservation::new(obs.observation, obs.payloads))
       .collect(),
     has_next_page,
     next_page_token: page.pagination.next_page_token,

crates/observation-tools-server/src/server.rs

@@ -14,7 +14,6 @@ use tower_http::trace::TraceLayer;
 use tracing::debug;
 use tracing::info;
 use tracing::warn;
-use utoipa_swagger_ui::SwaggerUi;
 
 /// The Observation Tools server
 pub struct Server {
@@ -72,7 +71,6 @@ impl Server {
     let app = Router::new()
       .merge(ui_router)
       .merge(api_router)
-      .merge(SwaggerUi::new("/api/swagger-ui").url("/api/openapi.json", openapi))
       .layer(TraceLayer::new_for_http())
       .with_state(state);