removed async trait

Author: JustFrederik

Cargo.toml

@@ -1,17 +1,16 @@
 [package]
 name = "translators"
-version = "0.1.8"
+version = "0.1.9"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 strum = "0.24.1"
 strum_macros = "0.24.1"
 envy = "0.4.1"
-reqwest = { version = "0.11", features = ["json"] }
+reqwest = { version = "0.11", features = ["json", "blocking"] }
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
-async-trait = "0.1.68"
 whatlang = { version = "0.16.2", optional = true }
 lingua = { version = "1.4.0", optional = true }
 futures = { version = "0.3.28", optional = true }
@@ -28,49 +27,57 @@ md-5 = { version = "0.10.5", optional = true }
 base64 = { version = "0.21.0", optional = true }
 uuid = { version = "1.3.2", features = ["v4"], optional = true }
 sentencepiece = { version = "0.11.1", optional = true }
-model-manager = { git = "https://github.com/JustFrederik/model_manager.git", rev = "ab98303", optional = true }
-rustyctranslate2 = { git = "https://github.com/JustFrederik/rustyctranslate2", rev = "94a745f", optional = true }
+model-manager = { git = "https://github.com/JustFrederik/model_manager.git", rev = "aee991c", optional = true }
+rustyctranslate2 = { git = "https://github.com/JustFrederik/rustyctranslate2", rev = "8ac5fa5", optional = true }
+#model-manager = { path = "../model_manager", optional = true }
+#rustyctranslate2 = { path = "../rustctranslate2", optional = true }
 chrono = { version = "0.4.19", optional = true }
 sha256 = { version = "1.0.3", optional = true }
-md5_alt = { package= 'md5', version = "0.7.0", optional = true }
+md5_alt = { package = 'md5', version = "0.7.0", optional = true }
 log = "0.4.17"
+llm = { git = "https://github.com/rustformers/llm" , branch = "main", optional = true }
+rand = { version = "0.8.4", optional = true }
 
 [features]
-default = ["whatlang-detector", "online", "retries", "fetch_languages", "generate"]
+default = ["whatlang-detector", "online", "fetch_languages", "generate", "offline"]
 
 whatlang-detector = ["dep:whatlang"]
 lingua-detector = ["dep:lingua"]
 all-detectors = ["whatlang-detector", "lingua-detector"]
 
-retries = ["dep:tokio", "dep:futures", "tokio?/full"]
 
 #Google is always available
 deepl = []
 mymemory = []
-chatgpt = ["dep:chatgpt_rs", "chatgpt_rs?/gpt3"]
+chatgpt = ["dep:chatgpt_rs", "chatgpt_rs?/gpt3", "dep:futures"]
 libre = []
 youdao = ["dep:chrono", "dep:sha256"]
 baidu = ["dep:md5_alt"]
 papago = []
-api = ["chatgpt", "deepl", "libre", "mymemory","baidu", "youdao", "papago"]
+api = ["chatgpt", "deepl", "libre", "mymemory", "baidu", "youdao", "papago"]
 
 papago-scrape = ["dep:hmac", "dep:md-5", "dep:base64", "dep:uuid", "uuid?/v4"]
 google-scrape = []
 youdao-scrape = []
-edge-gpt-scrape = ["dep:edge-gpt"]
+edge-gpt-scrape = ["dep:edge-gpt", "dep:futures"]
 baidu-scrape = ["dep:serde_urlencoded"]
 bing-scrape = ["dep:regex", "dep:serde_urlencoded"]
 scraper = ["bing-scrape", "papago-scrape", "youdao-scrape", "baidu-scrape", "google-scrape", "edge-gpt-scrape"]
 
 online = ["api", "scraper"]
 
-offline_req = ["dep:sentencepiece", "dep:model-manager", "dep:rustyctranslate2"]
-jparacrawl = ["offline_req"]
-sugoi = ["offline_req", "dep:regex"]
-m2m100 = ["offline_req"]
-nllb = ["offline_req"]
+ctranslate_req = ["dep:sentencepiece", "dep:model-manager", "dep:rustyctranslate2"]
+jparacrawl = ["ctranslate_req"]
+sugoi = ["ctranslate_req", "dep:regex"]
+m2m100 = ["ctranslate_req", "dep:rand"]
+nllb = ["ctranslate_req", "dep:rand"]
+bloom = ["dep:llm", "dep:rand"]
+gpt2 = ["dep:llm", "dep:rand"]
+gptj = ["dep:llm", "dep:rand"]
+gptneox = ["dep:llm", "dep:rand"]
+llama = ["dep:llm", "dep:rand"]
 
