removed sorting by key

Signed-off-by: AlexMikhalev <[email protected]>
terraphim · Jun 2, 2024 · d5494a6 · d5494a6
1 parent fc3ccef
commit d5494a6
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 61 deletions.
diff --git a/crates/terraphim_rolegraph/src/lib.rs b/crates/terraphim_rolegraph/src/lib.rs
@@ -197,7 +197,6 @@ impl RoleGraph {
 
         let mut ranked_documents = results.into_iter().collect::<Vec<_>>();
         ranked_documents.sort_by_key(|(_, doc)| std::cmp::Reverse(doc.rank));
-        ranked_documents.sort_by_key(|(_, doc)| std::cmp::Reverse(doc.id.clone()));
 
         let documents: Vec<_> = ranked_documents
             .into_iter()

diff --git a/crates/terraphim_service/src/lib.rs b/crates/terraphim_service/src/lib.rs
@@ -80,10 +80,11 @@ impl<'a> TerraphimService {
                 log::debug!("Sorting documents by relevance");
                 // Sort the documents by relevance
                 let documents = score::sort_documents(search_query, documents);
+                let total_length = documents.len();
                 let mut docs_ranked = Vec::new();
                 for (idx, doc) in documents.iter().enumerate() {
                     let document: &mut terraphim_types::Document = &mut doc.clone();
-                    let rank = terraphim_types::Rank::new(idx.try_into().unwrap());
+                    let rank = terraphim_types::Rank::new((total_length - idx).try_into().unwrap());
                     document.rank = Some(rank);
                     docs_ranked.push(document.clone());
                 }

diff --git a/crates/terraphim_service/src/score/mod.rs b/crates/terraphim_service/src/score/mod.rs
@@ -30,6 +30,7 @@ pub fn sort_documents(search_query: &SearchQuery, documents: Vec<Document>) -> V
     let mut results = scorer.score(&query, documents).unwrap();
     //FIXME: results.score and rank solve the same purpose. Results score shall be normalized into rank and mapped to IndexedDocument
     results.rescore(|doc| query.similarity.similarity(&query.name, &doc.title));
+    log::debug!("Rescore results {:#?}", results);
     results
         .into_vec()
         .iter()

diff --git a/desktop/src/lib/Search/ResultItem.svelte b/desktop/src/lib/Search/ResultItem.svelte
@@ -31,13 +31,19 @@
           {#if document.tags}
           <Taglist>
               {#each document.tags as tag}
+              <!-- FIXME: link shall be config parameter for KG -->
                 <a
                   href="https://terraphim.github.io/terraphim-project/#/page/{tag}"
                   target="_blank"><Tag rounded>{tag}</Tag></a
                 >
               {/each}
           </Taglist>
           {/if}
+        </div>
+          <div class="level-right">
+          <Taglist>
+            <Tag rounded>Rank {document.rank}</Tag>
+          </Taglist>
         </div>
         <div transition:fade>
           <button on:click={onTitleClick}>

diff --git a/desktop/src/lib/Search/Search.svelte b/desktop/src/lib/Search/Search.svelte
@@ -88,8 +88,8 @@
 {#if error}
   <p class="error">{error}</p>
 {:else if results.length}
-  {#each results as result_item}
-    <ResultItem document={result_item} />
+  {#each results as item}
+    <ResultItem document={item} />
   {/each}
 {:else}
   <section class="section">

diff --git a/...phim_server/dist/assets/index-ed0ded8b.js → ...phim_server/dist/assets/index-4c117adb.js b/...phim_server/dist/assets/index-ed0ded8b.js → ...phim_server/dist/assets/index-4c117adb.js
diff --git a/terraphim_server/dist/index.html b/terraphim_server/dist/index.html
@@ -6,7 +6,7 @@
     <link rel="apple-touch-icon" type="image/png" href="/180x180.png">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Terraphim AI</title>
-    <script type="module" crossorigin src="/assets/index-ed0ded8b.js"></script>
+    <script type="module" crossorigin src="/assets/index-4c117adb.js"></script>
     <link rel="stylesheet" href="/assets/index-36fd5f08.css">
   </head>
   <body>