Merge pull request #169 from nextcloud/enh/noid/agency

Agency
nextcloud · Jan 7, 2025 · 916244f · 916244f
2 parents 18fd49e + 1142a63
commit 916244f
Show file tree

Hide file tree

Showing 34 changed files with 835 additions and 241 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -58,7 +58,7 @@ Known providers:
 
 More details on how to set this up in the [admin docs](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html)
 ]]>	</description>
-	<version>2.1.1</version>
+	<version>2.2.0</version>
 	<licence>agpl</licence>
 	<author>Julien Veyssier</author>
 	<namespace>Assistant</namespace>

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/AssistantApiController.php b/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);
 		}

diff --git a/lib/Controller/AssistantController.php b/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);