Skip to content

Fix: Update openai_api_key retrieval methods #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackbackes merged 1 commit into from
Apr 18, 2023
Merged

Fix: Update openai_api_key retrieval methods #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,19 @@ fn load_api_key() -> Result<String, Box<dyn std::error::Error>> {
let config_path = dirs::home_dir().unwrap().join(".happycommit/config.toml");
let config = std::fs::read_to_string(config_path)?;
let config: toml::Value = toml::from_str(&config)?;
let openai_api_key = config.get("openai_api_key");
let openai_api_key = config.get("OPENAI_API_KEY");
if openai_api_key.is_none() {
return Err("OPENAI_API_KEY not set in ~/.happycommit/config.toml".into());
}
Ok(openai_api_key.unwrap().to_string())
let result = openai_api_key.unwrap().to_string();
// strip quotes
let result = result.replace("\"", "");
Ok(result)
};
let dotenv_checker = || -> Result<String, Box<dyn std::error::Error>> {
dotenv::dotenv().ok();
let openai_api_key =
dotenv::var("OPENAI_API_KEY").expect("OPENAI_API_KEY not set in .env file");
dotenv::var("OPENAI_API_KEY")?;
Ok(openai_api_key)
};

Expand Down