Feature/chat message search

appinfo/routes.php

@@ -48,6 +48,7 @@
 		['name' => 'chattyLLM#deleteMessage', 'url' => '/chat/delete_message', 'verb' => 'DELETE'],
 		['name' => 'chattyLLM#getMessages', 'url' => '/chat/messages', 'verb' => 'GET'],
 		['name' => 'chattyLLM#getMessage', 'url' => '/chat/sessions/{sessionId}/messages/{messageId}', 'verb' => 'GET'],
+		['name' => 'chattyLLM#searchMessages', 'url' => '/chat/search', 'verb' => 'GET'],
 		['name' => 'chattyLLM#generateForSession', 'url' => '/chat/generate', 'verb' => 'GET'],
 		['name' => 'chattyLLM#regenerateForSession', 'url' => '/chat/regenerate', 'verb' => 'GET'],
 		['name' => 'chattyLLM#checkSession', 'url' => '/chat/check_session', 'verb' => 'GET'],

lib/Controller/ChattyLLMController.php

@@ -466,6 +466,33 @@ public function deleteMessage(int $messageId, int $sessionId): JSONResponse {
 		}
 	}
 
+	/**
+	 * Search chat messages
+	 *
+	 * Search through all chat messages for the current user
+	 *
+	 * @param string $query The search query
+	 * @return JSONResponse<Http::STATUS_OK, array{messages: list<AssistantChatMessage>, sessionIds: list<int>}, array{}>|JSONResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_UNAUTHORIZED, array{error: string}, array{}>
+	 *
+	 * 200: Search results returned successfully
+	 * 401: Not logged in
+	 */
+	#[NoAdminRequired]
+	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['chat_api'])]
+	public function searchMessages(string $query): JSONResponse {
+
+		try {
+			$result = $this->chatService->searchMessages($this->userId, $query);
+			return new JSONResponse($result);
+		} catch (InternalException $e) {
+			$this->logger->warning('Failed to search chat messages', ['exception' => $e]);
+			return new JSONResponse(['error' => $this->l10n->t('Failed to search chat messages')], Http::STATUS_INTERNAL_SERVER_ERROR);
+		} catch (\OCA\Assistant\Service\UnauthorizedException $e) {
+			return new JSONResponse(['error' => $this->l10n->t('User not logged in')], Http::STATUS_UNAUTHORIZED);
+		}
+	}
+
+
 	/**
 	 * Generate a new assistant message
 	 *

lib/Db/ChattyLLM/MessageMapper.php

@@ -181,4 +181,39 @@ public function deleteMessageById(int $sessionId, int $messageId): void {
 
 		$qb->executeStatement();
 	}
+
+	/**
+	 * @param string $userId
+	 * @param string $query
+	 * @param int $limit
+	 * @return list<Message>
+	 * @throws \OCP\DB\Exception
+	 */
+	public function searchMessages(string $userId, string $query, int $limit = 100): array {
+		// Split the query into individual words on whitespace
+		$words = array_filter(preg_split('/\s+/', trim($query)));
+
+		if (empty($words)) { // A guard for the edge case where the query is empty or consists of all whitespaces
+			return [];
+		}
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->select(array_map(fn ($col) => 'm.' . $col . ' AS ' . $col, Message::$columns))
+			->from($this->getTableName(), 'm')
+			->join('m', 'assistant_chat_sns', 's', $qb->expr()->eq('m.session_id', 's.id')) 
+			->where($qb->expr()->eq('s.user_id', $qb->createPositionalParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		// Add a andWhere for each word and then AND them all together on to the query builder
+		foreach ($words as $word) {
+				$qb->andWhere($qb->expr()->iLike(
+					'm.content',
+					$qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($word) . '%', IQueryBuilder::PARAM_STR),
+				));
+			}
+
+			$qb->orderBy('m.timestamp', 'DESC')
+				->setMaxResults($limit);
+
+		return $this->findEntities($qb);
+	}
 }

lib/Service/ChatService.php