-offline = ["jparacrawl", "sugoi", "m2m100", "nllb"]
+offline = ["jparacrawl", "sugoi", "m2m100", "nllb", "bloom", "gpt2", "gptj", "gptneox", "llama"]
 
 all-translators = ["online", "offline"]
 

src/lib.rs

@@ -2,55 +2,55 @@ pub mod detector;
 pub mod error;
 #[cfg(feature = "generate")]
 pub mod generator;
-mod languages;
-#[cfg(feature = "offline_req")]
-mod model_register;
+pub mod languages;
+#[cfg(feature = "ctranslate_req")]
+pub mod model_register;
 pub mod translators;
 
 #[cfg(test)]
 mod tests {
-    #[cfg(not(feature = "offline_req"))]
+    #[cfg(not(feature = "ctranslate_req"))]
     use std::collections::HashMap;
 
     use dotenv::dotenv;
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use model_manager::model_manager::ModelManager;
-    use reqwest::Client;
+    use reqwest::blocking::Client;
 
     use crate::detector;
     use crate::detector::Detectors;
     use crate::generator::Records;
     use crate::languages::Language;
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::model_register::register;
-    #[cfg(not(feature = "offline_req"))]
+    #[cfg(not(feature = "ctranslate_req"))]
     use crate::translators::chainer::TranslatorInfo;
-    #[cfg(not(feature = "offline_req"))]
+    #[cfg(not(feature = "ctranslate_req"))]
     use crate::translators::chainer::TranslatorSelectorInfo;
-    #[cfg(not(feature = "offline_req"))]
+    #[cfg(not(feature = "ctranslate_req"))]
     use crate::translators::context::Context;
     use crate::translators::dev::{get_csv_errors, get_languages};
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::translators::offline::ctranslate2::model_management::{
         CTranslateModels, ModelLifetime, TokenizerModels,
     };
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::translators::offline::ctranslate2::Device;
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::translators::offline::m2m100::{M2M100ModelType, M2M100Translator};
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::translators::offline::ModelFormat;
     use crate::translators::scrape::papago::PapagoTranslator;
     use crate::translators::tokens::Tokens;
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     use crate::translators::translator_structure::TranslatorCTranslate;
     use crate::translators::translator_structure::TranslatorLanguages;
     use crate::translators::Translator;
-    #[cfg(not(feature = "offline_req"))]
+    #[cfg(not(feature = "ctranslate_req"))]
     use crate::translators::Translators;
 
     #[tokio::test]
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     async fn translate_offline() {
         let time = std::time::Instant::now();
         let mut mm = ModelManager::new().unwrap();
@@ -80,7 +80,7 @@ mod tests {
     }
 
     #[tokio::test]
-    #[cfg(feature = "offline_req")]
+    #[cfg(feature = "ctranslate_req")]
     async fn models() {
         //TODO: better downloader https://github.com/mattgathu/duma/tree/master
         let mut mm = ModelManager::new().unwrap();
@@ -105,10 +105,11 @@ mod tests {
         print!("{:?}", res);
     }
 
-    #[tokio::test]
-    #[cfg(not(feature = "offline_req"))]
-    async fn translate() {
+    #[test]
+    #[cfg(not(feature = "ctranslate_req"))]
+    fn translate() {
         dotenv().ok();
+
         let mut hashmap = HashMap::new();
         hashmap.insert(Language::Chinese, Translator::Papago);
         let selector = TranslatorSelectorInfo::Selective(
@@ -125,20 +126,18 @@ mod tests {
             Some(3),
             Detectors::Whatlang,
         )
-        .await
         .unwrap();
+
         let chatgpt_context = Context::ChatGPT("This is a text about ...".to_string());
         let translation = v
-            .translate("Hello world".to_string(), None, &[chatgpt_context])
-            .await
-            .unwrap();
+                .translate("Dies ist ein kurzer test der dazu da ist um zu überprüfen ob der übersetzer funtioniert.".to_string(), None, &[chatgpt_context])
+                .unwrap();
         let translations = v
             .translate_vec(
                 vec!["Hello world".to_string(), "This is a test".to_string()],
                 None,
                 &[],
             )
-            .await
             .unwrap();
         println!("{:?}, {:?}", translation, translations);
     }
@@ -152,9 +151,8 @@ mod tests {
     #[tokio::test]
     async fn add_line() {
         dotenv().ok();
-        let vv = PapagoTranslator::get_languages(&Client::new(), &Tokens::get_env().unwrap())
-            .await
-            .unwrap();
+        let vv =
+            PapagoTranslator::get_languages(&Client::new(), &Tokens::get_env().unwrap()).unwrap();
         //println!("{:?}", vv);
         let mut v = Records::new().unwrap();
         v.add_line("nllb", &vv);

src/main.rs

@@ -0,0 +1,75 @@
+// use llm::{ModelArchitecture, VocabularySource};
+// use std::convert::Infallible;
+// use std::io::Write;
+//
+// fn main() {
+//     // load a GGML model from disk
+//     let llama = llm::load_dynamic(
+//         ModelArchitecture::Llama,
+//         std::path::Path::new("/Users/frederik/Downloads/gpt4-x-vicuna-13B.ggmlv3.q4_1.bin"),
+//         VocabularySource::Model,
+//         llm::ModelParameters::default(),
+//         llm::load_progress_callback_stdout,
+//     )
+//     .unwrap_or_else(|err| panic!("Failed to load model: {err}"));
+//
+//     // use the model to generate text from a prompt
+//     let prompt = "A chat between Human and Assistant.\n### Assistant: Hello I am a profressional translator which translates sentences from mangas \n\
+//         ### Human: Please translate the following sentences for me in the same structure as they are given to japanese. Each translation is numbered with the same number and in a new line.\n\n1. This is a example sentance\n2. Another sentence to translate.\n###Assistant: 1.";
+//     let mut session = llama.start_session(Default::default());
+//     let mut buf = String::new();
+//     let res = session.infer(
+//         llama.as_ref(),
+//         &mut rand::thread_rng(),
+//         &llm::InferenceRequest {
+//             prompt: prompt.into(),
+//             parameters: &llm::InferenceParameters::default(),
+//             play_back_previous_tokens: false,
+//             maximum_token_count: None,
+//         },
+//         &mut Default::default(),
+//         inference_callback(String::from("###Human"), &mut buf),
+//     );
+//
+//     println!("res: {}", buf);
+//     match res {
+//         Ok(result) => println!("\n\nInference stats:\n{result}"),
+//         Err(err) => println!("\n{err}"),
+//     }
+// }
+//
+// fn inference_callback(
+//     stop_sequence: String,
+//     buf: &mut String,
+// ) -> impl FnMut(llm::InferenceResponse) -> Result<llm::InferenceFeedback, Infallible> + '_ {
+//     move |resp| match resp {
+//         llm::InferenceResponse::InferredToken(t) => {
+//             let mut reverse_buf = buf.clone();
+//             reverse_buf.push_str(t.as_str());
+//             if stop_sequence.as_str().eq(reverse_buf.as_str()) {
+//                 buf.clear();
+//                 return Ok(llm::InferenceFeedback::Halt);
+//             } else if stop_sequence.as_str().starts_with(reverse_buf.as_str()) {
+//                 buf.push_str(t.as_str());
+//                 return Ok(llm::InferenceFeedback::Continue);
+//             }
+//
+//             if buf.is_empty() {
+//                 print_token(t)
+//             } else {
+//                 print_token(reverse_buf)
+//             }
+//         }
+//         llm::InferenceResponse::EotToken => Ok(llm::InferenceFeedback::Halt),
+//         _ => Ok(llm::InferenceFeedback::Continue),
+//     }
+// }
+//
+// fn print_token(t: String) -> Result<llm::InferenceFeedback, Infallible> {
+//     print!("{t}");
+//     std::io::stdout().flush().unwrap();
+//
+//     Ok(llm::InferenceFeedback::Continue)
+// }
+
+fn main() {}

src/translators/api/baidu.rs

@@ -5,8 +5,7 @@ use crate::languages::Language;
 use crate::translators::translator_structure::{
     TranslationOutput, TranslationVecOutput, TranslatorNoContext,
 };
-use async_trait::async_trait;
-use reqwest::Client;
+use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::str::FromStr;
@@ -18,9 +17,8 @@ pub struct BaiduApiTranslator {
     key: String,
 }
 
-#[async_trait]
 impl TranslatorNoContext for BaiduApiTranslator {
-    async fn translate(
+    fn translate(
         &self,
         client: &Client,
         query: &str,
@@ -41,10 +39,8 @@ impl TranslatorNoContext for BaiduApiTranslator {
             .post(&self.url)
             .form(&form)
             .send()
-            .await
             .map_err(Error::fetch)?
             .json()
-            .await
             .map_err(Error::fetch)?;
         let resp = match resp {
             Response::Ok(v) => v,
@@ -61,14 +57,14 @@ impl TranslatorNoContext for BaiduApiTranslator {
         })
     }
 
-    async fn translate_vec(
+    fn translate_vec(
         &self,
         client: &Client,
         query: &[String],
         from: Option<Language>,
         to: &Language,
     ) -> Result<TranslationVecOutput, Error> {
-        let v = self.translate(client, &query.join("\n"), from, to).await?;
+        let v = self.translate(client, &query.join("\n"), from, to)?;
         Ok(TranslationVecOutput {
             text: v.text.split('\n').map(|v| v.to_string()).collect(),
             lang: v.lang,