update composer dependencies, fix psalm issues and run cs:fix, genera…

…te openapi specs

Signed-off-by: Julien Veyssier <[email protected]>

lib/Controller/AssistantApiController.php

@@ -76,7 +76,7 @@ public function notifyWhenReady(int $ocpTaskId): DataResponse {
 	 *
 	 * Get all available task types that the assistant can handle.
 	 *
-	 * @return DataResponse<Http::STATUS_OK, array{types: array<AssistantTaskProcessingTaskType>}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, array{types: list<AssistantTaskProcessingTaskType>}, array{}>
 	 *
 	 * 200: Available task types returned
 	 */
@@ -94,7 +94,7 @@ public function getAvailableTaskTypes(): DataResponse {
 	 * Get a list of assistant tasks for the current user.
 	 *
 	 * @param string|null $taskTypeId Task type id. If null, tasks of all task types will be retrieved
-	 * @return DataResponse<Http::STATUS_OK, array{tasks: array<AssistantTaskProcessingTask>}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, '', array{}>
+	 * @return DataResponse<Http::STATUS_OK, array{tasks: list<AssistantTaskProcessingTask>}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, '', array{}>
 	 *
 	 * 200: User tasks returned
 	 * 404: No tasks found
@@ -139,7 +139,7 @@ public function parseTextFromFile(?string $filePath = null, ?int $fileId = null)
 
 		try {
 			$text = $this->assistantService->parseTextFromFile($this->userId, $filePath, $fileId);
-		} catch (\Exception | \Throwable $e) {
+		} catch (\Exception|\Throwable $e) {
 			return new DataResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
 		}
 		return new DataResponse([
@@ -280,7 +280,7 @@ public function getOutputFilePreview(int $ocpTaskId, int $fileId): RedirectRespo
 			} elseif ($preview['type'] === 'icon') {
 				return new RedirectResponse($preview['icon']);
 			}
-		} catch (Exception | Throwable $e) {
+		} catch (Exception|Throwable $e) {
 			$this->logger->error('getImage error', ['exception' => $e]);
 			return new DataResponse('', Http::STATUS_NOT_FOUND);
 		}

lib/Controller/AssistantController.php

@@ -44,7 +44,7 @@ public function getAssistantTaskResultPage(int $taskId): TemplateResponse {
 					$this->initialStateService->provideInitialState('task', $task->jsonSerialize());
 					return new TemplateResponse(Application::APP_ID, 'assistantPage');
 				}
-			} catch (Exception | \Throwable $e) {
+			} catch (Exception|\Throwable $e) {
 			}
 		}
 		return new TemplateResponse('', '403', [], TemplateResponse::RENDER_AS_ERROR, Http::STATUS_FORBIDDEN);

lib/Controller/ChattyLLMController.php

@@ -26,7 +26,6 @@
 use OCP\TaskProcessing\Exception\ValidationException;
 use OCP\TaskProcessing\IManager as ITaskProcessingManager;
 use OCP\TaskProcessing\Task;
-use OCP\TaskProcessing\TaskTypes\TextToText;
 use OCP\TaskProcessing\TaskTypes\TextToTextChat;
 use Psr\Log\LoggerInterface;
 
@@ -90,7 +89,7 @@ public function newSession(int $timestamp, ?string $title = null): JSONResponse
 			return new JSONResponse([
 				'session' => $session,
 			]);
