[stable31] fix(TaskProcessing): Cache task types by user language

lib/private/TaskProcessing/Manager.php

@@ -73,6 +73,8 @@
 	public const LEGACY_PREFIX_TEXTTOIMAGE = 'legacy:TextToImage:';
 	public const LEGACY_PREFIX_SPEECHTOTEXT = 'legacy:SpeechToText:';
 
+	public const TASK_TYPES_CACHE_KEY = 'available_task_types_v3';
+
 	/** @var list<IProvider>|null */
 	private ?array $providers = null;
 
@@ -108,6 +110,7 @@
 		private IUserManager $userManager,
 		private IUserSession $userSession,
 		ICacheFactory $cacheFactory,
+		private IFactory $l10nFactory,
 	) {
 		$this->appData = $appDataFactory->get('core');
 		$this->distributedCache = $cacheFactory->createDistributed('task_processing::');
@@ -813,12 +816,15 @@
 	}
 
 	public function getAvailableTaskTypes(bool $showDisabled = false, ?string $userId = null): array {
+		// We cache by language, because some task type fields are translated
+		$cacheKey = self::TASK_TYPES_CACHE_KEY . ':' . $this->l10nFactory->findLanguage();
+
 		// userId will be obtained from the session if left to null
 		if (!$this->checkGuestAccess($userId)) {
 			return [];
 		}
 		if ($this->availableTaskTypes === null) {
-			$cachedValue = $this->distributedCache->get('available_task_types_v2');
+			$cachedValue = $this->distributedCache->get($cacheKey);
 			if ($cachedValue !== null) {
 				$this->availableTaskTypes = unserialize($cachedValue);
 			}
@@ -864,7 +870,7 @@
 			}
 
 			$this->availableTaskTypes = $availableTaskTypes;
-			$this->distributedCache->set('available_task_types_v2', serialize($this->availableTaskTypes), 60);
+			$this->distributedCache->set($cacheKey, serialize($this->availableTaskTypes), 60);
 		}
 
 
@@ -1074,7 +1080,7 @@
 				$task->setEndedAt(time());
 				$error = 'The task was processed successfully but the provider\'s output doesn\'t pass validation against the task type\'s outputShape spec and/or the provider\'s own optionalOutputShape spec';
 				$task->setErrorMessage($error);
 				$this->logger->error($error . ' Output was: ' . var_export($result, true), ['exception' => $e]);
 			} catch (NotPermittedException $e) {
 				$task->setProgress(1);
 				$task->setStatus(Task::STATUS_FAILED);

tests/lib/TaskProcessing/TaskProcessingTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -28,6 +29,7 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\L10N\IFactory;
 use OCP\TaskProcessing\EShapeType;
 use OCP\TaskProcessing\Events\GetTaskProcessingProvidersEvent;
 use OCP\TaskProcessing\Events\TaskFailedEvent;
@@ -612,6 +614,7 @@ protected function setUp(): void {
 			$userManager,
 			\OC::$server->get(IUserSession::class),
 			\OC::$server->get(ICacheFactory::class),
+			\OC::$server->get(IFactory::class),
 		);
 	}
 
@@ -1264,6 +1267,7 @@ private function createManagerInstance(): Manager {
 			\OC::$server->get(IUserManager::class),
 			\OC::$server->get(IUserSession::class),
 			\OC::$server->get(ICacheFactory::class),
+			\OC::$server->get(IFactory::class),
 		);
 	}