Skip to content

fix(sight): replace hand-rolled new_id with uuid v4 #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfeng18 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sight): replace hand-rolled new_id with uuid v4 #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/agentsight/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ symbolic-demangle = { version = "12.10.0", default-features = false, features =
thiserror = "1.0.63"
typed-arena = "2.0.2"
uname = "0.1.1"
uuid = { version = "1", features = ["v4"] }
# Static link OpenSSL to avoid runtime dependency on libssl.so.1.1
openssl = { version = "0.10", features = ["vendored"] }
flate2 = "1"
Expand Down
236 changes: 157 additions & 79 deletions src/agentsight/src/interruption/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,54 +37,54 @@ impl InterruptionType {
/// String identifier stored in the database
pub fn as_str(&self) -> &'static str {
match self {
Self::AgentCrash => "agent_crash",
Self::RateLimit => "rate_limit",
Self::AuthError => "auth_error",
Self::NetworkTimeout => "network_timeout",
Self::AgentCrash => "agent_crash",
Self::RateLimit => "rate_limit",
Self::AuthError => "auth_error",
Self::NetworkTimeout => "network_timeout",
Self::ServiceUnavailable => "service_unavailable",
Self::SafetyFilter => "safety_filter",
Self::SseTruncated => "sse_truncated",
Self::ContextOverflow => "context_overflow",
Self::TokenLimit => "token_limit",
Self::LlmError => "llm_error",
Self::RetryStorm => "retry_storm",
Self::DeadLoop => "dead_loop",
Self::SafetyFilter => "safety_filter",
Self::SseTruncated => "sse_truncated",
Self::ContextOverflow => "context_overflow",
Self::TokenLimit => "token_limit",
Self::LlmError => "llm_error",
Self::RetryStorm => "retry_storm",
Self::DeadLoop => "dead_loop",
}
}

pub fn from_str(s: &str) -> Option<Self> {
match s {
"agent_crash" => Some(Self::AgentCrash),
"rate_limit" => Some(Self::RateLimit),
"auth_error" => Some(Self::AuthError),
"network_timeout" => Some(Self::NetworkTimeout),
"agent_crash" => Some(Self::AgentCrash),
"rate_limit" => Some(Self::RateLimit),
"auth_error" => Some(Self::AuthError),
"network_timeout" => Some(Self::NetworkTimeout),
"service_unavailable" => Some(Self::ServiceUnavailable),
"safety_filter" => Some(Self::SafetyFilter),
"sse_truncated" => Some(Self::SseTruncated),
"context_overflow" => Some(Self::ContextOverflow),
"token_limit" => Some(Self::TokenLimit),
"llm_error" => Some(Self::LlmError),
"retry_storm" => Some(Self::RetryStorm),
"dead_loop" => Some(Self::DeadLoop),
"safety_filter" => Some(Self::SafetyFilter),
"sse_truncated" => Some(Self::SseTruncated),
"context_overflow" => Some(Self::ContextOverflow),
"token_limit" => Some(Self::TokenLimit),
"llm_error" => Some(Self::LlmError),
"retry_storm" => Some(Self::RetryStorm),
"dead_loop" => Some(Self::DeadLoop),
_ => None,
}
}

/// Default severity for this interruption type
pub fn default_severity(&self) -> Severity {
match self {
Self::AgentCrash => Severity::Critical,
Self::RateLimit => Severity::Medium,
Self::AuthError => Severity::High,
Self::NetworkTimeout => Severity::High,
Self::AgentCrash => Severity::Critical,
Self::RateLimit => Severity::Medium,
Self::AuthError => Severity::High,
Self::NetworkTimeout => Severity::High,
Self::ServiceUnavailable => Severity::High,
Self::SafetyFilter => Severity::Medium,
Self::SseTruncated => Severity::High,
Self::ContextOverflow => Severity::High,
Self::TokenLimit => Severity::Medium,
Self::LlmError => Severity::High,
Self::RetryStorm => Severity::Critical,
Self::DeadLoop => Severity::Critical,
Self::SafetyFilter => Severity::Medium,
Self::SseTruncated => Severity::High,
Self::ContextOverflow => Severity::High,
Self::TokenLimit => Severity::Medium,
Self::LlmError => Severity::High,
Self::RetryStorm => Severity::Critical,
Self::DeadLoop => Severity::Critical,
}
}
}
Expand All @@ -103,19 +103,19 @@ impl Severity {
pub fn as_str(&self) -> &'static str {
match self {
Self::Critical => "critical",
Self::High => "high",
Self::Medium => "medium",
Self::Low => "low",
Self::High => "high",
Self::Medium => "medium",
Self::Low => "low",
}
}

