style: format seluruh workspace dengan cargo fmt
Menyeragamkan format kode sesuai rustfmt (126 file). Sebelumnya lefthook pre-commit 'cargo fmt --check' akan gagal pada commit apa pun.
This commit is contained in:
@@ -47,12 +47,18 @@ async fn ws_handler(
|
||||
Query(query): Query<WsQuery>,
|
||||
axum::extract::State(state): axum::extract::State<Arc<WsState>>,
|
||||
) -> impl IntoResponse {
|
||||
let configured = std::env::var("ZESDEX_WS_TOKEN").ok().filter(|s| !s.is_empty());
|
||||
let configured = std::env::var("ZESDEX_WS_TOKEN")
|
||||
.ok()
|
||||
.filter(|s| !s.is_empty());
|
||||
match configured {
|
||||
Some(expected) if query.token.as_deref() != Some(expected.as_str()) => {
|
||||
warn!("rejecting WS connection: missing/invalid token");
|
||||
// 401 Unauthorized — client did not present the required token.
|
||||
(axum::http::StatusCode::UNAUTHORIZED, "missing or invalid token").into_response()
|
||||
(
|
||||
axum::http::StatusCode::UNAUTHORIZED,
|
||||
"missing or invalid token",
|
||||
)
|
||||
.into_response()
|
||||
}
|
||||
_ => ws.on_upgrade(move |socket| handle_socket(socket, state)),
|
||||
}
|
||||
@@ -95,17 +101,22 @@ async fn handle_socket(mut socket: WebSocket, state: Arc<WsState>) {
|
||||
Message::Text(text) => {
|
||||
let text_str = text.to_string();
|
||||
info!("Received WS message: {text_str}");
|
||||
|
||||
|
||||
if let Ok(val) = serde_json::from_str::<serde_json::Value>(&text_str) {
|
||||
if val.get("type").and_then(|v| v.as_str()) == Some("prompt") {
|
||||
if let Some(prompt) = val.get("message").and_then(|v| v.as_str()) {
|
||||
let session_dir = std::env::current_dir().unwrap_or_default();
|
||||
let workspace_roots = vec![session_dir.clone()];
|
||||
let turn_events = Arc::new(std::sync::Mutex::new(std::collections::VecDeque::new()));
|
||||
let turn_events =
|
||||
Arc::new(std::sync::Mutex::new(std::collections::VecDeque::new()));
|
||||
let in_flight = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||
let abort = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||
let api_key = std::env::var("OPENAI_API_KEY").unwrap_or_default();
|
||||
let model = val.get("model").and_then(|v| v.as_str()).unwrap_or("gpt-4o").to_string();
|
||||
let model = val
|
||||
.get("model")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("gpt-4o")
|
||||
.to_string();
|
||||
|
||||
let params = zesdex_domain::agent::AgentTurnParams {
|
||||
messages: vec![zesdex_domain::core::ChatMessage::user(prompt)],
|
||||
@@ -119,11 +130,11 @@ async fn handle_socket(mut socket: WebSocket, state: Arc<WsState>) {
|
||||
api_base: None,
|
||||
};
|
||||
|
||||
let client = std::sync::Arc::new(zesdex_infrastructure::llm::provider::LlmClient::new(
|
||||
api_key,
|
||||
model,
|
||||
None,
|
||||
));
|
||||
let client = std::sync::Arc::new(
|
||||
zesdex_infrastructure::llm::provider::LlmClient::new(
|
||||
api_key, model, None,
|
||||
),
|
||||
);
|
||||
|
||||
let tool_ctx = zesdex_infrastructure::tools::ToolCtx::builder()
|
||||
.session_dir(session_dir)
|
||||
@@ -138,11 +149,12 @@ async fn handle_socket(mut socket: WebSocket, state: Arc<WsState>) {
|
||||
let tools = zesdex_infrastructure::tools::all_tools();
|
||||
let defs = zesdex_infrastructure::tools::tool_defs(&tools);
|
||||
|
||||
let turn_service = zesdex_application::agent::turn_service::AgentTurnServiceImpl::new(
|
||||
client,
|
||||
tool_executor,
|
||||
defs,
|
||||
);
|
||||
let turn_service =
|
||||
zesdex_application::agent::turn_service::AgentTurnServiceImpl::new(
|
||||
client,
|
||||
tool_executor,
|
||||
defs,
|
||||
);
|
||||
|
||||
use zesdex_application::agent::AgentTurnService;
|
||||
tokio::spawn(async move {
|
||||
|
||||
Reference in New Issue
Block a user