jarno/ws-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: store chat_id to allow multiple chats, use enums in tauri

Browse Source 
communication
This commit is contained in:
Jarno
2026-02-22 11:52:42 +02:00
parent edc425e28f
commit 6364fdf1cd
11 changed files with 129 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
crates/daemon/src/daemongrpc.rs
View File

@@ -28,7 +28,10 @@ impl DaemonServer {
impl AiDaemon for DaemonServer {
async fn chat(&self, request: Request<CRequest>) -> Result<Response<CResponse>, Status> {
let r = request.into_inner();
let mut messages = gather_history(self.repo.clone())
let chat_id = get_chat_id(self.repo.clone(), r.chat_id)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?;
let mut messages = gather_history(self.repo.clone(), &chat_id)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?;
messages.push(ChatMessage::user(r.text()));
@@ -42,7 +45,7 @@ impl AiDaemon for DaemonServer {
let user_message = message_to_dto(
&self
.repo
.save_message(r.text(), &true)
.save_message(r.text(), &true, &0)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?,
);
@@ -52,12 +55,12 @@ impl AiDaemon for DaemonServer {
};
println!("User: {}", r.text());
println!("AI: {}", response_text.clone());
println!("AI: {}", response_text);
let ai_message = message_to_dto(
&self
.repo
.save_message(response_text, &false)
.save_message(response_text, &false, &0)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?,
);
@@ -70,11 +73,14 @@ impl AiDaemon for DaemonServer {
async fn chat_history(
&self,
_: Request<ChatHistoryRequest>,
request: Request<ChatHistoryRequest>,
) -> Result<Response<ChatHistoryResponse>, Status> {
let chat_id = get_chat_id(self.repo.clone(), request.into_inner().chat_id)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?;
let messages = self
.repo
.get_latest_messages()
.get_latest_messages(&chat_id, &20)
.await
.map_err(|e| Status::new(Code::Internal, e.to_string()))?;
@@ -106,8 +112,11 @@ pub fn message_to_dto(msg: &ChatMessageData) -> CMessage {
}
}
async fn gather_history(repo: Arc<dyn ChatRepository + Send + Sync>) -> Result<Vec<ChatMessage>> {
let messages = repo.get_latest_messages().await?;
async fn gather_history(
repo: Arc<dyn ChatRepository + Send + Sync>,
chat_id: &i32,
) -> Result<Vec<ChatMessage>> {
let messages = repo.get_latest_messages(chat_id, &10).await?;
Ok(messages
.iter()
.map(|m| match m.is_user {
@@ -116,3 +125,13 @@ async fn gather_history(repo: Arc<dyn ChatRepository + Send + Sync>) -> Result<V
})
.collect())
}
async fn get_chat_id(
repo: Arc<dyn ChatRepository + Send + Sync>,
chat_id: Option<i64>,
) -> Result<i32> {
Ok(match chat_id {
Some(i) => i as i32,
None => repo.get_chat_ids().await?.get(0).copied().unwrap_or(0),
})
}