allow to pass file ID or path as initial input text field value

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

lib/Controller/AssistantApiController.php

@@ -121,20 +121,24 @@ public function getUserTasks(?string $taskTypeId = null): DataResponse {
 	 *
 	 * Parse and extract text content of a file (if the file type is supported)
 	 *
-	 * @param string $filePath Path of the file to parse in the user's storage
+	 * @param string|null $filePath Path of the file to parse in the user's storage
+	 * @param int|null $fileId Id of the file to parse in the user's storage
 	 * @return DataResponse<Http::STATUS_OK, array{parsedText: string}, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, string, array{}>
 	 *
 	 * 200: Text parsed from file successfully
 	 * 400: Parsing text from file is not possible
 	 */
 	#[NoAdminRequired]
-	public function parseTextFromFile(string $filePath): DataResponse {
+	public function parseTextFromFile(?string $filePath = null, ?int $fileId = null): DataResponse {
 		if ($this->userId === null) {
 			return new DataResponse('Unknow user', Http::STATUS_BAD_REQUEST);
 		}
+		if ($fileId === null && $filePath === null) {
+			return new DataResponse('Invalid parameters', Http::STATUS_BAD_REQUEST);
+		}
 
 		try {
-			$text = $this->assistantService->parseTextFromFile($filePath, $this->userId);
+			$text = $this->assistantService->parseTextFromFile($this->userId, $filePath, $fileId);
 		} catch (\Exception | \Throwable $e) {
 			return new DataResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
 		}

lib/Service/AssistantService.php

@@ -545,12 +545,14 @@ private function sanitizeInputs(string $type, array $inputs): array {
 
 	/**
 	 * Parse text from file (if parsing the file type is supported)
-	 * @param string $filePath
 	 * @param string $userId
+	 * @param string|null $filePath
+	 * @param int|null $fileId
 	 * @return string
-	 * @throws \Exception
+	 * @throws NotPermittedException
+	 * @throws \OCP\Files\NotFoundException
 	 */
-	public function parseTextFromFile(string $filePath, string $userId): string {
+	public function parseTextFromFile(string $userId, ?string $filePath = null, ?int $fileId = null): string {
 
 		try {
 			$userFolder = $this->rootFolder->getUserFolder($userId);
@@ -559,7 +561,11 @@ public function parseTextFromFile(string $filePath, string $userId): string {
 		}
 
 		try {
-			$file = $userFolder->get($filePath);
+			if ($filePath !== null) {
+				$file = $userFolder->get($filePath);
+			} else {
+				$file = $userFolder->getFirstNodeById($fileId);
+			}
 		} catch (NotFoundException $e) {
 			throw new \Exception('File not found.');
 		}

src/components/AssistantTextProcessingForm.vue

@@ -315,23 +315,53 @@ export default {
 		console.debug('[assistant] form\'s myoutputs', this.myOutputs)
 	},
 	methods: {
+		// Parse the file if a fileId is passed as initial value to a text field
+		parseTextFileInputs(taskType) {
+			if (taskType === undefined || taskType === null) {
+				return
+			}
+			Object.keys(this.myInputs).forEach(k => {
+				if (taskType.inputShape[k]?.type === 'Text') {
+					if (this.myInputs[k]?.fileId || this.myInputs[k]?.filePath) {
+						const { filePath, fileId } = { fileId: this.myInputs[k]?.fileId, filePath: this.myInputs[k]?.filePath }
+						this.myInputs[k] = ''
+						this.parseFile({ fileId, filePath })
+							.then(response => {
+								if (response.data?.ocs?.data?.parsedText) {
+									this.myInputs[k] = response.data?.ocs?.data?.parsedText
+								}
+							})
+					}
+				}
+			})
+		},
+		parseFile({ filePath, fileId }) {
+			const url = generateOcsUrl('/apps/assistant/api/v1/parse-file')
+			return axios.post(url, {
+				filePath,
+				fileId,
+			})
+		},
 		getTaskTypes() {
 			this.loadingTaskTypes = true
 			axios.get(generateOcsUrl('/apps/assistant/api/v1/task-types'))
 				.then((response) => {
-					this.taskTypes = response.data.ocs.data.types
+					const taskTypes = response.data.ocs.data.types
 					// check if selected task type is in the list, fallback to text2text
-					const taskType = this.taskTypes.find(tt => tt.id === this.mySelectedTaskTypeId)
+					const taskType = taskTypes.find(tt => tt.id === this.mySelectedTaskTypeId)
 					if (taskType === undefined) {
-						const text2textType = this.taskTypes.find(tt => tt.id === TEXT2TEXT_TASK_TYPE_ID)
+						const text2textType = taskTypes.find(tt => tt.id === TEXT2TEXT_TASK_TYPE_ID)
 						if (text2textType) {
+							this.parseTextFileInputs(text2textType)
 							this.mySelectedTaskTypeId = TEXT2TEXT_TASK_TYPE_ID
 						} else {
 							this.mySelectedTaskTypeId = null
 						}
+					} else {
+						this.parseTextFileInputs(taskType)
 					}
 					// add placeholders
-					this.taskTypes.forEach(tt => {
+					taskTypes.forEach(tt => {
 						if (tt.id === TEXT2TEXT_TASK_TYPE_ID && tt.inputShape.input) {
 							tt.inputShape.input.placeholder = t('assistant', 'Generate a first draft for a blog post about privacy')
 						} else if (tt.id === 'context_chat:context_chat' && tt.inputShape.prompt) {
@@ -350,6 +380,7 @@ export default {
 							tt.inputShape.source_input.placeholder = t('assistant', 'A description of what you need or some original content')
 						}
 					})
+					this.taskTypes = taskTypes
 				})
 				.catch((error) => {
 					console.error(error)