updated logic to enqueue distance results

worldcoin · Jan 31, 2024 · 7049f92 · 7049f92
1 parent 9c94ab4
commit 7049f92
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/coordinator.rs b/src/coordinator.rs
@@ -277,21 +277,23 @@ impl Coordinator {
 
                 if distance > self.hamming_distance_threshold {
                     if closest_distances.len() < self.n_closest_distances {
-                        closest_distances.push(Distance::new(distance, id));
+                        closest_distances
+                            .push((ordered_float::OrderedFloat(distance), id));
 
                         max_closest_distance = closest_distances
                             .peek()
                             .expect("There should be at least one element")
-                            .distance
+                            .0
                             .into_inner();
                     } else if distance < max_closest_distance {
                         closest_distances.pop();
-                        closest_distances.push(Distance::new(distance, id));
+                        closest_distances
+                            .push((ordered_float::OrderedFloat(distance), id));
 
                         max_closest_distance = closest_distances
                             .peek()
                             .expect("There should be at least one element")
-                            .distance
+                            .0
                             .into_inner();
                     }
                 } else {
@@ -305,7 +307,7 @@ impl Coordinator {
 
         let closest_n_distances = closest_distances
             .into_iter()
-            .map(|d| d)
+            .map(|d| Distance::new(d.0.into_inner(), d.1))
             .collect::<Vec<Distance>>();
 
         let distance_results =
@@ -337,15 +339,14 @@ impl Coordinator {
         &self,
         distance_results: DistanceResults,
     ) -> eyre::Result<()> {
-        todo!();
-
-        // let distances_queue = self
-        //     .aws_client
-        //     .send_message()
-        //     .queue_url(self.distances_queue_url.clone())
-        //     // .message_body(input) //TODO: update/uncomment this
-        //     .send()
-        //     .await?;
+        //TODO: Implement DLQ logic
+
+        self.aws_client
+            .send_message()
+            .queue_url(self.distances_queue_url.clone())
+            .message_body(serde_json::to_string(&distance_results)?)
+            .send()
+            .await?;
 
         Ok(())
     }

diff --git a/src/distance.rs b/src/distance.rs
@@ -1,5 +1,6 @@
 use bytemuck::{Pod, Zeroable};
 use rayon::prelude::*;
+use serde::{Deserialize, Serialize};
 
 use crate::arch;
 pub use crate::bits::Bits;
@@ -53,22 +54,20 @@ impl DistanceEngine {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Distance {
-    pub distance: ordered_float::OrderedFloat<f64>,
+    pub distance: f64,
     pub id: usize,
 }
 
 impl Distance {
     pub fn new(distance: f64, id: usize) -> Self {
-        Self {
-            distance: ordered_float::OrderedFloat(distance),
-            id,
-        }
+        Self { distance, id }
     }
 }
 
 //TODO: docs
+#[derive(Debug, Serialize, Deserialize)]
 pub struct DistanceResults {
     pub latest_id: usize,
     pub closest_distances: Vec<Distance>,