@@ -168,6 +168,34 @@ public function getSessionsForUser(?string $userId): array {
 		}
 	}
 
+	/**
+	 * @return array{messages: list<array{id: int, session_id: int, role: string, content: string, timestamp: int, ocp_task_id: int, sources: string, attachments: list<array{type: string, fileId: int}>}>, sessionIds: list<int>}
+	 * @throws UnauthorizedException
+	 * @throws InternalException
+	 */
+	public function searchMessages(?string $userId, string $query): array {
+		if ($userId === null) {
+			throw new UnauthorizedException($this->l10n->t('Unauthorized'));
+		}
+		// For empty queries return two empty lists right away
+		if (trim($query) === '') {
+			return ['messages' => [], 'sessionIds' => []];
+		}
+		try {
+			$messages = $this->messageMapper->searchMessages($userId, $query);
+		} catch (Exception $e) {
+			throw new InternalException(previous: $e);
+		}
+		$sessionIds = array_values(array_unique(
+			array_map(fn (Message $m) => $m->getSessionId(), $messages) // Extract the session id from each message, remove duplicates, re-index the array
+		));
+		/** @var list<array{id: int, session_id: int, role: string, content: string, timestamp: int, ocp_task_id: int, sources: string, attachments: list<array{type: string, fileId: int}>}> $serializedMessages */
+		$serializedMessages = array_map(fn (Message $m) => $m->jsonSerialize(), $messages);
+		return [
+			'messages' => $serializedMessages,
+			'sessionIds' => $sessionIds,
+		];
+	}
 	/**
 	 * @throws BadRequestException
 	 * @throws InternalException

openapi.json

@@ -4292,6 +4292,137 @@
                 }
             }
         },
+        "/ocs/v2.php/apps/assistant/chat/search": {
+            "get": {
+                "operationId": "chattyllm-search-messages",
+                "summary": "Search chat messages",
+                "description": "Search through all chat messages for the current user",
+                "tags": [
+                    "chat_api"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "query",
+                        "in": "query",
+                        "description": "The search query",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Search results returned successfully",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "messages",
+                                        "sessionIds"
+                                    ],
+                                    "properties": {
+                                        "messages": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/ChatMessage"
+                                            }
+                                        },
+                                        "sessionIds": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "integer",
+                                                "format": "int64"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "error"
+                                    ],
+                                    "properties": {
+                                        "error": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "anyOf": [
+                                        {
+                                            "type": "object",
+                                            "required": [
+                                                "error"
+                                            ],
+                                            "properties": {
+                                                "error": {
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "type": "object",
+                                            "required": [
+                                                "ocs"
+                                            ],
+                                            "properties": {
+                                                "ocs": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "meta",
+                                                        "data"
+                                                    ],
+                                                    "properties": {
+                                                        "meta": {
+                                                            "$ref": "#/components/schemas/OCSMeta"
+                                                        },
+                                                        "data": {}
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/ocs/v2.php/apps/assistant/chat/generate": {
             "get": {
                 "operationId": "chattyllm-generate-for-session",

src/components/ChattyLLM/ChattyLLMInputForm.vue

@@ -13,15 +13,21 @@
 						<PlusIcon :size="20" />
 					</template>
 				</NcAppNavigationNew>
+				<NcAppNavigationSearch
+					v-model="searchQuery"
+					:placeholder="t('assistant', 'Search messages…')" />
 				<div v-if="sessions == null" class="unloaded-sessions">
 					<NcLoadingIcon :size="30" />
 					{{ t('assistant', 'Loading conversations…') }}
 				</div>
 				<div v-else-if="sessions != null && sessions.length === 0" class="unloaded-sessions">
 					{{ t('assistant', 'No conversations yet') }}
 				</div>
+				<div v-else-if="searchResults !== null && filteredSessions.length === 0" class="unloaded-sessions">
+					{{ t('assistant', 'No conversations match your search') }}
+				</div>
 				<NcAppNavigationItem
-					v-for="session in sessions"
+					v-for="session in filteredSessions"
 					v-else
 					:key="'conversation' + session.id"
 					:active="session.id === active?.id"
@@ -120,6 +126,8 @@
 					<ConversationBox :messages="messages"
 						:loading="loading"
 						:slow-pickup="slowPickup"
+						:search-query="searchQuery"
+						:matching-message-ids="matchingMessageIds"
 						@regenerate="runRegenerationTask"
 						@delete="deleteMessage" />
 					<div v-if="messages != null && messages.length > 0 && !loading.llmGeneration && !loading.newHumanMessage && messages[messages.length - 1]?.role === 'human'" class="session-area__chat-area__active-session__utility-button">
@@ -204,6 +212,7 @@ import NcAppNavigationNew from '@nextcloud/vue/components/NcAppNavigationNew'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import NcDialog from '@nextcloud/vue/components/NcDialog'
+import NcAppNavigationSearch from '@nextcloud/vue/components/NcAppNavigationSearch'
 
 import ConversationBox from './ConversationBox.vue'
 import EditableTextField from './EditableTextField.vue'
@@ -221,6 +230,7 @@ import { SHAPE_TYPE_NAMES, TASK_STATUS_INT } from '../../constants.js'
 // future: type (text, image, file, etc), attachments, etc support
 
 const getChatURL = (endpoint) => generateOcsUrl('/apps/assistant/chat' + endpoint)
+
 const Roles = {
 	HUMAN: 'human',
 	ASSISTANT: 'assistant',
@@ -247,6 +257,7 @@ export default {
 		NcAppNavigationItem,
 		NcAppNavigationList,
 		NcAppNavigationNew,
+		NcAppNavigationSearch,
 		NcButton,
 		NcLoadingIcon,
 		NcDialog,
@@ -279,6 +290,7 @@ export default {
 				newSession: false,
 				messageDelete: false,
 				sessionDelete: false,
+				search: false,
 			},
 			msgCursor: 0,
 			msgLimit: 20,
@@ -303,6 +315,9 @@ export default {
 					message: t('assisant', 'Which actions can you do for me?'),
 				},
 			],
+			searchQuery: '',
+			searchResults: null,
+			searchDebounceTimer: null,
 		}
 	},
 
@@ -315,6 +330,17 @@ export default {
 			const sessionTitle = this.getSessionTitle(session)?.trim()
 			return t('assistant', 'Are you sure you want to delete "{sessionTitle}"?', { sessionTitle })
 		},
+
+		filteredSessions() {
+			if (!this.sessions || this.searchResults === null) {
+				return this.sessions
+			}
+			return this.sessions.filter(s => this.searchResults.sessionIds.includes(s.id))
+		},
+
+		matchingMessageIds() {
+			return new Set(this.searchResults?.messages?.map(m => m.id) ?? [])
+		},
 	},
 
 	watch: {
@@ -392,6 +418,18 @@ export default {
 				this.loading.titleGeneration = false
 			}
 		},
+
+		searchQuery(newVal) {
+			console.debug('[search] searchQuery changed to:', JSON.stringify(newVal))
+			clearTimeout(this.searchDebounceTimer)
+			if (!newVal.trim()) {
+				this.searchResults = null
+				return
+			}
+			this.searchDebounceTimer = setTimeout(() => {
+				this.performSearch(newVal.trim())
+			}, 350)
+		},
 	},
 
 	beforeUnmount() {
@@ -913,6 +951,20 @@ export default {
 			const url = generateUrl('/apps/assistant/config')
 			return axios.put(url, req)
 		},
+
+		async performSearch(query) {
+			this.loading.search = true
+			try {
+				const response = await axios.get(getChatURL('/search'), { params: { query } })
+				this.searchResults = response.data
+			} catch (error) {
+				console.error('Search error:', error)
+				showError(error?.response?.data?.error ?? t('assistant', 'Error searching messages'))
+				this.searchResults = null
+			} finally {
+				this.loading.search = false
+			}
+		},
 	},
 }
 </script>