From cd82ef6de3e826bea74676c2bda5cedc21a24845 Mon Sep 17 00:00:00 2001 From: Erik Mackdanz Date: Fri, 29 Nov 2024 10:34:48 -0600 Subject: [PATCH] env support for most args --- src/main.rs | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index d0db012..5b0d280 100644 --- a/src/main.rs +++ b/src/main.rs @@ -83,8 +83,7 @@ //! //! ## TODO //! -//! - model from main not PR -//! - env support for all args +//! - why model from PR not main? //! use candle_transformers::models::bert::{BertModel, Config, HiddenAct, DTYPE}; @@ -104,13 +103,13 @@ enum Action { /// table doesn't exist already InitDatabase { - #[arg(long,default_value="vsearch")] + #[arg(long,env,default_value="vsearch")] dbname: String, - #[arg(long,default_value="localhost")] + #[arg(long,env,default_value="localhost")] host: String, - #[arg(long,default_value="cvmigrator")] + #[arg(long,env,default_value="cvmigrator")] user: String, #[arg(long,env)] @@ -120,13 +119,13 @@ enum Action { /// Read one document and add it to the database index Index { - #[arg(long,default_value="vsearch")] + #[arg(long,env,default_value="vsearch")] dbname: String, - #[arg(long,default_value="localhost")] + #[arg(long,env,default_value="localhost")] host: String, - #[arg(long,default_value="cvmigrator")] + #[arg(long,env,default_value="cvmigrator")] user: String, #[arg(long,env)] @@ -140,13 +139,13 @@ enum Action { /// Search the database for documents matching --search Search { - #[arg(long,default_value="vsearch")] + #[arg(long,env,default_value="vsearch")] dbname: String, - #[arg(long,default_value="localhost")] + #[arg(long,env,default_value="localhost")] host: String, - #[arg(long,default_value="cvmigrator")] + #[arg(long,env,default_value="cvmigrator")] user: String, #[arg(long,env)] @@ -166,22 +165,22 @@ struct Args { /// The model to use, check out available models: /// - #[arg(long)] + #[arg(long,env)] model_id: Option, - #[arg(long)] + #[arg(long,env)] revision: Option, /// Use the pytorch weights rather than the safetensors ones - #[arg(long)] + #[arg(long,env)] use_pth: bool, /// L2 normalization for embeddings. - #[arg(long, default_value = "true")] + #[arg(long, env, default_value = "true")] normalize_embeddings: bool, /// Use tanh based approximation for Gelu instead of erf implementation. - #[arg(long, default_value = "false")] + #[arg(long, env, default_value = "false")] approximate_gelu: bool, } -- 2.52.0