Rename openai_utils module to openai_bootstrap

Cargo.toml

@@ -23,8 +23,8 @@ features = ["derive"]
 [dependencies.openai_proc_macros]
 path = "openai_proc_macros"
 
-[dependencies.openai_utils]
-path = "openai_utils"
+[dependencies.openai_bootstrap]
+path = "openai_bootstrap"
 
 [dev-dependencies.tokio]
 version = "1.25"

openai_utils/Cargo.toml → openai_bootstrap/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "openai_utils"
+name = "openai_bootstrap"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

openai_bootstrap/src/lib.rs

@@ -0,0 +1,17 @@
+pub const BASE_URL: &str = "https://api.openai.com/v1";
+
+#[macro_export]
+macro_rules! authorization {
+    ($request:expr) => {{
+        use dotenvy::dotenv;
+        use reqwest::{header::AUTHORIZATION, RequestBuilder};
+        use std::env;
+
+        dotenv().ok();
+
+        let token =
+            env::var("OPENAI_KEY").expect("environment variable `OPENAI_KEY` should be defined");
+
+        $request.header(AUTHORIZATION, format!("Bearer {token}"))
+    }};
+}

openai_proc_macros/Cargo.toml

@@ -22,8 +22,8 @@ convert_case = "0.6"
 version = "0.11"
 features = [ "blocking", "json" ]
 
-[dependencies.openai_utils]
-path = "../openai_utils"
+[dependencies.openai_bootstrap]
+path = "../openai_bootstrap"
 
 [dependencies.serde]
 version = "1.0"

openai_proc_macros/src/lib.rs

@@ -1,9 +1,9 @@
+use convert_case::{Case, Casing};
+use openai_bootstrap::{authorization, BASE_URL};
 use proc_macro::TokenStream;
-use quote::{ quote, format_ident };
+use quote::{format_ident, quote};
 use reqwest::blocking::Client;
-use openai_utils::{ BASE_URL, authorization };
 use serde::Deserialize;
-use convert_case::{ Case, Casing };
 
 #[derive(Deserialize)]
 struct Models {
@@ -20,18 +20,18 @@ pub fn generate_model_id_enum(_input: TokenStream) -> TokenStream {
     let client = Client::new();
 
     let response: Models = authorization!(client.get(format!("{BASE_URL}/models")))
-        .send().unwrap().json().unwrap();
+        .send()
+        .unwrap()
+        .json()
+        .unwrap();
 
     let mut model_id_idents = Vec::new();
     let mut model_ids = Vec::new();
     let mut model_indexes = Vec::new();
     let mut index: u32 = 0;
 
     for model in response.data {
-        if model.id.contains(':')
-           || model.id.contains('.')
-           || model.id.contains("deprecated")
-        {
+        if model.id.contains(':') || model.id.contains('.') || model.id.contains("deprecated") {
             continue;
         }
 

src/completions.rs

@@ -5,7 +5,7 @@ use serde::{ Deserialize, Serialize };
 use super::{ models::ModelID, Usage };
 use std::collections::HashMap;
 use reqwest::Client;
-use openai_utils::{ BASE_URL, authorization };
+use openai_bootstrap::{ BASE_URL, authorization };
 
 #[derive(Deserialize)]
 pub struct Completion {

src/edits.rs

@@ -3,7 +3,7 @@
 use serde::{ Deserialize, Serialize };
 use super::{ Usage, models::ModelID };
 use reqwest::Client;
-use openai_utils::{ BASE_URL, authorization };
+use openai_bootstrap::{ BASE_URL, authorization };
 
 #[derive(Deserialize)]
 pub struct Edit {

src/embeddings.rs

@@ -5,7 +5,7 @@
 use serde::{ Deserialize, Serialize };
 use reqwest::Client;
 use super::{ models::ModelID, Usage };
-use openai_utils::{ BASE_URL, authorization };
+use openai_bootstrap::{ BASE_URL, authorization };
 
 #[derive(Serialize)]
 struct CreateEmbeddingsRequestBody<'a> {

src/models.rs

@@ -5,7 +5,7 @@
 use serde::Deserialize;
 use reqwest::Client;
 use openai_proc_macros::generate_model_id_enum;
-use openai_utils::{ BASE_URL, authorization };
+use openai_bootstrap::{ BASE_URL, authorization };
 
 #[derive(Deserialize)]
 pub struct Model {