Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Factor out invalid encrypted content completion error (#62512)

Conrad Irwina3d6515381b9
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 25fcb9313e8..0ef3e0c5343 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -4566,7 +4566,8 @@ impl Thread {
| PermissionError { .. }
| NoApiKey { .. }
| ApiEndpointNotFound { .. }
- | PromptTooLarge { .. } => None,
+ | PromptTooLarge { .. }
+ | InvalidEncryptedContent { .. } => None,
// These errors might be transient, so retry them
SerializeRequest { .. } | BuildRequestBody { .. } | StreamEndedUnexpectedly { .. } => {
Some(RetryStrategy::Fixed {
diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index c5dfcc60c2a..cfe70087be1 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -148,6 +148,11 @@ pub enum LanguageModelCompletionError {
provider: LanguageModelProviderName,
message: String,
},
+ #[error("invalid encrypted content from {provider}'s API: {message}")]
+ InvalidEncryptedContent {
+ provider: LanguageModelProviderName,
+ message: String,
+ },
#[error("authentication error with {provider}'s API: {message}")]
AuthenticationError {
provider: LanguageModelProviderName,
@@ -259,7 +264,9 @@ impl LanguageModelCompletionError {
) -> Self {
match status_code {
StatusCode::BAD_REQUEST => {
- if is_context_window_exceeded_message(&message) {
+ if is_invalid_encrypted_content_message(&message) {
+ Self::InvalidEncryptedContent { provider, message }
+ } else if is_context_window_exceeded_message(&message) {
Self::PromptTooLarge { tokens: None }
} else {
Self::BadRequestFormat { provider, message }
@@ -293,6 +300,18 @@ impl LanguageModelCompletionError {
}
}
+fn is_invalid_encrypted_content_message(message: &str) -> bool {
+ let Ok(response) = serde_json::from_str::<serde_json::Value>(message) else {
+ return false;
+ };
+ response
+ .get("error")
+ .and_then(|error| error.get("code"))
+ .or_else(|| response.get("code"))
+ .and_then(serde_json::Value::as_str)
+ == Some("invalid_encrypted_content")
+}
+
#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum StopReason {
@@ -697,6 +716,25 @@ mod tests {
));
}
+ #[test]
+ fn test_from_http_status_maps_invalid_encrypted_content() {
+ let message = r#"{"error":{"type":"invalid_request_error","code":"invalid_encrypted_content","message":"The encrypted content is invalid.","param":"input"}}"#;
+ let error = LanguageModelCompletionError::from_http_status(
+ String::from("OpenAI").into(),
+ StatusCode::BAD_REQUEST,
+ message.to_string(),
+ None,
+ );
+
+ assert!(matches!(
+ error,
+ LanguageModelCompletionError::InvalidEncryptedContent {
+ provider,
+ message: error_message,
+ } if provider.0 == "OpenAI" && error_message == message
+ ));
+ }
+
#[test]
fn test_from_cloud_failure_with_standard_format() {
let error = LanguageModelCompletionError::from_cloud_failure(