Unified · Split
| @@ -1,11 +1,14 @@ | |||
| 1 | use anyhow::Result; | 1 | use anyhow::Result; |
| 2 | use futures::{future::BoxFuture, stream::BoxStream}; | 2 | use futures::{future::BoxFuture, stream::BoxStream}; |
| 3 | 3 | ||
| 4 | use crate::models::LanguageModel; | ||
| 5 | |||
| 4 | pub trait CompletionRequest: Send + Sync { | 6 | pub trait CompletionRequest: Send + Sync { |
| 5 | fn data(&self) -> serde_json::Result<String>; | 7 | fn data(&self) -> serde_json::Result<String>; |
| 6 | } | 8 | } |
| 7 | 9 | ||
| 8 | pub trait CompletionProvider { | 10 | pub trait CompletionProvider { |
| 11 | fn base_model(&self) -> Box<dyn LanguageModel>; | ||
| 9 | fn complete( | 12 | fn complete( |
| 10 | &self, | 13 | &self, |
| 11 | prompt: Box<dyn CompletionRequest>, | 14 | prompt: Box<dyn CompletionRequest>, |
| @@ -12,7 +12,12 @@ use std::{ · 11 unmodified lines | |||
| 12 | sync::Arc, | 12 | sync::Arc, |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | use crate::completion::{CompletionProvider, CompletionRequest}; | 15 | use crate::{ |
| 16 | completion::{CompletionProvider, CompletionRequest}, | ||
| 17 | models::LanguageModel, | ||
| 18 | }; | ||
| 19 | |||
| 20 | use super::OpenAILanguageModel; | ||
| 16 | 21 | ||
| 17 | pub const OPENAI_API_URL: &'static str = "https://api.openai.com/v1"; | 22 | pub const OPENAI_API_URL: &'static str = "https://api.openai.com/v1"; |
| 18 | 23 | ||
| @@ -180,17 +185,27 @@ pub async fn stream_completion( · 161 unmodified lines | |||
| 180 | } | 185 | } |
| 181 | 186 | ||
| 182 | pub struct OpenAICompletionProvider { | 187 | pub struct OpenAICompletionProvider { |
| 188 | model: OpenAILanguageModel, | ||
| 183 | api_key: String, | 189 | api_key: String, |
| 184 | executor: Arc<Background>, | 190 | executor: Arc<Background>, |
| 185 | } | 191 | } |
| 186 | 192 | ||
| 187 | impl OpenAICompletionProvider { | 193 | impl OpenAICompletionProvider { |
| 188 | pub fn new(api_key: String, executor: Arc<Background>) -> Self { | 194 | pub fn new(model_name: &str, api_key: String, executor: Arc<Background>) -> Self { |
| 189 | Self { api_key, executor } | 195 | let model = OpenAILanguageModel::load(model_name); |
| 196 | Self { | ||
| 197 | model, | ||
| 198 | api_key, | ||
| 199 | executor, | ||
| 200 | } | ||
| 190 | } | 201 | } |
| 191 | } | 202 | } |
| 192 | 203 | ||
| 193 | impl CompletionProvider for OpenAICompletionProvider { | 204 | impl CompletionProvider for OpenAICompletionProvider { |
| 205 | fn base_model(&self) -> Box<dyn LanguageModel> { | ||
| 206 | let model: Box<dyn LanguageModel> = Box::new(self.model.clone()); | ||
| 207 | model | ||
| 208 | } | ||
| 194 | fn complete( | 209 | fn complete( |
| 195 | &self, | 210 | &self, |
| 196 | prompt: Box<dyn CompletionRequest>, | 211 | prompt: Box<dyn CompletionRequest>, |
| @@ -26,7 +26,6 @@ use crate::providers::open_ai::OpenAILanguageModel; · 25 unmodified lines | |||
| 26 | use crate::providers::open_ai::auth::OpenAICredentialProvider; | 26 | use crate::providers::open_ai::auth::OpenAICredentialProvider; |
| 27 | 27 | ||
| 28 | lazy_static! { | 28 | lazy_static! { |
| 29 | static ref OPENAI_API_KEY: Option<String> = env::var("OPENAI_API_KEY").ok(); | ||
| 30 | static ref OPENAI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap(); | 29 | static ref OPENAI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap(); |
| 31 | } | 30 | } |
| 32 | 31 | ||
| @@ -328,6 +328,7 @@ impl AssistantPanel { · 327 unmodified lines | |||
| 328 | 328 | ||
| 329 | let inline_assist_id = post_inc(&mut self.next_inline_assist_id); | 329 | let inline_assist_id = post_inc(&mut self.next_inline_assist_id); |
| 330 | let provider = Arc::new(OpenAICompletionProvider::new( | 330 | let provider = Arc::new(OpenAICompletionProvider::new( |
| 331 | "gpt-4", | ||
| 331 | api_key, | 332 | api_key, |
| 332 | cx.background().clone(), | 333 | cx.background().clone(), |
| 333 | )); | 334 | )); |
| @@ -335,6 +335,7 @@ fn strip_markdown_codeblock( · 334 unmodified lines | |||
| 335 | #[cfg(test)] | 335 | #[cfg(test)] |
| 336 | mod tests { | 336 | mod tests { |
| 337 | use super::*; | 337 | use super::*; |
| 338 | use ai::{models::LanguageModel, test::FakeLanguageModel}; | ||
| 338 | use futures::{ | 339 | use futures::{ |
| 339 | future::BoxFuture, | 340 | future::BoxFuture, |
| 340 | stream::{self, BoxStream}, | 341 | stream::{self, BoxStream}, |
| @@ -638,6 +639,10 @@ mod tests { · 297 unmodified lines | |||
| 638 | } | 639 | } |
| 639 | 640 | ||
| 640 | impl CompletionProvider for TestCompletionProvider { | 641 | impl CompletionProvider for TestCompletionProvider { |
| 642 | fn base_model(&self) -> Box<dyn LanguageModel> { | ||
| 643 | let model: Box<dyn LanguageModel> = Box::new(FakeLanguageModel { capacity: 8190 }); | ||
| 644 | model | ||
| 645 | } | ||
| 641 | fn complete( | 646 | fn complete( |
| 642 | &self, | 647 | &self, |
| 643 | _prompt: Box<dyn CompletionRequest>, | 648 | _prompt: Box<dyn CompletionRequest>, |