-		} catch (\OCP\DB\Exception | \RuntimeException $e) {
+		} catch (\OCP\DB\Exception|\RuntimeException $e) {
 			$this->logger->warning('Failed to create a chat session', ['exception' => $e]);
 			return new JSONResponse(['error' => $this->l10n->t('Failed to create a chat session')], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -112,7 +111,7 @@ public function updateSessionTitle(int $sessionId, string $title): JSONResponse
 		try {
 			$this->sessionMapper->updateSessionTitle($this->userId, $sessionId, $title);
 			return new JSONResponse();
-		} catch (\OCP\DB\Exception | \RuntimeException  $e) {
+		} catch (\OCP\DB\Exception|\RuntimeException  $e) {
 			$this->logger->warning('Failed to update the chat session', ['exception' => $e]);
 			return new JSONResponse(['error' => $this->l10n->t('Failed to update the chat session')], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -134,7 +133,7 @@ public function deleteSession(int $sessionId): JSONResponse {
 			$this->sessionMapper->deleteSession($this->userId, $sessionId);
 			$this->messageMapper->deleteMessagesBySession($sessionId);
 			return new JSONResponse();
-		} catch (\OCP\DB\Exception | \RuntimeException  $e) {
+		} catch (\OCP\DB\Exception|\RuntimeException  $e) {
 			$this->logger->warning('Failed to delete the chat session', ['exception' => $e]);
 			return new JSONResponse(['error' => $this->l10n->t('Failed to delete the chat session')], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -266,7 +265,7 @@ public function deleteMessage(int $messageId, int $sessionId): JSONResponse {
 
 			$this->messageMapper->deleteMessageById($messageId);
 			return new JSONResponse();
-		} catch (\OCP\DB\Exception | \RuntimeException $e) {
+		} catch (\OCP\DB\Exception|\RuntimeException $e) {
 			$this->logger->warning('Failed to delete a chat message', ['exception' => $e]);
 			return new JSONResponse(['error' => $this->l10n->t('Failed to delete a chat message')], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -642,7 +641,7 @@ private function checkIfSessionIsThinking(string $customId): void {
 	 * @throws ValidationException
 	 */
 	private function scheduleLLMChatTask(
-		string $newPrompt, string $systemPrompt, array $history, int $sessionId, bool $isMessage = true
+		string $newPrompt, string $systemPrompt, array $history, int $sessionId, bool $isMessage = true,
 	): ?int {
 		$customId = ($isMessage
 			? 'chatty-llm:'

lib/Controller/ConfigController.php

@@ -21,7 +21,7 @@ public function __construct(
 		IRequest $request,
 		private IConfig $config,
 		private IAppConfig $appConfig,
-		private ?string $userId
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
 	}

lib/Controller/PreviewController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Nextcloud - Assistant
  *
@@ -34,7 +35,7 @@ public function __construct(
 		IRequest $request,
 		private PreviewService $imageService,
 		private LoggerInterface $logger,
-		private ?string  $userId
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -64,7 +65,7 @@ public function getFileImage(int $id, int $x = 100, int $y = 100): Response {
 			} elseif ($preview['type'] === 'icon') {
 				return new RedirectResponse($preview['icon']);
 			}
-		} catch (Exception | Throwable $e) {
+		} catch (Exception|Throwable $e) {
 			$this->logger->error('getImage error', ['exception' => $e]);
 			return new DataResponse('', Http::STATUS_NOT_FOUND);
 		}

lib/Db/TaskNotification.php

@@ -7,6 +7,7 @@
 namespace OCA\Assistant\Db;
 
 use OCP\AppFramework\Db\Entity;
+use OCP\DB\Types;
 
 /**
  * @method \int getOcpTaskId()
@@ -22,8 +23,8 @@ class TaskNotification extends Entity implements \JsonSerializable {
 
 
 	public function __construct() {
-		$this->addType('ocp_task_id', 'int');
-		$this->addType('timestamp', 'int');
+		$this->addType('ocp_task_id', Types::INTEGER);
+		$this->addType('timestamp', Types::INTEGER);
 	}
 
 	#[\ReturnTypeWillChange]

lib/Event/BeforeAssistantNotificationEvent.php

@@ -59,7 +59,7 @@ public function getNotificationTarget(): ?string {
 
 	/**
 	 * @param string|null $notificationTarget URL that will be used as target for the notification and its main action,
-	 * null means the assistant will take care of rendering the result (in a modal or by setting a dedicated NC page showing the result)
+	 *                                        null means the assistant will take care of rendering the result (in a modal or by setting a dedicated NC page showing the result)
 	 * @return void
 	 */
 	public function setNotificationTarget(?string $notificationTarget): void {
@@ -75,7 +75,7 @@ public function getNotificationActionLabel(): ?string {
 
 	/**
 	 * @param string|null $notificationActionLabel Label of the main notification action
-	 * null will not change the default action label
+	 *                                             null will not change the default action label
 	 * @return void
 	 */
 	public function setNotificationActionLabel(?string $notificationActionLabel): void {

lib/Listener/SpeechToText/SpeechToTextReferenceListener.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2023 Anupam Kumar <[email protected]>
  *

lib/Notification/Notifier.php

@@ -98,7 +98,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 				$taskType = $availableTaskTypes[$params['taskTypeId']];
 				$taskTypeName = $taskType['name'];
 			}
-		} catch (\Exception | \Throwable $e) {
+		} catch (\Exception|\Throwable $e) {
 			$this->logger->debug('Impossible to get task type ' . $params['taskTypeId'], ['exception' => $e]);
 		}
 

lib/Reference/FreePromptReferenceProvider.php

@@ -17,7 +17,7 @@ public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
 		private IReferenceManager $referenceManager,
-		private ?string $userId
+		private ?string $userId,
 	) {
 	}
 

lib/Reference/SpeechToTextReferenceProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2023 Anupam Kumar <[email protected]>
  *
@@ -35,7 +36,7 @@ public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
 		private IReferenceManager $referenceManager,
-		private ?string $userId
+		private ?string $userId,
 	) {
 	}
 

lib/Reference/Text2ImageReferenceProvider.php

@@ -18,7 +18,7 @@ public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
 		private IReferenceManager $referenceManager,
-		private ?string $userId
+		private ?string $userId,
 	) {
 	}
 

lib/ResponseDefinitions.php

@@ -52,14 +52,17 @@
  *     appId: string,
  *     completionExpectedAt: integer|null,
  *     customId: string|null,
- *     id: int|null,
- *     input: array<string, mixed>,
+ *     id: int,
+ *     input: array<string, list<numeric|string>|numeric|string>,
  *     lastUpdated: integer,
- *     output: array<string, mixed>,
+ *     output: array<string, list<numeric|string>|numeric|string>|null,
  *     progress: float|null,
  *     status: string,
  *     type: string,
  *     userId: string|null,
+ *     endedAt: int|null,
+ *     scheduledAt: int|null,
+ *     startedAt: int|null,
  * }
  */
 class ResponseDefinitions {

lib/Service/AssistantService.php

@@ -557,7 +557,7 @@ public function parseTextFromFile(string $userId, ?string $filePath = null, ?int
 
 		try {
 			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (\OC\User\NoUserException | NotPermittedException $e) {
+		} catch (\OC\User\NoUserException|NotPermittedException $e) {
 			throw new \Exception('Could not access user storage.');
 		}
 
@@ -577,7 +577,7 @@ public function parseTextFromFile(string $userId, ?string $filePath = null, ?int
 			} else {
 				throw new \Exception('Provided path does not point to a file.');
 			}
-		} catch (LockedException | GenericFileException | NotPermittedException $e) {
+		} catch (LockedException|GenericFileException|NotPermittedException $e) {
 			throw new \Exception('File could not be accessed.');
 		}
 

lib/Service/NotificationService.php

@@ -52,7 +52,7 @@ public function sendNotification(Task $task, ?string $customTarget = null, ?stri
 		$notification->setApp(Application::APP_ID)
 			->setUser($task->getUserId())
 			->setDateTime(new DateTime())
-			->setObject($objectType, (string) ($task->getId() ?? 0))
+			->setObject($objectType, (string)($task->getId() ?? 0))
 			->setSubject($subject, $params);
 
 		$manager->notify($notification);

lib/Settings/Admin.php

@@ -41,7 +41,7 @@ public function getForm(): TemplateResponse {
 		$speechToTextEnabled = $this->appConfig->getValueString(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
 		$chattyLLMUserInstructions = $this->appConfig->getValueString(Application::APP_ID, 'chat_user_instructions', Application::CHAT_USER_INSTRUCTIONS);
 		$chattyLLMUserInstructionsTitle = $this->appConfig->getValueString(Application::APP_ID, 'chat_user_instructions_title', Application::CHAT_USER_INSTRUCTIONS_TITLE);
-		$chattyLLMLastNMessages = (int) $this->appConfig->getValueString(Application::APP_ID, 'chat_last_n_messages', '10');
+		$chattyLLMLastNMessages = (int)$this->appConfig->getValueString(Application::APP_ID, 'chat_last_n_messages', '10');
 
 		$adminConfig = [
 			'text_processing_available' => $taskProcessingAvailable,

lib/Settings/PersonalSection.php

@@ -10,7 +10,7 @@ class PersonalSection implements IIconSection {
 
 	public function __construct(
 		private IURLGenerator $urlGenerator,
-		private IL10N $l
+		private IL10N $l,
 	) {
 	}
 
@@ -35,8 +35,8 @@ public function getName(): string {
 
 	/**
 	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
+	 *             the settings navigation. The sections are arranged in ascending order of
+	 *             the priority values. It is required to return a value between 0 and 99.
 	 */
 	public function getPriority(): int {
 		return 40;

openapi.json

@@ -98,7 +98,10 @@
                     "progress",
                     "status",
                     "type",
-                    "userId"
+                    "userId",
+                    "endedAt",
+                    "scheduledAt",
+                    "startedAt"
                 ],
                 "properties": {
                     "appId": {
@@ -115,13 +118,32 @@
                     },
                     "id": {
                         "type": "integer",
-                        "format": "int64",
-                        "nullable": true
+                        "format": "int64"
                     },
                     "input": {
                         "type": "object",
                         "additionalProperties": {
-                            "type": "object"
+                            "oneOf": [
+                                {
+                                    "type": "array",
+                                    "items": {
+                                        "oneOf": [
+                                            {
+                                                "type": "number"
+                                            },
+                                            {
+                                                "type": "string"
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
                         }
                     },
                     "lastUpdated": {
@@ -130,8 +152,29 @@
                     },
                     "output": {
                         "type": "object",
+                        "nullable": true,
                         "additionalProperties": {
-                            "type": "object"
+                            "oneOf": [
+                                {
+                                    "type": "array",
+                                    "items": {
+                                        "oneOf": [
+                                            {
+                                                "type": "number"
+                                            },
+                                            {
+                                                "type": "string"
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
                         }
                     },
                     "progress": {
@@ -148,6 +191,21 @@
                     "userId": {
                         "type": "string",
                         "nullable": true
+                    },
+                    "endedAt": {
+                        "type": "integer",
+                        "format": "int64",
+                        "nullable": true
+                    },
+                    "scheduledAt": {
+                        "type": "integer",
+                        "format": "int64",
+                        "nullable": true
+                    },
+                    "startedAt": {
+                        "type": "integer",
+                        "format": "int64",
+                        "nullable": true
                     }
                 }
             },