/// Numeric weight for comparison (higher = worse)
pub fn weight(&self) -> u8 {
match self {
Self::Critical => 4,
Self::High => 3,
Self::Medium => 2,
Self::Low => 1,
Self::High => 3,
Self::Medium => 2,
Self::Low => 1,
}
}
}
Expand Down Expand Up @@ -172,17 +172,8 @@ impl InterruptionEvent {
}
}

/// Generate a 32-char hex ID (uses current timestamp + random bytes)
fn new_id() -> String {
use std::time::{SystemTime, UNIX_EPOCH};
let ns = SystemTime::now()
.duration_since(UNIX_EPOCH)
.map(|d| d.as_nanos())
.unwrap_or(0);
// Mix with a pseudo-random value derived from address of a stack var
let stack_var: u64 = 0;
let addr = &stack_var as *const u64 as u64;
format!("{:016x}{:016x}", ns as u64 ^ addr, ns as u64)
uuid::Uuid::new_v4().simple().to_string()
}

#[cfg(test)]
Expand All @@ -195,10 +186,16 @@ mod tests {
assert_eq!(InterruptionType::RateLimit.as_str(), "rate_limit");
assert_eq!(InterruptionType::AuthError.as_str(), "auth_error");
assert_eq!(InterruptionType::NetworkTimeout.as_str(), "network_timeout");
assert_eq!(InterruptionType::ServiceUnavailable.as_str(), "service_unavailable");
assert_eq!(
InterruptionType::ServiceUnavailable.as_str(),
"service_unavailable"
);
assert_eq!(InterruptionType::SafetyFilter.as_str(), "safety_filter");
assert_eq!(InterruptionType::SseTruncated.as_str(), "sse_truncated");
assert_eq!(InterruptionType::ContextOverflow.as_str(), "context_overflow");
assert_eq!(
InterruptionType::ContextOverflow.as_str(),
"context_overflow"
);
assert_eq!(InterruptionType::TokenLimit.as_str(), "token_limit");
assert_eq!(InterruptionType::LlmError.as_str(), "llm_error");
assert_eq!(InterruptionType::RetryStorm.as_str(), "retry_storm");
Expand All @@ -207,36 +204,108 @@ mod tests {

#[test]
fn test_interruption_type_from_str() {
assert_eq!(InterruptionType::from_str("agent_crash"), Some(InterruptionType::AgentCrash));
assert_eq!(InterruptionType::from_str("rate_limit"), Some(InterruptionType::RateLimit));
assert_eq!(InterruptionType::from_str("auth_error"), Some(InterruptionType::AuthError));
assert_eq!(InterruptionType::from_str("network_timeout"), Some(InterruptionType::NetworkTimeout));
assert_eq!(InterruptionType::from_str("service_unavailable"), Some(InterruptionType::ServiceUnavailable));
assert_eq!(InterruptionType::from_str("safety_filter"), Some(InterruptionType::SafetyFilter));
assert_eq!(InterruptionType::from_str("sse_truncated"), Some(InterruptionType::SseTruncated));
assert_eq!(InterruptionType::from_str("context_overflow"), Some(InterruptionType::ContextOverflow));
assert_eq!(InterruptionType::from_str("token_limit"), Some(InterruptionType::TokenLimit));
assert_eq!(InterruptionType::from_str("llm_error"), Some(InterruptionType::LlmError));
assert_eq!(InterruptionType::from_str("retry_storm"), Some(InterruptionType::RetryStorm));
assert_eq!(InterruptionType::from_str("dead_loop"), Some(InterruptionType::DeadLoop));
assert_eq!(
InterruptionType::from_str("agent_crash"),
Some(InterruptionType::AgentCrash)
);
assert_eq!(
InterruptionType::from_str("rate_limit"),
Some(InterruptionType::RateLimit)
);
assert_eq!(
InterruptionType::from_str("auth_error"),
Some(InterruptionType::AuthError)
);
assert_eq!(
InterruptionType::from_str("network_timeout"),
Some(InterruptionType::NetworkTimeout)
);
assert_eq!(
InterruptionType::from_str("service_unavailable"),
Some(InterruptionType::ServiceUnavailable)
);
assert_eq!(
InterruptionType::from_str("safety_filter"),
Some(InterruptionType::SafetyFilter)
);
assert_eq!(
InterruptionType::from_str("sse_truncated"),
Some(InterruptionType::SseTruncated)
);
assert_eq!(
InterruptionType::from_str("context_overflow"),
Some(InterruptionType::ContextOverflow)
);
assert_eq!(
InterruptionType::from_str("token_limit"),
Some(InterruptionType::TokenLimit)
);
assert_eq!(
InterruptionType::from_str("llm_error"),
Some(InterruptionType::LlmError)
);
assert_eq!(
InterruptionType::from_str("retry_storm"),
Some(InterruptionType::RetryStorm)
);
assert_eq!(
InterruptionType::from_str("dead_loop"),
Some(InterruptionType::DeadLoop)
);
assert_eq!(InterruptionType::from_str("unknown"), None);
assert_eq!(InterruptionType::from_str(""), None);
}

#[test]
fn test_interruption_type_default_severity() {
assert_eq!(InterruptionType::AgentCrash.default_severity(), Severity::Critical);
assert_eq!(InterruptionType::RateLimit.default_severity(), Severity::Medium);
assert_eq!(InterruptionType::AuthError.default_severity(), Severity::High);
assert_eq!(InterruptionType::NetworkTimeout.default_severity(), Severity::High);
assert_eq!(InterruptionType::ServiceUnavailable.default_severity(), Severity::High);
assert_eq!(InterruptionType::SafetyFilter.default_severity(), Severity::Medium);
assert_eq!(InterruptionType::SseTruncated.default_severity(), Severity::High);
assert_eq!(InterruptionType::ContextOverflow.default_severity(), Severity::High);
assert_eq!(InterruptionType::TokenLimit.default_severity(), Severity::Medium);
assert_eq!(InterruptionType::LlmError.default_severity(), Severity::High);
assert_eq!(InterruptionType::RetryStorm.default_severity(), Severity::Critical);
assert_eq!(InterruptionType::DeadLoop.default_severity(), Severity::Critical);
assert_eq!(
InterruptionType::AgentCrash.default_severity(),
Severity::Critical
);
assert_eq!(
InterruptionType::RateLimit.default_severity(),
Severity::Medium
);
assert_eq!(
InterruptionType::AuthError.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::NetworkTimeout.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::ServiceUnavailable.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::SafetyFilter.default_severity(),
Severity::Medium
);
assert_eq!(
InterruptionType::SseTruncated.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::ContextOverflow.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::TokenLimit.default_severity(),
Severity::Medium
);
assert_eq!(
InterruptionType::LlmError.default_severity(),
Severity::High
);
assert_eq!(
InterruptionType::RetryStorm.default_severity(),
Severity::Critical
);
assert_eq!(
InterruptionType::DeadLoop.default_severity(),
Severity::Critical
);
}

#[test]
Expand Down Expand Up @@ -293,7 +362,12 @@ mod tests {
fn test_interruption_event_new_no_detail() {
let event = InterruptionEvent::new(
InterruptionType::AgentCrash,
None, None, None, None, None, None,
None,
None,
None,
None,
None,
None,
500_000,
None,
);
Expand All @@ -308,11 +382,10 @@ mod tests {
fn test_new_id_uniqueness() {
let id1 = new_id();
let id2 = new_id();
// IDs should be 32 chars hex
assert_eq!(id1.len(), 32);
assert_eq!(id2.len(), 32);
// All hex chars
assert!(id1.chars().all(|c| c.is_ascii_hexdigit()));
assert_ne!(id1, id2);
}

#[test]
Expand Down Expand Up @@ -340,7 +413,12 @@ mod tests {

#[test]
fn test_severity_serde_roundtrip() {
let severities = vec![Severity::Critical, Severity::High, Severity::Medium, Severity::Low];
let severities = vec![
Severity::Critical,
Severity::High,
Severity::Medium,
Severity::Low,
];
for s in severities {
let json = serde_json::to_string(&s).unwrap();
let back: Severity = serde_json::from_str(&json).unwrap();
Expand Down
Loading