Added chroot support.
This commit is contained in:
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
api-key = "<YOUR-KEY>"
|
api-key = "<YOUR-KEY>"
|
||||||
base-url = "api.openai.com"
|
base-url = "api.openai.com"
|
||||||
|
chroot-dir = "/home/bot/root"
|
||||||
|
|
||||||
|
# If using chroot (recommended) then this will be relative.
|
||||||
|
command-path = "/cmds"
|
||||||
|
|
||||||
# If you don't already know the model name you can generally find a listing
|
# If you don't already know the model name you can generally find a listing
|
||||||
# on the models API pages.
|
# on the models API pages.
|
||||||
|
|||||||
18
src/main.rs
18
src/main.rs
@@ -3,6 +3,7 @@ use color_eyre::{
|
|||||||
eyre::WrapErr,
|
eyre::WrapErr,
|
||||||
};
|
};
|
||||||
use human_panic::setup_panic;
|
use human_panic::setup_panic;
|
||||||
|
use std::os::unix::fs;
|
||||||
use tracing::{
|
use tracing::{
|
||||||
Level,
|
Level,
|
||||||
info,
|
info,
|
||||||
@@ -10,12 +11,12 @@ use tracing::{
|
|||||||
use tracing_subscriber::FmtSubscriber;
|
use tracing_subscriber::FmtSubscriber;
|
||||||
|
|
||||||
mod chat;
|
mod chat;
|
||||||
mod command;
|
mod commands;
|
||||||
mod qna;
|
mod qna;
|
||||||
mod setup;
|
mod setup;
|
||||||
|
|
||||||
const DEFAULT_INSTRUCT: &'static str =
|
const DEFAULT_INSTRUCT: &str =
|
||||||
"You are a shady, yet helpful IRC bot. You try to give responses that can
|
"You are a shady, yet helpful IRC bot. You try to give responses that can
|
||||||
be sent in a single IRC response according to the specification.";
|
be sent in a single IRC response according to the specification.";
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
@@ -36,6 +37,13 @@ async fn main() -> Result<()> {
|
|||||||
let settings = setup::init().await.wrap_err("Failed to initialize.")?;
|
let settings = setup::init().await.wrap_err("Failed to initialize.")?;
|
||||||
let config = settings.config;
|
let config = settings.config;
|
||||||
|
|
||||||
|
// chroot if applicable.
|
||||||
|
if let Ok(chroot_path) = config.get_string("chroot-dir") {
|
||||||
|
fs::chroot(&chroot_path)
|
||||||
|
.wrap_err_with(|| format!("Failed setting chroot '{}'", chroot_path.to_string()))?;
|
||||||
|
std::env::set_current_dir("/").wrap_err("Couldn't change directory after chroot.")?;
|
||||||
|
}
|
||||||
|
|
||||||
let handle = qna::new(
|
let handle = qna::new(
|
||||||
config.get_string("api-key").wrap_err("API missing.")?,
|
config.get_string("api-key").wrap_err("API missing.")?,
|
||||||
config
|
config
|
||||||
@@ -44,7 +52,9 @@ async fn main() -> Result<()> {
|
|||||||
config
|
config
|
||||||
.get_string("model")
|
.get_string("model")
|
||||||
.wrap_err("model string missing.")?,
|
.wrap_err("model string missing.")?,
|
||||||
config.get_string("instruct").unwrap_or_else(|_| DEFAULT_INSTRUCT.to_string()),
|
config
|
||||||
|
.get_string("instruct")
|
||||||
|
.unwrap_or_else(|_| DEFAULT_INSTRUCT.to_string()),
|
||||||
)
|
)
|
||||||
.wrap_err("Couldn't initialize LLM handle.")?;
|
.wrap_err("Couldn't initialize LLM handle.")?;
|
||||||
let mut c = chat::new(&config, &handle).await?;
|
let mut c = chat::new(&config, &handle).await?;
|
||||||
|
|||||||
22
src/setup.rs
22
src/setup.rs
@@ -1,15 +1,9 @@
|
|||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use color_eyre::{
|
use color_eyre::{Result, eyre::WrapErr};
|
||||||
Result,
|
|
||||||
eyre::WrapErr,
|
|
||||||
};
|
|
||||||
use config::Config;
|
use config::Config;
|
||||||
use directories::ProjectDirs;
|
use directories::ProjectDirs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use tracing::{
|
use tracing::{info, instrument};
|
||||||
info,
|
|
||||||
instrument,
|
|
||||||
};
|
|
||||||
|
|
||||||
// TODO: use [clap(long, short, help_heading = Some(section))]
|
// TODO: use [clap(long, short, help_heading = Some(section))]
|
||||||
#[derive(Clone, Debug, Parser)]
|
#[derive(Clone, Debug, Parser)]
|
||||||
@@ -23,6 +17,14 @@ pub(crate) struct Args {
|
|||||||
/// Base URL for the LLM API to use.
|
/// Base URL for the LLM API to use.
|
||||||
pub(crate) base_url: Option<String>,
|
pub(crate) base_url: Option<String>,
|
||||||
|
|
||||||
|
/// Directory to use for chroot (recommended).
|
||||||
|
#[arg(long)]
|
||||||
|
pub(crate) chroot_dir: Option<String>,
|
||||||
|
|
||||||
|
/// Root directory for file based command structure.
|
||||||
|
#[arg(long)]
|
||||||
|
pub(crate) command_dir: Option<String>,
|
||||||
|
|
||||||
#[arg(long)]
|
#[arg(long)]
|
||||||
/// Instructions to the model on how to behave.
|
/// Instructions to the model on how to behave.
|
||||||
pub(crate) intruct: Option<String>,
|
pub(crate) intruct: Option<String>,
|
||||||
@@ -30,7 +32,7 @@ pub(crate) struct Args {
|
|||||||
#[arg(long)]
|
#[arg(long)]
|
||||||
pub(crate) model: Option<String>,
|
pub(crate) model: Option<String>,
|
||||||
|
|
||||||
#[arg(long)]
|
#[arg(long = "channel")]
|
||||||
/// List of IRC channels to join.
|
/// List of IRC channels to join.
|
||||||
pub(crate) channels: Option<Vec<String>>,
|
pub(crate) channels: Option<Vec<String>>,
|
||||||
|
|
||||||
@@ -93,6 +95,8 @@ pub async fn init() -> Result<Setup> {
|
|||||||
// but a derive macro could do this a bit better if this becomes too large.
|
// but a derive macro could do this a bit better if this becomes too large.
|
||||||
.set_override_option("api-key", args.api_key.clone())?
|
.set_override_option("api-key", args.api_key.clone())?
|
||||||
.set_override_option("base-url", args.base_url.clone())?
|
.set_override_option("base-url", args.base_url.clone())?
|
||||||
|
.set_override_option("chroot-dir", args.chroot_dir.clone())?
|
||||||
|
.set_override_option("command-path", args.command_dir.clone())?
|
||||||
.set_override_option("model", args.model.clone())?
|
.set_override_option("model", args.model.clone())?
|
||||||
.set_override_option("instruct", args.model.clone())?
|
.set_override_option("instruct", args.model.clone())?
|
||||||
.set_override_option("channels", args.channels.clone())?
|
.set_override_option("channels", args.channels.clone())?
|
||||||
|
|||||||
Reference in New Issue
Block a user