
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
90 lines
2.9 KiB
Rust
90 lines
2.9 KiB
Rust
use anthropic::{AnthropicError, ANTHROPIC_API_URL};
|
|
use anyhow::{anyhow, Context as _, Result};
|
|
use client::telemetry::Telemetry;
|
|
use gpui::BackgroundExecutor;
|
|
use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
|
|
use std::env;
|
|
use std::sync::Arc;
|
|
use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
|
|
use util::ResultExt;
|
|
|
|
use crate::provider::anthropic::PROVIDER_ID as ANTHROPIC_PROVIDER_ID;
|
|
|
|
pub fn report_assistant_event(
|
|
event: AssistantEvent,
|
|
telemetry: Option<Arc<Telemetry>>,
|
|
client: Arc<dyn HttpClient>,
|
|
model_api_key: Option<String>,
|
|
executor: &BackgroundExecutor,
|
|
) {
|
|
if let Some(telemetry) = telemetry.as_ref() {
|
|
telemetry.report_assistant_event(event.clone());
|
|
if telemetry.metrics_enabled() && event.model_provider == ANTHROPIC_PROVIDER_ID {
|
|
executor
|
|
.spawn(async move {
|
|
report_anthropic_event(event, client, model_api_key)
|
|
.await
|
|
.log_err();
|
|
})
|
|
.detach();
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn report_anthropic_event(
|
|
event: AssistantEvent,
|
|
client: Arc<dyn HttpClient>,
|
|
model_api_key: Option<String>,
|
|
) -> Result<(), AnthropicError> {
|
|
let api_key = match model_api_key {
|
|
Some(key) => key,
|
|
None => {
|
|
return Err(AnthropicError::Other(anyhow!(
|
|
"Anthropic API key is not set"
|
|
)));
|
|
}
|
|
};
|
|
|
|
let uri = format!("{ANTHROPIC_API_URL}/v1/log/zed");
|
|
let request_builder = HttpRequest::builder()
|
|
.method(Method::POST)
|
|
.uri(uri)
|
|
.header("X-Api-Key", api_key)
|
|
.header("Content-Type", "application/json");
|
|
let serialized_event: serde_json::Value = serde_json::json!({
|
|
"completion_type": match event.kind {
|
|
AssistantKind::Inline => "natural_language_completion_in_editor",
|
|
AssistantKind::InlineTerminal => "natural_language_completion_in_terminal",
|
|
AssistantKind::Panel => "conversation_message",
|
|
},
|
|
"event": match event.phase {
|
|
AssistantPhase::Response => "response",
|
|
AssistantPhase::Invoked => "invoke",
|
|
AssistantPhase::Accepted => "accept",
|
|
AssistantPhase::Rejected => "reject",
|
|
},
|
|
"metadata": {
|
|
"language_name": event.language_name,
|
|
"message_id": event.message_id,
|
|
"platform": env::consts::OS,
|
|
}
|
|
});
|
|
|
|
let request = request_builder
|
|
.body(AsyncBody::from(serialized_event.to_string()))
|
|
.context("failed to construct request body")?;
|
|
|
|
let response = client
|
|
.send(request)
|
|
.await
|
|
.context("failed to send request to Anthropic")?;
|
|
|
|
if response.status().is_success() {
|
|
return Ok(());
|
|
}
|
|
|
|
return Err(AnthropicError::Other(anyhow!(
|
|
"Failed to log: {}",
|
|
response.status(),
|
|
)));
|
|
}
|