-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Fredrick R. Brennan <copypaste@kittens.ph>
- Loading branch information
1 parent
20eaff0
commit bfd544e
Showing
6 changed files
with
245 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,21 @@ | ||
| [package] | ||
| name = "ata" | ||
| version = "1.0.3" | ||
| version = "2.0.0" | ||
| edition = "2021" | ||
| authors = ["Rik Huijzer <t.h.huijzer@rug.nl>", "Fredrick R. Brennan <copypaste@kittens.ph>"] | ||
| license = "MIT" | ||
|
|
||
| [dependencies] | ||
| rustyline = "10.1" | ||
| clap = { version = "4.1.4", features = ["derive"] } | ||
| directories = "4.0" | ||
| hyper = { version = "0.14", features = ["full"] } | ||
| hyper-rustls = { version = "0.23" } | ||
| os_str_bytes = "6.4.1" | ||
| rustyline = "10.1" | ||
| serde = { version = "1", features = ["derive"] } | ||
| serde_json = { version = "1" } | ||
| tokio = { version = "1", features = ["full"] } | ||
| toml = { version = "0.6" } | ||
| clap = { version = "4.1.4", features = ["derive"] } | ||
|
|
||
| [dev-dependencies] | ||
| pretty_assertions = "1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| use directories::ProjectDirs; | ||
| use os_str_bytes::OsStrBytes as _; | ||
| use os_str_bytes::OsStringBytes as _; | ||
| use serde::Deserialize; | ||
| use std::convert::Infallible; | ||
| use std::ffi::OsString; | ||
| use std::path::Path; | ||
| use std::path::PathBuf; | ||
| use std::str::FromStr; | ||
| use toml::de::Error as TomlError; | ||
|
|
||
| #[derive(Clone, Deserialize, Debug)] | ||
| pub struct Config { | ||
| pub api_key: String, | ||
| pub model: String, | ||
| pub max_tokens: i64, | ||
| pub temperature: f64 | ||
| } | ||
|
|
||
| #[derive(Clone, Deserialize, Debug, Default)] | ||
| pub enum ConfigLocation { | ||
| #[default] | ||
| Auto, | ||
| Path(PathBuf), | ||
| Named(PathBuf), | ||
| } | ||
|
|
||
| impl FromStr for ConfigLocation { | ||
| type Err = Infallible; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| Ok(if !s.contains('.') && !s.is_empty() { | ||
| Self::Named(s.into()) | ||
| } else if !s.is_empty() { | ||
| Self::Path(s.into()) | ||
| } else if s.trim().is_empty() { | ||
| Self::Auto | ||
| } else { | ||
| unreachable!() | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| impl<S> From<S> for ConfigLocation where S: AsRef<str> { | ||
| fn from(s: S) -> Self { | ||
| Self::from_str(s.as_ref()).unwrap() | ||
| } | ||
| } | ||
|
|
||
| fn get_config_dir() -> PathBuf { | ||
| ProjectDirs::from( | ||
| "ata", | ||
| "Ask the Terminal Anything (ATA) Project Authors", | ||
| "ata", | ||
| ).unwrap().config_dir().into() | ||
| } | ||
|
|
||
| pub fn default_path(name: Option<&Path>) -> PathBuf { | ||
| let mut config_file = get_config_dir(); | ||
| let file: Vec<_> = if let Some(name) = name { | ||
| let mut name = name.to_path_buf(); | ||
| name.set_extension("toml"); | ||
| name.as_os_str() | ||
| .to_raw_bytes() | ||
| .iter() | ||
| .copied() | ||
| .collect() | ||
| } else { | ||
| "ata.toml".bytes().collect() | ||
| }; | ||
| let file = OsString::assert_from_raw_vec(file); | ||
| config_file.push(&file); | ||
| config_file | ||
| } | ||
|
|
||
| impl ConfigLocation { | ||
| pub fn location(&self) -> PathBuf { | ||
| match self { | ||
| ConfigLocation::Auto => { | ||
| if self.location().exists() { | ||
| return self.location(); | ||
| } | ||
| default_path(None) | ||
| } | ||
| ConfigLocation::Path(pb) => { | ||
| pb.clone() | ||
| }, | ||
| ConfigLocation::Named(name) => { | ||
| if name.as_os_str() == "default" { | ||
| return match Path::new("ata.toml").exists() { | ||
| true => Path::new(&"ata.toml").into(), | ||
| false => default_path(None) | ||
| }; | ||
| } | ||
| default_path(Some(name)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl FromStr for Config { | ||
| type Err = TomlError; | ||
|
|
||
| fn from_str(contents: &str) -> Result<Self, Self::Err> { | ||
| toml::from_str(contents) | ||
| } | ||
| } | ||
|
|
||
| impl<S> From<S> for Config where S: AsRef<str> { | ||
| fn from(s: S) -> Self { | ||
| Self::from_str(s.as_ref()) | ||
| .unwrap_or_else(|e| panic!("Config parsing failure!: {:?}", e)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.