History

add concept of LanguageModel to CompletionProvider

KCaverly committed 3 years ago

Commit ec9d79b1 parent 6c8bb4b5 files · +27 −4Browse files

Unified · Split

5 files
  1. crates/ai/src/completion.rs +3 −0
  2. crates/ai/src/providers/open_ai/completion.rs +18 −3
  3. crates/ai/src/providers/open_ai/embedding.rs +0 −1
  4. crates/assistant/src/assistant_panel.rs +1 −0
  5. crates/assistant/src/codegen.rs +5 −0
crates/ai/src/completion.rs+3−0
@@ -1,11 +1,14 @@
11 use anyhow::Result;
22 use futures::{future::BoxFuture, stream::BoxStream};
33
4+use crate::models::LanguageModel;
5+
46 pub trait CompletionRequest: Send + Sync {
57 fn data(&self) -> serde_json::Result<String>;
68 }
79
810 pub trait CompletionProvider {
11+ fn base_model(&self) -> Box<dyn LanguageModel>;
912 fn complete(
1013 &self,
1114 prompt: Box<dyn CompletionRequest>,
crates/ai/src/providers/open_ai/completion.rs+18−3
@@ -12,7 +12,12 @@ use std::{ · 11 unmodified lines
1212 sync::Arc,
1313 };
1414
15−use crate::completion::{CompletionProvider, CompletionRequest};
15+use crate::{
16+ completion::{CompletionProvider, CompletionRequest},
17+ models::LanguageModel,
18+};
19+
20+use super::OpenAILanguageModel;
1621
1722 pub const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";
1823
@@ -180,17 +185,27 @@ pub async fn stream_completion( · 161 unmodified lines
180185 }
181186
182187 pub struct OpenAICompletionProvider {
188+ model: OpenAILanguageModel,
183189 api_key: String,
184190 executor: Arc<Background>,
185191 }
186192
187193 impl OpenAICompletionProvider {
188− pub fn new(api_key: String, executor: Arc<Background>) -> Self {
189− Self { api_key, executor }
194+ pub fn new(model_name: &str, api_key: String, executor: Arc<Background>) -> Self {
195+ let model = OpenAILanguageModel::load(model_name);
196+ Self {
197+ model,
198+ api_key,
199+ executor,
200+ }
190201 }
191202 }
192203
193204 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+ }
194209 fn complete(
195210 &self,
196211 prompt: Box<dyn CompletionRequest>,
crates/ai/src/providers/open_ai/embedding.rs+0−1
@@ -26,7 +26,6 @@ use crate::providers::open_ai::OpenAILanguageModel; · 25 unmodified lines
2626 use crate::providers::open_ai::auth::OpenAICredentialProvider;
2727
2828 lazy_static! {
29− static ref OPENAI_API_KEY: Option<String> = env::var("OPENAI_API_KEY").ok();
3029 static ref OPENAI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap();
3130 }
3231
crates/assistant/src/assistant_panel.rs+1−0
@@ -328,6 +328,7 @@ impl AssistantPanel { · 327 unmodified lines
328328
329329 let inline_assist_id = post_inc(&mut self.next_inline_assist_id);
330330 let provider = Arc::new(OpenAICompletionProvider::new(
331+ "gpt-4",
331332 api_key,
332333 cx.background().clone(),
333334 ));
crates/assistant/src/codegen.rs+5−0
@@ -335,6 +335,7 @@ fn strip_markdown_codeblock( · 334 unmodified lines
335335 #[cfg(test)]
336336 mod tests {
337337 use super::*;
338+ use ai::{models::LanguageModel, test::FakeLanguageModel};
338339 use futures::{
339340 future::BoxFuture,
340341 stream::{self, BoxStream},
@@ -638,6 +639,10 @@ mod tests { · 297 unmodified lines
638639 }
639640
640641 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+ }
641646 fn complete(
642647 &self,
643648 _prompt: Box<dyn CompletionRequest>,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t