From a7ce1a9f48471654464e88d3de2183ef60487459 Mon Sep 17 00:00:00 2001 From: Zhenbo Li Date: Sat, 21 Sep 2024 20:25:34 -0400 Subject: [PATCH] fix compile warnings --- fire_seq_search_server/src/http_client/endpoints.rs | 4 ++-- fire_seq_search_server/src/lib.rs | 5 +++-- fire_seq_search_server/src/load_notes/mod.rs | 5 +---- fire_seq_search_server/src/local_llm/mod.rs | 7 +++---- fire_seq_search_server/src/query_engine/mod.rs | 6 ++---- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/fire_seq_search_server/src/http_client/endpoints.rs b/fire_seq_search_server/src/http_client/endpoints.rs index 89bbc6f..0f40899 100644 --- a/fire_seq_search_server/src/http_client/endpoints.rs +++ b/fire_seq_search_server/src/http_client/endpoints.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use log::{debug, info}; +use log::{debug}; use crate::query_engine::{QueryEngine, ServerInformation}; use axum::Json; use axum::extract::State; -use axum::{response::Html, routing::get, Router, extract::Path}; +use axum::{response::Html, extract::Path}; pub async fn get_server_info(State(engine_arc): State>) -> Json { diff --git a/fire_seq_search_server/src/lib.rs b/fire_seq_search_server/src/lib.rs index 6752d9c..bc397b3 100644 --- a/fire_seq_search_server/src/lib.rs +++ b/fire_seq_search_server/src/lib.rs @@ -8,7 +8,7 @@ pub mod word_frequency; pub mod local_llm; -use log::{debug, info}; +use log::debug; use crate::query_engine::ServerInformation; use crate::query_engine::NotebookSoftware::Logseq; @@ -20,6 +20,7 @@ pub static JOURNAL_PREFIX: &str = "@journal@"; pub struct Article { + #[allow(dead_code)] /* TODO rethink if we need it 2024 Sep 21 */ file_name: String, content: String } @@ -73,7 +74,6 @@ tanvity's default tokenizer will lowercase all English characters. However, I think there could be a better approach 1. use https://github.com/pemistahl/lingua-rs to determine the language of the text 2. Select proper tokenizer - */ fn process_token_text(text: &str, indices: &Vec<(usize, char)>, token: &jieba_rs::Token<'_>) -> Option { let raw = String::from(&text[(indices[token.start].0)..(indices[token.end].0)]); let lower = raw.to_lowercase(); @@ -83,6 +83,7 @@ fn process_token_text(text: &str, indices: &Vec<(usize, char)>, token: &jieba_rs Some(lower) } } + */ // TODO use stub now pub fn tokenize_default(sentence: &str) -> Vec { diff --git a/fire_seq_search_server/src/load_notes/mod.rs b/fire_seq_search_server/src/load_notes/mod.rs index 87be1e6..9ac794c 100644 --- a/fire_seq_search_server/src/load_notes/mod.rs +++ b/fire_seq_search_server/src/load_notes/mod.rs @@ -1,10 +1,7 @@ -use std::fs::DirEntry; -use log::{debug, error, info, warn}; +use log::{debug, error, info}; use std::process; -use rayon::prelude::*; use crate::query_engine::ServerInformation; -use crate::JOURNAL_PREFIX; use std::borrow::Cow; diff --git a/fire_seq_search_server/src/local_llm/mod.rs b/fire_seq_search_server/src/local_llm/mod.rs index 162b645..9e8673d 100644 --- a/fire_seq_search_server/src/local_llm/mod.rs +++ b/fire_seq_search_server/src/local_llm/mod.rs @@ -1,5 +1,4 @@ use log::{info, error}; -use crate::query_engine::ServerInformation; use crate::query_engine::DocData; use std::collections::HashMap; @@ -166,7 +165,7 @@ impl LlmEngine { let client = reqwest::Client::new(); info!("llm engine initialized"); - let mut map = Arc::new(Mutex::new( + let map = Arc::new(Mutex::new( JobProcessor::new())); Self { endpoint, @@ -230,7 +229,7 @@ impl LlmEngine{ return; } - let mut next_job: Option = None; + let next_job: Option; let mut jcache = self.job_cache.lock().await;//.unwrap(); next_job = jcache.job_queue.pop_front(); @@ -306,7 +305,7 @@ async fn locate_llamafile() -> Option { lf.filepath = Some( lf_path.to_owned() ); info!("lf {:?}", &lf); - let ppath = std::path::Path::new(&lf_path); + let _ppath = std::path::Path::new(&lf_path); //let val = sha256::try_digest(ppath).unwrap(); let val = "1903778f7defd921347b25327ebe5dd902f29417ba524144a8e4f7c32d83dee8"; if val != lf.sha256 { diff --git a/fire_seq_search_server/src/query_engine/mod.rs b/fire_seq_search_server/src/query_engine/mod.rs index 2fe7da7..8451e05 100644 --- a/fire_seq_search_server/src/query_engine/mod.rs +++ b/fire_seq_search_server/src/query_engine/mod.rs @@ -1,7 +1,7 @@ // Everything about Tantivy should be hidden behind this component -use log::{debug, info, warn, error}; -use crate::{Article, decode_cjk_str}; +use log::{debug, info, error}; +use crate::decode_cjk_str; use crate::post_query::post_query_wrapper; use std::sync::Arc; @@ -87,8 +87,6 @@ impl QueryEngine { note: NoteListItem, index_writer: &IndexWriter) { - info!(" inside future {:?}", note); - let raw_content = match std::fs::read_to_string(¬e.realpath) { Ok(s) => s, Err(e) => {