Merge pull request #10632 from nextcloud/backport/10620/stable4.2

[stable4.2] fix: Adjust TaskProcessingListener
nextcloud · Jan 30, 2025 · bf52851 · bf52851
2 parents 28015fd + 46e74b8
commit bf52851
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/lib/Listener/NewMessagesSummarizeListener.php b/lib/Listener/NewMessagesSummarizeListener.php
@@ -34,7 +34,7 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
-		if ($this->appConfig->getAppValue('llm_processing', 'no') !== 'yes') {
+		if ($this->appConfig->getAppValueBool('llm_processing', false) === false) {
 			return;
 		}
 		if (!($event instanceof NewMessagesSynchronized)) {

diff --git a/lib/Service/AiIntegrations/AiIntegrationsService.php b/lib/Service/AiIntegrations/AiIntegrationsService.php
@@ -20,10 +20,9 @@
 use OCA\Mail\Model\EventData;
 use OCA\Mail\Model\IMAPMessage;
 use OCP\IConfig;
-use OCP\TaskProcessing\Exception\Exception as TaskProcessingException;
 use OCP\TaskProcessing\IManager as TaskProcessingManager;
 use OCP\TaskProcessing\Task as TaskProcessingTask;
-use OCP\TaskProcessing\TaskTypes\TextToText;
+use OCP\TaskProcessing\TaskTypes\TextToTextSummary;
 use OCP\TextProcessing\FreePromptTaskType;
 use OCP\TextProcessing\IManager;
 use OCP\TextProcessing\SummaryTaskType;
@@ -66,17 +65,15 @@ public function __construct(
 	 * @return void
 	 */
 	public function summarizeMessages(Account $account, array $messages): void {
-		try {
-			$this->taskProcessingManager->getPreferredProvider(TextToText::ID);
-		} catch (TaskProcessingException $e) {
+		$availableTaskTypes = $this->taskProcessingManager->getAvailableTaskTypes();
+		if (!isset($availableTaskTypes[TextToTextSummary::ID])) {
 			$this->logger->info('No text summary provider available');
 			return;
 		}
 
 		$client = $this->clientFactory->getClient($account);
 		try {
 			foreach ($messages as $entry) {
-
 				if (mb_strlen((string)$entry->getSummary()) !== 0) {
 					continue;
 				}
@@ -104,7 +101,7 @@ public function summarizeMessages(Account $account, array $messages): void {
 						  "Here is the ***E-MAIL*** for which you must generate a helpful summary: \r\n" .
 						  "***START_OF_E-MAIL***\r\n$messageBody\r\n***END_OF_E-MAIL***\r\n";
 				$task = new TaskProcessingTask(
-					TextToText::ID,
+					TextToTextSummary::ID,
 					[
 						'max_tokens' => 1024,
 						'input' => $prompt,

diff --git a/tests/Unit/Listener/NewMessagesSummarizeListenerTest.php b/tests/Unit/Listener/NewMessagesSummarizeListenerTest.php
@@ -57,9 +57,9 @@ public function testLlmEnabled(): void {
 			->method('getMessages')
 			->willReturn([]);
 		$this->appConfig->expects($this->once())
-			->method('getAppValue')
-			->with('llm_processing', 'no')
-			->willReturn('yes');
+			->method('getAppValueBool')
+			->with('llm_processing', false)
+			->willReturn(true);
 		$this->aiService->expects($this->once())
 			->method('summarizeMessages')
 			->with($account, []);
@@ -69,9 +69,9 @@ public function testLlmEnabled(): void {
 	public function testLlmDisabled(): void {
 		$event = $this->createMock(NewMessagesSynchronized::class);
 		$this->appConfig->expects($this->once())
-			->method('getAppValue')
-			->with('llm_processing', 'no')
-			->willReturn('no');
+			->method('getAppValueBool')
+			->with('llm_processing', false)
+			->willReturn(false);
 		$this->aiService->expects($this->never())
 			->method('summarizeMessages');
 		$this->listener->handle($event);

diff --git a/tests/Unit/Service/AiIntegrationsServiceTest.php b/tests/Unit/Service/AiIntegrationsServiceTest.php
@@ -22,7 +22,6 @@
 use OCA\Mail\Service\AiIntegrations\Cache;
 use OCP\AppFramework\QueryException;
 use OCP\IConfig;
-use OCP\TaskProcessing\Exception\Exception as TaskProcessingException;
 use OCP\TaskProcessing\IManager as TaskProcessingManager;
 use OCP\TaskProcessing\IProvider as TaskProcessingProvider;
 use OCP\TextProcessing\FreePromptTaskType;
@@ -379,8 +378,8 @@ public function testSummarizeMessagesNoProvider() {
 		$account = new Account(new MailAccount());
 		$message = new Message();
 		$this->taskProcessingManager->expects(self::once())
-			->method('getPreferredProvider')
-			->willThrowException(new TaskProcessingException());
+			->method('getAvailableTaskTypes')
+			->willReturn([]);
 		$this->logger->expects(self::once())
 			->method('info')
 			->with('No text summary provider available');
@@ -402,8 +401,8 @@ public function testSummarizeMessagesContainsSummary() {
 		$message->setSummary('Test Summary');
 
 		$this->taskProcessingManager->expects(self::once())
-			->method('getPreferredProvider')
-			->willReturn($this->taskProcessingProvider);
+			->method('getAvailableTaskTypes')
+			->willReturn(['core:text2text:summary' => $this->taskProcessingProvider]);
 		$this->clientFactory->expects(self::once())
 			->method('getClient');
 
@@ -440,8 +439,8 @@ public function testSummarizeMessagesIsEncrypted() {
 			->method('isEncrypted')->willReturn(true);
 
 		$this->taskProcessingManager->expects(self::once())
-			->method('getPreferredProvider')
-			->willReturn($this->taskProcessingProvider);
+			->method('getAvailableTaskTypes')
+			->willReturn(['core:text2text:summary' => $this->taskProcessingProvider]);
 		$this->taskProcessingManager->expects(self::never())
 			->method('scheduleTask');
 
@@ -499,8 +498,8 @@ public function testSummarizeMessages() {
 			->method('isEncrypted')->willReturn(false);
 
 		$this->taskProcessingManager->expects(self::once())
-			->method('getPreferredProvider')
-			->willReturn($this->taskProcessingProvider);
+			->method('getAvailableTaskTypes')
+			->willReturn(['core:text2text:summary' => $this->taskProcessingProvider]);
 		$this->taskProcessingManager->expects(self::once())
 			->method('scheduleTask');