zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

ensure OpenAIEmbeddingProvider is using the provider credentials

Browse Source
This commit is contained in:
KCaverly 2023-10-27 08:33:35 +02:00
parent ca82ec8e8e
commit 6c8bb4b05e
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ai/src/providers/open_ai/embedding.rs
View File

@ -162,14 +162,15 @@ impl EmbeddingProvider for OpenAIEmbeddingProvider {
async fn embed_batch(
&self,
spans: Vec<String>,
_credential: ProviderCredential,
credential: ProviderCredential,
) -> Result<Vec<Embedding>> {
const BACKOFF_SECONDS: [usize; 4] = [3, 5, 15, 45];
const MAX_RETRIES: usize = 4;
let api_key = OPENAI_API_KEY
.as_ref()
.ok_or_else(|| anyhow!("no api key"))?;
let api_key = match credential {
ProviderCredential::Credentials { api_key } => anyhow::Ok(api_key),
_ => Err(anyhow!("no api key provided")),
}?;
let mut request_number = 0;
let mut rate_limiting = false;
@ -178,7 +179,7 @@ impl EmbeddingProvider for OpenAIEmbeddingProvider {
while request_number < MAX_RETRIES {
response = self
.send_request(
api_key,
&api_key,
spans.iter().map(|x| &**x).collect(),
request_timeout,
)

2
crates/semantic_index/src/embedding_queue.rs
View File

@ -41,7 +41,7 @@ pub struct EmbeddingQueue {
pending_batch_token_count: usize,
finished_files_tx: channel::Sender<FileToEmbed>,
finished_files_rx: channel::Receiver<FileToEmbed>,
provider_credential: ProviderCredential,
pub provider_credential: ProviderCredential,
}
#[derive(Clone)]

17
crates/semantic_index/src/semantic_index.rs
View File

@ -281,15 +281,13 @@ impl SemanticIndex {
}
pub fn authenticate(&mut self, cx: &AppContext) -> bool {
let credential = self.provider_credential.clone();
match credential {
ProviderCredential::NoCredentials => {
let credential = self.embedding_provider.retrieve_credentials(cx);
self.provider_credential = credential;
}
_ => {}
}
let existing_credential = self.provider_credential.clone();
let credential = match existing_credential {
ProviderCredential::NoCredentials => self.embedding_provider.retrieve_credentials(cx),
_ => existing_credential,
};
self.provider_credential = credential.clone();
self.embedding_queue.lock().set_credential(credential);
self.is_authenticated()
}
@ -1020,14 +1018,11 @@ impl SemanticIndex {
cx: &mut ModelContext<Self>,
) -> Task<Result<()>> {
if !self.is_authenticated() {
println!("Authenticating");
if !self.authenticate(cx) {
return Task::ready(Err(anyhow!("user is not authenticated")));
}
}
println!("SHOULD NOW BE AUTHENTICATED");
if !self.projects.contains_key(&project.downgrade()) {
let subscription = cx.subscribe(&project, |this, project, event, cx| match event {
project::Event::WorktreeAdded | project::Event::WorktreeRemoved(_) => {