This PR removes some unnecessary `String` cloning in the tool use paths. We now store the data in `Arc<str>`s for cheap cloning. Release Notes: - N/A
1023 lines
37 KiB
Rust
1023 lines
37 KiB
Rust
use std::pin::Pin;
|
|
use std::str::FromStr;
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::{anyhow, Context as _, Result};
|
|
use aws_config::stalled_stream_protection::StalledStreamProtectionConfig;
|
|
use aws_config::Region;
|
|
use aws_credential_types::Credentials;
|
|
use aws_http_client::AwsHttpClient;
|
|
use bedrock::bedrock_client::types::{
|
|
ContentBlockDelta, ContentBlockStart, ContentBlockStartEvent, ConverseStreamOutput,
|
|
};
|
|
use bedrock::bedrock_client::{self, Config};
|
|
use bedrock::{
|
|
value_to_aws_document, BedrockError, BedrockInnerContent, BedrockMessage, BedrockSpecificTool,
|
|
BedrockStreamingResponse, BedrockTool, BedrockToolChoice, BedrockToolInputSchema, Model,
|
|
};
|
|
use collections::{BTreeMap, HashMap};
|
|
use credentials_provider::CredentialsProvider;
|
|
use editor::{Editor, EditorElement, EditorStyle};
|
|
use futures::{future::BoxFuture, stream::BoxStream, FutureExt, Stream, StreamExt};
|
|
use gpui::{
|
|
AnyView, App, AsyncApp, Context, Entity, FontStyle, Subscription, Task, TextStyle, WhiteSpace,
|
|
};
|
|
use gpui_tokio::Tokio;
|
|
use http_client::HttpClient;
|
|
use language_model::{
|
|
AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
|
|
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
|
|
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
|
|
LanguageModelRequest, LanguageModelToolUse, MessageContent, RateLimiter, Role,
|
|
};
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
use settings::{Settings, SettingsStore};
|
|
use strum::IntoEnumIterator;
|
|
use theme::ThemeSettings;
|
|
use tokio::runtime::Handle;
|
|
use ui::{prelude::*, Icon, IconName, Tooltip};
|
|
use util::{maybe, ResultExt};
|
|
|
|
use crate::AllLanguageModelSettings;
|
|
|
|
const PROVIDER_ID: &str = "amazon-bedrock";
|
|
const PROVIDER_NAME: &str = "Amazon Bedrock";
|
|
|
|
#[derive(Default, Clone, Deserialize, Serialize, PartialEq, Debug)]
|
|
pub struct BedrockCredentials {
|
|
pub region: String,
|
|
pub access_key_id: String,
|
|
pub secret_access_key: String,
|
|
}
|
|
|
|
#[derive(Default, Clone, Debug, PartialEq)]
|
|
pub struct AmazonBedrockSettings {
|
|
pub session_token: Option<String>,
|
|
pub available_models: Vec<AvailableModel>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema)]
|
|
pub struct AvailableModel {
|
|
pub name: String,
|
|
pub display_name: Option<String>,
|
|
pub max_tokens: usize,
|
|
pub cache_configuration: Option<LanguageModelCacheConfiguration>,
|
|
pub max_output_tokens: Option<u32>,
|
|
pub default_temperature: Option<f32>,
|
|
}
|
|
|
|
/// The URL of the base AWS service.
|
|
///
|
|
/// Right now we're just using this as the key to store the AWS credentials
|
|
/// under in the keychain.
|
|
const AMAZON_AWS_URL: &str = "https://amazonaws.com";
|
|
|
|
// These environment variables all use a `ZED_` prefix because we don't want to overwrite the user's AWS credentials.
|
|
const ZED_BEDROCK_ACCESS_KEY_ID_VAR: &str = "ZED_ACCESS_KEY_ID";
|
|
const ZED_BEDROCK_SECRET_ACCESS_KEY_VAR: &str = "ZED_SECRET_ACCESS_KEY";
|
|
const ZED_BEDROCK_REGION_VAR: &str = "ZED_AWS_REGION";
|
|
const ZED_AWS_CREDENTIALS_VAR: &str = "ZED_AWS_CREDENTIALS";
|
|
|
|
pub struct State {
|
|
credentials: Option<BedrockCredentials>,
|
|
credentials_from_env: bool,
|
|
_subscription: Subscription,
|
|
}
|
|
|
|
impl State {
|
|
fn reset_credentials(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
|
|
let credentials_provider = <dyn CredentialsProvider>::global(cx);
|
|
cx.spawn(|this, mut cx| async move {
|
|
credentials_provider
|
|
.delete_credentials(AMAZON_AWS_URL, &cx)
|
|
.await
|
|
.log_err();
|
|
this.update(&mut cx, |this, cx| {
|
|
this.credentials = None;
|
|
this.credentials_from_env = false;
|
|
cx.notify();
|
|
})
|
|
})
|
|
}
|
|
|
|
fn set_credentials(
|
|
&mut self,
|
|
credentials: BedrockCredentials,
|
|
cx: &mut Context<Self>,
|
|
) -> Task<Result<()>> {
|
|
let credentials_provider = <dyn CredentialsProvider>::global(cx);
|
|
cx.spawn(|this, mut cx| async move {
|
|
credentials_provider
|
|
.write_credentials(
|
|
AMAZON_AWS_URL,
|
|
"Bearer",
|
|
&serde_json::to_vec(&credentials)?,
|
|
&cx,
|
|
)
|
|
.await?;
|
|
this.update(&mut cx, |this, cx| {
|
|
this.credentials = Some(credentials);
|
|
cx.notify();
|
|
})
|
|
})
|
|
}
|
|
|
|
fn is_authenticated(&self) -> bool {
|
|
self.credentials.is_some()
|
|
}
|
|
|
|
fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
|
|
if self.is_authenticated() {
|
|
return Task::ready(Ok(()));
|
|
}
|
|
|
|
let credentials_provider = <dyn CredentialsProvider>::global(cx);
|
|
cx.spawn(|this, mut cx| async move {
|
|
let (credentials, from_env) =
|
|
if let Ok(credentials) = std::env::var(ZED_AWS_CREDENTIALS_VAR) {
|
|
(credentials, true)
|
|
} else {
|
|
let (_, credentials) = credentials_provider
|
|
.read_credentials(AMAZON_AWS_URL, &cx)
|
|
.await?
|
|
.ok_or_else(|| AuthenticateError::CredentialsNotFound)?;
|
|
(
|
|
String::from_utf8(credentials)
|
|
.context("invalid {PROVIDER_NAME} credentials")?,
|
|
false,
|
|
)
|
|
};
|
|
|
|
let credentials: BedrockCredentials =
|
|
serde_json::from_str(&credentials).context("failed to parse credentials")?;
|
|
|
|
this.update(&mut cx, |this, cx| {
|
|
this.credentials = Some(credentials);
|
|
this.credentials_from_env = from_env;
|
|
cx.notify();
|
|
})?;
|
|
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
pub struct BedrockLanguageModelProvider {
|
|
http_client: AwsHttpClient,
|
|
handler: tokio::runtime::Handle,
|
|
state: gpui::Entity<State>,
|
|
}
|
|
|
|
impl BedrockLanguageModelProvider {
|
|
pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
|
|
let state = cx.new(|cx| State {
|
|
credentials: None,
|
|
credentials_from_env: false,
|
|
_subscription: cx.observe_global::<SettingsStore>(|_, cx| {
|
|
cx.notify();
|
|
}),
|
|
});
|
|
|
|
let tokio_handle = Tokio::handle(cx);
|
|
|
|
let coerced_client = AwsHttpClient::new(http_client.clone(), tokio_handle.clone());
|
|
|
|
Self {
|
|
http_client: coerced_client,
|
|
handler: tokio_handle.clone(),
|
|
state,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl LanguageModelProvider for BedrockLanguageModelProvider {
|
|
fn id(&self) -> LanguageModelProviderId {
|
|
LanguageModelProviderId(PROVIDER_ID.into())
|
|
}
|
|
|
|
fn name(&self) -> LanguageModelProviderName {
|
|
LanguageModelProviderName(PROVIDER_NAME.into())
|
|
}
|
|
|
|
fn icon(&self) -> IconName {
|
|
IconName::AiBedrock
|
|
}
|
|
|
|
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
|
|
let model = bedrock::Model::default();
|
|
Some(Arc::new(BedrockModel {
|
|
id: LanguageModelId::from(model.id().to_string()),
|
|
model,
|
|
http_client: self.http_client.clone(),
|
|
handler: self.handler.clone(),
|
|
state: self.state.clone(),
|
|
request_limiter: RateLimiter::new(4),
|
|
}))
|
|
}
|
|
|
|
fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
|
|
let mut models = BTreeMap::default();
|
|
|
|
for model in bedrock::Model::iter() {
|
|
if !matches!(model, bedrock::Model::Custom { .. }) {
|
|
models.insert(model.id().to_string(), model);
|
|
}
|
|
}
|
|
|
|
// Override with available models from settings
|
|
for model in AllLanguageModelSettings::get_global(cx)
|
|
.bedrock
|
|
.available_models
|
|
.iter()
|
|
{
|
|
models.insert(
|
|
model.name.clone(),
|
|
bedrock::Model::Custom {
|
|
name: model.name.clone(),
|
|
display_name: model.display_name.clone(),
|
|
max_tokens: model.max_tokens,
|
|
max_output_tokens: model.max_output_tokens,
|
|
default_temperature: model.default_temperature,
|
|
},
|
|
);
|
|
}
|
|
|
|
models
|
|
.into_values()
|
|
.map(|model| {
|
|
Arc::new(BedrockModel {
|
|
id: LanguageModelId::from(model.id().to_string()),
|
|
model,
|
|
http_client: self.http_client.clone(),
|
|
handler: self.handler.clone(),
|
|
state: self.state.clone(),
|
|
request_limiter: RateLimiter::new(4),
|
|
}) as Arc<dyn LanguageModel>
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
fn is_authenticated(&self, cx: &App) -> bool {
|
|
self.state.read(cx).is_authenticated()
|
|
}
|
|
|
|
fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
|
|
self.state.update(cx, |state, cx| state.authenticate(cx))
|
|
}
|
|
|
|
fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
|
|
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
|
|
.into()
|
|
}
|
|
|
|
fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
|
|
self.state
|
|
.update(cx, |state, cx| state.reset_credentials(cx))
|
|
}
|
|
}
|
|
|
|
impl LanguageModelProviderState for BedrockLanguageModelProvider {
|
|
type ObservableEntity = State;
|
|
|
|
fn observable_entity(&self) -> Option<gpui::Entity<Self::ObservableEntity>> {
|
|
Some(self.state.clone())
|
|
}
|
|
}
|
|
|
|
struct BedrockModel {
|
|
id: LanguageModelId,
|
|
model: Model,
|
|
http_client: AwsHttpClient,
|
|
handler: tokio::runtime::Handle,
|
|
state: gpui::Entity<State>,
|
|
request_limiter: RateLimiter,
|
|
}
|
|
|
|
impl BedrockModel {
|
|
fn stream_completion(
|
|
&self,
|
|
request: bedrock::Request,
|
|
cx: &AsyncApp,
|
|
) -> Result<
|
|
BoxFuture<'static, BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>>,
|
|
> {
|
|
let Ok(Ok((access_key_id, secret_access_key, region))) =
|
|
cx.read_entity(&self.state, |state, _cx| {
|
|
if let Some(credentials) = &state.credentials {
|
|
Ok((
|
|
credentials.access_key_id.clone(),
|
|
credentials.secret_access_key.clone(),
|
|
credentials.region.clone(),
|
|
))
|
|
} else {
|
|
return Err(anyhow!("Failed to read credentials"));
|
|
}
|
|
})
|
|
else {
|
|
return Err(anyhow!("App state dropped"));
|
|
};
|
|
|
|
let runtime_client = bedrock_client::Client::from_conf(
|
|
Config::builder()
|
|
.stalled_stream_protection(StalledStreamProtectionConfig::disabled())
|
|
.credentials_provider(Credentials::new(
|
|
access_key_id,
|
|
secret_access_key,
|
|
None,
|
|
None,
|
|
"Keychain",
|
|
))
|
|
.region(Region::new(region))
|
|
.http_client(self.http_client.clone())
|
|
.build(),
|
|
);
|
|
|
|
let owned_handle = self.handler.clone();
|
|
|
|
Ok(async move {
|
|
let request = bedrock::stream_completion(runtime_client, request, owned_handle);
|
|
request.await.unwrap_or_else(|e| {
|
|
futures::stream::once(async move { Err(BedrockError::ClientError(e)) }).boxed()
|
|
})
|
|
}
|
|
.boxed())
|
|
}
|
|
}
|
|
|
|
impl LanguageModel for BedrockModel {
|
|
fn id(&self) -> LanguageModelId {
|
|
self.id.clone()
|
|
}
|
|
|
|
fn name(&self) -> LanguageModelName {
|
|
LanguageModelName::from(self.model.display_name().to_string())
|
|
}
|
|
|
|
fn provider_id(&self) -> LanguageModelProviderId {
|
|
LanguageModelProviderId(PROVIDER_ID.into())
|
|
}
|
|
|
|
fn provider_name(&self) -> LanguageModelProviderName {
|
|
LanguageModelProviderName(PROVIDER_NAME.into())
|
|
}
|
|
|
|
fn telemetry_id(&self) -> String {
|
|
format!("bedrock/{}", self.model.id())
|
|
}
|
|
|
|
fn max_token_count(&self) -> usize {
|
|
self.model.max_token_count()
|
|
}
|
|
|
|
fn max_output_tokens(&self) -> Option<u32> {
|
|
Some(self.model.max_output_tokens())
|
|
}
|
|
|
|
fn count_tokens(
|
|
&self,
|
|
request: LanguageModelRequest,
|
|
cx: &App,
|
|
) -> BoxFuture<'static, Result<usize>> {
|
|
get_bedrock_tokens(request, cx)
|
|
}
|
|
|
|
fn stream_completion(
|
|
&self,
|
|
request: LanguageModelRequest,
|
|
cx: &AsyncApp,
|
|
) -> BoxFuture<'static, Result<BoxStream<'static, Result<LanguageModelCompletionEvent>>>> {
|
|
let request = into_bedrock(
|
|
request,
|
|
self.model.id().into(),
|
|
self.model.default_temperature(),
|
|
self.model.max_output_tokens(),
|
|
);
|
|
|
|
let owned_handle = self.handler.clone();
|
|
|
|
let request = self.stream_completion(request, cx);
|
|
let future = self.request_limiter.stream(async move {
|
|
let response = request.map_err(|e| anyhow!(e)).unwrap().await;
|
|
Ok(map_to_language_model_completion_events(
|
|
response,
|
|
owned_handle,
|
|
))
|
|
});
|
|
async move { Ok(future.await?.boxed()) }.boxed()
|
|
}
|
|
|
|
fn use_any_tool(
|
|
&self,
|
|
request: LanguageModelRequest,
|
|
name: String,
|
|
description: String,
|
|
schema: Value,
|
|
_cx: &AsyncApp,
|
|
) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
|
|
let mut request = into_bedrock(
|
|
request,
|
|
self.model.id().into(),
|
|
self.model.default_temperature(),
|
|
self.model.max_output_tokens(),
|
|
);
|
|
|
|
request.tool_choice = Some(BedrockToolChoice::Tool(
|
|
BedrockSpecificTool::builder()
|
|
.name(name.clone())
|
|
.build()
|
|
.unwrap(),
|
|
));
|
|
|
|
request.tools = vec![BedrockTool::builder()
|
|
.name(name.clone())
|
|
.description(description.clone())
|
|
.input_schema(BedrockToolInputSchema::Json(value_to_aws_document(&schema)))
|
|
.build()
|
|
.unwrap()];
|
|
|
|
let handle = self.handler.clone();
|
|
|
|
let request = self.stream_completion(request, _cx);
|
|
self.request_limiter
|
|
.run(async move {
|
|
let response = request.map_err(|e| anyhow!(e)).unwrap().await;
|
|
Ok(extract_tool_args_from_events(name, response, handle)
|
|
.await?
|
|
.boxed())
|
|
})
|
|
.boxed()
|
|
}
|
|
|
|
fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
|
|
None
|
|
}
|
|
}
|
|
|
|
pub fn into_bedrock(
|
|
request: LanguageModelRequest,
|
|
model: String,
|
|
default_temperature: f32,
|
|
max_output_tokens: u32,
|
|
) -> bedrock::Request {
|
|
let mut new_messages: Vec<BedrockMessage> = Vec::new();
|
|
let mut system_message = String::new();
|
|
|
|
for message in request.messages {
|
|
if message.contents_empty() {
|
|
continue;
|
|
}
|
|
|
|
match message.role {
|
|
Role::User | Role::Assistant => {
|
|
let bedrock_message_content: Vec<BedrockInnerContent> = message
|
|
.content
|
|
.into_iter()
|
|
.filter_map(|content| match content {
|
|
MessageContent::Text(text) => {
|
|
if !text.is_empty() {
|
|
Some(BedrockInnerContent::Text(text))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
_ => None,
|
|
})
|
|
.collect();
|
|
let bedrock_role = match message.role {
|
|
Role::User => bedrock::BedrockRole::User,
|
|
Role::Assistant => bedrock::BedrockRole::Assistant,
|
|
Role::System => unreachable!("System role should never occur here"),
|
|
};
|
|
if let Some(last_message) = new_messages.last_mut() {
|
|
if last_message.role == bedrock_role {
|
|
last_message.content.extend(bedrock_message_content);
|
|
continue;
|
|
}
|
|
}
|
|
new_messages.push(
|
|
BedrockMessage::builder()
|
|
.role(bedrock_role)
|
|
.set_content(Some(bedrock_message_content))
|
|
.build()
|
|
.expect("failed to build Bedrock message"),
|
|
);
|
|
}
|
|
Role::System => {
|
|
if !system_message.is_empty() {
|
|
system_message.push_str("\n\n");
|
|
}
|
|
system_message.push_str(&message.string_contents());
|
|
}
|
|
}
|
|
}
|
|
|
|
bedrock::Request {
|
|
model,
|
|
messages: new_messages,
|
|
max_tokens: max_output_tokens,
|
|
system: Some(system_message),
|
|
tools: vec![],
|
|
tool_choice: None,
|
|
metadata: None,
|
|
stop_sequences: Vec::new(),
|
|
temperature: request.temperature.or(Some(default_temperature)),
|
|
top_k: None,
|
|
top_p: None,
|
|
}
|
|
}
|
|
|
|
// TODO: just call the ConverseOutput.usage() method:
|
|
// https://docs.rs/aws-sdk-bedrockruntime/latest/aws_sdk_bedrockruntime/operation/converse/struct.ConverseOutput.html#method.output
|
|
pub fn get_bedrock_tokens(
|
|
request: LanguageModelRequest,
|
|
cx: &App,
|
|
) -> BoxFuture<'static, Result<usize>> {
|
|
cx.background_executor()
|
|
.spawn(async move {
|
|
let messages = request.messages;
|
|
let mut tokens_from_images = 0;
|
|
let mut string_messages = Vec::with_capacity(messages.len());
|
|
|
|
for message in messages {
|
|
use language_model::MessageContent;
|
|
|
|
let mut string_contents = String::new();
|
|
|
|
for content in message.content {
|
|
match content {
|
|
MessageContent::Text(text) => {
|
|
string_contents.push_str(&text);
|
|
}
|
|
MessageContent::Image(image) => {
|
|
tokens_from_images += image.estimate_tokens();
|
|
}
|
|
MessageContent::ToolUse(_tool_use) => {
|
|
// TODO: Estimate token usage from tool uses.
|
|
}
|
|
MessageContent::ToolResult(tool_result) => {
|
|
string_contents.push_str(&tool_result.content);
|
|
}
|
|
}
|
|
}
|
|
|
|
if !string_contents.is_empty() {
|
|
string_messages.push(tiktoken_rs::ChatCompletionRequestMessage {
|
|
role: match message.role {
|
|
Role::User => "user".into(),
|
|
Role::Assistant => "assistant".into(),
|
|
Role::System => "system".into(),
|
|
},
|
|
content: Some(string_contents),
|
|
name: None,
|
|
function_call: None,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Tiktoken doesn't yet support these models, so we manually use the
|
|
// same tokenizer as GPT-4.
|
|
tiktoken_rs::num_tokens_from_messages("gpt-4", &string_messages)
|
|
.map(|tokens| tokens + tokens_from_images)
|
|
})
|
|
.boxed()
|
|
}
|
|
|
|
pub async fn extract_tool_args_from_events(
|
|
name: String,
|
|
mut events: Pin<Box<dyn Send + Stream<Item = Result<BedrockStreamingResponse, BedrockError>>>>,
|
|
handle: Handle,
|
|
) -> Result<impl Send + Stream<Item = Result<String>>> {
|
|
handle
|
|
.spawn(async move {
|
|
let mut tool_use_index = None;
|
|
while let Some(event) = events.next().await {
|
|
if let BedrockStreamingResponse::ContentBlockStart(ContentBlockStartEvent {
|
|
content_block_index,
|
|
start,
|
|
..
|
|
}) = event?
|
|
{
|
|
match start {
|
|
None => {
|
|
continue;
|
|
}
|
|
Some(start) => match start.as_tool_use() {
|
|
Ok(tool_use) => {
|
|
if name == tool_use.name {
|
|
tool_use_index = Some(content_block_index);
|
|
break;
|
|
}
|
|
}
|
|
Err(err) => {
|
|
return Err(anyhow!("Failed to parse tool use event: {:?}", err));
|
|
}
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
let Some(tool_use_index) = tool_use_index else {
|
|
return Err(anyhow!("Tool is not used"));
|
|
};
|
|
|
|
Ok(events.filter_map(move |event| {
|
|
let result = match event {
|
|
Err(_err) => None,
|
|
Ok(output) => match output.clone() {
|
|
BedrockStreamingResponse::ContentBlockDelta(inner) => {
|
|
match inner.clone().delta {
|
|
Some(ContentBlockDelta::ToolUse(tool_use)) => {
|
|
if inner.content_block_index == tool_use_index {
|
|
Some(Ok(tool_use.input))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
_ => None,
|
|
},
|
|
};
|
|
|
|
async move { result }
|
|
}))
|
|
})
|
|
.await?
|
|
}
|
|
|
|
pub fn map_to_language_model_completion_events(
|
|
events: Pin<Box<dyn Send + Stream<Item = Result<BedrockStreamingResponse, BedrockError>>>>,
|
|
handle: Handle,
|
|
) -> impl Stream<Item = Result<LanguageModelCompletionEvent>> {
|
|
struct RawToolUse {
|
|
id: String,
|
|
name: String,
|
|
input_json: String,
|
|
}
|
|
|
|
struct State {
|
|
events: Pin<Box<dyn Send + Stream<Item = Result<BedrockStreamingResponse, BedrockError>>>>,
|
|
tool_uses_by_index: HashMap<i32, RawToolUse>,
|
|
}
|
|
|
|
futures::stream::unfold(
|
|
State {
|
|
events,
|
|
tool_uses_by_index: HashMap::default(),
|
|
},
|
|
move |mut state: State| {
|
|
let inner_handle = handle.clone();
|
|
async move {
|
|
inner_handle
|
|
.spawn(async {
|
|
while let Some(event) = state.events.next().await {
|
|
match event {
|
|
Ok(event) => match event {
|
|
ConverseStreamOutput::ContentBlockDelta(cb_delta) => {
|
|
if let Some(ContentBlockDelta::Text(text_out)) =
|
|
cb_delta.delta
|
|
{
|
|
return Some((
|
|
Some(Ok(LanguageModelCompletionEvent::Text(
|
|
text_out,
|
|
))),
|
|
state,
|
|
));
|
|
} else if let Some(ContentBlockDelta::ToolUse(text_out)) =
|
|
cb_delta.delta
|
|
{
|
|
if let Some(tool_use) = state
|
|
.tool_uses_by_index
|
|
.get_mut(&cb_delta.content_block_index)
|
|
{
|
|
tool_use.input_json.push_str(text_out.input());
|
|
return Some((None, state));
|
|
};
|
|
|
|
return Some((None, state));
|
|
} else if cb_delta.delta.is_none() {
|
|
return Some((None, state));
|
|
}
|
|
}
|
|
ConverseStreamOutput::ContentBlockStart(cb_start) => {
|
|
if let Some(start) = cb_start.start {
|
|
match start {
|
|
ContentBlockStart::ToolUse(text_out) => {
|
|
let tool_use = RawToolUse {
|
|
id: text_out.tool_use_id,
|
|
name: text_out.name,
|
|
input_json: String::new(),
|
|
};
|
|
|
|
state.tool_uses_by_index.insert(
|
|
cb_start.content_block_index,
|
|
tool_use,
|
|
);
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
ConverseStreamOutput::ContentBlockStop(cb_stop) => {
|
|
if let Some(tool_use) = state
|
|
.tool_uses_by_index
|
|
.remove(&cb_stop.content_block_index)
|
|
{
|
|
return Some((
|
|
Some(maybe!({
|
|
Ok(LanguageModelCompletionEvent::ToolUse(
|
|
LanguageModelToolUse {
|
|
id: tool_use.id.into(),
|
|
name: tool_use.name.into(),
|
|
input: if tool_use.input_json.is_empty()
|
|
{
|
|
Value::Null
|
|
} else {
|
|
serde_json::Value::from_str(
|
|
&tool_use.input_json,
|
|
)
|
|
.map_err(|err| anyhow!(err))?
|
|
},
|
|
},
|
|
))
|
|
})),
|
|
state,
|
|
));
|
|
}
|
|
}
|
|
_ => {}
|
|
},
|
|
Err(err) => return Some((Some(Err(anyhow!(err))), state)),
|
|
}
|
|
}
|
|
None
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|
|
},
|
|
)
|
|
.filter_map(|event| async move { event })
|
|
}
|
|
|
|
struct ConfigurationView {
|
|
access_key_id_editor: Entity<Editor>,
|
|
secret_access_key_editor: Entity<Editor>,
|
|
region_editor: Entity<Editor>,
|
|
state: gpui::Entity<State>,
|
|
load_credentials_task: Option<Task<()>>,
|
|
}
|
|
|
|
impl ConfigurationView {
|
|
const PLACEHOLDER_TEXT: &'static str = "XXXXXXXXXXXXXXXXXXX";
|
|
const PLACEHOLDER_REGION: &'static str = "us-east-1";
|
|
|
|
fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
|
|
cx.observe(&state, |_, _, cx| {
|
|
cx.notify();
|
|
})
|
|
.detach();
|
|
|
|
let load_credentials_task = Some(cx.spawn({
|
|
let state = state.clone();
|
|
|this, mut cx| async move {
|
|
if let Some(task) = state
|
|
.update(&mut cx, |state, cx| state.authenticate(cx))
|
|
.log_err()
|
|
{
|
|
// We don't log an error, because "not signed in" is also an error.
|
|
let _ = task.await;
|
|
}
|
|
this.update(&mut cx, |this, cx| {
|
|
this.load_credentials_task = None;
|
|
cx.notify();
|
|
})
|
|
.log_err();
|
|
}
|
|
}));
|
|
|
|
Self {
|
|
access_key_id_editor: cx.new(|cx| {
|
|
let mut editor = Editor::single_line(window, cx);
|
|
editor.set_placeholder_text(Self::PLACEHOLDER_TEXT, cx);
|
|
editor
|
|
}),
|
|
secret_access_key_editor: cx.new(|cx| {
|
|
let mut editor = Editor::single_line(window, cx);
|
|
editor.set_placeholder_text(Self::PLACEHOLDER_TEXT, cx);
|
|
editor
|
|
}),
|
|
region_editor: cx.new(|cx| {
|
|
let mut editor = Editor::single_line(window, cx);
|
|
editor.set_placeholder_text(Self::PLACEHOLDER_REGION, cx);
|
|
editor
|
|
}),
|
|
state,
|
|
load_credentials_task,
|
|
}
|
|
}
|
|
|
|
fn save_credentials(
|
|
&mut self,
|
|
_: &menu::Confirm,
|
|
_window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let access_key_id = self
|
|
.access_key_id_editor
|
|
.read(cx)
|
|
.text(cx)
|
|
.to_string()
|
|
.trim()
|
|
.to_string();
|
|
let secret_access_key = self
|
|
.secret_access_key_editor
|
|
.read(cx)
|
|
.text(cx)
|
|
.to_string()
|
|
.trim()
|
|
.to_string();
|
|
let region = self
|
|
.region_editor
|
|
.read(cx)
|
|
.text(cx)
|
|
.to_string()
|
|
.trim()
|
|
.to_string();
|
|
|
|
let state = self.state.clone();
|
|
cx.spawn(|_, mut cx| async move {
|
|
state
|
|
.update(&mut cx, |state, cx| {
|
|
let credentials: BedrockCredentials = BedrockCredentials {
|
|
access_key_id: access_key_id.clone(),
|
|
secret_access_key: secret_access_key.clone(),
|
|
region: region.clone(),
|
|
};
|
|
|
|
state.set_credentials(credentials, cx)
|
|
})?
|
|
.await
|
|
})
|
|
.detach_and_log_err(cx);
|
|
}
|
|
|
|
fn reset_credentials(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
|
self.access_key_id_editor
|
|
.update(cx, |editor, cx| editor.set_text("", window, cx));
|
|
self.secret_access_key_editor
|
|
.update(cx, |editor, cx| editor.set_text("", window, cx));
|
|
self.region_editor
|
|
.update(cx, |editor, cx| editor.set_text("", window, cx));
|
|
|
|
let state = self.state.clone();
|
|
cx.spawn(|_, mut cx| async move {
|
|
state
|
|
.update(&mut cx, |state, cx| state.reset_credentials(cx))?
|
|
.await
|
|
})
|
|
.detach_and_log_err(cx);
|
|
}
|
|
|
|
fn make_text_style(&self, cx: &Context<Self>) -> TextStyle {
|
|
let settings = ThemeSettings::get_global(cx);
|
|
TextStyle {
|
|
color: cx.theme().colors().text,
|
|
font_family: settings.ui_font.family.clone(),
|
|
font_features: settings.ui_font.features.clone(),
|
|
font_fallbacks: settings.ui_font.fallbacks.clone(),
|
|
font_size: rems(0.875).into(),
|
|
font_weight: settings.ui_font.weight,
|
|
font_style: FontStyle::Normal,
|
|
line_height: relative(1.3),
|
|
background_color: None,
|
|
underline: None,
|
|
strikethrough: None,
|
|
white_space: WhiteSpace::Normal,
|
|
text_overflow: None,
|
|
text_align: Default::default(),
|
|
line_clamp: None,
|
|
}
|
|
}
|
|
|
|
fn render_aa_id_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let text_style = self.make_text_style(cx);
|
|
|
|
EditorElement::new(
|
|
&self.access_key_id_editor,
|
|
EditorStyle {
|
|
background: cx.theme().colors().editor_background,
|
|
local_player: cx.theme().players().local(),
|
|
text: text_style,
|
|
..Default::default()
|
|
},
|
|
)
|
|
}
|
|
|
|
fn render_sk_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let text_style = self.make_text_style(cx);
|
|
|
|
EditorElement::new(
|
|
&self.secret_access_key_editor,
|
|
EditorStyle {
|
|
background: cx.theme().colors().editor_background,
|
|
local_player: cx.theme().players().local(),
|
|
text: text_style,
|
|
..Default::default()
|
|
},
|
|
)
|
|
}
|
|
|
|
fn render_region_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let text_style = self.make_text_style(cx);
|
|
|
|
EditorElement::new(
|
|
&self.region_editor,
|
|
EditorStyle {
|
|
background: cx.theme().colors().editor_background,
|
|
local_player: cx.theme().players().local(),
|
|
text: text_style,
|
|
..Default::default()
|
|
},
|
|
)
|
|
}
|
|
|
|
fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
|
|
!self.state.read(cx).is_authenticated()
|
|
}
|
|
}
|
|
|
|
impl Render for ConfigurationView {
|
|
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
const IAM_CONSOLE_URL: &str = "https://us-east-1.console.aws.amazon.com/iam/home";
|
|
const INSTRUCTIONS: [&str; 3] = [
|
|
"To use Zed's assistant with Bedrock, you need to add the Access Key ID, Secret Access Key and AWS Region. Follow these steps:",
|
|
"- Create a pair at:",
|
|
"- Paste your Access Key ID, Secret Key, and Region below and hit enter to use the assistant:",
|
|
];
|
|
let env_var_set = self.state.read(cx).credentials_from_env;
|
|
|
|
if self.load_credentials_task.is_some() {
|
|
div().child(Label::new("Loading credentials...")).into_any()
|
|
} else if self.should_render_editor(cx) {
|
|
v_flex()
|
|
.size_full()
|
|
.on_action(cx.listener(Self::save_credentials))
|
|
.child(Label::new(INSTRUCTIONS[0]))
|
|
.child(h_flex().child(Label::new(INSTRUCTIONS[1])).child(
|
|
Button::new("iam_console", IAM_CONSOLE_URL)
|
|
.style(ButtonStyle::Subtle)
|
|
.icon(IconName::ExternalLink)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.on_click(move |_, _window, cx| cx.open_url(IAM_CONSOLE_URL))
|
|
)
|
|
)
|
|
.child(Label::new(INSTRUCTIONS[2]))
|
|
.child(
|
|
h_flex()
|
|
.gap_1()
|
|
.child(self.render_aa_id_editor(cx))
|
|
.child(self.render_sk_editor(cx))
|
|
.child(self.render_region_editor(cx))
|
|
)
|
|
.child(
|
|
Label::new(
|
|
format!("You can also assign the {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR} and {ZED_BEDROCK_REGION_VAR} environment variable and restart Zed."),
|
|
)
|
|
.size(LabelSize::Small),
|
|
)
|
|
.into_any()
|
|
} else {
|
|
h_flex()
|
|
.size_full()
|
|
.justify_between()
|
|
.child(
|
|
h_flex()
|
|
.gap_1()
|
|
.child(Icon::new(IconName::Check).color(Color::Success))
|
|
.child(Label::new(if env_var_set {
|
|
format!("Access Key ID is set in {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, Secret Key is set in {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR}, Region is set in {ZED_BEDROCK_REGION_VAR} environment variables.")
|
|
} else {
|
|
"Credentials configured.".to_string()
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("reset-key", "Reset key")
|
|
.icon(Some(IconName::Trash))
|
|
.icon_size(IconSize::Small)
|
|
.icon_position(IconPosition::Start)
|
|
.disabled(env_var_set)
|
|
.when(env_var_set, |this| {
|
|
this.tooltip(Tooltip::text(format!("To reset your credentials, unset the {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR}, and {ZED_BEDROCK_REGION_VAR} environment variables.")))
|
|
})
|
|
.on_click(cx.listener(|this, _, window, cx| this.reset_credentials(window, cx))),
|
|
)
|
|
.into_any()
|
|
}
|
|
}
|
|
}
|