Merge pull request #550 from nextcloud/feat/assignments-frontend

Implement scheduled tasks ui

Author: marcelklehr

lib/Controller/ChattyLLMController.php

@@ -311,16 +311,17 @@ public function deleteSession(int $sessionId): JSONResponse {
 	 *
 	 * Get all chat sessions for the current user
 	 *
+	 * @param bool|null $isAssignment Whether to get only the sessions for assignments (true) or not (false) defaults to false
 	 * @return JSONResponse<Http::STATUS_OK, list<AssistantChatSession>, array{}>|JSONResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_UNAUTHORIZED, array{error: string}, array{}>
 	 *
 	 * 200: The session list has been obtained successfully
 	 * 401: Not logged in
 	 */
 	#[NoAdminRequired]
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['chat_api'])]
-	public function getSessions(): JSONResponse {
+	public function getSessions(?bool $isAssignment = false): JSONResponse {
 		try {
-			$sessions = $this->chatService->getSessionsForUser($this->userId);
+			$sessions = $this->chatService->getSessionsForUser($this->userId, $isAssignment);
 			/** @var list<AssistantChatSession> $serializedSessions */
 			$serializedSessions = array_map(static function ($session) {
 				return $session->jsonSerialize();
@@ -380,6 +381,7 @@ public function newMessage(
 	 * @param int $sessionId The session ID
 	 * @param int $limit The max number of messages to return
 	 * @param int $cursor The index of the first result to return
+	 * @param string $filterByRole Only role to include in the response
 	 * @return JSONResponse<Http::STATUS_OK, list<AssistantChatMessage>, array{}>|JSONResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_UNAUTHORIZED|Http::STATUS_NOT_FOUND, array{error: string}, array{}>
 	 *
 	 * 200: The message list has been successfully obtained
@@ -388,9 +390,9 @@ public function newMessage(
 	 */
 	#[NoAdminRequired]
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['chat_api'])]
-	public function getMessages(int $sessionId, int $limit = 20, int $cursor = 0): JSONResponse {
+	public function getMessages(int $sessionId, int $limit = 20, int $cursor = 0, string $filterByRole = ''): JSONResponse {
 		try {
-			$messages = $this->chatService->getSessionMessages($this->userId, $sessionId, $limit, $cursor);
+			$messages = $this->chatService->getSessionMessages($this->userId, $sessionId, $limit, $cursor, $filterByRole);
 			return new JSONResponse(array_map(static function (Message $message) {
 				return $message->jsonSerialize();
 			}, $messages));

lib/Db/ChattyLLM/MessageMapper.php

@@ -80,17 +80,22 @@ public function getLastNonEmptyHumanMessage(int $sessionId): Message {
 	 * @param int $sessionId
 	 * @param int $cursor
 	 * @param int $limit
+	 * @param string $filterByRole Only include messages with this role (empty to include all)
 	 * @return list<Message>
 	 * @throws \OCP\DB\Exception
 	 */
-	public function getMessages(int $sessionId, int $cursor, int $limit): array {
+	public function getMessages(int $sessionId, int $cursor, int $limit, string $filterByRole = ''): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select(Message::$columns)
 			->from($this->getTableName())
 			->where($qb->expr()->eq('session_id', $qb->createPositionalParameter($sessionId, IQueryBuilder::PARAM_INT)))
 			->orderBy('id', 'DESC')
 			->setFirstResult($cursor);
 
+		if ($filterByRole !== '') {
+			$qb->andWhere($qb->expr()->eq('role', $qb->createPositionalParameter($filterByRole, IQueryBuilder::PARAM_STR)));
+		}
+
 		if ($limit > 0) {
 			$qb->setMaxResults($limit);
 		}

lib/Db/ChattyLLM/SessionMapper.php

@@ -84,16 +84,23 @@ public function getUserSessionForAssignment(string $userId, int $assignmentId):
 
 	/**
 	 * @param string $userId
+	 * @param bool $isAssignment
 	 * @return list<Session>
 	 * @throws \OCP\DB\Exception
 	 */
-	public function getUserSessions(string $userId): array {
+	public function getUserSessions(string $userId, bool $isAssignment): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select(Session::$columns)
 			->from($this->getTableName())
 			->where($qb->expr()->eq('user_id', $qb->createPositionalParameter($userId, IQueryBuilder::PARAM_STR)))
 			->orderBy('timestamp', 'DESC');
 
+		if ($isAssignment) {
+			$qb->andWhere($qb->expr()->isNotNull('assignment_id'));
+		} else {
+			$qb->andWhere($qb->expr()->isNull('assignment_id'));
+		}
+
 		return $this->findEntities($qb);
 	}
 

lib/Service/AssistantService.php

@@ -64,6 +64,7 @@ class AssistantService {
 
 	private const TASK_TYPE_PRIORITIES = [
 		'chatty-llm' => 1,
+		'assignments' => 1,
 		TextToText::ID => 2,
 		'context_chat:context_chat' => 3,
 		'legacy:TextProcessing:OCA\ContextChat\TextProcessing\ContextChatTaskType' => 3,
@@ -287,6 +288,9 @@ private function getCategory(string $typeId): array {
 		if (str_starts_with($typeId, 'chatty')) {
 			$categoryId = 'chat';
 			$categoryName = $this->l10n->t('Chat with AI');
+		} elseif (str_starts_with($typeId, 'assignments')) {
+			$categoryId = 'assignments';
+			$categoryName = $this->l10n->t('Scheduled tasks');
 		} elseif (str_starts_with($typeId, 'context_chat')) {
 			$categoryId = 'context';
 			$categoryName = $this->l10n->t('Context Chat');
@@ -435,6 +439,23 @@ public function getAvailableTaskTypes(): array {
 					'priority' => self::TASK_TYPE_PRIORITIES['chatty-llm'] ?? 1000,
 					'preferredProviderName' => $preferredProviderName,
 				];
+				// add the chattyUI assignments virtual task type
+				$types[] = [
+					'id' => 'assignments',
+					'name' => $this->l10n->t('Scheduled tasks'),
+					'description' => $this->l10n->t('Scheduled tasks'),
+					'category' => $this->getCategory('assignments'),
+					'inputShape' => [],
+					'inputShapeEnumValues' => [],
+					'inputShapeDefaults' => [],
+					'outputShape' => [],
+					'optionalInputShape' => [],
+					'optionalInputShapeEnumValues' => [],
+					'optionalInputShapeDefaults' => [],
+					'optionalOutputShape' => [],
+					'priority' => self::TASK_TYPE_PRIORITIES['assignments'] ?? 1000,
+					'preferredProviderName' => $preferredProviderName,
+				];
 				// do not add the raw TextToTextChat type
 				if (!self::DEBUG) {
 					continue;

lib/Service/ChatService.php

@@ -157,12 +157,12 @@ public function deleteSession(?string $userId, int $sessionId): void {
 	 * @throws InternalException
 	 * @throws UnauthorizedException
 	 */
-	public function getSessionsForUser(?string $userId): array {
+	public function getSessionsForUser(?string $userId, bool $isAssignment): array {
 		if ($userId === null) {
 			throw new UnauthorizedException($this->l10n->t('Unauthorized'));
 		}
 		try {
-			return $this->sessionMapper->getUserSessions($userId);
+			return $this->sessionMapper->getUserSessions($userId, $isAssignment);
 		} catch (Exception $e) {
 			throw new InternalException(previous: $e);
 		}
@@ -249,12 +249,13 @@ public function createMessage(?string $userId, int $sessionId, string $role, str
 	}
 
 	/**
+	 * @param string $filterByRole Only include messages with this role (empty to include all)
 	 * @return list<Message>
 	 * @throws InternalException
 	 * @throws NotFoundException
 	 * @throws UnauthorizedException
 	 */
-	public function getSessionMessages(?string $userId, int $sessionId, int $limit = 20, int $cursor = 0): array {
+	public function getSessionMessages(?string $userId, int $sessionId, int $limit = 20, int $cursor = 0, string $filterByRole = ''): array {
 		if ($userId === null) {
 			throw new UnauthorizedException($this->l10n->t('Unauthorized'));
 		}
@@ -272,7 +273,7 @@ public function getSessionMessages(?string $userId, int $sessionId, int $limit =
 
 		/** @var list<Message> $messages */
 		try {
-			$messages = $this->messageMapper->getMessages($sessionId, $cursor, $limit);
+			$messages = $this->messageMapper->getMessages($sessionId, $cursor, $limit, $filterByRole);
 		} catch (Exception $e) {
 			throw new InternalException(previous: $e);
 		}

openapi.json

@@ -2899,6 +2899,16 @@
                     }
                 ],
                 "parameters": [
+                    {
+                        "name": "isAssignment",
+                        "in": "query",
+                        "description": "Whether to get only the sessions for assignments (true) or not (false) defaults to false",
+                        "schema": {
+                            "type": "boolean",
+                            "nullable": true,
+                            "default": false
+                        }
+                    },
                     {
                         "name": "OCS-APIRequest",
                         "in": "header",
@@ -4044,6 +4054,15 @@
                             "default": 0
                         }
                     },
+                    {
+                        "name": "filterByRole",
+                        "in": "query",
+                        "description": "Only role to include in the response",
+                        "schema": {
+                            "type": "string",
+                            "default": ""
+                        }
+                    },
                     {
                         "name": "OCS-APIRequest",
                         "in": "header",